diff options
| author | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2024-03-05 16:48:54 -0500 |
|---|---|---|
| committer | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2024-03-05 16:48:54 -0500 |
| commit | 61398dbbecb85d0bde563ce5aa4dae13d038f29d (patch) | |
| tree | cdcb1b1052eb8e7fbe9f8486706772a981d26dfe /include | |
| parent | 321c4840b84e894eb34a44cfee518124509f273b (diff) | |
tabs -> spaces
Diffstat (limited to 'include')
| -rw-r--r-- | include/JSystem/JAudio/JASWSParser.h | 4 | ||||
| -rw-r--r-- | include/JSystem/JGadget/allocator.h | 12 | ||||
| -rw-r--r-- | include/JSystem/JMessage/control.h | 20 | ||||
| -rw-r--r-- | include/JSystem/JMessage/processor.h | 316 | ||||
| -rw-r--r-- | include/JSystem/JStudio/JStudio/jstudio-object.h | 116 | ||||
| -rw-r--r-- | include/JSystem/JStudio/JStudio/object-id.h | 2 | ||||
| -rw-r--r-- | include/JSystem/JStudio/JStudio_JAudio/control.h | 94 | ||||
| -rw-r--r-- | include/JSystem/JStudio/JStudio_JMessage/control.h | 22 | ||||
| -rw-r--r-- | include/JSystem/JStudio/JStudio_JParticle/control.h | 44 |
9 files changed, 315 insertions, 315 deletions
diff --git a/include/JSystem/JAudio/JASWSParser.h b/include/JSystem/JAudio/JASWSParser.h index f49613ca..56c4e91b 100644 --- a/include/JSystem/JAudio/JASWSParser.h +++ b/include/JSystem/JAudio/JASWSParser.h @@ -49,12 +49,12 @@ namespace JASystem { }; struct TWaveArchive { /* 0x00 */ char mFileName[0x74]; - /* 0x74 */ u32 mWaveOffsets[1]; + /* 0x74 */ u32 mWaveOffsets[1]; }; struct TWaveArchiveBank { /* 0x00 */ u32 mMagic; /* 0x04 */ u8 field_0x4[0x08 - 0x04]; - /* 0x08 */ u32 mArchiveOffsets[1]; + /* 0x08 */ u32 mArchiveOffsets[1]; }; u32 getGroupCount(void*); diff --git a/include/JSystem/JGadget/allocator.h b/include/JSystem/JGadget/allocator.h index 3f7b3d81..15ec1c9b 100644 --- a/include/JSystem/JGadget/allocator.h +++ b/include/JSystem/JGadget/allocator.h @@ -6,14 +6,14 @@ namespace JGadget { template <typename T> struct TAllocator { - static TAllocator get() { } + static TAllocator get() { } - inline TAllocator(); + inline TAllocator(); - u8 _00; // _00 - u32 _04; // _04 - u32 _08; // _08 - u32 _0C; // _0C + u8 _00; // _00 + u32 _04; // _04 + u32 _08; // _08 + u32 _0C; // _0C }; typedef TAllocator<void*> TVoidAllocator; diff --git a/include/JSystem/JMessage/control.h b/include/JSystem/JMessage/control.h index 520b7439..f24c1556 100644 --- a/include/JSystem/JMessage/control.h +++ b/include/JSystem/JMessage/control.h @@ -41,16 +41,16 @@ struct TControl { /* 0x04 */ void* _04; /* 0x08 */ void* _08; - /* 0x0C */ TSequenceProcessor* mBaseProcSeq; - /* 0x10 */ TRenderingProcessor* mBaseProcRender; - /* 0x14 */ u16 mMessageCode; - /* 0x16 */ u16 mMessageIndex; - /* 0x18 */ const TResource* mResourceCache; - /* 0x1C */ const char* mMessageBegin; - /* 0x20 */ const char* _20; - /* 0x24 */ const char* mCurrentText; - /* 0x28 */ void* mEntry; - /* 0x2C */ TProcessor::TStack_ mRenderStack; + /* 0x0C */ TSequenceProcessor* mBaseProcSeq; + /* 0x10 */ TRenderingProcessor* mBaseProcRender; + /* 0x14 */ u16 mMessageCode; + /* 0x16 */ u16 mMessageIndex; + /* 0x18 */ const TResource* mResourceCache; + /* 0x1C */ const char* mMessageBegin; + /* 0x20 */ const char* _20; + /* 0x24 */ const char* mCurrentText; + /* 0x28 */ void* mEntry; + /* 0x2C */ TProcessor::TStack_ mRenderStack; }; }; // namespace JMessage diff --git a/include/JSystem/JMessage/processor.h b/include/JSystem/JMessage/processor.h index f32a9351..6ef59cfa 100644 --- a/include/JSystem/JMessage/processor.h +++ b/include/JSystem/JMessage/processor.h @@ -11,151 +11,151 @@ struct TControl; struct TResource; struct TProcessor { - typedef bool (*OnCharacterEndCallBack)(TProcessor*); - typedef const char* (*OnSelectBeginCallBack)(TProcessor*); - typedef const char* (*ProcessOnSelectCallBack)(TProcessor*); - - struct TStack_ { - TStack_() { clear(); } - - TStack_(const TStack_& other) - { - mSize = other.mSize; - for (int i = 0; i < mSize; i++) { - mStack[i] = mStack[i]; - } - } - - inline bool empty() const { return mSize == 0; } - inline bool isPushable() const { return mSize < 4; } - inline void clear() { mSize = 0; } - - inline u32 getMaxSize() const { return 4; } - inline u32 getSize() const { return mSize; } - inline const char* getTop() const { return mStack[mSize - 1]; } - - inline void push(const char* str) - { - mStack[mSize] = str; - mSize++; - } - - inline void pop() { mSize--; } - - u32 mSize; // _00 - const char* mStack[3]; // _04 - }; - - struct TProcess { - struct TProcessData { - ProcessOnSelectCallBack mSelectCallback; // _00 - const char* mBase; // _04 - const void* mOffset; // _08 - u32 mRest; // _0C - }; - - TProcess() { reset_normal(); } - - void reset_normal() { mEndCallback = process_onCharacterEnd_normal_; } - void reset_select() { mEndCallback = process_onCharacterEnd_select_; } - - OnCharacterEndCallBack mEndCallback; // _00 - TProcessData mData; // _04 - }; + typedef bool (*OnCharacterEndCallBack)(TProcessor*); + typedef const char* (*OnSelectBeginCallBack)(TProcessor*); + typedef const char* (*ProcessOnSelectCallBack)(TProcessor*); + + struct TStack_ { + TStack_() { clear(); } + + TStack_(const TStack_& other) + { + mSize = other.mSize; + for (int i = 0; i < mSize; i++) { + mStack[i] = mStack[i]; + } + } + + inline bool empty() const { return mSize == 0; } + inline bool isPushable() const { return mSize < 4; } + inline void clear() { mSize = 0; } + + inline u32 getMaxSize() const { return 4; } + inline u32 getSize() const { return mSize; } + inline const char* getTop() const { return mStack[mSize - 1]; } + + inline void push(const char* str) + { + mStack[mSize] = str; + mSize++; + } + + inline void pop() { mSize--; } + + u32 mSize; // _00 + const char* mStack[3]; // _04 + }; + + struct TProcess { + struct TProcessData { + ProcessOnSelectCallBack mSelectCallback; // _00 + const char* mBase; // _04 + const void* mOffset; // _08 + u32 mRest; // _0C + }; + + TProcess() { reset_normal(); } + + void reset_normal() { mEndCallback = process_onCharacterEnd_normal_; } + void reset_select() { mEndCallback = process_onCharacterEnd_select_; } + + OnCharacterEndCallBack mEndCallback; // _00 + TProcessData mData; // _04 + }; ~TProcessor(); - virtual void do_character(int); - virtual bool do_tag(u32, const void*, u32); - virtual bool do_systemTagCode(u16, const void*, u32); - virtual void do_select_begin(u32); - virtual void do_select_end(); - virtual void do_select_separate(); - virtual void do_begin_(const void*, const char*) = 0; - virtual void do_end_() = 0; - virtual bool do_tag_(u32, const void*, u32) = 0; - virtual void do_systemTagCode_(u16, const void*, u32) = 0; - - void setBegin_messageCode(u16, u16); - void setBegin_messageID(u32, u32, bool*); - void setBegin_messageCode(u32); // weak - TResource* getResource_groupID(u16) const; - u32 toMessageCode_messageID(u32, u32, bool*) const; - char* on_message_limited(u16) const; // weak - char* on_message(u32) const; // weak - char* getMessageText_messageCode(u32) const; // weak - static bool process_onCharacterEnd_normal_(TProcessor*); - static bool process_onCharacterEnd_select_(TProcessor*); - static const char* process_onSelect_limited_(TProcessor*); - static const char* process_onSelect_(TProcessor*); - void reset_(const char*); + virtual void do_character(int); + virtual bool do_tag(u32, const void*, u32); + virtual bool do_systemTagCode(u16, const void*, u32); + virtual void do_select_begin(u32); + virtual void do_select_end(); + virtual void do_select_separate(); + virtual void do_begin_(const void*, const char*) = 0; + virtual void do_end_() = 0; + virtual bool do_tag_(u32, const void*, u32) = 0; + virtual void do_systemTagCode_(u16, const void*, u32) = 0; + + void setBegin_messageCode(u16, u16); + void setBegin_messageID(u32, u32, bool*); + void setBegin_messageCode(u32); // weak + TResource* getResource_groupID(u16) const; + u32 toMessageCode_messageID(u32, u32, bool*) const; + char* on_message_limited(u16) const; // weak + char* on_message(u32) const; // weak + char* getMessageText_messageCode(u32) const; // weak + static bool process_onCharacterEnd_normal_(TProcessor*); + static bool process_onCharacterEnd_select_(TProcessor*); + static const char* process_onSelect_limited_(TProcessor*); + static const char* process_onSelect_(TProcessor*); + void reset_(const char*); void process_select_limited_(TProcessor*); void process_select_(TProcessor*); - int setBegin_messageEntryText(const TResource* resource, const void* entry, const char* param_2) - { - // mResourceCache = resource; - reset_(param_2); - do_begin_(entry, param_2); - return TRUE; - } - - const TResource* getResourceCache() const { return mResourceCache; } - const char* getCurrent() const { return mCurrent; } - const TReference* getReference() const { return mReference; } - - // Unused/inlined: - void pushCurrent(const char*); - const char* popCurrent(); - void on_select_begin(OnSelectBeginCallBack, const void*, const char*, u32); - void on_select_end(); - void on_select_separate(); - void on_tag_(); - void process_character_(); - - // _00 = VTBL - const TReference* mReference; // _04 - const TResource* mResourceCache; // _08 - const char* mCurrent; // _0C - TStack_ mStack; // _10 - TProcess mProcess; // _24 + int setBegin_messageEntryText(const TResource* resource, const void* entry, const char* param_2) + { + // mResourceCache = resource; + reset_(param_2); + do_begin_(entry, param_2); + return TRUE; + } + + const TResource* getResourceCache() const { return mResourceCache; } + const char* getCurrent() const { return mCurrent; } + const TReference* getReference() const { return mReference; } + + // Unused/inlined: + void pushCurrent(const char*); + const char* popCurrent(); + void on_select_begin(OnSelectBeginCallBack, const void*, const char*, u32); + void on_select_end(); + void on_select_separate(); + void on_tag_(); + void process_character_(); + + // _00 = VTBL + const TReference* mReference; // _04 + const TResource* mResourceCache; // _08 + const char* mCurrent; // _0C + TStack_ mStack; // _10 + TProcess mProcess; // _24 }; struct TSequenceProcessor : public TProcessor { - typedef bool OnJumpRegisterCallBack(TSequenceProcessor*); - typedef bool OnBranchRegisterCallBack(TSequenceProcessor*, u32); - typedef void* ProcessOnJumpCallBack(const TSequenceProcessor*); + typedef bool OnJumpRegisterCallBack(TSequenceProcessor*); + typedef bool OnBranchRegisterCallBack(TSequenceProcessor*, u32); + typedef void* ProcessOnJumpCallBack(const TSequenceProcessor*); - TSequenceProcessor(const TReference*, TControl*); + TSequenceProcessor(const TReference*, TControl*); TSequenceProcessor(TControl*); - virtual ~TSequenceProcessor(); // _08 - virtual void do_reset_(const char*); // _28 - virtual bool do_setBegin_isReady_() const; // _2C - virtual void do_begin_(const void*, const char*); // _30 - virtual void do_end_(); // _34 - virtual bool do_tag_(u32, const void*, u32); // _38 - virtual void do_systemTagCode_(u16, const void*, u32); // _3C - virtual void do_begin(const void*, const char*); // _40 - virtual void do_end(); // _44 - virtual bool do_isReady(); // _48 - virtual bool do_jump_isReady(); // _4C - virtual void do_jump(const void*, const char*); // _50 - virtual void do_branch_query(u16); // _54 - virtual int do_branch_queryResult(); // _58 - virtual void do_branch(const void*, const char*); // _5C - - char* process(const char*); - bool on_isReady(); - void on_jump_isReady(); - void on_jump(const void*, const char*); - void on_branch_queryResult(); - void on_branch(const void*, const char*); - void process_onJump_limited_(const TSequenceProcessor*); - static void* process_onJump_(const TSequenceProcessor*); - void process_onBranch_limited_(const TSequenceProcessor*, u32); - void process_onBranch_(const TSequenceProcessor*, u32); + virtual ~TSequenceProcessor(); // _08 + virtual void do_reset_(const char*); // _28 + virtual bool do_setBegin_isReady_() const; // _2C + virtual void do_begin_(const void*, const char*); // _30 + virtual void do_end_(); // _34 + virtual bool do_tag_(u32, const void*, u32); // _38 + virtual void do_systemTagCode_(u16, const void*, u32); // _3C + virtual void do_begin(const void*, const char*); // _40 + virtual void do_end(); // _44 + virtual bool do_isReady(); // _48 + virtual bool do_jump_isReady(); // _4C + virtual void do_jump(const void*, const char*); // _50 + virtual void do_branch_query(u16); // _54 + virtual int do_branch_queryResult(); // _58 + virtual void do_branch(const void*, const char*); // _5C + + char* process(const char*); + bool on_isReady(); + void on_jump_isReady(); + void on_jump(const void*, const char*); + void on_branch_queryResult(); + void on_branch(const void*, const char*); + void process_onJump_limited_(const TSequenceProcessor*); + static void* process_onJump_(const TSequenceProcessor*); + void process_onBranch_limited_(const TSequenceProcessor*, u32); + void process_onBranch_(const TSequenceProcessor*, u32); void reset_(const char*); void process_jump_limited_(TSequenceProcessor*); @@ -163,14 +163,14 @@ struct TSequenceProcessor : public TProcessor { void process_branch_limited_(TSequenceProcessor*, u32); void process_branch_(TSequenceProcessor*, u32); - // Unused/inlined: - const char* toString_status(int); - int toValue_status(const char*); - void on_jump_register(OnJumpRegisterCallBack*, u32); - void on_branch_register(OnBranchRegisterCallBack*, const void*, u32); - void on_branch_query(u16); - void process_setMessageIndex_reserved_(u16); - void process_setMessageCode_(const TSequenceProcessor*, u16, u16); + // Unused/inlined: + const char* toString_status(int); + int toValue_status(const char*); + void on_jump_register(OnJumpRegisterCallBack*, u32); + void on_branch_register(OnBranchRegisterCallBack*, const void*, u32); + void on_branch_query(u16); + void process_setMessageIndex_reserved_(u16); + void process_setMessageCode_(const TSequenceProcessor*, u16, u16); void reset() {} void setBegin(const void* param_1, const char* param_2) { @@ -178,31 +178,31 @@ struct TSequenceProcessor : public TProcessor { do_begin_(param_1, param_2); } - // _00 = VTBL - // _00-_38 = TProcessor - TControl* _38; // _38 - int _3C; // _3C - ProcessOnJumpCallBack* _40; // _40 - processorCallBack(void*, ulong) pointer? - u32 _44; // _44 - u32 _48; // _48 + // _00 = VTBL + // _00-_38 = TProcessor + TControl* _38; // _38 + int _3C; // _3C + ProcessOnJumpCallBack* _40; // _40 - processorCallBack(void*, ulong) pointer? + u32 _44; // _44 + u32 _48; // _48 }; struct TRenderingProcessor : public TProcessor { - TRenderingProcessor(const TReference*); + TRenderingProcessor(const TReference*); TRenderingProcessor(TControl*); - virtual void do_begin_(const void*, const char*); - virtual void do_end_(); - virtual bool do_tag_(u32, const void*, u32); - virtual void do_systemTagCode_(u16, const void*, u32); - virtual ~TRenderingProcessor(); - virtual void do_begin(const void*, const char*); - virtual void do_end(); + virtual void do_begin_(const void*, const char*); + virtual void do_end_(); + virtual bool do_tag_(u32, const void*, u32); + virtual void do_systemTagCode_(u16, const void*, u32); + virtual ~TRenderingProcessor(); + virtual void do_begin(const void*, const char*); + virtual void do_end(); - void process(const char*); + void process(const char*); - // _00 = VTBL - // _00-_38 = TProcessor + // _00 = VTBL + // _00-_38 = TProcessor }; } // namespace JMessage diff --git a/include/JSystem/JStudio/JStudio/jstudio-object.h b/include/JSystem/JStudio/JStudio/jstudio-object.h index e8f4abe7..a120706f 100644 --- a/include/JSystem/JStudio/JStudio/jstudio-object.h +++ b/include/JSystem/JStudio/JStudio/jstudio-object.h @@ -81,9 +81,9 @@ struct TVariableValue { } } - inline void setOutput(const TOutput* output) { - pOutput_ = (output != NULL ? (TOutput*)output : (TOutput*)&soOutput_none_); - } + inline void setOutput(const TOutput* output) { + pOutput_ = (output != NULL ? (TOutput*)output : (TOutput*)&soOutput_none_); + } static u8 soOutput_none_[4 + 4 /* padding */]; @@ -139,22 +139,22 @@ public: }; struct TAdaptor { - inline TAdaptor(TVariableValue* values, int count) - : pValue_(values) - , u(count) - { - } - - struct TSetVariableValue_immediate { - inline TSetVariableValue_immediate(u32 p1, f32 p2) - : field_0x0(p1) - , field_0x4(p2) - { - } - - u32 field_0x0; - f32 field_0x4; - }; + inline TAdaptor(TVariableValue* values, int count) + : pValue_(values) + , u(count) + { + } + + struct TSetVariableValue_immediate { + inline TSetVariableValue_immediate(u32 p1, f32 p2) + : field_0x0(p1) + , field_0x4(p2) + { + } + + u32 field_0x0; + f32 field_0x4; + }; typedef void (*setVarFunc)(JStudio::TAdaptor*, JStudio::TObject*, u32, void const*, u32); virtual ~TAdaptor() = 0; virtual void adaptor_do_prepare(const JStudio::TObject*); @@ -204,11 +204,11 @@ struct TAdaptor { }; struct TAdaptor_actor : public TAdaptor { - TAdaptor_actor() - : TAdaptor(mValue, ARRAY_SIZE(mValue)) - , mValue() - { - } + TAdaptor_actor() + : TAdaptor(mValue, ARRAY_SIZE(mValue)) + , mValue() + { + } virtual ~TAdaptor_actor() = 0; /* 0x10 */ TVariableValue mValue[14]; @@ -227,11 +227,11 @@ struct TObject_actor : public TObject { }; struct TAdaptor_ambientLight : public TAdaptor { - TAdaptor_ambientLight() - : TAdaptor(mValue, ARRAY_SIZE(mValue)) - , mValue() - { - } + TAdaptor_ambientLight() + : TAdaptor(mValue, ARRAY_SIZE(mValue)) + , mValue() + { + } virtual ~TAdaptor_ambientLight() = 0; /* 0x10 */ TVariableValue mValue[4]; @@ -249,11 +249,11 @@ struct TObject_ambientLight : public TObject { }; struct TAdaptor_camera : public TAdaptor { - TAdaptor_camera() - : TAdaptor(mValue, ARRAY_SIZE(mValue)) - , mValue() - { - } + TAdaptor_camera() + : TAdaptor(mValue, ARRAY_SIZE(mValue)) + , mValue() + { + } virtual ~TAdaptor_camera() = 0; /* 0x10 */ TVariableValue mValue[12]; @@ -272,11 +272,11 @@ struct TObject_camera : public TObject { }; struct TAdaptor_fog : public TAdaptor { - TAdaptor_fog() - : TAdaptor(mValue, ARRAY_SIZE(mValue)) - , mValue() - { - } + TAdaptor_fog() + : TAdaptor(mValue, ARRAY_SIZE(mValue)) + , mValue() + { + } virtual ~TAdaptor_fog() = 0; /* 0x10 */ TVariableValue mValue[6]; @@ -295,11 +295,11 @@ struct TObject_fog : public TObject { }; struct TAdaptor_light : public TAdaptor { - TAdaptor_light() - : TAdaptor(mValue, ARRAY_SIZE(mValue)) - , mValue() - { - } + TAdaptor_light() + : TAdaptor(mValue, ARRAY_SIZE(mValue)) + , mValue() + { + } virtual ~TAdaptor_light() = 0; /* 0x10 */ TVariableValue mValue[13]; @@ -320,10 +320,10 @@ struct TObject_light : public TObject { }; struct TAdaptor_message : public TAdaptor { - TAdaptor_message() - : TAdaptor(NULL, 0) - { - } + TAdaptor_message() + : TAdaptor(NULL, 0) + { + } virtual ~TAdaptor_message() = 0; }; @@ -337,11 +337,11 @@ struct TObject_message : public TObject { }; struct TAdaptor_particle : public TAdaptor { - TAdaptor_particle() - : TAdaptor(mValue, ARRAY_SIZE(mValue)) - , mValue() - { - } + TAdaptor_particle() + : TAdaptor(mValue, ARRAY_SIZE(mValue)) + , mValue() + { + } virtual ~TAdaptor_particle() = 0; /* 0x10 */ TVariableValue mValue[20]; @@ -364,11 +364,11 @@ struct TObject_particle : public TObject { }; struct TAdaptor_sound : public TAdaptor { - TAdaptor_sound() - : TAdaptor(mValue, ARRAY_SIZE(mValue)) - , mValue() - { - } + TAdaptor_sound() + : TAdaptor(mValue, ARRAY_SIZE(mValue)) + , mValue() + { + } virtual ~TAdaptor_sound() = 0; /* 0x10 */ TVariableValue mValue[11]; diff --git a/include/JSystem/JStudio/JStudio/object-id.h b/include/JSystem/JStudio/JStudio/object-id.h index ad747d70..b38901c8 100644 --- a/include/JSystem/JStudio/JStudio/object-id.h +++ b/include/JSystem/JStudio/JStudio/object-id.h @@ -13,7 +13,7 @@ public: bool isEqual(JStudio::object::TIDData const&, JStudio::object::TIDData const&); inline const void* getID() const { return mID; } - inline u32 getIDSize() const { return mID_size; } + inline u32 getIDSize() const { return mID_size; } private: /* 0x00 */ const void* mID; diff --git a/include/JSystem/JStudio/JStudio_JAudio/control.h b/include/JSystem/JStudio/JStudio_JAudio/control.h index b727822f..b8316a88 100644 --- a/include/JSystem/JStudio/JStudio_JAudio/control.h +++ b/include/JSystem/JStudio/JStudio_JAudio/control.h @@ -19,68 +19,68 @@ struct TAdaptor_sound : public JStudio::TAdaptor_sound { void operator()(float, JStudio::TAdaptor*) const; }; - struct TVVOSetValue_ : public JStudio::TVariableValue::TOutput { - virtual void operator()(f32, JStudio::TAdaptor*) const; // _08 - virtual ~TVVOSetValue_(); // _0C (weak) + struct TVVOSetValue_ : public JStudio::TVariableValue::TOutput { + virtual void operator()(f32, JStudio::TAdaptor*) const; // _08 + virtual ~TVVOSetValue_(); // _0C (weak) - // _00 = VTBL - int _04; // _04 - u32 _08; // _08, unknown - int _0C; // _0C - int _10; // _10 - }; + // _00 = VTBL + int _04; // _04 + u32 _08; // _08, unknown + int _0C; // _0C + int _10; // _10 + }; static TVVOOn_BEGIN_FADE_IN_ soVVOOn_BEGIN_FADE_IN_; static TVVOOn_END_FADE_OUT_ soVVOOn_END_FADE_OUT_; static TVVOSetValue_ saoVVOSetValue_[]; - TAdaptor_sound(JAIBasic*); + TAdaptor_sound(JAIBasic*); - virtual ~TAdaptor_sound(); // _08 - virtual void adaptor_do_prepare(const JStudio::TObject*); // _0C - virtual void adaptor_do_end(const JStudio::TObject*); // _14 - virtual void adaptor_do_update(const JStudio::TObject*, u32); // _18 - virtual void adaptor_do_SOUND(JStudio::data::TEOperationData, const void*, u32); // _20 - virtual void adaptor_do_BEGIN(JStudio::data::TEOperationData, const void*, u32); // _24 - virtual void adaptor_do_BEGIN_FADE_IN(JStudio::data::TEOperationData, const void*, u32); // _28 - virtual void adaptor_do_END(JStudio::data::TEOperationData, const void*, u32); // _2C - virtual void adaptor_do_END_FADE_OUT(JStudio::data::TEOperationData, const void*, u32); // _30 - virtual void adaptor_do_PARENT(JStudio::data::TEOperationData, const void*, u32); // _34 - virtual void adaptor_do_PARENT_NODE(JStudio::data::TEOperationData, const void*, u32); // _38 - virtual void adaptor_do_PARENT_ENABLE(JStudio::data::TEOperationData, const void*, u32); // _3C - virtual void adaptor_do_LOCATED(JStudio::data::TEOperationData, const void*, u32); // _40 + virtual ~TAdaptor_sound(); // _08 + virtual void adaptor_do_prepare(const JStudio::TObject*); // _0C + virtual void adaptor_do_end(const JStudio::TObject*); // _14 + virtual void adaptor_do_update(const JStudio::TObject*, u32); // _18 + virtual void adaptor_do_SOUND(JStudio::data::TEOperationData, const void*, u32); // _20 + virtual void adaptor_do_BEGIN(JStudio::data::TEOperationData, const void*, u32); // _24 + virtual void adaptor_do_BEGIN_FADE_IN(JStudio::data::TEOperationData, const void*, u32); // _28 + virtual void adaptor_do_END(JStudio::data::TEOperationData, const void*, u32); // _2C + virtual void adaptor_do_END_FADE_OUT(JStudio::data::TEOperationData, const void*, u32); // _30 + virtual void adaptor_do_PARENT(JStudio::data::TEOperationData, const void*, u32); // _34 + virtual void adaptor_do_PARENT_NODE(JStudio::data::TEOperationData, const void*, u32); // _38 + virtual void adaptor_do_PARENT_ENABLE(JStudio::data::TEOperationData, const void*, u32); // _3C + virtual void adaptor_do_LOCATED(JStudio::data::TEOperationData, const void*, u32); // _40 - void beginSound_fadeIn_(u32); - void endSound_fadeOut_(u32); + void beginSound_fadeIn_(u32); + void endSound_fadeOut_(u32); - /* 0x0E8 */ JAIBasic* mpBasic; - /* 0x0EC */ JAISound* mpSound; - /* 0x0F0 */ u32 _F0; - /* 0x0F4 */ int _F4; + /* 0x0E8 */ JAIBasic* mpBasic; + /* 0x0EC */ JAISound* mpSound; + /* 0x0F0 */ u32 _F0; + /* 0x0F4 */ int _F4; /* 0x0F8 */ u8 _F8[0x104 - 0x0F8]; - // u32 _E4; - // Vec* _E8; // Vector3f* in ghidra, should be Vec* or JGeometry::TVec3* surely - // Vec _EC; // same as above - // JStage::TSystem* mSystem; - // JStage::TObject* _FC; - // u32 _100; - // u8 _104; + // u32 _E4; + // Vec* _E8; // Vector3f* in ghidra, should be Vec* or JGeometry::TVec3* surely + // Vec _EC; // same as above + // JStage::TSystem* mSystem; + // JStage::TObject* _FC; + // u32 _100; + // u8 _104; }; // Size: 0x104 struct TCreateObject : public JStudio::TCreateObject { - TCreateObject(JAIBasic* jai, const JStage::TSystem* system) - { - mSound = jai; - mSystem = system; - } - virtual ~TCreateObject(); // _08 - virtual bool create(JStudio::TObject** newObject, const JStudio::stb::data::TParse_TBlock_object& data); // _0C + TCreateObject(JAIBasic* jai, const JStage::TSystem* system) + { + mSound = jai; + mSystem = system; + } + virtual ~TCreateObject(); // _08 + virtual bool create(JStudio::TObject** newObject, const JStudio::stb::data::TParse_TBlock_object& data); // _0C - // _00 = VTBL - // _00-_0C = JStudio::TCreateObject - JAIBasic* mSound; // _04 - const JStage::TSystem* mSystem; // _08 + // _00 = VTBL + // _00-_0C = JStudio::TCreateObject + JAIBasic* mSound; // _04 + const JStage::TSystem* mSystem; // _08 }; } // namespace JStudio_JAudio diff --git a/include/JSystem/JStudio/JStudio_JMessage/control.h b/include/JSystem/JStudio/JStudio_JMessage/control.h index 36447ffd..5f207867 100644 --- a/include/JSystem/JStudio/JStudio_JMessage/control.h +++ b/include/JSystem/JStudio/JStudio_JMessage/control.h @@ -6,28 +6,28 @@ namespace JStudio_JMessage { struct TCreateObject_base : JStudio::TCreateObject { - virtual ~TCreateObject_base() = 0; // _08 - virtual bool create(JStudio::TObject** newObject, const JStudio::stb::data::TParse_TBlock_object& data); // _0C - virtual JMessage::TControl* find(const JStudio::stb::data::TParse_TBlock_object&) = 0; // _10 + virtual ~TCreateObject_base() = 0; // _08 + virtual bool create(JStudio::TObject** newObject, const JStudio::stb::data::TParse_TBlock_object& data); // _0C + virtual JMessage::TControl* find(const JStudio::stb::data::TParse_TBlock_object&) = 0; // _10 }; } // namespace JStudio_JMessage namespace JStudio_JMessage { struct TCreateObject : public TCreateObject_base { - TCreateObject(JMessage::TControl* control) { mControl = control; } + TCreateObject(JMessage::TControl* control) { mControl = control; } - virtual ~TCreateObject(); // _08 - virtual JMessage::TControl* find(const JStudio::stb::data::TParse_TBlock_object&); // _10 + virtual ~TCreateObject(); // _08 + virtual JMessage::TControl* find(const JStudio::stb::data::TParse_TBlock_object&); // _10 - JMessage::TControl* mControl; // _0C + JMessage::TControl* mControl; // _0C }; struct TAdaptor_message : public JStudio::TAdaptor_message { - virtual ~TAdaptor_message(); // _08 - virtual void adaptor_do_MESSAGE(JStudio::data::TEOperationData, const void*, u32); // _20 + virtual ~TAdaptor_message(); // _08 + virtual void adaptor_do_MESSAGE(JStudio::data::TEOperationData, const void*, u32); // _20 - TAdaptor_message(JMessage::TControl*); - JMessage::TControl* mControl; // _10 + TAdaptor_message(JMessage::TControl*); + JMessage::TControl* mControl; // _10 }; } // namespace JStudio_JMessage diff --git a/include/JSystem/JStudio/JStudio_JParticle/control.h b/include/JSystem/JStudio/JStudio_JParticle/control.h index 4f7a1699..447eabed 100644 --- a/include/JSystem/JStudio/JStudio_JParticle/control.h +++ b/include/JSystem/JStudio/JStudio_JParticle/control.h @@ -22,19 +22,19 @@ struct TCreateObject : public JStudio::TCreateObject { }; struct TAdaptor_particle : public JStudio::TAdaptor_particle { - struct TJPACallback_ : JPACallBackBase<JPABaseEmitter*> { - inline TJPACallback_(TAdaptor_particle* adaptor) - : mAdaptor(adaptor) - , mObject(NULL) - { - } + struct TJPACallback_ : JPACallBackBase<JPABaseEmitter*> { + inline TJPACallback_(TAdaptor_particle* adaptor) + : mAdaptor(adaptor) + , mObject(NULL) + { + } - virtual ~TJPACallback_() { } // _08 (weak) - virtual void execute(JPABaseEmitter*); // _0C + virtual ~TJPACallback_() { } // _08 (weak) + virtual void execute(JPABaseEmitter*); // _0C - TAdaptor_particle* mAdaptor; // _04 - const JStudio::TObject* mObject; // _08 - }; + TAdaptor_particle* mAdaptor; // _04 + const JStudio::TObject* mObject; // _08 + }; struct TVVOOn_BEGIN_FADE_IN_ : public JStudio::TVariableValue::TOutput { void operator()(float, JStudio::TAdaptor*) const; @@ -60,17 +60,17 @@ struct TAdaptor_particle : public JStudio::TAdaptor_particle { virtual void adaptor_do_PARENT_NODE(JStudio::data::TEOperationData, void const*, u32); virtual void adaptor_do_PARENT_ENABLE(JStudio::data::TEOperationData, void const*, u32); - /* 0x19C */ JPAEmitterManager* mEmitterManager; - /* 0x1A0 */ JPABaseEmitter* mEmitter; - /* 0x1A4 */ TJPACallback_ mCallback; - /* 0x1B0 */ int _188; - /* 0x1B4 */ u32 _18C; - /* 0x1B8 */ u32 _190; - /* 0x1BC */ u32 _194; - /* 0x1C0 */ const JStage::TSystem* mSystem; - /* 0x1C4 */ JStage::TObject* _19C; - /* 0x1C8 */ u32 _1A0; - /* 0x1CC */ bool _1A4; + /* 0x19C */ JPAEmitterManager* mEmitterManager; + /* 0x1A0 */ JPABaseEmitter* mEmitter; + /* 0x1A4 */ TJPACallback_ mCallback; + /* 0x1B0 */ int _188; + /* 0x1B4 */ u32 _18C; + /* 0x1B8 */ u32 _190; + /* 0x1BC */ u32 _194; + /* 0x1C0 */ const JStage::TSystem* mSystem; + /* 0x1C4 */ JStage::TObject* _19C; + /* 0x1C8 */ u32 _1A0; + /* 0x1CC */ bool _1A4; }; // Size: 0x1D0 }; // namespace JStudio_JParticle |
