patrick boss progress

escape209 · Jul 27, 2024 · f860a57 · f860a57
1 parent 607f4b6
commit f860a57
Show file tree

Hide file tree

Showing 7 changed files with 613 additions and 25 deletions.
diff --git a/src/SB/Core/gc/iModel.h b/src/SB/Core/gc/iModel.h
@@ -17,6 +17,7 @@ S32 iModelCullPlusShadow(RpAtomic* model, RwMatrix* mat, xVec3* shadowVec, S32*
 void iModelTagEval(RpAtomic* model, const xModelTag* tag, RwMatrixTag* mat, xVec3* dest);
 U32 iModelTagSetup(xModelTag* tag, RpAtomic* model, F32 x, F32 y, F32 z);
 void iModelSetMaterialAlpha(RpAtomic* model, U8 alpha);
+void iModelMaterialMul(RpAtomic* model, F32 rm, F32 gm, F32 bm);
 RpAtomic* iModelFileNew(void* buffer, U32 size);
 void iModelRender(RpAtomic* model, RwMatrix* mat);
 void iModelUnload(RpAtomic* userdata);

diff --git a/src/SB/Core/x/xCollide.h b/src/SB/Core/x/xCollide.h
@@ -1,6 +1,7 @@
 #ifndef XCOLLIDE_H
 #define XCOLLIDE_H
 
+#include "xEnv.h"
 #include "xModel.h"
 #include "xQuickCull.h"
 #include "iMath3.h"
@@ -18,7 +19,7 @@ struct xCollis
     U32 oid;
     void* optr;
     xModelInstance* mptr;
-    F32 dist;
+    F32 dist; // 0x30
     xVec3 norm;
     xVec3 tohit;
     xVec3 depen;
@@ -110,6 +111,10 @@ bool xSphereHitsVCircle(const xSphere& s, const xVec3& c, F32 r);
 bool xSphereHitsVCircle(const xVec3& sc, F32 sr, const xVec3& cc, F32 cr);
 U32 xSphereHitsModel(const xSphere* b, const xModelInstance* m, xCollis* coll);
 
+S32 xParabolaHitsEnv(xParabola* p, xEnv* env, xCollis* colls);
+void xParabolaEvalPos(const xParabola*, xVec3*, F32);
+void xParabolaEvalVel(const xParabola*, xVec3*, F32);
+
 void xVec3AddScaled(xVec3*, const xVec3*, F32);
 
 #endif
diff --git a/src/SB/Core/x/xGrid.h b/src/SB/Core/x/xGrid.h
@@ -67,11 +67,13 @@ S32 xGridRemove(xGridBound* gridb);
 xGridBound** xGridGetCell(xGrid* grid, const xEnt* ent, S32& grx, S32& grz);
 void xGridGetCell(xGrid* grid, F32 posx, F32 posy, F32 posz, S32& grx, S32& grz);
 xGridBound* xGridIterFirstCell(xGrid* grid, S32 grx, S32 grz, xGridIterator& iter);
-xGridBound* xGridIterFirstCell(xGrid* grid, F32 posx, F32, F32 posz, S32& grx,
-                               S32& grz, xGridIterator& it);
+xGridBound* xGridIterFirstCell(xGrid* grid, F32 posx, F32, F32 posz, S32& grx, S32& grz,
+                               xGridIterator& it);
 xGridBound* xGridIterFirstCell(xGridBound** head, xGridIterator& it);
 xGridBound* xGridIterNextCell(xGridIterator& it);
 void xGridIterClose(xGridIterator& it);
 void xGridCheckPosition(xGrid* grid, xVec3* pos, xQCData* qcd, GridEntCallback hitCB, void* cbdata);
+S32 xGridEntIsTooBig(xGrid* grid, const xEnt* ent);
+S32 xGridAdd(xGrid* grid, xEnt* ent);
 
 #endif
diff --git a/src/SB/Game/zGlobals.h b/src/SB/Game/zGlobals.h
@@ -219,13 +219,13 @@ struct zPlayerGlobals
     xVec3 AutoMoveTarget;
     xBase* AutoMoveObject;
     zEnt* Diggable;
-    F32 DigTimer;
+    F32 DigTimer; // 0x17AC
     zPlayerCarryInfo carry;
     zPlayerLassoInfo lassoInfo;
     xModelTag BubbleWandTag[2];
-    xModelInstance* model_wand;
+    xModelInstance* model_wand; // 0x19E0
     xEntBoulder* bubblebowl;
-    F32 bbowlInitVel;
+    F32 bbowlInitVel; // 0x19E8
     zEntHangable* HangFound;
     zEntHangable* HangEnt;
     zEntHangable* HangEntLast;
@@ -317,7 +317,7 @@ struct zGlobals : xGlobals
     zPlayerGlobals player;
     zAssetPickupTable* pickupTable; // 0x1FB8
     zCutsceneMgr* cmgr; // 0x1FBC
-    zScene* sceneCur;
+    zScene* sceneCur; // 0x1FC0
     zScene* scenePreload;
 };