mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-05-23 06:54:16 -04:00
Code Issues Packages Projects Releases Wiki Activity

Demo: Fix cM3dGCyl

Browse Source
This commit is contained in:
LagoLunatic
2025-05-21 14:51:12 -04:00
parent c625992a77
commit ee2e164fa2
3 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.py
+3 -3
View File
@@ -1423,7 +1423,7 @@ config.libs = [
ActorRel(Equivalent, "d_a_obj_toripost", extra_cflags=['-pragma "nosyminline on"']), # weak func order
ActorRel(NonMatching, "d_a_obj_tousekiki"),
ActorRel(NonMatching, "d_a_obj_warpt"),
ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_obj_wood", extra_cflags=['-pragma "nosyminline on"']),
ActorRel(Matching, "d_a_obj_wood", extra_cflags=['-pragma "nosyminline on"']),
ActorRel(Equivalent, "d_a_pirate_flag"), # weak func order
ActorRel(Equivalent, "d_a_race_item", extra_cflags=['-pragma "nosyminline on"']), # weak func order
ActorRel(Equivalent, "d_a_rd", extra_cflags=['-pragma "nosyminline on"']), # weak func order
@@ -1546,7 +1546,7 @@ config.libs = [
ActorRel(NonMatching, "d_a_bwds"),
ActorRel(NonMatching, "d_a_daiocta"),
ActorRel(NonMatching, "d_a_daiocta_eye"),
ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_deku_item", extra_cflags=['-pragma "nosyminline on"']),
ActorRel(Matching, "d_a_deku_item", extra_cflags=['-pragma "nosyminline on"']),
ActorRel(NonMatching, "d_a_dk"),
ActorRel(Matching, "d_a_dummy"),
ActorRel(NonMatching, "d_a_fallrock_tag"),
@@ -1732,7 +1732,7 @@ config.libs = [
ActorRel(NonMatching, "d_a_st"),
ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_steam_tag", extra_cflags=['-pragma "nosyminline on"']),
ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_swattack", extra_cflags=['-pragma "nosyminline on"']),
ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_switem", extra_cflags=['-pragma "nosyminline on"']),
ActorRel(Matching, "d_a_switem", extra_cflags=['-pragma "nosyminline on"']),
ActorRel(NonMatching, "d_a_swpropeller"),
ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_swtact"),
ActorRel(Matching, "d_a_tag_etc"),
include/SSystem/SComponent/c_m3d_g_cyl.h
+6
View File
@@ -25,9 +25,15 @@ public:
cM3dGCyl() {}
cM3dGCyl(const cXyz*, f32, f32);
virtual ~cM3dGCyl() {}
#if VERSION == VERSION_DEMO
void SetC(const cXyz& pos) { mCenter = pos; }
void SetH(f32 h) { mHeight = h; }
void SetR(f32 r) { mRadius = r; }
#else
void SetC(const cXyz& pos);
void SetH(f32 h);
void SetR(f32 r);
#endif
void Set(const cM3dGCylS & src) {
SetC(src.mCenter);
SetR(src.mRadius);
src/SSystem/SComponent/c_m3d_g_cyl.cpp
+2
View File
@@ -11,6 +11,7 @@
#define CHECK_FLOAT_RANGE(line, x) JUT_ASSERT(line, -1.0e32f < x && x < 1.0e32f);
#define CHECK_VEC3_RANGE(line, v) JUT_ASSERT(line, -1.0e32f < v.x && v.x < 1.0e32f && -1.0e32f < v.y && v.y < 1.0e32f && -1.0e32f < v.z && v.z < 1.0e32f)
#if VERSION > VERSION_DEMO
/* 80251D88-80252020 .text SetC__8cM3dGCylFRC4cXyz */
void cM3dGCyl::SetC(const cXyz& pos) {
CHECK_FLOAT_CLASS(21, pos.x);
@@ -33,6 +34,7 @@ void cM3dGCyl::SetR(f32 r) {
CHECK_FLOAT_RANGE(49, r);
mRadius = r;
}
#endif
/* 80252278-8025229C .text cross__8cM3dGCylCFPC8cM3dGSphP4cXyz */
bool cM3dGCyl::cross(const cM3dGSph* pOther, cXyz* pOut) const {