[WIP] GeographyObjMgr - MapObj Classes

include/JSystem/JGeometry/Quat.h

@@ -85,8 +85,10 @@ namespace JGeometry {
 
         void setRotate(const TVec3f& pVec, f32 pAngle)
         {
-            this->xyz().scale(sinf(pAngle * 0.5f), pVec);
-            this->w = cosf(pAngle * 0.5f);
+            const f32 s = sinf(pAngle * 0.5f); 
+            this->xyz().scale(s, pVec);
+            const f32 c = cosf(pAngle * 0.5f);
+            this->w = c;
         }
 
         void setRotate(const TVec3f& from, const TVec3f& to)

include/Kaneshige/Course/Course.h

@@ -229,6 +229,10 @@ class Course
 
     f32 getGroundThickness() const { return sGndThickness; }
 
+    JGeometry::TVec3f *getDirZ() { return &mDirZ; };
+    JGeometry::TVec3f *getDirY() { return &mDirY; };
+    JGeometry::TVec3f *getDirX() { return &mDirX; };
+
 private: // add all documented stuff from Ghidra
     static u16 sDrawAreaModel;
     static bool sForceDebugFogSetting;

include/Kaneshige/Course/CrsData.h

@@ -183,7 +183,7 @@ class CrsData
         JGeometry::TVec3<s16> zNorm; // 18
         JGeometry::TVec3<s16> yNorm; // 1e
         u16 objID;
-        u16 pathID;                  // 26
+        u16 mPathID;                 // 26
         u16 _28;                     //
         u16 pointIdx;                // 2a
         struct {

include/Kaneshige/Objects/GeoStartLine.h

@@ -3,9 +3,8 @@
 
 #include "Sato/GeographyObj.h"
 
-class GeoStartLine : public GeographyObj
-{
-    // Global
+class GeoStartLine : public GeographyObj {
+public:
     GeoStartLine();                              // 0x801b4860
     virtual ~GeoStartLine() {}                   // 0x801b4bd0
     virtual void reset();                        // 0x801b49c8

include/Kaneshige/RaceMgr.h

@@ -1,6 +1,7 @@
 #ifndef RACEMGR_H
 #define RACEMGR_H
 
+#include "JSystem/JKernel/JKRArchive.h"
 #include "JSystem/JUtility/TColor.h"
 #include "Kaneshige/Blurscreen.h"
 #include "Kaneshige/KartInfo.h"
@@ -229,6 +230,10 @@ class RaceMgr : public JKRDisposer
         return mBestTotalTimes[recID];
     }
 
+    JKRArchive *getAwardArc() {
+        return (JKRArchive *)mAwardArc;
+    }
+
 public:
     RaceDirector *mRaceDirector;
     RaceDrawer *mRaceDrawer;
@@ -252,7 +257,7 @@ class RaceMgr : public JKRDisposer
     KartLoader *mKartLoader[8];
     Award2D *mAward2D;
     StaffRoll2D *mStaffRoll2D;
-    void *mAwardArc;
+    void *mAwardArc;        // Should this be declared a JKRArchive...?
     RaceTime mBestLapTime;
     RaceTime mBestTotalTimes[5];
     s16 mEvents;

include/Sato/GeographyObj.h

@@ -118,7 +118,7 @@ class GeographyObj
 
     void setItemColReaction(u8 p1, u8 p2) { mReaction.setFlg(p1, p2); }
 
-    bool IsPathMove() const { return mObjData->pathID != 0xffff; }
+    bool IsPathMove() const { return mObjData->mPathID != 0xffff; }
 
     template<class T>
     static T *New(const CrsData::SObject &object) { return new T(object); }
@@ -149,13 +149,16 @@ class GeographyObj
     void clrAllCheckKartHitFlag() { mCheckKartHitFlags = 0; }
     void clrAllIsHitKartFlg() { mIsHitKartFlags = 0; }
 
-    void setObjFlagCheckItemHitting() { mGeoObjFlag |= 2; }    
+    void setCheckKartHitFlag(int kartId) { mCheckKartHitFlags |=  (1 << kartId); }
+    void setObjFlagCheckGeoHitting() { mGeoObjFlag |= 1; }
+    void setObjFlagCheckItemHitting() { mGeoObjFlag |= 2; }
     void setObjFlagSimpleDraw() { mObjFlag |= 1; }
     void setObjFlagMainResource() { mObjFlag |= 2; }
     void setObjFlagNorm() { mObjFlag |= 4; }
     void setObjFlagShadow() { mObjFlag |= 8; }
     void setObjFlagNoCollision() { mObjFlag |= 0x80; }
     void setObjFlagLODBias() { mObjFlag |= 0x100; }
+    void setObjFlagAwardCup() { mObjFlag |= 0x400; }
     void setObjFlagHidding() { mGeoObjFlag |= 0x20; }
 
     void setAllCheckKartHitFlag() { mCheckKartHitFlags = 0xffffffff; }

include/Sato/GeographyObjMgr.h

@@ -46,6 +46,7 @@ class GeographyObjManager : JKRDisposer
     ExGeographyObj *search_boundSp(const JGeometry::TVec3f &pos, f32);
 
     GeographyObj *createSubObj(u32 id);
+    GeographyObj *createGenSubObj(u32 id);
     GeographyObj *createPrevDrawSubObj(u32 id);
 
     f32 getKartHitDepthNormalObj(int kart_index) const { return mKartHitDepth[kart_index]; }
@@ -68,6 +69,8 @@ class GeographyObjManager : JKRDisposer
         return &mKartHitRefVec[myNum];
     }
 
+    void getKartCollidePosRadius(JGeometry::TVec3f &, f32 &, int);
+
     static GeographyObjManager *gMgr;
 
     u8 _18[0x10];               // 18
@@ -78,7 +81,10 @@ class GeographyObjManager : JKRDisposer
     bool mKartHitItemBox[8];    // 348
     u8 _350[0xAC];              // 350
     TJugem *mJugem[4];          // 3FC
-    u8 _40C[0x491 - 0x40C];     // 40C
+    u8 _40C[0x410 - 0x40C];     // 40C
+    JGeometry::TVec3f mKartCollidePos[8]; // 410
+    f32 mKartCollideRadius[8];  // 470
+    u8 _490;                    // 490
     bool mIsBalloonBattle;      // 491
     bool mIsBombBattle;         // 492
     bool mIsRobberyBattle;      // 493

include/Sato/ItemObj.h

@@ -263,6 +263,7 @@ class ItemObj
     void setTransfer1() { mTransferFlags |= 1; }
     void clrTransferPartner() { mTransferFlags &= ~0x200; }
     void setTransferPartner() { mTransferFlags |= 0x200; }
+    bool tstTransfer2() { return mTransferFlags & 0x2; }
 
     // Inline/Unused
     void combMtxOn();

include/Sato/JPEffectMgr.h

@@ -16,7 +16,7 @@ class JPEffectMgr
     void create_forMenu();                                                      // 0x8023038c
     JPABaseEmitter *createEmt(u16, const JGeometry::TVec3f &);                  // 0x8023050c
     JPABaseEmitter *createEmt(const char *, const JGeometry::TVec3f &);         // 0x80230544
-    void createEmtCameraClip(const char *, const JGeometry::TVec3f &);          // 0x80230590
+    JPABaseEmitter *createEmtCameraClip(const char *, const JGeometry::TVec3f &); // 0x80230590
     JPABaseEmitter *createEmt2D(const char *, const JGeometry::TVec3f &);       // 0x80230600
     JPABaseEmitter *createEmt(const char *, const JGeometry::TVec3f &, Mtx);    // 0x8023064c
     void createEmtThunder(const char *, const JGeometry::TVec3f &);             // 0x802306c0

include/Sato/Objects/GeoRFlower.h

@@ -16,6 +16,7 @@ class GeoRFlower : public GeographyObj { // Autogenerated
 
 
 class GeoMarioFlower1 : public GeographyObj {
+public:
     GeoMarioFlower1(const CrsData::SObject &);
     ~GeoMarioFlower1() {}
     void reset();

include/Sato/StringObj.h

@@ -100,6 +100,21 @@ class StringNodeManager {
         _3c = val;
     }
 
+
+    void link_set_30(u32 num, bool val) {
+#line 112
+        JUT_MINMAX_ASSERT(0, num, mStrNodeList.getNumLinks());
+        mStrNodeList.getNth(num)->getObject()->_30 = val;                            
+    }
+
+    void setNodeLength(u32 num, f32 val) {
+#line 202
+        JUT_MINMAX_ASSERT(0, num, mStrNodeList.getNumLinks());
+        mStrNodeList.getNth(num)->getObject()->_34 = val;                            
+    }
+
+
+
     // VTBL: 0x0
     JSUList<StringNode> mStrNodeList;           // 0x4
     f32 _10;
@@ -108,7 +123,7 @@ class StringNodeManager {
     f32 _1c;
     f32 _20;                                    // Scaling multiplier of some sort.
     f32 _24;                                    // Something related to distance calculations...?
-    Vec _28;
+    JGeometry::TVec3f _28;
     StringNode *_34;
     GameAudio::ObjectSoundMgr *mObjSoundMgr;    // 0x38
     u32 _3c;

include/Shiraiwa/Coord3D.h

@@ -17,9 +17,9 @@ class TFreeMove {
     void setTargetPos(const JGeometry::TVec3f &, f32, f32);
     void setTargetOffset(const JGeometry::TVec3f &, f32, f32);
     void setTargetOffsetUniform(const JGeometry::TVec3f &, int);
-    void update();
-    void checkReachTarget();
-    void velUpdate(JGeometry::TVec3f &, f32, f32);
+    bool update();
+    bool checkReachTarget();
+    bool velUpdate(JGeometry::TVec3f &, f32, f32);
     void TPathMove(const CrsData::SObject *);
 
     // Inline/Unused
@@ -35,8 +35,12 @@ class TFreeMove {
         _18 = false;
     }
 
+    void setUnknown24(f32 value) {
+        _24 = value;
+    }
+
 private:
-    JGeometry::TVec3f mTagret;
+    JGeometry::TVec3f mTarget;
     JGeometry::TVec3f *mpPos;
     JGeometry::TVec3f *mpVel;
     bool _18;
@@ -49,30 +53,33 @@ class TPathMove {
 public:
     TPathMove(const CrsData::SObject *);
     virtual ~TPathMove() {}
-    void update();
+    u8 update();
     void init(JGeometry::TVec3f *, JGeometry::TVec3f *);
     void reset();
     void setTargetNode();
     void setTargetNode(u16, f32, f32);
     void getNodePosition(JGeometry::TVec3f *, u16);
-    void getNextNode();
+    u16 getNextNode();
     void updatePos();
-    void checkReachTarget();
+    bool checkReachTarget();
 
     // Inline/Unused
     void setTargetNode(f32, f32);
     void setTargetNode(u16);
     void getNodeDir(u16, JGeometry::TVec3f *);
 
-protected:
-    const CrsData::SObject *mpObj; // 04
-    s16 _8;                      // 
-    JGeometry::TVec3f *mpPos;      // 0c
-    JGeometry::TVec3f *mpVel;      // 10
-    f32 _14;
-    f32 _18;
-    bool _1c;
-    PLACEHOLDER_BYTES(0x1d, 0x24);
+public:
+    const CrsData::SObject *mpObj;  // 0x4
+    u16 _8;                         // 0x8
+    s8 _a;                          // 0xa
+    JGeometry::TVec3f *mpPos;       // 0xc
+    JGeometry::TVec3f *mpVel;       // 0x10
+    f32 _14;                        // 0x14
+    f32 _18;                        // 0x18
+    bool _1c;                       // 0x1c
+    bool _1d;                       // 0x1d + 2 bytes padding
+    f32 _20;                        // 0x20
+    //PLACEHOLDER_BYTES(0x1d, 0x24);
 }; // Size: 0x24
 
 class TFreeRotate {
@@ -81,7 +88,7 @@ class TFreeRotate {
     virtual ~TFreeRotate() {}
     void init(JGeometry::TPos3f *);
     void setTargetVec(const JGeometry::TVec3f &, const JGeometry::TVec3f &, f32, f32, f32);
-    void setTargetVec(const JGeometry::TVec3f &, f32, f32, f32, u8);
+    void setTargetVec(const JGeometry::TVec3f &, f32, f32, f32, unsigned char);
     void setTargetQuat(const JGeometry::TQuat4f &, f32, f32, f32);
     bool update();
     void angleUpdate();
@@ -109,5 +116,5 @@ class TFreeRotate {
     f32 mTarget;
     bool _3c;
 };
- 
+
 #endif // COORD3D_H