mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-08-08 10:33:07 -04:00
Code Issues Packages Projects Releases Wiki Activity

tabs -> spaces

Browse Source
This commit is contained in:
LagoLunatic
2024-03-05 16:48:54 -05:00
parent 321c4840b8
commit 61398dbbec
21 changed files with 602 additions and 603 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/JSystem/JStudio/JStudio/jstudio-object.h
+56 -56
View File
@@ -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)
{
}
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)
{
}
struct TSetVariableValue_immediate {
inline TSetVariableValue_immediate(u32 p1, f32 p2)
: field_0x0(p1)
, field_0x4(p2)
{
}
u32 field_0x0;
f32 field_0x4;
};
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];
include/JSystem/JStudio/JStudio/object-id.h
+1 -1
View File
@@ -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;
include/JSystem/JStudio/JStudio_JAudio/control.h
+47 -47
View File
@@ -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
include/JSystem/JStudio/JStudio_JMessage/control.h
+11 -11
View File
@@ -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
include/JSystem/JStudio/JStudio_JParticle/control.h
+22 -22
View File
@@ -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