summaryrefslogtreecommitdiff
path: root/include/toBeSorted
diff options
context:
space:
mode:
authorrobojumper <robojumper@gmail.com>2026-01-07 21:48:44 +0100
committerrobojumper <robojumper@gmail.com>2026-03-01 20:59:52 +0100
commitfe54824a8b31d2e3caccfd8726a4a6af53fa3770 (patch)
tree7686759f5a9b2dc0ab87f967bd0e52cf64b1b092 /include/toBeSorted
parentac48f9877b3918e2c41557fad76c37563678643e (diff)
d_camera_map OK
Diffstat (limited to 'include/toBeSorted')
-rw-r--r--include/toBeSorted/d_camera_map.h31
1 files changed, 17 insertions, 14 deletions
diff --git a/include/toBeSorted/d_camera_map.h b/include/toBeSorted/d_camera_map.h
index 4a0f2633..cd78c839 100644
--- a/include/toBeSorted/d_camera_map.h
+++ b/include/toBeSorted/d_camera_map.h
@@ -1,13 +1,15 @@
#ifndef TO_BE_SORTED_D_CAMERA_MAP_H
#define TO_BE_SORTED_D_CAMERA_MAP_H
+#include "common.h"
+#include "m/m_vec.h"
#include "toBeSorted/d_camera_base.h"
class dAcObjBase_c;
class dCameraMap_c : public dCameraBase_c {
public:
- dCameraMap_c() {}
+ dCameraMap_c() : field_0xC4(0.0f) {}
/* vt 0x08 */ virtual void onBecomeActive() override;
/* vt 0x0C */ virtual void onBecomeInactive() override;
/* vt 0x10 */ virtual bool create() override;
@@ -17,29 +19,30 @@ public:
/* vt 0x20 */ virtual ~dCameraMap_c() {}
/* vt 0x30 */ virtual void setView(const CamView &view) override;
// Not sure what this is...
- /* vt 0x34 */ virtual bool vt_0x34() {
- return true;
- }
+ /* vt 0x34 */ virtual bool vt_0x34();
void fn_80093340();
- void fn_80093360();
- void fn_80093380();
- bool fn_800932E0() const;
- void fn_800932F0();
+ void setNoCameraTransition();
+ void setCameraTransition();
+ bool isActiveOrAnimating() const;
+ void startOut();
private:
- /* 0x2C */ u8 _0x2C[0x40 - 0x2C];
+ /* 0x2C */ mVec3_c field_0x2C;
+ /* 0x38 */ f32 field_0x38;
+ /* 0x3C */ f32 field_0x3C;
/* 0x40 */ f32 field_0x40;
/* 0x44 */ dAcObjBase_c *field_0x44;
/* 0x48 */ CamView mView1;
/* 0x68 */ CamView mSourceView;
/* 0x88 */ CamView mTargetView;
/* 0xA8 */ u8 _0xA8[0xAC - 0xA8];
- /* 0xAC */ u8 field_0xAC;
- /* 0xAD */ u8 _0xAD[0xB4 - 0xAD];
- /* 0xB4 */ u8 field_0xB4;
- /* 0xB5 */ u8 _0xB5[0xB8 - 0xB5];
- /* 0xB8 */ UNKWORD field_0xB8;
+ /* 0xAC */ bool mIsMovingOut;
+ /* 0xB0 */ UNKWORD field_0xB0;
+ /* 0xB4 */ bool mIsActiveOrAnimating;
+ /* 0xB8 */ s32 mTimer;
+ /* 0xBC */ u8 _0xBC[0xC4 - 0xBC];
+ /* 0xC4 */ f32 field_0xC4;
};
#endif