mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-05-23 06:54:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

general cleanup, d_menu_quit / d_a_obj_testcube mostly done, d_msg_scrn_explain debug (#3065)

Browse Source 
* typedef for cPhs_Step

* make sdk includes consistent

* d_menu_quit / d_msg_scrn_explain debug

* d_a_obj_testcube mostly done

* d_debug_pad mostly done

* jstudio tool library headers

* some JStudioCameraEditor headers

* d_jcam_editor mostly done

* try fixing some shield regressions

* d_bg_parts mostly done

* fix merge errors

* debug fix
This commit is contained in:
TakaRikka
2026-01-24 23:36:23 -08:00
committed by GitHub
parent e01dbc3297
commit 5867eaf68b
612 changed files with 4052 additions and 1141 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/JSystem/J2DGraph/J2DGrafContext.h
+1 -1
View File
@@ -3,7 +3,7 @@
#include "JSystem/JGeometry.h"
#include "JSystem/JUtility/TColor.h"
#include "dolphin/mtx.h"
#include <dolphin/mtx.h>
/**
* @ingroup jsystem-j2d
include/JSystem/J2DGraph/J2DManage.h
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef J2DMANAGE_H
#define J2DMANAGE_H
#include "dolphin/types.h"
#include <dolphin/types.h>
class JSUInputStream;
include/JSystem/J2DGraph/J2DPane.h
+1 -1
View File
@@ -4,7 +4,7 @@
#include "JSystem/JGeometry.h"
#include "JSystem/JSupport/JSUList.h"
#include <dolphin/gx.h>
#include "dolphin/mtx.h"
#include <dolphin/mtx.h>
class J2DAnmBase;
class J2DAnmColor;
include/JSystem/J2DGraph/J2DTevs.h
+1 -1
View File
@@ -2,7 +2,7 @@
#define J2DTEVS_H
#include <dolphin/gx.h>
#include "dolphin/mtx.h"
#include <dolphin/mtx.h>
#include "global.h"
/**
include/JSystem/J3DGraphAnimator/J3DModel.h
+1 -1
View File
@@ -3,7 +3,7 @@
#include "JSystem/J3DGraphAnimator/J3DSkinDeform.h"
#include "JSystem/J3DGraphBase/J3DPacket.h"
#include "dolphin/types.h"
#include <dolphin/types.h>
enum J3DMdlFlag {
J3DMdlFlag_None = 0x0,
include/JSystem/J3DGraphAnimator/J3DModelData.h
+4
View File
@@ -99,6 +99,10 @@ public:
mShapeTable.hide();
}
const void* getBinary() {
return mpRawData;
}
private:
friend class J3DModelLoader;
include/JSystem/J3DGraphAnimator/J3DSkinDeform.h
+1 -1
View File
@@ -3,7 +3,7 @@
#include "JSystem/J3DGraphAnimator/J3DCluster.h"
#include "JSystem/J3DGraphAnimator/J3DMtxBuffer.h"
#include "dolphin/types.h"
#include <dolphin/types.h>
class J3DModel;
class J3DAnmCluster;
include/JSystem/J3DGraphBase/J3DMaterial.h
+1
View File
@@ -69,6 +69,7 @@ public:
BOOL isDrawModeOpaTexEdge() { return (mMaterialMode & 3) ? 1 : 0; }
J3DPEBlock* getPEBlock() { return mPEBlock; }
void onInvalid() { mInvalid = 1; }
u32 getInvalid() { return mInvalid; }
u32 getTexGenNum() const { return mTexGenBlock->getTexGenNum(); }
u8 getTevStageNum() const { return mTevBlock->getTevStageNum(); }
J3DTexCoord* getTexCoord(u32 idx) { return mTexGenBlock->getTexCoord(idx); }
include/JSystem/J3DGraphBase/J3DPacket.h
+2 -2
View File
@@ -4,8 +4,8 @@
#include "JSystem/J3DAssert.h"
#include "JSystem/J3DGraphBase/J3DSys.h"
#include "JSystem/J3DGraphBase/J3DEnum.h"
#include "dolphin/gd/GDBase.h"
#include "dolphin/mtx.h"
#include <dolphin/gd/GDBase.h>
#include <dolphin/mtx.h>
#include <stdint.h>
class J3DMatPacket;
include/JSystem/J3DGraphBase/J3DShape.h
+1 -1
View File
@@ -189,7 +189,7 @@ public:
J3DMaterial* getMaterial() const { return mMaterial; }
u16 getIndex() const { return mIndex; }
u32 getTexMtxLoadType() const { return mFlags & 0xF000; }
u32 getMtxGroupNum() const { return mMtxGroupNum; }
u16 getMtxGroupNum() const { return mMtxGroupNum; }
J3DShapeDraw* getShapeDraw(u16 idx) { return mShapeDraw[idx]; }
J3DShapeMtx* getShapeMtx(u16 idx) { return mShapeMtx[idx]; }
Vec* getMin() { return &mMin; }
include/JSystem/J3DGraphBase/J3DShapeDraw.h
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef J3DSHAPEDRAW_H
#define J3DSHAPEDRAW_H
#include "dolphin/types.h"
#include <dolphin/types.h>
/**
* @ingroup jsystem-j3d
include/JSystem/J3DGraphBase/J3DShapeMtx.h
+1 -1
View File
@@ -3,7 +3,7 @@
#include "JSystem/J3DGraphBase/J3DShape.h"
#include "JSystem/J3DAssert.h"
#include "dolphin/mtx.h"
#include <dolphin/mtx.h>
class J3DTexMtx;
class J3DTexGenBlock;
include/JSystem/J3DGraphBase/J3DStruct.h
+2 -2
View File
@@ -2,8 +2,8 @@
#define J3DSTRUCT_H
#include <dolphin/gx.h>
#include "dolphin/mtx.h"
#include "dolphin/mtx.h"
#include <dolphin/mtx.h>
#include <dolphin/mtx.h>
#include "global.h"
/**
include/JSystem/J3DGraphBase/J3DSys.h
+13 -9
View File
@@ -88,15 +88,6 @@ struct J3DSys {
void setDrawModeOpaTexEdge() { mDrawMode = J3DSysDrawMode_OpaTexEdge; }
void setDrawModeXlu() { mDrawMode = J3DSysDrawMode_Xlu; }
void* getVtxPos() { return mVtxPos; }
void setVtxPos(void* pVtxPos) { mVtxPos = pVtxPos; }
void* getVtxNrm() { return mVtxNrm; }
void setVtxNrm(void* pVtxNrm) { mVtxNrm = pVtxNrm; }
void* getVtxCol() { return mVtxCol; }
void setVtxCol(GXColor* pVtxCol) { mVtxCol = pVtxCol; }
void setDrawBuffer(J3DDrawBuffer* buffer, int type) {
J3D_ASSERT_RANGE(114, type >= 0 && type < J3DSysDrawBuf_MAX);
J3D_ASSERT_NULLPTR(115, buffer);
@@ -160,6 +151,19 @@ struct J3DSys {
GXSetArray(GX_NRM_MTX_ARRAY, mModelNrmMtx, sizeof(*mModelNrmMtx));
}
void* getVtxPos() { return mVtxPos; }
void setVtxPos(void* pVtxPos) {
J3D_ASSERT_NULLPTR(252, pVtxPos != NULL);
mVtxPos = pVtxPos;
}
void* getVtxNrm() { return mVtxNrm; }
void setVtxNrm(void* pVtxNrm) { mVtxNrm = pVtxNrm; }
void* getVtxCol() { return mVtxCol; }
void setVtxCol(GXColor* pVtxCol) { mVtxCol = pVtxCol; }
Mtx& getModelDrawMtx(u16 no) { return mModelDrawMtx[no]; }
J3DShapePacket* getShapePacket() { return mShapePacket; }
include/JSystem/J3DGraphBase/J3DTevs.h
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef J3DTEVS_H
#define J3DTEVS_H
#include "dolphin/types.h"
#include <dolphin/types.h>
#include <dolphin/gx.h>
#include "JSystem/J3DGraphBase/J3DGD.h"
#include "JSystem/J3DGraphBase/J3DStruct.h"
include/JSystem/J3DGraphBase/J3DVertex.h
+1 -1
View File
@@ -2,7 +2,7 @@
#define J3DVERTEX_H
#include <dolphin/gx.h>
#include "dolphin/mtx.h"
#include <dolphin/mtx.h>
typedef struct _GXColor GXColor;
class J3DModel;
include/JSystem/J3DGraphLoader/J3DModelLoader.h
+1 -1
View File
@@ -2,7 +2,7 @@
#define J3DMODELLOADER_H
#include "JSystem/J3DGraphBase/J3DSys.h"
#include "dolphin/mtx.h"
#include <dolphin/mtx.h>
class J3DModelData;
class J3DMaterialTable;
include/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize.h
+1 -1
View File
@@ -1,6 +1,6 @@
#ifndef J3DMODELLOADERCALCSIZE_H
#define J3DMODELLOADERCALCSIZE_H
#include "dolphin/types.h"
#include <dolphin/types.h>
#endif /* J3DMODELLOADERCALCSIZE_H */
include/JSystem/J3DU/J3DUClipper.h
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef J3DUCLIPPER_H
#define J3DUCLIPPER_H
#include "dolphin/mtx.h"
#include <dolphin/mtx.h>
/**
* @ingroup jsystem-j3d
include/JSystem/J3DU/J3DUD.h
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef J3DUD_H
#define J3DUD_H
#include "dolphin/types.h"
#include <dolphin/types.h>
namespace J3DUD {
inline f32 JMAAbs(f32 x) {
include/JSystem/JAHostIO/JAHFrameNode.h
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef JAHFRAMENODE_H
#define JAHFRAMENODE_H
#include "dolphin/types.h"
#include <dolphin/types.h>
#include "JSystem/JAHostIO/JAHioNode.h"
class JAHVirtualNode;
include/JSystem/JAHostIO/JAHioMessage.h
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef JAHIOMESSAGE_H
#define JAHIOMESSAGE_H
#include "dolphin/types.h"
#include <dolphin/types.h>
class JAHioNode;
class JORMContext;
include/JSystem/JAudio2/JASAiCtrl.h
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef JASAICTRL_H
#define JASAICTRL_H
#include "dolphin/types.h"
#include <dolphin/types.h>
enum JASOutputRate {
OUTPUT_RATE_0,
include/JSystem/JAudio2/JASAramStream.h
+1 -1
View File
@@ -3,7 +3,7 @@
#include "JSystem/JAudio2/JASTaskThread.h"
#include "JSystem/JUtility/JUTAssert.h"
#include "dolphin/dvd.h"
#include <dolphin/dvd.h>
class JASChannel;
include/JSystem/JAudio2/JASAudioReseter.h
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef JASAUDIORESETER_H
#define JASAUDIORESETER_H
#include "dolphin/types.h"
#include <dolphin/types.h>
/**
* @ingroup jsystem-jaudio
include/JSystem/JAudio2/JASBank.h
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef JASBANK_H
#define JASBANK_H
#include "dolphin/types.h"
#include <dolphin/types.h>
class JASChannel;
class JASInstParam;
include/JSystem/JAudio2/JASBankList.h
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef JASBANKLIST_H
#define JASBANKLIST_H
#include "dolphin/types.h"
#include <dolphin/types.h>
class JASBank;
include/JSystem/JAudio2/JASCalc.h
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef JASCALC_H
#define JASCALC_H
#include "dolphin/types.h"
#include <dolphin/types.h>
/**
* @ingroup jsystem-jaudio
include/JSystem/JAudio2/JASCallback.h
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef JASCALLBACK_H
#define JASCALLBACK_H
#include "dolphin/types.h"
#include <dolphin/types.h>
typedef s32 JASCallback(void*);
include/JSystem/JAudio2/JASDSPInterface.h
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef JASDSPINTERFACE_H
#define JASDSPINTERFACE_H
#include "dolphin/types.h"
#include <dolphin/types.h>
struct JASWaveInfo;
include/JSystem/JAudio2/JASDvdThread.h
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef JASDVDTHREAD_H
#define JASDVDTHREAD_H
#include "dolphin/types.h"
#include <dolphin/types.h>
class JASTaskThread;
include/JSystem/JAudio2/JASLfo.h
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef JASLFO_H
#define JASLFO_H
#include "dolphin/types.h"
#include <dolphin/types.h>
/**
* @ingroup jsystem-jaudio
include/JSystem/JAudio2/JASOscillator.h
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef JASOSCILLATOR_H
#define JASOSCILLATOR_H
#include "dolphin/types.h"
#include <dolphin/types.h>
/**
* @ingroup jsystem-jaudio
include/JSystem/JAudio2/JASProbe.h
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef JASPROBE_H
#define JASPROBE_H
#include "dolphin/types.h"
#include <dolphin/types.h>
/**
* @ingroup jsystem-jaudio
include/JSystem/JAudio2/JASRegisterParam.h
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef JASREGISTERPARAM_H
#define JASREGISTERPARAM_H
#include "dolphin/types.h"
#include <dolphin/types.h>
/**
* @ingroup jsystem-jaudio
include/JSystem/JAudio2/JASSeqParser.h
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef JASSEQPARSER_H
#define JASSEQPARSER_H
#include "dolphin/types.h"
#include <dolphin/types.h>
class JASTrack;
include/JSystem/JAudio2/JASSeqReader.h
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef JASSEQREADER_H
#define JASSEQREADER_H
#include "dolphin/types.h"
#include <dolphin/types.h>
/**
* @ingroup jsystem-jaudio
include/JSystem/JAudio2/JASSoundParams.h
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef JASSOUNDPARAMS_H
#define JASSOUNDPARAMS_H
#include "dolphin/types.h"
#include <dolphin/types.h>
/**
* @ingroup jsystem-jaudio
include/JSystem/JAudio2/JASTrackPort.h
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef JASTRACKPORT_H
#define JASTRACKPORT_H
#include "dolphin/types.h"
#include <dolphin/types.h>
/**
* @ingroup jsystem-jaudio
include/JSystem/JAudio2/JASWaveInfo.h
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef JASWAVEINFO_H
#define JASWAVEINFO_H
#include "dolphin/types.h"
#include <dolphin/types.h>
class JASWaveArc;
include/JSystem/JAudio2/JAUAudioArcInterpreter.h
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef JAUAUDIOARCINTERPRETER_H
#define JAUAUDIOARCINTERPRETER_H
#include "dolphin/types.h"
#include <dolphin/types.h>
/**
* @ingroup jsystem-jaudio
include/JSystem/JAudio2/JAUInitializer.h
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef JAUINITIALIZER_H
#define JAUINITIALIZER_H
#include "dolphin/types.h"
#include <dolphin/types.h>
class JKRSolidHeap;
include/JSystem/JAudio2/dspproc.h
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef DSPPROC_H
#define DSPPROC_H
#include "dolphin/types.h"
#include <dolphin/types.h>
void DSPReleaseHalt2(u32 msg);
void DsetupTable(u32 param_0, u32 param_1, u32 param_2, u32 param_3, u32 param_4);
include/JSystem/JAudio2/dsptask.h
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef DSPTASK_H
#define DSPTASK_H
#include "dolphin/types.h"
#include <dolphin/types.h>
void DspBoot(void (*)(void*));
void DspFinishWork(u16 param_0);
include/JSystem/JFramework/JFWSystem.h
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef JFWSYSTEM_H
#define JFWSYSTEM_H
#include "dolphin/types.h"
#include <dolphin/types.h>
#include "JSystem/JUtility/JUTAssert.h"
typedef struct _GXRenderModeObj GXRenderModeObj;
include/JSystem/JGeometry.h
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef JGEOMETRY_H
#define JGEOMETRY_H
#include "dolphin/mtx.h"
#include <dolphin/mtx.h>
#include <cmath>
#include "JSystem/JMath/JMath.h"
include/JSystem/JHostIO/JOREntry.h
+1 -1
View File
@@ -2,7 +2,7 @@
#define JORENTRY_H
#include "JSystem/JHostIO/JHIComm.h"
#include "dolphin/os.h"
#include <dolphin/os.h>
template<typename T, int I>
class JHIpvector {
include/JSystem/JKernel/JKRDvdFile.h
+1 -1
View File
@@ -2,7 +2,7 @@
#define JKRDVDFILE_H
#include "JSystem/JKernel/JKRFile.h"
#include "dolphin/dvd.h"
#include <dolphin/dvd.h>
#include <dolphin/os.h>
#include <dolphin/os.h>
include/JSystem/JKernel/JKRFileFinder.h
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef JKRFILEFINDER_H
#define JKRFILEFINDER_H
#include "dolphin/dvd.h"
#include <dolphin/dvd.h>
/**
* @ingroup jsystem-jkernel
include/JSystem/JMath/JMATrigonometric.h
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef JMATRIGONOMETRIC_H
#define JMATRIGONOMETRIC_H
#include "dolphin/types.h"
#include <dolphin/types.h>
#include <cmath>
#include <utility>
include/JSystem/JMath/JMath.h
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef JMATH_H
#define JMATH_H
#include "dolphin/mtx.h"
#include <dolphin/mtx.h>
#include <cmath>
void JMAMTXApplyScale(const Mtx, Mtx, f32, f32, f32);
include/JSystem/JMath/random.h
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef RANDOM_H
#define RANDOM_H
#include "dolphin/types.h"
#include <dolphin/types.h>
namespace JMath {
include/JSystem/JParticle/JPADrawInfo.h
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef JPADRAWINFO_H
#define JPADRAWINFO_H
#include "dolphin/mtx.h"
#include <dolphin/mtx.h>
/**
* @ingroup jsystem-jparticle
include/JSystem/JParticle/JPADynamicsBlock.h
+1 -1
View File
@@ -3,7 +3,7 @@
#include "JSystem/JGeometry.h"
#include "dolphin/types.h"
#include <dolphin/types.h>
class JPAEmitterWorkData;
include/JSystem/JParticle/JPAEmitterManager.h
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef JPAEMITTERMANAGER_H
#define JPAEMITTERMANAGER_H
#include "dolphin/types.h"
#include <dolphin/types.h>
#include "JSystem/JParticle/JPAList.h"
#include "JSystem/JParticle/JPADrawInfo.h"
#include "JSystem/JSupport/JSUList.h"
include/JSystem/JParticle/JPAExTexShape.h
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef JPAEXTEXSHAPE_H
#define JPAEXTEXSHAPE_H
#include "dolphin/types.h"
#include <dolphin/types.h>
class JPAEmitterWorkData;
include/JSystem/JParticle/JPAExtraShape.h
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef JPAEXTRASHAPE_H
#define JPAEXTRASHAPE_H
#include "dolphin/types.h"
#include <dolphin/types.h>
class JPAEmitterWorkData;
class JPABaseParticle;
include/JSystem/JParticle/JPAFieldBlock.h
+1 -1
View File
@@ -2,7 +2,7 @@
#define JPAFIELDBLOCK_H
#include "JSystem/JGeometry.h"
#include "dolphin/types.h"
#include <dolphin/types.h>
class JKRHeap;
class JPAEmitterWorkData;
include/JSystem/JParticle/JPAKeyBlock.h
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef JPAKEYBLOCK_H
#define JPAKEYBLOCK_H
#include "dolphin/types.h"
#include <dolphin/types.h>
/**
* @ingroup jsystem-jparticle
include/JSystem/JParticle/JPAList.h
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef JPALIST_H
#define JPALIST_H
#include "dolphin/types.h"
#include <dolphin/types.h>
/**
* @ingroup jsystem-jparticle
include/JSystem/JParticle/JPAMath.h
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef JPAMATH_H
#define JPAMATH_H
#include "dolphin/mtx.h"
#include <dolphin/mtx.h>
#include "JSystem/JGeometry.h"
void JPAGetDirMtx(JGeometry::TVec3<f32> const& param_0, f32 (*param_1)[4]);
include/JSystem/JParticle/JPARandom.h
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef JPARANDOM_H
#define JPARANDOM_H
#include "dolphin/types.h"
#include <dolphin/types.h>
/**
* @ingroup jsystem-jparticle
include/JSystem/JParticle/JPAResource.h
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef JPARESOURCE_H
#define JPARESOURCE_H
#include "dolphin/types.h"
#include <dolphin/types.h>
class JKRHeap;
class JPAEmitterWorkData;
include/JSystem/JParticle/JPAResourceLoader.h
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef JPARESOURCELOADER_H
#define JPARESOURCELOADER_H
#include "dolphin/types.h"
#include <dolphin/types.h>
class JPAResourceManager;
include/JSystem/JStage/JSGObject.h
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef JSGOBJECT_H
#define JSGOBJECT_H
#include "dolphin/mtx.h"
#include <dolphin/mtx.h>
namespace JStage {
/**
include/JSystem/JStudio/JStudio/jstudio-math.h
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef JSTUDIO_MATH_H
#define JSTUDIO_MATH_H
#include "dolphin/mtx.h"
#include <dolphin/mtx.h>
#include <cmath>
#define m_PI_D 3.141592653589793
include/JSystem/JStudio/JStudio/jstudio-object.h
+6
View File
@@ -120,6 +120,12 @@ public:
virtual void do_data(void const*, u32, void const*, u32);
TAdaptor* getAdaptor() const { return mpAdaptor; }
void setAdaptor(TAdaptor* pAdaptor) {
mpAdaptor = pAdaptor;
prepareAdaptor();
}
TControl* getControl() { return (TControl*)stb::TObject::getControl(); }
const TControl* getControl() const { return (const TControl*)stb::TObject::getControl(); }
include/JSystem/JStudio/JStudio/object-id.h
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef OBJECT_ID_H
#define OBJECT_ID_H
#include "dolphin/types.h"
#include <dolphin/types.h>
namespace JStudio {
namespace object {
include/JSystem/JStudio/JStudio/stb-data.h
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef STB_DATA_H
#define STB_DATA_H
#include "dolphin/types.h"
#include <dolphin/types.h>
namespace JStudio {
namespace stb {
include/JSystem/JStudio/JStudio/stb.h
+1 -1
View File
@@ -4,7 +4,7 @@
#include "JSystem/JGadget/linklist.h"
#include "JSystem/JStudio/JStudio/object-id.h"
#include "JSystem/JStudio/JStudio/stb-data-parse.h"
#include "dolphin/os.h"
#include <dolphin/os.h>
namespace JStudio {
class TObject;
include/JSystem/JStudio/JStudioCameraEditor/control.h
+217
View File
@@ -0,0 +1,217 @@
#ifndef JSTUDIOCAMERAEDITOR_CONTROL_H
#define JSTUDIOCAMERAEDITOR_CONTROL_H
#include "JSystem/JStudio/JStudio/jstudio-control.h"
#include "JSystem/JStudio/JStudio/jstudio-object.h"
#include "JSystem/JStudio/JStudioCameraEditor/csb.h"
#include "JSystem/JStudio/JStudioCameraEditor/sequence.h"
#include "JSystem/JStudio/JStudioCameraEditor/controlset-csb-valueset.h"
#include "JSystem/JStudio/JStudioToolLibrary/controlset-preview.h"
#include "JSystem/JStudio/JStudioToolLibrary/controlset-transform.h"
#include "JSystem/JStudio/JStudioToolLibrary/console.h"
#include "JSystem/JStudio/JStudioToolLibrary/interface.h"
#include "JSystem/JStudio/JStudioToolLibrary/visual.h"
#include "JSystem/JStudio/JStudioToolLibrary/scroll.h"
#include "JSystem/JGadget/std-vector.h"
#include "JSystem/JHostIO/JORServer.h"
namespace JStudioCameraEditor {
struct TControl : public JORReflexible, public JOREventCallbackListNode {
struct TSWValueWidth_ {
TSWValueWidth_(uint, uint);
/* 0x0 */ uint field_0x0;
/* 0x4 */ uint field_0x4;
};
struct TOptionSet_ : public csb::TValueSet {
TOptionSet_();
int getPadding_vertical_() const;
int getPadding_horizontal_() const;
int getMargin_horizontal_() const;
/* 0x02C */ int field_0x2c;
/* 0x030 */ int field_0x30;
/* 0x034 */ u8 field_0x34;
/* 0x035 */ u8 field_0x35;
/* 0x038 */ int field_0x38;
/* 0x03C */ int field_0x3c;
/* 0x040 */ int field_0x40;
/* 0x044 */ u8 field_0x44;
/* 0x045 */ u8 field_0x45;
/* 0x048 */ f32 field_0x48;
/* 0x04C */ f32 field_0x4c;
/* 0x050 */ f32 field_0x50;
/* 0x054 */ f32 field_0x54;
/* 0x058 */ f32 field_0x58;
/* 0x05C */ f32 field_0x5c;
/* 0x060 */ f32 field_0x60;
/* 0x064 */ f32 field_0x64;
/* 0x068 */ f32 field_0x68;
/* 0x06C */ f32 field_0x6c;
/* 0x070 */ int field_0x70;
/* 0x074 */ int field_0x74;
/* 0x078 */ int field_0x78;
/* 0x07C */ u8 field_0x7c;
/* 0x07D */ u8 field_0x7d;
/* 0x07E */ u8 field_0x7e;
/* 0x07F */ u8 field_0x7f;
/* 0x080 */ u8 field_0x80;
/* 0x081 */ u8 field_0x81;
/* 0x082 */ u8 field_0x82;
/* 0x083 */ u8 field_0x83;
/* 0x084 */ u8 field_0x84;
/* 0x088 */ int field_0x88;
/* 0x08C */ int field_0x8c;
/* 0x090 */ int field_0x90;
/* 0x094 */ int field_0x94;
/* 0x098 */ f32 field_0x98;
/* 0x09C */ f32 field_0x9c;
/* 0x0A0 */ JUtility::TColor field_0xa0;
/* 0x0A4 */ int field_0xa4;
/* 0x0A8 */ int field_0xa8;
/* 0x0AC */ int field_0xac;
/* 0x0B0 */ f32 field_0xb0;
/* 0x0B4 */ int field_0xb4;
/* 0x0B8 */ int field_0xb8;
/* 0x0BC */ int field_0xbc;
/* 0x0C0 */ int field_0xc0;
/* 0x0C4 */ int field_0xc4;
/* 0x0C8 */ int field_0xc8;
/* 0x0CC */ int field_0xcc;
/* 0x0D0 */ int field_0xd0;
/* 0x0D4 */ int field_0xd4;
/* 0x0D8 */ int field_0xd8;
/* 0x0DC */ int field_0xdc;
/* 0x0E0 */ int field_0xe0;
/* 0x0E4 */ int field_0xe4;
/* 0x0E8 */ int field_0xe8;
/* 0x0EC */ TSWValueWidth_ field_0xec;
/* 0x0F4 */ TSWValueWidth_ field_0xf4;
/* 0x0FC */ TSWValueWidth_ field_0xfc;
/* 0x104 */ TSWValueWidth_ field_0x104;
/* 0x10C */ JUtility::TColor field_0x10c;
/* 0x110 */ JUtility::TColor field_0x110;
/* 0x114 */ JUtility::TColor field_0x114;
/* 0x118 */ JUtility::TColor field_0x118;
/* 0x11C */ JUtility::TColor field_0x11c;
/* 0x120 */ JUtility::TColor field_0x120;
/* 0x124 */ JUtility::TColor field_0x124;
/* 0x128 */ JUtility::TColor field_0x128;
/* 0x12C */ JUtility::TColor field_0x12c;
/* 0x130 */ JUtility::TColor field_0x130;
/* 0x134 */ JUtility::TColor field_0x134;
/* 0x138 */ JUtility::TColor field_0x138;
/* 0x13C */ JUtility::TColor field_0x13c;
/* 0x140 */ JUtility::TColor field_0x140;
/* 0x144 */ JUtility::TColor field_0x144;
/* 0x148 */ JStudioToolLibrary::TColor_variable::TVelocity field_0x148;
/* 0x158 */ JStudioToolLibrary::TColor_variable::TVelocity field_0x158;
/* 0x168 */ JStudioToolLibrary::TColor_variable::TVelocity field_0x168;
/* 0x178 */ JStudioToolLibrary::TColor_variable::TVelocity field_0x178;
/* 0x188 */ JStudioToolLibrary::TColor_variable::TVelocity field_0x188;
/* 0x198 */ JStudioToolLibrary::TColor_variable::TVelocity field_0x198;
/* 0x1A8 */ int field_0x1a8;
/* 0x1AC */ int field_0x1ac;
};
struct TAdaptor_preview_ : public JStudioToolLibrary::TControlSet_preview::TAdaptor {
TAdaptor_preview_(TControl*);
virtual bool do_isReady();
virtual void do_begin();
virtual void do_end();
virtual void do_current(u32, s32);
virtual ~TAdaptor_preview_();
/* 0x4 */ TControl* pControl_;
};
enum TECommand {};
TControl();
void jstudio_setSecondPerFrame(double param_0) {
oJSTControl_.setSecondPerFrame(param_0);
}
void show_setRender(J2DOrthoGraph* pOrthoGraph, JUTFont* pFont) {
field_0x3cc.setRender(pOrthoGraph);
oPrint_.setFont(pFont);
}
void interface_setPad(const JUTGamePad* pPad) {
oPad_.setPad(pPad);
}
void jstudio_setAdaptor(JStudio::TAdaptor_camera* pAdaptor) {
field_0x608.setAdaptor(pAdaptor);
}
bool isEnabled() const { return bEnabled_; }
virtual void listenPropertyEvent(const JORPropertyEvent*);
virtual void genMessage(JORMContext*);
virtual int JORAct(u32, const char*);
virtual ~TControl();
virtual void update();
virtual void show2D();
virtual void show3D(const Mtx);
virtual int command(TECommand, const char*);
/* 0x018 */ JStudioToolLibrary::TConsole field_0x18;
/* 0x020 */ TOptionSet_ oOptionSet_;
/* 0x1D0 */ TAdaptor_preview_ field_0x1d0;
/* 0x1D8 */ bool bEnabled_;
/* 0x1DC */ int field_0x1dc;
/* 0x1E0 */ JStudioToolLibrary::TControlSet_preview oPreviewControl_;
/* 0x218 */ TControlSet_csb_valueSet field_0x218;
/* 0x260 */ TControlSet_csb_valueSet field_0x260;
/* 0x2A8 */ JStudioToolLibrary_JStudio::TControlSet_transform oTransformControl_;
/* 0x2D4 */ TSequenceContainer oSequenceContainer_;
/* 0x2E8 */ csb::TValueSet field_0x2e8;
/* 0x314 */ JGadget::TVector<csb::TValueSet, JGadget::TAllocator<csb::TValueSet> > field_0x314;
/* 0x328 */ TSequenceContainer field_0x328;
/* 0x33C */ u8 field_0x33C[0x36C - 0x33C];
/* 0x36C */ int field_0x36c;
/* 0x370 */ u8 field_0x370;
/* 0x371 */ u8 field_0x371;
/* 0x372 */ u8 field_0x372;
/* 0x373 */ u8 field_0x373;
/* 0x374 */ u8 field_0x374;
/* 0x378 */ int field_0x378;
/* 0x37C */ u8 field_0x37c;
/* 0x380 */ int field_0x380;
/* 0x384 */ int field_0x384[2];
/* 0x38C */ JGadget::TLinkList<csb::TSequence, 0>::iterator itIFSequence_;
/* 0x390 */ u32 uitIFSequence_;
/* 0x394 */ csb::TValueSet* itIFValueSet_;
/* 0x398 */ csb::TValueSet* uitIFValueSet_;
/* 0x39C */ JStudioToolLibrary::TPad oPad_;
/* 0x3A0 */ JStudioToolLibrary::TPad::TData oPadData_;
/* 0x3C8 */ bool bIsPad_applied_;
/* 0x3CC */ JStudioToolLibrary::TDrawPrimitive2D field_0x3cc;
/* 0x3D0 */ JStudioToolLibrary::TDrawPrimitive3D field_0x3d0;
/* 0x3D8 */ JStudioToolLibrary::TPrint oPrint_;
/* 0x3EC */ bool bVisible2D_;
/* 0x3ED */ bool bVisible3D_;
/* 0x3F0 */ JStudioToolLibrary::TScroll_drawBar_horizontal field_0x3f0;
/* 0x428 */ JStudioToolLibrary::TScroll_drawBar_horizontal field_0x428;
/* 0x460 */ int field_0x460;
/* 0x464 */ int field_0x464;
/* 0x468 */ JStudioToolLibrary::TColor_variable field_0x468;
/* 0x47C */ JStudioToolLibrary::TColor_variable field_0x47c;
/* 0x490 */ JStudioToolLibrary::TColor_variable field_0x490;
/* 0x4A4 */ JStudioToolLibrary::TColor_variable field_0x4a4;
/* 0x4B8 */ JStudioToolLibrary::TColor_variable field_0x4b8;
/* 0x4CC */ JStudioToolLibrary::TColor_variable field_0x4cc;
/* 0x4E0 */ u8 field_0x4E0[0x4F8 - 0x4E0];
/* 0x4F8 */ JStudio::TControl oJSTControl_;
/* 0x608 */ JStudio::TObject_camera field_0x608;
/* 0x640 */ u8 field_0x640;
};
}
#endif
include/JSystem/JStudio/JStudioCameraEditor/controlset-csb-valueset.h
+16
View File
@@ -0,0 +1,16 @@
#ifndef JSTUDIOCAMERAEDITOR_CONTROLSET_CSB_VALUESET_H
#define JSTUDIOCAMERAEDITOR_CONTROLSET_CSB_VALUESET_H
#include "JSystem/JStudio/JStudioToolLibrary/controlset.h"
#include "JSystem/JStudio/JStudioCameraEditor/csb.h"
namespace JStudioCameraEditor {
struct TControlSet_csb_valueSet : public JStudioToolLibrary::TControlSet {
/* 0x14 */ bool bChanged_;
/* 0x15 */ u8 field_0x15;
/* 0x18 */ csb::TValueSet* pValueSet_;
/* 0x1C */ csb::TValueSet field_0x1c;
};
}
#endif
include/JSystem/JStudio/JStudioCameraEditor/csb.h
+77
View File
@@ -0,0 +1,77 @@
#ifndef JSTUDIOCAMERAEDITOR_CSB_H
#define JSTUDIOCAMERAEDITOR_CSB_H
#include <dolphin/mtx.h>
#include "JSystem/JGadget/linklist.h"
#include "JSystem/JGadget/std-vector.h"
#include "JSystem/JStudio/JStudio/functionvalue.h"
namespace JStudioCameraEditor {
namespace csb {
namespace data {
enum TEValue {};
}
struct TValueSet {
TValueSet();
TValueSet(const TValueSet&);
void set(data::TEValue, f32);
void setVector_targetPosition(const Vec&);
void setVector_position(const Vec&);
void setApplied(data::TEValue, bool);
void getVector_targetPosition_relativePosition(Vec*) const;
void getVector_targetPosition(Vec*) const;
void getVector_position(Vec*) const;
void getVector_up(Vec*) const;
f32 getValue(data::TEValue) const;
void setTime(u32);
u32 getTime() const;
void setVector_position_relativeTargetPosition(const Vec&);
void getVector_position_relativeTargetPosition(Vec*) const;
void setVector_targetPosition_relativePosition(const Vec&);
void addValue(data::TEValue, f32);
void set(const TValueSet&, uint);
bool isApplied(data::TEValue) const;
/* 0x00 */ f32 fValue_[8];
/* 0x20 */ bool bApplied_[8];
/* 0x28 */ u32 uTime_;
};
struct TSequence : public JGadget::TLinkListNode {
TSequence(u32);
~TSequence();
JGadget::TVector<TValueSet, JGadget::TAllocator<TValueSet> >& referValueSetContainer();
void getValueSetContainer() const;
void setInterpolate(JStudio::TFunctionValue::TEInterpolate);
JStudio::TFunctionValue::TEInterpolate getInterpolate() const;
void setTime(u32);
u32 getTime() const;
void setTime_begin(u32);
u32 getTime_begin() const;
void assign(const TSequence&);
u32 getTime_valueSet_all() const;
u32 getTime_actual(u32*) const;
u32 getTime_begin_actual_(u32) const;
bool getFunctionValue(JStudio::TFunctionValue_list_parameter*, JGadget::TVector<f32, JGadget::TAllocator<f32> >*, data::TEValue, double) const;
u32 getFunctionValueDataNumberNeeded() const;
/* 0x08 */ JGadget::TVector<TValueSet, JGadget::TAllocator<TValueSet> > oContainer_;
/* 0x1C */ u32 uTime_;
/* 0x20 */ u32 uTimeBegin_;
/* 0x24 */ JStudio::TFunctionValue::TEInterpolate eInterpolate_;
};
struct TSequenceContainer : public JGadget::TLinkList_factory<TSequence, 0> {
TSequenceContainer();
virtual ~TSequenceContainer();
virtual TSequence* Do_create();
virtual void Do_destroy(TSequence*);
};
}
}
#endif
include/JSystem/JStudio/JStudioCameraEditor/sequence.h
+20
View File
@@ -0,0 +1,20 @@
#ifndef JSTUDIOCAMERAEDITOR_SEQUENCE_H
#define JSTUDIOCAMERAEDITOR_SEQUENCE_H
#include "JSystem/JStudio/JStudioCameraEditor/csb.h"
namespace JStudioCameraEditor {
struct TSequenceContainer : public csb::TSequenceContainer {
TSequenceContainer();
int GetSequenceValueSetDefaultNumber();
virtual ~TSequenceContainer();
virtual csb::TSequence* Do_create();
virtual void Do_destroy(csb::TSequence*);
/* 0x10 */ int field_0x10;
};
}
#endif
include/JSystem/JStudio/JStudioToolLibrary/anchor.h
+39
View File
@@ -0,0 +1,39 @@
#ifndef JSTUDIOTOOLLIBRARY_ANCHOR_H
#define JSTUDIOTOOLLIBRARY_ANCHOR_H
#include "JSystem/JStudio/JStudioToolLibrary/scroll.h"
namespace JStudioToolLibrary {
enum TEAnchor {
};
struct TPoint {
TPoint(const TPoint&);
TPoint(int, int);
void setX(int);
void setY(int);
int getX() const;
int getY() const;
/* 0x0 */ int iX_;
/* 0x4 */ int iY_;
};
struct TAnchor_corner {
TAnchor_corner(TEAnchor, int, int);
void setAnchor(TEAnchor);
void setAnchorPosition(const TPoint&);
void getPosition(TPoint*, const TRectangle&, int, int) const;
TEAnchor getAnchor() const;
TPoint* getAnchorPosition() const;
/* 0x0 */ TEAnchor eAnchor_;
/* 0x4 */ TPoint oAnchorPosition_;
};
}
#endif
include/JSystem/JStudio/JStudioToolLibrary/console.h
+87
View File
@@ -0,0 +1,87 @@
#ifndef JSTUDIOTOOLLIBRARY_CONSOLE_H
#define JSTUDIOTOOLLIBRARY_CONSOLE_H
#include "JSystem/JKernel/JKRHeap.h"
#include "JSystem/JHostIO/JORReflexible.h"
#include "JSystem/JUtility/TColor.h"
namespace JStudioToolLibrary {
struct JORValPrpEvent {};
struct JORStrValPrpEvent {};
struct TConsole {
TConsole(const char*, JORReflexible*);
u32 memory_allocate_available(JKRHeap*, double, u32*);
bool memory_isAllocatable(JKRHeap*);
bool memory_isAllocatable(JKRHeap*, u32);
bool memory_isAllocatable_available(JKRHeap*, double, u32*);
bool memory_allocate(JKRHeap*, u32);
void control_enable(const u32*, bool);
void control_enable(u32, bool);
void control_setStyle(u32, u32);
void control_generateRadioButton(JORMContext*, u32, const char*, const char*, int);
void control_generateSelectList(JORMContext*, u32, const char*, uint, const char*, int);
void control_generateLabel(JORMContext*, u32, const char*);
void control_getRadioButton(const JORValPrpEvent*);
void control_isCheckBox(const JORValPrpEvent*);
void control_getSelectList(const JORValPrpEvent*);
void control_generateEditBox_float(JORMContext*, u32, const char*, const f32&);
void control_generateEditBox_uint(JORMContext*, u32, const char*, const uint&);
void control_generateTitle(JORMContext*, const char*) const;
void control_generateSeparator(JORMContext*, const char*);
void control_setCheckBox(u32, bool);
void control_generateRadioButton_style(JORMContext*, u32, u32, const char*, const char**, int);
void control_setRadioButton(u32, int);
void control_generateSelectList_style(JORMContext*, u32, u32, const char*, uint, const char**, int);
void control_setSelectList(u32, int);
void control_generateLabel_style(JORMContext*, u32, u32, const char*);
void control_generateEditBox_style(JORMContext*, u32, u32, const char*, const char*);
void control_generateEditBox_style_int(JORMContext*, u32, u32, const char*, const int&);
void control_generateEditBox_style_uint(JORMContext*, u32, u32, const char*, const uint&);
void control_generateEditBox_style_float(JORMContext*, u32, u32, const char*, const f32&);
void control_generateEditBox_style_RGBA(JORMContext*, u32, u32, const char*, JUtility::TColor);
void control_generateEditBox_int(JORMContext*, u32, const char*, const int&);
void control_setEditBox(u32, const char*);
void control_setEditBox_f(u32, const char*, ...);
void control_setEditBox_f_va(u32, const char*, va_list);
void control_setEditBox_int(u32, const int&);
void control_setEditBox_uint(u32, const uint&);
void control_setEditBox_float(u32, const f32&);
void control_setEditBox_RGBA(u32, const JUtility::TColor&);
void control_replyEditBox_int(const JORStrValPrpEvent*, int*);
void control_replyEditBox_uint(const JORStrValPrpEvent*, uint*);
void control_replyEditBox_float(const JORStrValPrpEvent*, f32*);
void control_replyEditBox_float_not(const JORStrValPrpEvent*, f32*, const f32&);
void control_replyEditBox_float_greaterEqual(const JORStrValPrpEvent*, f32*, const f32&);
void control_replyEditBox_RGBA(const JORStrValPrpEvent*, JUtility::TColor*);
void control_forceEditBox(u32, const char*, const char*);
void control_replyEditBox_float_range(const JORStrValPrpEvent*, f32*, const f32&, const f32&);
void control_replyEditBox_uint_range(const JORStrValPrpEvent*, uint*, const uint&, const uint&);
bool parseValue_int(const char*, int*);
bool parseValue_uint(const char*, uint*);
bool parseValue_float(const char*, f32*);
bool parseValue_double(const char*, double*);
bool parseValue_RGBA(const char*, JUtility::TColor*);
bool parseValueList_float(const char*, char, f32*, f32*);
int openMessageBox(uint, const char*);
int openMessageBox_f(uint, const char*, ...);
int openMessageBox_f_va(uint, const char*, va_list);
bool openBrowser(const char*);
void toValue_style_(u32);
void getValueString_int(char*, u32, int);
void getValueString_uint(char*, u32, uint);
void getValueString_float(char*, u32, f32);
void getValueString_RGBA(char*, u32, const JUtility::TColor&);
/* 0x0 */ char* szTitle_;
/* 0x4 */ JORReflexible* pReflexible_;
};
}
#endif
include/JSystem/JStudio/JStudioToolLibrary/controlset-preview.h
+81
View File
@@ -0,0 +1,81 @@
#ifndef JSTUDIOTOOLLIBRARY_CONTROLSET_PREVIEW_H
#define JSTUDIOTOOLLIBRARY_CONTROLSET_PREVIEW_H
#include "JSystem/JStudio/JStudioToolLibrary/controlset.h"
namespace JStudioToolLibrary {
struct TControlSet_preview : public TControlSet {
struct TAdaptor {
virtual bool do_isReady();
virtual void do_begin();
virtual void do_end();
virtual void do_current(u32, s32);
};
enum TEPreview {};
TControlSet_preview(TConsole*, u32, uint, TAdaptor*);
void preview_start();
void preview_stop();
void preview_rewind();
void preview_step();
void preview_pause();
void preview_play();
bool isPreview_stop() const;
u32 getTime() const;
u8 isTime_end() const;
void update();
void forwardTime_next_();
int getTime_step() const;
void adaptor_current_(u32, s32);
void flushTime_();
void setTime_(u32);
void value_setTime_(u32);
void preview(TEPreview);
void adaptor_begin_();
void resetTime_();
bool adaptor_isReady_();
u32 getControlStyle_time_end_() const;
u32 getControlStyle_time_() const;
void adaptor_end_();
void control_updateTime_();
void control_generate_preview(JORMContext*, TControlSet*, const TControl&);
void control_reply_preview(const JORPropertyEvent*, TControlSet*, const TControl&);
void control_update_preview(TControlSet*, const TControl&);
void control_generate_preview_rewind(JORMContext*, TControlSet*, const TControl&);
void control_reply_preview_rewind(const JORPropertyEvent*, TControlSet*, const TControl&);
void control_update_preview_rewind(TControlSet*, const TControl&);
void control_generate_preview_play(JORMContext*, TControlSet*, const TControl&);
void control_reply_preview_play(const JORPropertyEvent*, TControlSet*, const TControl&);
void control_update_preview_play(TControlSet*, const TControl&);
void control_generate_preview_step(JORMContext*, TControlSet*, const TControl&);
void control_reply_preview_step(const JORPropertyEvent*, TControlSet*, const TControl&);
void control_update_preview_step(TControlSet*, const TControl&);
void control_generate_time(JORMContext*, TControlSet*, const TControl&);
void control_reply_time(const JORPropertyEvent*, TControlSet*, const TControl&);
void control_update_time(TControlSet*, const TControl&);
void control_generate_time_end(JORMContext*, TControlSet*, const TControl&);
u32 getTime_end() const;
void control_reply_time_end(const JORPropertyEvent*, TControlSet*, const TControl&);
void control_update_time_end(TControlSet*, const TControl&);
void control_generate_time_step(JORMContext*, TControlSet*, const TControl&);
void control_reply_time_step(const JORPropertyEvent*, TControlSet*, const TControl&);
void setTime_step(u32);
void control_updateTime_step();
void value_setTime_step(u32);
void control_update_time_step(TControlSet*, const TControl&);
/* 0x14 */ u8 field_0x14;
/* 0x18 */ int field_0x18;
/* 0x1C */ u32 uTime_;
/* 0x20 */ u32 field_0x20;
/* 0x24 */ int field_0x24;
/* 0x28 */ u32 field_0x28;
/* 0x2C */ int iTimeStep_;
/* 0x30 */ u8 bTimeEnd_;
/* 0x34 */ TAdaptor* pAdaptor_;
};
}
#endif
include/JSystem/JStudio/JStudioToolLibrary/controlset-transform.h
+54
View File
@@ -0,0 +1,54 @@
#ifndef JSTUDIOTOOLLIBRARY_CONTROLSET_TRANSFORM_H
#define JSTUDIOTOOLLIBRARY_CONTROLSET_TRANSFORM_H
#include "JSystem/JStudio/JStudioToolLibrary/controlset.h"
#include "JSystem/JStudio/JStudio/jstudio-control.h"
namespace JStudioToolLibrary_JStudio {
struct TControlSet_transform : public JStudioToolLibrary::TControlSet {
TControlSet_transform(JStudioToolLibrary::TConsole*, u32, JStudio::TControl);
void resetOrigin();
void setOrigin(const Vec&, f32);
void setEnabled(bool);
JStudio::TControl* jstudio_getControl() const;
void jstudio_setControl(JStudio::TControl*);
void control_updateEnabled();
void value_setEnabled(bool);
void control_updateOrigin();
void value_setOrigin(const Vec&, f32);
bool setOrigin(const char*);
bool setOrigin_TxyzRy_(TControlSet_transform*, const char*);
void control_generate_float_(JORMContext*, TControlSet_transform*, const JStudioToolLibrary::TControlSet::TControl&, f32);
void control_reply_float_(const JORPropertyEvent*, TControlSet_transform*, f32*);
void control_update_float_(TControlSet_transform*, const JStudioToolLibrary::TControlSet::TControl&, f32);
void control_generate_enable(JORMContext*, TControlSet_transform*, const JStudioToolLibrary::TControlSet::TControl&);
bool isEnabled() const;
void control_reply_enable(const JORPropertyEvent*, TControlSet_transform*, const JStudioToolLibrary::TControlSet::TControl&);
void control_update_enable(TControlSet_transform*, const JStudioToolLibrary::TControlSet::TControl&);
void control_generate_origin_translationX(JORMContext*, TControlSet_transform*, const JStudioToolLibrary::TControlSet::TControl&);
void control_reply_origin_translationX(const JORPropertyEvent*, TControlSet_transform*, const JStudioToolLibrary::TControlSet::TControl&);
void control_update_origin_translationX(TControlSet_transform*, const JStudioToolLibrary::TControlSet::TControl&);
void control_generate_origin_translationY(JORMContext*, TControlSet_transform*, const JStudioToolLibrary::TControlSet::TControl&);
void control_reply_origin_translationY(const JORPropertyEvent*, TControlSet_transform*, const JStudioToolLibrary::TControlSet::TControl&);
void control_update_origin_translationY(TControlSet_transform*, const JStudioToolLibrary::TControlSet::TControl&);
void control_generate_origin_translationZ(JORMContext*, TControlSet_transform*, const JStudioToolLibrary::TControlSet::TControl&);
void control_reply_origin_translationZ(const JORPropertyEvent*, TControlSet_transform*, const JStudioToolLibrary::TControlSet::TControl&);
void control_update_origin_translationZ(TControlSet_transform*, const JStudioToolLibrary::TControlSet::TControl&);
void control_generate_origin_rotationY(JORMContext*, TControlSet_transform*, const JStudioToolLibrary::TControlSet::TControl&);
void control_reply_origin_rotationY(const JORPropertyEvent*, TControlSet_transform*, const JStudioToolLibrary::TControlSet::TControl&);
void control_update_origin_rotationY(TControlSet_transform*, const JStudioToolLibrary::TControlSet::TControl&);
void control_generate_origin_reset(JORMContext*, TControlSet_transform*, const JStudioToolLibrary::TControlSet::TControl&);
void control_reply_origin_reset(const JORPropertyEvent*, TControlSet_transform*, const JStudioToolLibrary::TControlSet::TControl&);
void control_update_origin_reset(TControlSet_transform*, const JStudioToolLibrary::TControlSet::TControl&);
/* 0x14 */ bool bEnabled_;
/* 0x18 */ TControl* pControl_;
/* 0x1C */ Vec field_0x1c;
/* 0x28 */ f32 field_0x28;
};
}
#endif
include/JSystem/JStudio/JStudioToolLibrary/controlset.h
+63
View File
@@ -0,0 +1,63 @@
#ifndef JSTUDIOTOOLLIBRARY_CONTROLSET_H
#define JSTUDIOTOOLLIBRARY_CONTROLSET_H
#include "JSystem/JStudio/JStudioToolLibrary/console.h"
namespace JStudioToolLibrary {
struct TControlSet {
struct TControl {
typedef void* (*generateFn)(JORMContext*, TControlSet*, const TControl&);
typedef void* (*replyFn)(const JORPropertyEvent*, TControlSet*, const TControl&);
typedef void* (*updateFn)(TControlSet*, const TControl&);
TControl();
TControl(const char*, generateFn, replyFn, updateFn);
void update(TControlSet*) const;
void reply(const JORPropertyEvent*, TControlSet*) const;
void generate(JORMContext*, TControlSet*) const;
bool isEnd() const;
const char* getLabel() const;
int getID(const TControlSet&) const;
void setStyle(TControlSet*, u32) const;
/* 0x00 */ char* szLabel_;
/* 0x04 */ void* pfnGenerate_;
/* 0x08 */ void* pfnReply_;
/* 0x0C */ void* pfnUpdate_;
};
TControlSet(TConsole*, const TControl*, u32, u32, const u32*);
TConsole* getConsole();
TControl* control_getControl_IDOffset(u32) const;
u32 control_getNumber() const;
void control_generate(JORMContext*);
void control_generate_all(JORMContext*);
void control_generate(JORMContext*, const TControl&);
void control_generate_IDOffset(JORMContext*, const u32*);
void control_generate_IDOffset(JORMContext*, u32);
void control_generate_separator(JORMContext*, TControlSet*, const TControl&);
void control_generate_label(JORMContext*, TControlSet*, const TControl&);
void control_reply(const JORPropertyEvent*);
void control_getControl(u32) const;
u32 control_getIDBegin() const;
void control_toID(const TControl*) const;
u32 control_toID_IDOffset(u32) const;
u32 control_toIDOffset(const TControl&) const;
void control_update_IDOffset(u32);
void control_update(const TControl&);
void control_update_IDOffset(const u32*);
void control_setStyle(const TControl&, u32);
void control_setStyle_IDOffset(u32, u32);
/* 0x00 */ TConsole* pConsole_;
/* 0x04 */ TControl* paoControl_;
/* 0x08 */ u32 uNumber_;
/* 0x0C */ u32 field_0xc;
/* 0x10 */ u32 field_0x10;
};
}
#endif
include/JSystem/JStudio/JStudioToolLibrary/interface.h
+47
View File
@@ -0,0 +1,47 @@
#ifndef JSTUDIOTOOLLIBRARY_INTERFACE_H
#define JSTUDIOTOOLLIBRARY_INTERFACE_H
#include "JSystem/JUtility/JUTGamePad.h"
namespace JStudioToolLibrary {
struct TPad {
struct TData {
TData();
void reset();
/* 0x00 */ int iButton_;
/* 0x04 */ int iButtonTrigger_;
/* 0x08 */ int iButtonRelease_;
/* 0x0C */ int iButtonRepeat_;
/* 0x10 */ f32 fAnalogMainStickX_;
/* 0x14 */ f32 fAnalogMainStickY_;
/* 0x18 */ f32 fAnalogSubStickX_;
/* 0x1C */ f32 fAnalogSubStickY_;
/* 0x20 */ f32 fAnalogTriggerL_;
/* 0x24 */ f32 fAnalogTriggerR_;
};
TPad();
void setPad(const JUTGamePad* pPad) {
pPad_ = pPad;
}
bool isEnabled() const;
void getData(TData*) const;
f32 getAnalog_triggerR() const;
f32 getAnalog_triggerL() const;
f32 getAnalog_subStickY() const;
f32 getAnalog_subStickX() const;
f32 getAnalog_mainStickY() const;
f32 getAnalog_mainStickX() const;
int getButton_repeat() const;
int getButton_release() const;
int getButton_trigger() const;
int getButton() const;
/* 0x0 */ const JUTGamePad* pPad_;
};
}
#endif
include/JSystem/JStudio/JStudioToolLibrary/scroll.h
+49
View File
@@ -0,0 +1,49 @@
#ifndef JSTUDIOTOOLLIBRARY_SCROLL_H
#define JSTUDIOTOOLLIBRARY_SCROLL_H
#include "JSystem/JStudio/JStudioToolLibrary/visual.h"
namespace JStudioToolLibrary {
struct TScroll {
TScroll();
virtual ~TScroll();
int getStride() const;
int getValue() const;
int getMin() const;
int getMax() const;
void setStride(int);
void setValue_scroll(int);
void setValue(int);
void setRange(int, int);
void setValue_range_(int, int, int);
/* 0x04 */ int iValue_;
/* 0x08 */ int iMin_;
/* 0x0C */ int iMax_;
/* 0x10 */ int field_0x10;
/* 0x14 */ int iStride_;
};
struct TScroll_drawBar : public TScroll {
void setRectangle(int, int, int, int);
TRectangle& getRectangle() const;
JUtility::TColor& getColor_disabled() const;
JUtility::TColor& getColor_background() const;
JUtility::TColor& getColor_foreground() const;
JUtility::TColor& getColor_frame() const;
/* 0x18 */ TRectangle oRectangle_;
/* 0x28 */ JUtility::TColor oColorFrame_;
/* 0x2C */ JUtility::TColor oColorBackground_;
/* 0x30 */ JUtility::TColor oColorForeground_;
/* 0x34 */ JUtility::TColor oColorDisabled_;
};
struct TScroll_drawBar_horizontal : public TScroll_drawBar {
virtual ~TScroll_drawBar_horizontal();
virtual void draw(TDrawPrimitive2D*) const;
};
}
#endif
include/JSystem/JStudio/JStudioToolLibrary/visual.h
+125
View File
@@ -0,0 +1,125 @@
#ifndef JSTUDIOTOOLLIBRARY_VISUAL_H
#define JSTUDIOTOOLLIBRARY_VISUAL_H
#include "JSystem/JUtility/TColor.h"
#include "JSystem/JUtility/JUTFont.h"
#include "JSystem/J2DGraph/J2DOrthoGraph.h"
namespace JStudioToolLibrary {
struct TRectangle {
TRectangle();
TRectangle(int, int, int, int);
void set(int, int, int, int);
int getBottom() const;
int getTop() const;
int getRight() const;
int getLeft() const;
int getWidth() const;
int getHeight() const;
/* 0x00 */ int iLeft_;
/* 0x04 */ int iTop_;
/* 0x08 */ int iRight_;
/* 0x0C */ int iBottom_;
};
struct TDrawPrimitive2D {
TDrawPrimitive2D();
void setRender(J2DOrthoGraph* pOrthoGraph) {
pOrthoGraph_ = pOrthoGraph;
}
void fillRectangle(int, int, int, int);
void setColor(const JUtility::TColor&);
void prepare();
bool isEnabled() const;
TRectangle getRectangle() const;
void setColor(const JUtility::TColor&, const JUtility::TColor&, const JUtility::TColor&, const JUtility::TColor&);
void frameRectangle(int, int, int, int);
void setLineWidth(f32);
/* 0x0 */ J2DOrthoGraph* pOrthoGraph_;
};
struct TDrawPrimitive3D {
TDrawPrimitive3D();
void setColor(GXColor);
void setLineWidth(f32);
void setGXState_position3f32();
void endGX();
void beginGX(GXPrimitive, u32);
void setGXColor(GXColor);
void setGXLineWidth(f32);
void prepare();
void drawAxis();
void setGXColor();
void setGXLineWidth();
void setGXState_position1x8();
void drawAxis_arrow();
void drawAxis_color();
void setGXState_position1x8_color1x8();
void drawAxis_color_arrow();
void drawGrid_xyz(uint);
void setGXState_position3s16();
void drawGrid_xy(uint);
void drawGrid_xz(uint);
void drawGrid_yz(uint);
/* 0x0 */ f32 fLineWidth_;
/* 0x4 */ GXColor oColor_;
};
struct TPrint {
TPrint();
int getY() const;
int getX() const;
void setFont(JUTFont* pFont) {
pFont_ = pFont;
}
void setColor(const JUtility::TColor&);
void locate(int, int);
void prepare();
int getFontHeight() const;
int getFontWidth() const;
bool isEnabled() const;
void processControlCharacter(int);
void print(int);
void drawCharacter(int);
void print(const char*);
void print_f(const char*, ...);
void print_f_va(const char*, va_list);
/* 0x00 */ JUTFont* pFont_;
/* 0x04 */ int field_0x4;
/* 0x08 */ int field_0x8;
/* 0x0C */ int iX_;
/* 0x10 */ int iY_;
};
struct TColor_variable {
struct TVelocity {
TVelocity(const TVelocity&);
TVelocity(int, int, int, int);
/* 0x00 */ int field_0x0;
/* 0x04 */ int field_0x4;
/* 0x08 */ int field_0x8;
/* 0x0C */ int field_0xc;
};
TColor_variable(const JUtility::TColor&, const TVelocity&);
void update();
void updateValue_(u8*, int*);
/* 0x00 */ JUtility::TColor oColor_;
/* 0x04 */ TVelocity oVelocity_;
};
}
#endif
include/JSystem/JStudio/JStudio_JStage/control.h
+3
View File
@@ -38,6 +38,9 @@ struct TAdaptor_object_ {
void adaptor_object_begin_() { pJSGObject_->JSGFEnableFlag(1); }
void adaptor_object_end_() { pJSGObject_->JSGFDisableFlag(1); }
#if VERSION == VERSION_SHIELD_DEBUG
/* 0x0 */ const JStudio::TAdaptor* pAdaptor_;
#endif
/* 0x0 */ JStage::TSystem const* pJSGSystem_;
/* 0x4 */ JStage::TObject* pJSGObject_;
};
include/JSystem/JSupport/JSUIosBase.h
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef JSUIOSBASE_H_
#define JSUIOSBASE_H_
#include "dolphin/types.h"
#include <dolphin/types.h>
enum JSUStreamSeekFrom {
JSUStreamSeekFrom_SET = 0, // absolute
include/JSystem/JSupport/JSUList.h
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef JSULIST_H
#define JSULIST_H
#include "dolphin/types.h"
#include <dolphin/types.h>
template <typename T>
class JSUList;
include/JSystem/JUtility/JUTAssert.h
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef JUTASSERT_H
#define JUTASSERT_H
#include "dolphin/os.h"
#include <dolphin/os.h>
#if DEBUG
#define JUT_SHOW_ASSERT(LINE, COND) JUTAssertion::showAssert(JUTAssertion::getSDevice(), __FILE__, LINE, #COND)
include/JSystem/JUtility/JUTDirectFile.h
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef JUTDIRECTFILE_H
#define JUTDIRECTFILE_H
#include "dolphin/dvd.h"
#include <dolphin/dvd.h>
#define JUTDF_BUFSIZE (0x800)
include/JSystem/JUtility/JUTFontData_Ascfont_fix12.h
+1 -1
View File
@@ -1,6 +1,6 @@
#ifndef JUTFONTDATA_ASCFONT_FIX12_H
#define JUTFONTDATA_ASCFONT_FIX12_H
#include "dolphin/types.h"
#include <dolphin/types.h>
#endif /* JUTFONTDATA_ASCFONT_FIX12_H */
include/JSystem/JUtility/JUTGraphFifo.h
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef JUTGRAPHFIFO_H
#define JUTGRAPHFIFO_H
#include "dolphin/gx.h"
#include <dolphin/gx.h>
/**
* @ingroup jsystem-jutility
include/JSystem/JUtility/JUTNameTab.h
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef JUTNAMETAB_H
#define JUTNAMETAB_H
#include "dolphin/types.h"
#include <dolphin/types.h>
/**
* @ingroup jsystem-jutility
include/JSystem/JUtility/JUTResource.h
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef JUTRESOURCE_H
#define JUTRESOURCE_H
#include "dolphin/types.h"
#include <dolphin/types.h>
class JKRArchive;
class JSUInputStream;
include/JSystem/TPosition3.h
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef TPOSITION3_H
#define TPOSITION3_H
#include "dolphin/mtx.h"
#include <dolphin/mtx.h>
#include "JSystem/JMath/JMath.h"
#include "JSystem/JGeometry.h"
include/SSystem/SComponent/c_API_controller_pad.h
+2 -2
View File
@@ -1,7 +1,7 @@
#ifndef C_API_CONTROLLER_PAD_
#define C_API_CONTROLLER_PAD_
#include "dolphin/types.h"
#include <dolphin/types.h>
struct interface_of_controller_pad {
/* 0x00 */ f32 mMainStickPosX;
@@ -35,4 +35,4 @@ struct interface_of_controller_pad {
void cAPICPad_recalibrate(void);
u32 cAPICPad_ANY_BUTTON(u32 param_0);
#endif
#endif
include/SSystem/SComponent/c_bg_s_chk.h
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef C_BG_S_CHK_H
#define C_BG_S_CHK_H
#include "dolphin/mtx.h"
#include <dolphin/mtx.h>
#include "f_pc/f_pc_base.h"
#include "SSystem/SComponent/c_bg_s_grp_pass_chk.h"
#include "SSystem/SComponent/c_bg_s_poly_pass_chk.h"
include/SSystem/SComponent/c_bg_s_poly_info.h
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef C_BG_S_POLY_INFO_H
#define C_BG_S_POLY_INFO_H
#include "dolphin/types.h"
#include <dolphin/types.h>
#include "f_pc/f_pc_manager.h"
class cBgS_PolyInfo {
include/SSystem/SComponent/c_bg_w.h
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef C_BG_W_H
#define C_BG_W_H
#include "dolphin/types.h"
#include <dolphin/types.h>
class cBgW_BgId {
private:
include/SSystem/SComponent/c_counter.h
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef C_COUNTER_H
#define C_COUNTER_H
#include "dolphin/types.h"
#include <dolphin/types.h>
struct counter_class {
u32 mCounter0;
include/SSystem/SComponent/c_lib.h
+1 -1
View File
@@ -2,7 +2,7 @@
#define C_LIB_H_
#include "SSystem/SComponent/c_xyz.h"
#include "dolphin/mtx.h"
#include <dolphin/mtx.h>
#include "SSystem/SComponent/c_math.h"
inline bool cLib_IsZero(f32 value) {
include/SSystem/SComponent/c_m3d.h
+1 -1
View File
@@ -2,7 +2,7 @@
#define C_M3D_H_
#include <cmath>
#include "dolphin/mtx.h"
#include <dolphin/mtx.h>
class cM3dGAab;
class cM3dGCps;
include/SSystem/SComponent/c_m3d_g_cir.h
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef C_M3D_G_CIR_H
#define C_M3D_G_CIR_H
#include "dolphin/types.h"
#include <dolphin/types.h>
class cM2dGCir {
public:

Some files were not shown because too many files have changed in this diff Show More