Skip to content

TVec template fixes #3170

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

Open
LagoLunatic wants to merge 2 commits into
base: main
Choose a base branch
from
+62 −50
Open

TVec template fixes #3170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fc1a111
TVec template fixes
LagoLunatic Jul 31, 2026
510f01d
Fix cubic
LagoLunatic Jul 31, 2026
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
95 changes: 52 additions & 43 deletions libs/JSystem/include/JSystem/JGeometry.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,12 +65,12 @@ struct TUtil<f32> {
};

template<>
struct TUtil<double> {
static inline double epsilon() { return 32.0f * FLT_EPSILON; }
static inline double one() { return 1.0; }
static inline double atan2(double x, double y) { return ::atan2(x, y); }
static inline double asin(double x) { return ::asin(x); }
static inline double halfPI() { return 1.5707963267948966; }
struct TUtil<f64> {
static inline f64 epsilon() { return 32.0f * FLT_EPSILON; }
static inline f64 one() { return 1.0; }
static inline f64 atan2(f64 x, f64 y) { return ::atan2(x, y); }
static inline f64 asin(f64 x) { return ::asin(x); }
static inline f64 halfPI() { return 1.5707963267948966; }
};

template <typename T>
Expand All @@ -79,29 +79,31 @@ struct TVec3 {
T y;
T z;

void set(const TVec3& other) {
x = other.x;
y = other.y;
z = other.z;
template <class U>
void set(const TVec3<U>& other) {
x = (T)other.x;
y = (T)other.y;
z = (T)other.z;
}
};

template <>
struct TVec3<double> {
double x, y, z;
struct TVec3<f64> {
f64 x, y, z;

void set(double x_, double y_, double z_) {
x = x_;
y = y_;
z = z_;
template <class U>
void set(U x_, U y_, U z_) {
x = (f64)x_;
y = (f64)y_;
z = (f64)z_;
}

inline TVec3<double>& operator*=(double b) {
inline TVec3<f64>& operator*=(f64 b) {
scale(b);
return *this;
}

void scale(double b) {
void scale(f64 b) {
x *= b;
y *= b;
z *= b;
Expand All @@ -114,7 +116,8 @@ struct TVec3<s16> {

TVec3() {}

TVec3(s16 x, s16 y, s16 z) {
template <class U>
TVec3(U x, U y, U z) {
set(x, y, z);
}

Expand All @@ -125,7 +128,8 @@ struct TVec3<s16> {
return *this;
}

void set(s16 x_, s16 y_, s16 z_) {
template <class U>
void set(U x_, U y_, U z_) {
x = (s16)x_;
y = (s16)y_;
z = (s16)z_;
Expand Down Expand Up @@ -187,21 +191,21 @@ struct TVec3<f32> : public Vec {
setTVec3f(&i_vec.x, &x);
}

template<class U>
template <class U>
TVec3(U x, U y, U z) {
set((U)x, (U)y, (U)z);
set(x, y, z);
}

TVec3() {}

operator Vec*() { return (Vec*)&x; }
operator const Vec*() const { return (Vec*)&x; }

template<class U>
template <class U>
void set(const TVec3<U>& other) {
x = (U)other.x;
y = (U)other.y;
z = (U)other.z;
x = (f32)other.x;
y = (f32)other.y;
z = (f32)other.z;
}

void set(const Vec& other) {
Expand All @@ -210,11 +214,11 @@ struct TVec3<f32> : public Vec {
z = other.z;
}

template<class U>
template <class U>
void set(U x_, U y_, U z_) {
x = (U)x_;
y = (U)y_;
z = (U)z_;
x = (f32)x_;
y = (f32)y_;
z = (f32)z_;
}

inline void add(const TVec3<f32>& b) {
Expand Down Expand Up @@ -399,8 +403,9 @@ struct TVec3<f32> : public Vec {
return JMathInlineVEC::C_VECDotProduct(this, &other);
}

void cubic(const TVec3<f32>& param_1, const TVec3<f32>& param_2, const TVec3<f32>& param_3,
const TVec3<f32>& param_4, f32 param_5) {
template <class U>
void cubic(const TVec3<U>& param_1, const TVec3<U>& param_2, const TVec3<U>& param_3,
const TVec3<U>& param_4, U param_5) {
f32 fVar5 = param_5 * param_5;
f32 fVar6 = fVar5 * param_5;
f32 fVar8 = 1.0f + (2.0f * fVar6 - 3.0f * fVar5);
Expand All @@ -416,23 +421,27 @@ struct TVec3<f32> : public Vec {
template <typename T>
struct TVec2 {
TVec2() {}
TVec2(T v) { set(v); }
TVec2(T v) { setAll(v); }

template <typename U>
TVec2(const U x, const U y) { set(x, y); }
template <class U>
TVec2(U x, U y) { set(x, y); }

void set(T v) { y = x = v; }
template <class U>
void setAll(U v) {
x = (T)v;
y = (T)v;
}

template <typename U>
void set(const U x, const U y) {
this->x = x;
this->y = y;
template <class U>
void set(U x_, U y_) {
x = (T)x_;
y = (T)y_;
}

template <typename U>
template <class U>
void set(const TVec2<U>& other) {
x = other.x;
y = other.y;
x = (T)other.x;
y = (T)other.y;
}

void setMin(const TVec2<f32>& min) {
Expand Down
7 changes: 5 additions & 2 deletions libs/JSystem/include/JSystem/JParticle/JPAEmitter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,8 +152,11 @@ class JPABaseEmitter {
void setSpread(f32 i_spread) { mSpread = i_spread; }
void setLocalTranslation(const JGeometry::TVec3<f32>& i_trans) { mLocalTrs.set(i_trans); }
void setLocalRotation(const JGeometry::TVec3<s16>& i_rot) {
mLocalRot.set(i_rot.x * (360.0f / 0xffff), i_rot.y * (360.0f / 0xffff),
i_rot.z * (360.0f / 0xffff));
mLocalRot.set(
(s16)(i_rot.x * (360.0f / 0xffff)),
(s16)(i_rot.y * (360.0f / 0xffff)),
(s16)(i_rot.z * (360.0f / 0xffff))
);
}
void setRateStep(u8 i_step) { mRateStep = i_step; }

Expand Down
6 changes: 3 additions & 3 deletions libs/JSystem/src/JStudio/JStudio_JParticle/object-particle.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,9 +377,9 @@ void TAdaptor_particle::TJPACallback_emitter_::execute(JPABaseEmitter* pJPAEmitt
}
pJPAEmitter->setGlobalTranslation(pVVar9->translation);
pJPAEmitter->setGlobalRotation(JGeometry::TVec3<s16>(
65536.0 * (pVVar9->rotation.x / 360.0),
65536.0 * (pVVar9->rotation.y / 360.0),
65536.0 * (pVVar9->rotation.z / 360.0)
(s16)(65536.0 * (pVVar9->rotation.x / 360.0)),
(s16)(65536.0 * (pVVar9->rotation.y / 360.0)),
(s16)(65536.0 * (pVVar9->rotation.z / 360.0))
));
pJPAEmitter->setGlobalScale(pVVar9->scaling);
} else {
Expand Down
4 changes: 2 additions & 2 deletions src/d/actor/d_a_kytag03.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,8 +315,8 @@ static int daKytag03_Execute(kytag03_class* i_this) {
sp2C.z = 3.0f;
i_this->mpEmitter->setGlobalScale(sp2C);

JGeometry::TVec3<s16> rot(4000, S_ang_y_work, 1500);
S_ang_y_work += 100;
JGeometry::TVec3<s16> rot((s16)4000, S_ang_y_work, (s16)1500);
S_ang_y_work += (s16)100;

i_this->mpEmitter->setGlobalRotation(rot);
i_this->mpEmitter->setRate(0.5f);
Expand Down
Loading