Skip to content

Vector3 record #92

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 15 commits into from
Sep 26, 2025
Merged

Vector3 record #92

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
2e027cc
add vector3 record
JordyAaldering Apr 29, 2024
7ebbee6
vec3d remove ambiguous equality operations
JordyAaldering Apr 30, 2024
21263d1
rename vec3d to vector3
JordyAaldering Apr 30, 2024
f783153
vec3d equality operations
JordyAaldering May 1, 2024
45f0410
add missing macro arguments
JordyAaldering May 1, 2024
4d3ad06
add Vector3 to Structures.sac
JordyAaldering May 2, 2024
51eede6
Add DxS and SxD variants for Vector3
JordyAaldering Nov 13, 2024
81441be
add float variant of vector3
JordyAaldering Jan 7, 2025
5ade95f
add missing undefs
JordyAaldering Jan 7, 2025
b5624c2
avoid name clash
JordyAaldering Sep 25, 2025
e4af485
move .mac to correct location
JordyAaldering Sep 25, 2025
e75a949
try to avoid name clashes
JordyAaldering Sep 25, 2025
05f0750
try to avoid name clashes
JordyAaldering Sep 25, 2025
b366e52
use d>0:shp notation
JordyAaldering Sep 25, 2025
dd4c295
must disable vector3 in structures module for now
JordyAaldering Sep 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions cmake/sac-core-ext.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,8 @@ structures/ScalarArith.xsac Core
structures/String.sac Core
structures/StringArray.sac Ext
structures/Structures.sac Core
structures/Vector3d.xsac Ext
structures/Vector3f.xsac Ext

# System
system/Clock.sac Core
Expand Down
171 changes: 171 additions & 0 deletions include/Vector3.mac
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,171 @@
#pragma safe

module VECTOR3;

export all;

struct VECTOR3 {
REAL VX;
REAL VY;
REAL VZ;
};

inline REAL
l2norm(struct VECTOR3 v)
{
x = _mul_SxS_(v.VX, v.VX);
y = _mul_SxS_(v.VY, v.VY);
z = _mul_SxS_(v.VZ, v.VZ);
return Math::sqrt(_add_SxS_(_add_SxS_(x, y), z));
}

/******************************************************************************
*
* Binary operations
*
******************************************************************************/

#define VEC3D_BIN_AxA(name, op) \
inline struct VECTOR3[d>0:shp] \
name(struct VECTOR3[d>0:shp] a, struct VECTOR3[d>0:shp] b) \
{ \
return { iv -> VECTOR3 { op(_sel_VxA_(iv, a).VX, _sel_VxA_(iv, b).VX), \
op(_sel_VxA_(iv, a).VY, _sel_VxA_(iv, b).VY), \
op(_sel_VxA_(iv, a).VZ, _sel_VxA_(iv, b).VZ) } \
| iv < shp }; \
}

#define VEC3D_BIN_AxS(name, op) \
inline struct VECTOR3[d>0:shp] \
name(struct VECTOR3[d>0:shp] a, struct VECTOR3 b) \
{ \
return { iv -> VECTOR3 { op(_sel_VxA_(iv, a).VX, b.VX), \
op(_sel_VxA_(iv, a).VY, b.VY), \
op(_sel_VxA_(iv, a).VZ, b.VZ) } \
| iv < shp }; \
}

#define VEC3D_BIN_AxX(name, op) \
inline struct VECTOR3[d>0:shp] name(struct VECTOR3[d>0:shp] a, REAL b) \
{ \
return { iv -> VECTOR3 { op(_sel_VxA_(iv, a).VX, b), \
op(_sel_VxA_(iv, a).VY, b), \
op(_sel_VxA_(iv, a).VZ, b) } \
| iv < shp }; \
}

#define VEC3D_BIN_SxS(name, op) \
inline struct VECTOR3 name(struct VECTOR3 a, struct VECTOR3 b) \
{ \
return VECTOR3 { op(a.VX, b.VX), op(a.VY, b.VY), op(a.VZ, b.VZ) }; \
}

#define VEC3D_BIN_SxX(name, op) \
inline struct VECTOR3 name(struct VECTOR3 a, REAL b) \
{ \
return VECTOR3 { op(a.VX, b), op(a.VY, b), op(a.VZ, b) }; \
}

#define VEC3D_BIN(name, op) \
VEC3D_BIN_AxA(name, op) \
VEC3D_BIN_AxS(name, op) \
VEC3D_BIN_AxX(name, op) \
VEC3D_BIN_SxS(name, op) \
VEC3D_BIN_SxX(name, op)

