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

Started copying JStudio progress from pikmin2

Browse Source
This commit is contained in:
LagoLunatic
2024-03-04 18:28:09 -05:00
parent 47f60f2733
commit cddc3efdcd
16 changed files with 715 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/JSystem/JStudio/JStudio/jstudio-control.h
+36 -1
View File
@@ -30,8 +30,10 @@ struct TFactory : public stb::TFactory {
class TControl : public stb::TControl {
public:
struct TTransform_translation_rotation_scaling {};
struct TTransform_position {};
struct TTransform_position_direction {};
struct TTransform_translation_rotation {};
struct TTransform_translation_rotation_scaling {};
TControl();
virtual ~TControl();
@@ -47,7 +49,9 @@ public:
fvb_destroyObject_all();
}
bool transformOnSet_isEnabled() const { return mTransformOnSet; }
void transformOnSet_enable(bool param_0) { mTransformOnSet = param_0; }
bool transformOnGet_isEnabled() const { return mTransformOnGet; }
void transformOnGet_enable(bool param_0) { mTransformOnGet = param_0; }
void transform_enable(bool param_0) {
@@ -60,6 +64,10 @@ public:
transformOnGet_setOrigin(xyz, rotY);
}
f32 transformOnSet_getRotationY() const { return mTransformOnSet_RotationY; }
CMtxP transformOnSet_getMatrix() const { return mTransformOnSet_Matrix; }
CMtxP transformOnGet_getMatrix() const { return mTransformOnGet_Matrix; }
void setSecondPerFrame(f64 param_0) { mSecondPerFrame = param_0; }
f64 getSecondPerFrame() const { return mSecondPerFrame; }
@@ -87,6 +95,33 @@ public:
}
return obj->referFunctionValue();
}
void fvb_getObjectContainer() const {}
void fvb_referControl() {}
void fvb_removeObject_all() {}
void stb_getObjectContainer() const {}
void stb_referObjectContainer() {}
void stb_removeObject(JStudio::TObject*) {}
void transformOnGet_transform(const JStudio::TControl::TTransform_position&, JStudio::TControl::TTransform_position*) const {}
void transformOnGet_transform(const JStudio::TControl::TTransform_position_direction&, JStudio::TControl::TTransform_position_direction*) const {}
void transformOnGet_transform(const JStudio::TControl::TTransform_translation_rotation&, JStudio::TControl::TTransform_translation_rotation*) const {}
void transformOnGet_transformDirection(const Vec&, Vec*) const {}
void transformOnGet_transformRotation(const Vec&, Vec*) const {}
void transformOnGet_transformTranslation(const Vec&, Vec*) const {}
void transformOnGet_transform_ifEnabled(const JStudio::TControl::TTransform_position_direction&, JStudio::TControl::TTransform_position_direction*) const {}
void transformOnGet_transform_ifEnabled(const JStudio::TControl::TTransform_translation_rotation&, JStudio::TControl::TTransform_translation_rotation*) const {}
void transformOnSet_transform(const JStudio::TControl::TTransform_position&, JStudio::TControl::TTransform_position*) const {}
void transformOnSet_transform(const JStudio::TControl::TTransform_position_direction&, JStudio::TControl::TTransform_position_direction*) const {}
void transformOnSet_transform(const JStudio::TControl::TTransform_translation_rotation&, JStudio::TControl::TTransform_translation_rotation*) const {}
void transformOnSet_transform(CMtxP, MtxP) const {}
void transformOnSet_transformDirection(const Vec&, Vec*) const {}
void transformOnSet_transformDirection_ifEnabled(const Vec&, Vec*) const {}
void transformOnSet_transformRotation(const Vec&, Vec*) const {}
void transformOnSet_transformTranslation(const Vec&, Vec*) const {}
void transformOnSet_transformTranslation_ifEnabled(const Vec&, Vec*) const {}
void transformOnSet_transform_ifEnabled(const JStudio::TControl::TTransform_position_direction&, JStudio::TControl::TTransform_position_direction*) const {}
void transformOnSet_transform_ifEnabled(const JStudio::TControl::TTransform_translation_rotation&, JStudio::TControl::TTransform_translation_rotation*) const {}
void transformOnSet_transform_ifEnabled(CMtxP, MtxP) const {}
/* 0x58 */ f64 mSecondPerFrame;
/* 0x60 */ fvb::TControl fvb_Control;
include/JSystem/JStudio/JStudio/jstudio-object.h
+35 -11
View File
@@ -14,6 +14,7 @@ namespace data {
UNK_0x3 = 0x3,
UNK_0x10 = 0x10,
UNK_0x12 = 0x12,
UNK_0x18 = 0x18,
UNK_0x19 = 0x19,
};
};
@@ -108,6 +109,7 @@ public:
TAdaptor* getAdaptor() { return mpAdaptor; }
TControl* getControl() { return (TControl*)stb::TObject::getControl(); }
const TControl* getControl() const { return (const TControl*)stb::TObject::getControl(); }
void prepareAdaptor() {
if (mpAdaptor != NULL) {
@@ -133,10 +135,22 @@ public:
};
struct TAdaptor {
struct TSetVariableValue_immediate {
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)
: _00(p1)
, _04(p2)
{
}
u32 _00; // _00
f32 _04; // _04
};
typedef void (*setVarFunc)(JStudio::TAdaptor*, JStudio::TObject*, u32, void const*, u32);
virtual ~TAdaptor() = 0;
virtual void adaptor_do_prepare(const JStudio::TObject*);
@@ -277,6 +291,11 @@ struct TObject_light : public TObject {
};
struct TAdaptor_message : public TAdaptor {
inline TAdaptor_message()
: TAdaptor(NULL, 0)
{
}
virtual ~TAdaptor_message() = 0;
};
@@ -289,17 +308,22 @@ struct TObject_message : public TObject {
};
struct TAdaptor_particle : public TAdaptor {
TAdaptor_particle()
: TAdaptor(mValue, ARRAY_SIZE(mValue))
, mValue()
{
}
virtual ~TAdaptor_particle() = 0;
/* 0x10 */ TVariableValue mValue[20];
static u8 const sauVariableValue_3_TRANSLATION_XYZ[12];
static u8 const sauVariableValue_3_ROTATION_XYZ[12];
static u8 const sauVariableValue_3_SCALING_XYZ[12];
static u8 const sauVariableValue_3_COLOR_RGB[12];
static u8 const sauVariableValue_4_COLOR_RGBA[16];
static u8 const sauVariableValue_3_COLOR1_RGB[12];
static u8 const sauVariableValue_4_COLOR1_RGBA[16];
static u32 const sauVariableValue_3_TRANSLATION_XYZ[12];
static u32 const sauVariableValue_3_ROTATION_XYZ[12];
static u32 const sauVariableValue_3_SCALING_XYZ[12];
static u32 const sauVariableValue_3_COLOR_RGB[12];
static u32 const sauVariableValue_4_COLOR_RGBA[16];
static u32 const sauVariableValue_3_COLOR1_RGB[12];
static u32 const sauVariableValue_4_COLOR1_RGBA[16];
};
struct TObject_particle : public TObject {