diff options
Diffstat (limited to '')
| -rw-r--r-- | include/g3dhax.h | 8 | ||||
| -rwxr-xr-x | include/game.h | 23 |
2 files changed, 4 insertions, 27 deletions
diff --git a/include/g3dhax.h b/include/g3dhax.h index f2cdd29..d4aa9a0 100644 --- a/include/g3dhax.h +++ b/include/g3dhax.h @@ -257,12 +257,12 @@ namespace m3d { void *frameHeap; // should be a frame heap mAllocator_c allocator; + float getCurrentFrame(); + float setCurrentFrame(float value); + float getUpdateRate(); + float setUpdateRate(float value); private: void setupHeap(mAllocator_c *allocator, u32 *sizeOutput); - float _getCurrentFrame(); - float _setCurrentFrame(float value); - float _getUpdateRate(); - float _setUpdateRate(float value); }; class fanm_c : public banm_c { diff --git a/include/game.h b/include/game.h index b6b07dd..bbb7de0 100755 --- a/include/game.h +++ b/include/game.h @@ -2201,28 +2201,5 @@ inline u8 *getResource(const char *arcName, const char *fileName) { inline void scaleDown(Vec* scale, float amt) { scale->x -= amt; scale->y -= amt; scale->z -= amt; }
inline void scaleUp(Vec* scale, float amt) { scale->x -= amt; scale->y -= amt; scale->z -= amt; }
-inline void setNewActivePhysicsRect(dStageActor_c* actor, Vec* scale) {
- float amtX = scale->x;
- float amtY = scale->y;
-
- ActivePhysics::Info info;
- info.xDistToCenter = 0.0;
- info.yDistToCenter = 3.0 * amtY;
- info.xDistToEdge = 4.0 * amtX;
- info.yDistToEdge = 4.0 * amtY;
-
- info.category1 = actor->aPhysics.info.category1;
- info.category2 = actor->aPhysics.info.category2;
- info.bitfield1 = actor->aPhysics.info.bitfield1;
- info.bitfield2 = actor->aPhysics.info.bitfield2;
- info.unkShort1C = actor->aPhysics.info.unkShort1C;
- info.callback = actor->aPhysics.info.callback;
-
- OSReport("Making new Physics Class and adding to the list\n");
- actor->aPhysics.removeFromList();
- actor->aPhysics.initWithStruct(actor, &info);
- actor->aPhysics.addToList();
-}
-
#endif
|