Skip to content

Commit 1b6e53a

Browse files
committed
some JStudioCameraEditor headers
1 parent 86e9135 commit 1b6e53a

File tree

12 files changed

+358
-42
lines changed

12 files changed

+358
-42
lines changed
Lines changed: 205 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,205 @@
1+
#ifndef JSTUDIOCAMERAEDITOR_CONTROL_H
2+
#define JSTUDIOCAMERAEDITOR_CONTROL_H
3+
4+
#include "JSystem/JStudio/JStudio/jstudio-control.h"
5+
#include "JSystem/JStudio/JStudio/jstudio-object.h"
6+
#include "JSystem/JStudio/JStudioCameraEditor/csb.h"
7+
#include "JSystem/JStudio/JStudioCameraEditor/sequence.h"
8+
#include "JSystem/JStudio/JStudioCameraEditor/controlset-csb-valueset.h"
9+
#include "JSystem/JStudio/JStudioToolLibrary/controlset-preview.h"
10+
#include "JSystem/JStudio/JStudioToolLibrary/controlset-transform.h"
11+
#include "JSystem/JStudio/JStudioToolLibrary/console.h"
12+
#include "JSystem/JStudio/JStudioToolLibrary/interface.h"
13+
#include "JSystem/JStudio/JStudioToolLibrary/visual.h"
14+
#include "JSystem/JStudio/JStudioToolLibrary/scroll.h"
15+
#include "JSystem/JGadget/std-vector.h"
16+
#include "JSystem/JHostIO/JORServer.h"
17+
18+
namespace JStudioCameraEditor {
19+
struct TControl : public JORReflexible, public JOREventCallbackListNode {
20+
struct TSWValueWidth_ {
21+
TSWValueWidth_(uint, uint);
22+
23+
/* 0x0 */ uint field_0x0;
24+
/* 0x4 */ uint field_0x4;
25+
};
26+
27+
struct TOptionSet_ : public csb::TValueSet {
28+
TOptionSet_();
29+
30+
int getPadding_vertical_() const;
31+
int getPadding_horizontal_() const;
32+
int getMargin_horizontal_() const;
33+
34+
/* 0x02C */ int field_0x2c;
35+
/* 0x030 */ int field_0x30;
36+
/* 0x034 */ u8 field_0x34;
37+
/* 0x035 */ u8 field_0x35;
38+
/* 0x038 */ int field_0x38;
39+
/* 0x03C */ int field_0x3c;
40+
/* 0x040 */ int field_0x40;
41+
/* 0x044 */ u8 field_0x44;
42+
/* 0x045 */ u8 field_0x45;
43+
/* 0x048 */ f32 field_0x48;
44+
/* 0x04C */ f32 field_0x4c;
45+
/* 0x050 */ f32 field_0x50;
46+
/* 0x054 */ f32 field_0x54;
47+
/* 0x058 */ f32 field_0x58;
48+
/* 0x05C */ f32 field_0x5c;
49+
/* 0x060 */ f32 field_0x60;
50+
/* 0x064 */ f32 field_0x64;
51+
/* 0x068 */ f32 field_0x68;
52+
/* 0x06C */ f32 field_0x6c;
53+
/* 0x070 */ int field_0x70;
54+
/* 0x074 */ int field_0x74;
55+
/* 0x078 */ int field_0x78;
56+
/* 0x07C */ u8 field_0x7c;
57+
/* 0x07D */ u8 field_0x7d;
58+
/* 0x07E */ u8 field_0x7e;
59+
/* 0x07F */ u8 field_0x7f;
60+
/* 0x080 */ u8 field_0x80;
61+
/* 0x081 */ u8 field_0x81;
62+
/* 0x082 */ u8 field_0x82;
63+
/* 0x083 */ u8 field_0x83;
64+
/* 0x084 */ u8 field_0x84;
65+
/* 0x088 */ int field_0x88;
66+
/* 0x08C */ int field_0x8c;
67+
/* 0x090 */ int field_0x90;
68+
/* 0x094 */ int field_0x94;
69+
/* 0x098 */ f32 field_0x98;
70+
/* 0x09C */ f32 field_0x9c;
71+
/* 0x0A0 */ JUtility::TColor field_0xa0;
72+
/* 0x0A4 */ int field_0xa4;
73+
/* 0x0A8 */ int field_0xa8;
74+
/* 0x0AC */ int field_0xac;
75+
/* 0x0B0 */ f32 field_0xb0;
76+
/* 0x0B4 */ int field_0xb4;
77+
/* 0x0B8 */ int field_0xb8;
78+
/* 0x0BC */ int field_0xbc;
79+
/* 0x0C0 */ int field_0xc0;
80+
/* 0x0C4 */ int field_0xc4;
81+
/* 0x0C8 */ int field_0xc8;
82+
/* 0x0CC */ int field_0xcc;
83+
/* 0x0D0 */ int field_0xd0;
84+
/* 0x0D4 */ int field_0xd4;
85+
/* 0x0D8 */ int field_0xd8;
86+
/* 0x0DC */ int field_0xdc;
87+
/* 0x0E0 */ int field_0xe0;
88+
/* 0x0E4 */ int field_0xe4;
89+
/* 0x0E8 */ int field_0xe8;
90+
/* 0x0EC */ TSWValueWidth_ field_0xec;
91+
/* 0x0F4 */ TSWValueWidth_ field_0xf4;
92+
/* 0x0FC */ TSWValueWidth_ field_0xfc;
93+
/* 0x104 */ TSWValueWidth_ field_0x104;
94+
/* 0x10C */ JUtility::TColor field_0x10c;
95+
/* 0x110 */ JUtility::TColor field_0x110;
96+
/* 0x114 */ JUtility::TColor field_0x114;
97+
/* 0x118 */ JUtility::TColor field_0x118;
98+
/* 0x11C */ JUtility::TColor field_0x11c;
99+
/* 0x120 */ JUtility::TColor field_0x120;
100+
/* 0x124 */ JUtility::TColor field_0x124;
101+
/* 0x128 */ JUtility::TColor field_0x128;
102+
/* 0x12C */ JUtility::TColor field_0x12c;
103+
/* 0x130 */ JUtility::TColor field_0x130;
104+
/* 0x134 */ JUtility::TColor field_0x134;
105+
/* 0x138 */ JUtility::TColor field_0x138;
106+
/* 0x13C */ JUtility::TColor field_0x13c;
107+
/* 0x140 */ JUtility::TColor field_0x140;
108+
/* 0x144 */ JUtility::TColor field_0x144;
109+
/* 0x148 */ JStudioToolLibrary::TColor_variable::TVelocity field_0x148;
110+
/* 0x158 */ JStudioToolLibrary::TColor_variable::TVelocity field_0x158;
111+
/* 0x168 */ JStudioToolLibrary::TColor_variable::TVelocity field_0x168;
112+
/* 0x178 */ JStudioToolLibrary::TColor_variable::TVelocity field_0x178;
113+
/* 0x188 */ JStudioToolLibrary::TColor_variable::TVelocity field_0x188;
114+
/* 0x198 */ JStudioToolLibrary::TColor_variable::TVelocity field_0x198;
115+
/* 0x1A8 */ int field_0x1a8;
116+
/* 0x1AC */ int field_0x1ac;
117+
};
118+
119+
struct TAdaptor_preview_ : public JStudioToolLibrary::TControlSet_preview::TAdaptor {
120+
TAdaptor_preview_(TControl*);
121+
122+
virtual bool do_isReady();
123+
virtual void do_begin();
124+
virtual void do_end();
125+
virtual void do_current(u32, s32);
126+
virtual ~TAdaptor_preview_();
127+
128+
/* 0x4 */ TControl* pControl_;
129+
};
130+
131+
enum TECommand {};
132+
133+
TControl();
134+
135+
void jstudio_setSecondPerFrame(double);
136+
void show_setRender(J2DOrthoGraph*, JUTFont*);
137+
void interface_setPad(const JUTGamePad*);
138+
void jstudio_setAdaptor(JStudio::TAdaptor_camera*);
139+
bool isEnabled() const;
140+
141+
virtual void listenPropertyEvent(const JORPropertyEvent*);
142+
virtual void genMessage(JORMContext*);
143+
144+
virtual int JORAct(u32, const char*);
145+
virtual ~TControl();
146+
virtual void update(const Mtx);
147+
virtual void show2D();
148+
virtual void show3D();
149+
virtual int command(TECommand, const char*);
150+
151+
/* 0x018 */ JStudioToolLibrary::TConsole field_0x18;
152+
/* 0x020 */ TOptionSet_ oOptionSet_;
153+
/* 0x1D0 */ TAdaptor_preview_ field_0x1d0;
154+
/* 0x1D8 */ bool bEnabled_;
155+
/* 0x1DC */ int field_0x1dc;
156+
/* 0x1E0 */ JStudioToolLibrary::TControlSet_preview oPreviewControl_;
157+
/* 0x218 */ TControlSet_csb_valueSet field_0x218;
158+
/* 0x260 */ TControlSet_csb_valueSet field_0x260;
159+
/* 0x2A8 */ JStudioToolLibrary_JStudio::TControlSet_transform oTransformControl_;
160+
/* 0x2D4 */ TSequenceContainer oSequenceContainer_;
161+
/* 0x2E8 */ csb::TValueSet field_0x2e8;
162+
/* 0x314 */ JGadget::TVector<csb::TValueSet, JGadget::TAllocator<csb::TValueSet> > field_0x314;
163+
/* 0x328 */ TSequenceContainer field_0x328;
164+
/* 0x33C */ u8 field_0x33C[0x36C - 0x33C];
165+
/* 0x36C */ int field_0x36c;
166+
/* 0x370 */ u8 field_0x370;
167+
/* 0x371 */ u8 field_0x371;
168+
/* 0x372 */ u8 field_0x372;
169+
/* 0x373 */ u8 field_0x373;
170+
/* 0x374 */ u8 field_0x374;
171+
/* 0x378 */ int field_0x378;
172+
/* 0x37C */ u8 field_0x37c;
173+
/* 0x380 */ int field_0x380;
174+
/* 0x384 */ int field_0x384[2];
175+
/* 0x38C */ JGadget::TLinkList<csb::TSequence, 0>::iterator itIFSequence_;
176+
/* 0x390 */ u32 uitIFSequence_;
177+
/* 0x394 */ csb::TValueSet* itIFValueSet_;
178+
/* 0x398 */ csb::TValueSet* uitIFValueSet_;
179+
/* 0x39C */ JStudioToolLibrary::TPad oPad_;
180+
/* 0x3A0 */ JStudioToolLibrary::TPad::TData oPadData_;
181+
/* 0x3C8 */ bool bIsPad_applied_;
182+
/* 0x3CC */ JStudioToolLibrary::TDrawPrimitive2D field_0x3cc;
183+
/* 0x3D0 */ JStudioToolLibrary::TDrawPrimitive3D field_0x3d0;
184+
/* 0x3D8 */ JStudioToolLibrary::TPrint oPrint_;
185+
/* 0x3EC */ bool bVisible2D_;
186+
/* 0x3ED */ bool bVisible3D_;
187+
/* 0x3F0 */ JStudioToolLibrary::TScroll_drawBar_horizontal field_0x3f0;
188+
/* 0x428 */ JStudioToolLibrary::TScroll_drawBar_horizontal field_0x428;
189+
/* 0x460 */ int field_0x460;
190+
/* 0x464 */ int field_0x464;
191+
/* 0x468 */ JStudioToolLibrary::TColor_variable field_0x468;
192+
/* 0x47C */ JStudioToolLibrary::TColor_variable field_0x47c;
193+
/* 0x490 */ JStudioToolLibrary::TColor_variable field_0x490;
194+
/* 0x4A4 */ JStudioToolLibrary::TColor_variable field_0x4a4;
195+
/* 0x4B8 */ JStudioToolLibrary::TColor_variable field_0x4b8;
196+
/* 0x4CC */ JStudioToolLibrary::TColor_variable field_0x4cc;
197+
/* 0x4E0 */ u8 field_0x4E0[0x4F8 - 0x4E0];
198+
/* 0x4F8 */ JStudio::TControl oJSTControl_;
199+
/* 0x604 */ u8 field_0x604[0x608 - 0x604];
200+
/* 0x608 */ JStudio::TObject_camera field_0x608;
201+
/* 0x640 */ u8 field_0x640;
202+
};
203+
}
204+
205+
#endif
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
#ifndef JSTUDIOCAMERAEDITOR_CONTROLSET_CSB_VALUESET_H
2+
#define JSTUDIOCAMERAEDITOR_CONTROLSET_CSB_VALUESET_H
3+
4+
#include "JSystem/JStudio/JStudioToolLibrary/controlset.h"
5+
#include "JSystem/JStudio/JStudioCameraEditor/csb.h"
6+
7+
namespace JStudioCameraEditor {
8+
struct TControlSet_csb_valueSet : public JStudioToolLibrary::TControlSet {
9+
/* 0x14 */ bool bChanged_;
10+
/* 0x15 */ u8 field_0x15;
11+
/* 0x18 */ csb::TValueSet* pValueSet_;
12+
/* 0x1C */ csb::TValueSet field_0x1c;
13+
};
14+
}
15+
16+
#endif
Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
#ifndef JSTUDIOCAMERAEDITOR_CSB_H
2+
#define JSTUDIOCAMERAEDITOR_CSB_H
3+
4+
#include <dolphin/mtx.h>
5+
#include "JSystem/JGadget/linklist.h"
6+
#include "JSystem/JGadget/std-vector.h"
7+
#include "JSystem/JStudio/JStudio/functionvalue.h"
8+
9+
namespace JStudioCameraEditor {
10+
namespace csb {
11+
namespace data {
12+
enum TEValue {};
13+
}
14+
15+
struct TValueSet {
16+
TValueSet();
17+
TValueSet(const TValueSet&);
18+
19+
void set(data::TEValue, f32);
20+
void setVector_targetPosition(const Vec&);
21+
void setVector_position(const Vec&);
22+
void setApplied(data::TEValue, bool);
23+
void getVector_targetPosition_relativePosition(Vec*) const;
24+
void getVector_targetPosition(Vec*) const;
25+
void getVector_position(Vec*) const;
26+
void getVector_up(Vec*) const;
27+
f32 getValue(data::TEValue) const;
28+
void setTime(u32);
29+
u32 getTime() const;
30+
void setVector_position_relativeTargetPosition(const Vec&);
31+
void getVector_position_relativeTargetPosition(Vec*) const;
32+
void setVector_targetPosition_relativePosition(const Vec&);
33+
void addValue(data::TEValue, f32);
34+
void set(const TValueSet&, uint);
35+
bool isApplied(data::TEValue) const;
36+
37+
/* 0x00 */ f32 fValue_[8];
38+
/* 0x20 */ bool bApplied_[8];
39+
/* 0x28 */ u32 uTime_;
40+
};
41+
42+
struct TSequence : public JGadget::TLinkListNode {
43+
TSequence(u32);
44+
~TSequence();
45+
46+
JGadget::TVector<TValueSet, JGadget::TAllocator<TValueSet> >& referValueSetContainer();
47+
void getValueSetContainer() const;
48+
void setInterpolate(JStudio::TFunctionValue::TEInterpolate);
49+
JStudio::TFunctionValue::TEInterpolate getInterpolate() const;
50+
void setTime(u32);
51+
u32 getTime() const;
52+
void setTime_begin(u32);
53+
u32 getTime_begin() const;
54+
void assign(const TSequence&);
55+
u32 getTime_valueSet_all() const;
56+
u32 getTime_actual(u32*) const;
57+
u32 getTime_begin_actual_(u32) const;
58+
bool getFunctionValue(JStudio::TFunctionValue_list_parameter*, JGadget::TVector<f32, JGadget::TAllocator<f32> >*, data::TEValue, double) const;
59+
u32 getFunctionValueDataNumberNeeded() const;
60+
61+
/* 0x08 */ JGadget::TVector<TValueSet, JGadget::TAllocator<TValueSet> > oContainer_;
62+
/* 0x1C */ u32 uTime_;
63+
/* 0x20 */ u32 uTimeBegin_;
64+
/* 0x24 */ JStudio::TFunctionValue::TEInterpolate eInterpolate_;
65+
};
66+
67+
struct TSequenceContainer : public JGadget::TLinkList_factory<TSequence, 0> {
68+
TSequenceContainer();
69+
70+
virtual ~TSequenceContainer();
71+
virtual TSequence* Do_create();
72+
virtual void Do_destroy(TSequence*);
73+
};
74+
}
75+
}
76+
77+
#endif
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
#ifndef JSTUDIOCAMERAEDITOR_SEQUENCE_H
2+
#define JSTUDIOCAMERAEDITOR_SEQUENCE_H
3+
4+
#include "JSystem/JStudio/JStudioCameraEditor/csb.h"
5+
6+
namespace JStudioCameraEditor {
7+
struct TSequenceContainer : public csb::TSequenceContainer {
8+
TSequenceContainer();
9+
10+
int GetSequenceValueSetDefaultNumber();
11+
12+
virtual ~TSequenceContainer();
13+
virtual csb::TSequence* Do_create();
14+
virtual void Do_destroy(csb::TSequence*);
15+
16+
/* 0x10 */ int field_0x10;
17+
};
18+
}
19+
20+
#endif

