d_camera OK

4 files changed, 22 insertions, 11 deletions

diff --git a/include/toBeSorted/d_camera_base.h b/include/toBeSorted/d_camera_base.h
index 1bf6eb69..53438ea4 100644
--- a/include/toBeSorted/d_camera_base.h
+++ b/include/toBeSorted/d_camera_base.h
@@ -7,6 +7,7 @@
 // A basic description of a camera perspective, simplified.
 struct CamView {
     CamView() : mPosition(0.0f, 0.0f, 0.0f), mTarget(0.0f, 0.0f, 1.0f), mFov(50.0f), mTilt(0.0f) {}
+    CamView(const mVec3_c &pos, const mVec3_c &target, f32 fov, f32 tilt) : mPosition(pos), mTarget(target), mFov(fov), mTilt(tilt) {}
     ~CamView() {}
 
     /* 0x00 */ mVec3_c mPosition;
@@ -20,13 +21,13 @@ struct CamView {
 class dCameraBase_c {
 protected:
     /* 0x00 */ bool mCreated;
-    /* 0x01 */ u8 field_0x01;
+    /* 0x01 */ u8 mPrevIsActive;
     /* 0x02 */ bool mIsActive;
     /* 0x04 */ s32 mIndex;
     /* 0x08 */ CamView mView;
 
 public:
-    dCameraBase_c() : mCreated(false), field_0x01(0), mIsActive(false), mIndex(-1) {}
+    dCameraBase_c() : mCreated(false), mPrevIsActive(0), mIsActive(false), mIndex(-1) {}
 
     bool doCreate(s32 index);
     bool doRemove();
@@ -34,8 +35,8 @@ public:
     bool doDraw();
 
     // vt at 0x28
-    /* vt 0x08 */ virtual void vt_0x08() {}
-    /* vt 0x0C */ virtual void vt_0x0C() {}
+    /* vt 0x08 */ virtual void onBecomeActive() {}
+    /* vt 0x0C */ virtual void onBecomeInactive() {}
     /* vt 0x10 */ virtual bool create() {
         return true;
     }
diff --git a/include/toBeSorted/d_camera_event.h b/include/toBeSorted/d_camera_event.h
index d4caef6b..c83826fb 100644
--- a/include/toBeSorted/d_camera_event.h
+++ b/include/toBeSorted/d_camera_event.h
@@ -7,8 +7,8 @@
 class dCameraEvent_c : public dCameraBase_c {
 public:
     dCameraEvent_c();
-    /* vt 0x08 */ virtual void vt_0x08() override;
-    /* vt 0x0C */ virtual void vt_0x0C() override;
+    /* vt 0x08 */ virtual void onBecomeActive() override;
+    /* vt 0x0C */ virtual void onBecomeInactive() override;
     /* vt 0x10 */ virtual bool create() override;
     /* vt 0x14 */ virtual bool remove() override;
     /* vt 0x18 */ virtual bool execute() override;
diff --git a/include/toBeSorted/d_camera_game.h b/include/toBeSorted/d_camera_game.h
index 439f2811..00f7832c 100644
--- a/include/toBeSorted/d_camera_game.h
+++ b/include/toBeSorted/d_camera_game.h
@@ -139,8 +139,8 @@ public:
     static s32 sStyleIdxes[CAM_STYLE_IDX_MAX];
 
     dCameraGame_c();
-    /* vt 0x08 */ virtual void vt_0x08() override;
-    /* vt 0x0C */ virtual void vt_0x0C() override;
+    /* vt 0x08 */ virtual void onBecomeActive() override;
+    /* vt 0x0C */ virtual void onBecomeInactive() override;
     /* vt 0x10 */ virtual bool create() override;
     /* vt 0x14 */ virtual bool remove() override;
     /* vt 0x18 */ virtual bool execute() override;
@@ -152,6 +152,14 @@ public:
         return field_0x060;
     }
 
+    bool getField_0x078() const {
+        return field_0x078;
+    }
+    
+    f32 getField_0x0AC() const {
+        return field_0x0AC;
+    }
+
     void clearCamIds();
     
     bool isCurrentTrend(const char *name) const;
@@ -184,7 +192,7 @@ private:
     /* 0x06C */ UNKWORD field_0x06C;
     /* 0x070 */ UNKWORD field_0x070;
     /* 0x074 */ UNKWORD field_0x074;
-    /* 0x078 */ u8 field_0x078;
+    /* 0x078 */ bool field_0x078;
     /* 0x079 */ u8 field_0x079;
     /* 0x07A */ u8 field_0x07A;
     /* 0x07C */ UNKWORD field_0x07C;
diff --git a/include/toBeSorted/d_camera_map.h b/include/toBeSorted/d_camera_map.h
index 1d71ec0e..4a0f2633 100644
--- a/include/toBeSorted/d_camera_map.h
+++ b/include/toBeSorted/d_camera_map.h
@@ -8,8 +8,8 @@ class dAcObjBase_c;
 class dCameraMap_c : public dCameraBase_c {
 public:
     dCameraMap_c() {}
-    /* vt 0x08 */ virtual void vt_0x08() override;
-    /* vt 0x0C */ virtual void vt_0x0C() override;
+    /* vt 0x08 */ virtual void onBecomeActive() override;
+    /* vt 0x0C */ virtual void onBecomeInactive() override;
     /* vt 0x10 */ virtual bool create() override;
     /* vt 0x14 */ virtual bool remove() override;
     /* vt 0x18 */ virtual bool execute() override;
@@ -24,6 +24,8 @@ public:
     void fn_80093340();
     void fn_80093360();
     void fn_80093380();
+    bool fn_800932E0() const;
+    void fn_800932F0();
 
 private:
     /* 0x2C */ u8 _0x2C[0x40 - 0x2C];