mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-07-07 13:23:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add checkScaleOne inline

Browse Source
This commit is contained in:
LagoLunatic
2024-06-29 10:45:55 -04:00
parent c56933f43c
commit f4a2e2f9f4
2 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/dolphin/mtx/vec.h
+8
View File
@@ -49,6 +49,14 @@ inline f32 C_VECSquareMag(const Vec* v) {
return v->x * v->x + v->y * v->y + v->z * v->z;
}
inline BOOL checkScaleOne(Vec v) {
if (v.x == 1.0f && v.y == 1.0f && v.z == 1.0f) {
return TRUE;
} else {
return FALSE;
}
}
/* When compiling in debug mode, use C implementations */
#if 0
#define VECAdd C_VECAdd
src/JSystem/J3DGraphAnimator/J3DJoint.cpp
+2 -16
View File
@@ -56,15 +56,8 @@ void J3DMtxCalcBasic::calcTransform(u16 param_0, const J3DTransformInfo& info) {
J3DSys::mCurrentS.x *= info.mScale.x;
J3DSys::mCurrentS.y *= info.mScale.y;
J3DSys::mCurrentS.z *= info.mScale.z;
Vec tmp = J3DSys::mCurrentS;
s32 var1;
if (tmp.x == 1.0f && tmp.y == 1.0f && tmp.z == 1.0f) {
var1 = 1;
} else {
var1 = 0;
}
s32 r29;
if (var1) {
if (checkScaleOne(J3DSys::mCurrentS)) {
j3dSys.getModel()->setScaleFlag(param_0, 1);
r29 = 1;
} else {
@@ -112,15 +105,8 @@ void J3DMtxCalcSoftimage::calcTransform(u16 param_0, const J3DTransformInfo& inf
J3DSys::mCurrentS.x = J3DSys::mCurrentS.x * info.mScale.x;
J3DSys::mCurrentS.y = J3DSys::mCurrentS.y * info.mScale.y;
J3DSys::mCurrentS.z = J3DSys::mCurrentS.z * info.mScale.z;
Vec tmp = J3DSys::mCurrentS;
s32 var1;
if (tmp.x == 1.0f && tmp.y == 1.0f && tmp.z == 1.0f) {
var1 = 1;
} else {
var1 = 0;
}
s32 var2;
if (var1) {
if (checkScaleOne(J3DSys::mCurrentS)) {
j3dSys.getModel()->setScaleFlag(param_0, 1);
var2 = 1;
} else {