include/JSystem/JStudio/JStudioToolLibrary/anchor.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ namespace JStudioToolLibrary {
1818
int getX() const;
1919
int getY() const;
2020

21-
/* 0x0 */ int x_;
22-
/* 0x4 */ int y_;
21+
/* 0x0 */ int iX_;
22+
/* 0x4 */ int iY_;
2323
};
2424

2525
struct TAnchor_corner {
@@ -31,8 +31,8 @@ namespace JStudioToolLibrary {
3131
TEAnchor getAnchor() const;
3232
TPoint* getAnchorPosition() const;
3333

34-
/* 0x0 */ TEAnchor anchor_;
35-
/* 0x4 */ TPoint anchorPosition_;
34+
/* 0x0 */ TEAnchor eAnchor_;
35+
/* 0x4 */ TPoint oAnchorPosition_;
3636
};
3737
}
3838

include/JSystem/JStudio/JStudioToolLibrary/controlset-preview.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,12 +68,12 @@ namespace JStudioToolLibrary {
6868

6969
/* 0x14 */ u8 field_0x14;
7070
/* 0x18 */ int field_0x18;
71-
/* 0x1C */ u32 time_;
71+
/* 0x1C */ u32 uTime_;
7272
/* 0x20 */ u32 field_0x20;
7373
/* 0x24 */ int field_0x24;
7474
/* 0x28 */ u32 field_0x28;
75-
/* 0x2C */ int timeStep_;
76-
/* 0x30 */ u8 timeEnd_;
75+
/* 0x2C */ int iTimeStep_;
76+
/* 0x30 */ u8 bTimeEnd_;
7777
/* 0x34 */ TAdaptor* pAdaptor_;
7878
};
7979
}