VEC3D_BIN(+, _add_SxS_)
VEC3D_BIN(-, _sub_SxS_)
VEC3D_BIN(*, _mul_SxS_)
VEC3D_BIN(/, _div_SxS_)

/******************************************************************************
*
* Unary operations
*
******************************************************************************/

#define VEC3D_UNARY_A(name, op) \
inline struct VECTOR3[d>0:shp] name(struct VECTOR3[d>0:shp] a) \
{ \
return { iv -> VECTOR3 { op(_sel_VxA_(iv, a).VX), \
op(_sel_VxA_(iv, a).VY), \
op(_sel_VxA_(iv, a).VZ) } \
| iv < shp }; \
}

#define VEC3D_UNARY_S(name, op) \
inline struct VECTOR3 name(struct VECTOR3 a) \
{ \
return VECTOR3{ op(a.VX), op(a.VY), op(a.VZ) }; \
}

#define VEC3D_UNARY(name, op) \
VEC3D_UNARY_A(name, op) \
VEC3D_UNARY_S(name, op)

VEC3D_UNARY(-, _neg_S_)

/******************************************************************************
*
* Equality operations
*
******************************************************************************/

#define VEC3D_EQ_AxA(name, op, and_or) \
inline bool[d>0:shp] name(struct VECTOR3[d>0:shp] a, struct VECTOR3[d>0:shp] b)\
{ \
return with { \
(_mul_SxV_(0, shp) <= iv < shp) : \
and_or(op(_sel_VxA_(iv, a).VX, _sel_VxA_(iv, b).VX), \
and_or(op(_sel_VxA_(iv, a).VY, _sel_VxA_(iv, b).VY), \
op(_sel_VxA_(iv, a).VZ, _sel_VxA_(iv, b).VZ))); \
}: genarray(shp, true); \
}

#define VEC3D_EQ_AxS(name, op, and_or) \
inline bool[d>0:shp] name(struct VECTOR3[d>0:shp] a, struct VECTOR3 b) \
{ \
return with { \
(_mul_SxV_(0, shp) <= iv < shp) : \
and_or(op(_sel_VxA_(iv, a).VX, b.VX), \
and_or(op(_sel_VxA_(iv, a).VY, b.VY), \
op(_sel_VxA_(iv, a).VZ, b.VZ))); \
}: genarray(shp, true); \
}

#define VEC3D_EQ_AxX(name, op, and_or) \
inline bool[d>0:shp] name(struct VECTOR3[d>0:shp] a, REAL b) \
{ \
return with { \
(_mul_SxV_(0, shp) <= iv < shp) : \
and_or(op(_sel_VxA_(iv, a).VX, b), \
and_or(op(_sel_VxA_(iv, a).VY, b), \
op(_sel_VxA_(iv, a).VZ, b))); \
}: genarray(shp, true); \
}

#define VEC3D_EQ_SxS(name, op, and_or) \
inline bool name(struct VECTOR3 a, struct VECTOR3 b) \
{ \
return and_or(op(a.VX, b.VX), \
and_or(op(a.VY, b.VY), \
op(a.VZ, b.VZ))); \
}

#define VEC3D_EQ_SxX(name, op, and_or) \
inline bool name(struct VECTOR3 a, REAL b) \
{ \
return and_or(op(a.VX, b), \
and_or(op(a.VY, b), \
op(a.VZ, b))); \
}

#define VEC3D_EQ(name, op, and_or) \
VEC3D_EQ_AxA(name, op, and_or) \
VEC3D_EQ_AxS(name, op, and_or) \
VEC3D_EQ_AxX(name, op, and_or) \
VEC3D_EQ_SxS(name, op, and_or) \
VEC3D_EQ_SxX(name, op, and_or)

VEC3D_EQ(==, _eq_SxS_, _and_SxS_)
VEC3D_EQ(!=, _neq_SxS_, _or_SxS_)
5 changes: 5 additions & 0 deletions src/structures/Structures.sac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,11 @@ import Color8: all;
import Complex: all;
import List: all;
import Quaternion: all;
/* Importing both currently causes a name clash, because the same C function
* name is being generated for both the double and float variants.
* Until this has been fixed, we must exclude them from this module. */
//import Vector3d: all;
//import Vector3f: all;
#endif

export all;
7 changes: 7 additions & 0 deletions src/structures/Vector3d.xsac
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#define REAL double
#define VECTOR3 Vector3d
#define VX xd
#define VY yd
#define VZ zd

#include "Vector3.mac"
7 changes: 7 additions & 0 deletions src/structures/Vector3f.xsac
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#define REAL float
#define VECTOR3 Vector3f
#define VX xf
#define VY yf
#define VZ zf

#include "Vector3.mac"
Loading