include/JSystem/JStudio/JStudioToolLibrary/controlset-transform.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ namespace JStudioToolLibrary_JStudio {
4444
void control_reply_origin_reset(const JORPropertyEvent*, TControlSet_transform*, const JStudioToolLibrary::TControlSet::TControl&);
4545
void control_update_origin_reset(TControlSet_transform*, const JStudioToolLibrary::TControlSet::TControl&);
4646

47-
/* 0x14 */ bool enabled_;
47+
/* 0x14 */ bool bEnabled_;
4848
/* 0x18 */ TControl* pControl_;
4949
/* 0x1C */ Vec field_0x1c;
5050
/* 0x28 */ f32 field_0x28;

include/JSystem/JStudio/JStudioToolLibrary/controlset.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ namespace JStudioToolLibrary {
2121
int getID(const TControlSet&) const;
2222
void setStyle(TControlSet*, u32) const;
2323

24-
/* 0x00 */ char* label_;
24+
/* 0x00 */ char* szLabel_;
2525
/* 0x04 */ void* pfnGenerate_;
2626
/* 0x08 */ void* pfnReply_;
2727
/* 0x0C */ void* pfnUpdate_;
@@ -54,7 +54,7 @@ namespace JStudioToolLibrary {
5454

5555
/* 0x00 */ TConsole* pConsole_;
5656
/* 0x04 */ TControl* paoControl_;
57-
/* 0x08 */ u32 number_;
57+
/* 0x08 */ u32 uNumber_;
5858
/* 0x0C */ u32 field_0xc;
5959
/* 0x10 */ u32 field_0x10;
6060
};

0 commit comments

Comments
 (0)