Game-Decompilation/pikmin2
1
0
Fork 0
mirror of https://github.com/projectPiki/pikmin2.git synced 2024-11-23 05:20:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

progress for #50

Browse Source 
use f32 and f64 in most headers
This commit is contained in:
EpochFlame 2023-01-16 15:23:01 -05:00
parent 2b9e73f6e4
commit 4bca5a00cd
172 changed files with 1434 additions and 1428 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/recommended_todo.md
View File

@ -92,7 +92,7 @@
| File | Size (bytes) | File | Size (bytes) |
| ---- | ---- | ---- | ---- |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectEbisawaU/ebiUtility.cpp">ebiUtility.cpp</a> | 3779 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectEbisawaU/ebiGeometry.cpp">ebiGeometry.cpp</a> | 5821 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectEbisawaU/ebiP2TitleLight.cpp">ebiP2TitleLight.cpp</a> | 5999 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectEbisawaU/ebiP2TitleCoordMgr.cpp">ebiP2TitleCoordMgr.cpp</a> | 9326 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectEbisawaU/ebiP2TitleLight.cpp">ebiP2TitleLight.cpp</a> | 5906 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectEbisawaU/ebiP2TitleCoordMgr.cpp">ebiP2TitleCoordMgr.cpp</a> | 9326 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectEbisawaU/ebiScreenPushStart.cpp">ebiScreenPushStart.cpp</a> | 10505 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectEbisawaU/ebiCardEReader.cpp">ebiCardEReader.cpp</a> | 13664 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectEbisawaU/ebiFileSelectMgr.cpp">ebiFileSelectMgr.cpp</a> | 14258 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectEbisawaU/efx2dEffect.cpp">efx2dEffect.cpp</a> | 17805 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectEbisawaU/efxObject.cpp">efxObject.cpp</a> | 18283 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectEbisawaU/particle2dMgr.cpp">particle2dMgr.cpp</a> | 18589 |

4
include/BootSection.h
View File

@ -65,7 +65,7 @@ struct BootSection : public Game::BaseHIOSection {
StateID m_stateID; // _48
int _4C; // _4C
float _50; // _50
f32 _50; // _50
JUTTexture* m_warningTexture; // _54
JUTTexture* m_warningPressStartTexture; // _58
JUTTexture* m_nintendoLogoTexture; // _5C
@ -77,7 +77,7 @@ struct BootSection : public Game::BaseHIOSection {
bool _DC; // _DC, previously m_inProgreSet <-- the fuck does that mean?
u8 _DD; // _DD
TinyPikmin* m_tinyPikis; // _E0
float _E4; // _E4, scale of sorts
f32 _E4; // _E4, scale of sorts
};
#endif

10
include/BoundBox.h
View File

@ -15,7 +15,7 @@ struct BoundBox {
{
}
BoundBox(float min, float max)
BoundBox(f32 min, f32 max)
: m_min(min)
, m_max(max)
{
@ -55,10 +55,10 @@ struct BoundBox {
};
struct BoundBox2d {
float _00;
float _04;
float _08;
float _0C;
f32 _00;
f32 _04;
f32 _08;
f32 _0C;
};
#endif

10
include/Camera.h
View File

@ -150,14 +150,14 @@ struct BlendCamera : public Camera {
void setCameras(Camera**);
// Camera _00 - _144
int m_cameraCount; // _144
Camera** m_cameras; // _148
float m_blendFactor; // _14C
Matrixf _150; // _150
int m_cameraCount; // _144
Camera** m_cameras; // _148
f32 m_blendFactor; // _14C
Matrixf _150; // _150
};
namespace PSM {
extern float sCamFov;
extern f32 sCamFov;
}
#endif

8
include/CollInfo.h
View File

@ -43,7 +43,7 @@ struct CollPart : public CNode {
virtual void doEntry() { } // _20 (weak)
virtual void doSetView(u32) { } // _24 (weak)
virtual void doViewCalc() { } // _28 (weak)
virtual void doSimulation(float rate) { } // _2C (weak)
virtual void doSimulation(f32 rate) { } // _2C (weak)
virtual void doDirectDraw(Graphics& gfx) { } // _30 (weak)
////////////// END VTABLE
@ -82,11 +82,11 @@ struct CollPart : public CNode {
void makeMatrixTo(Matrixf&);
void makeTubeTree();
void read(Stream&, bool);
void setScale(float);
void setScale(f32);
void update();
float m_baseRadius; // _18, base radius used to calculate real radius (in setScale, it's scaled)
float m_radius; // _1C
f32 m_baseRadius; // _18, base radius used to calculate real radius (in setScale, it's scaled)
f32 m_radius; // _1C
Vector3f m_offset; // _20
u32 m_jointIndex; // _2C
ID32 m_currentID; // _30, identifier of current part, initialised to root

10
include/Dolphin/float.h
View File

@ -1,13 +1,15 @@
#ifndef _DOLPHIN_FLOAT_H
#define _DOLPHIN_FLOAT_H
#include "types.h"
extern const float __float_nan[];
#define __float_nan *__float_nan
extern const float __float_huge;
extern const double __double_max;
extern const double __double_huge;
extern const double __extended_min;
extern const double __extended_max;
extern const f64 __double_max;
extern const f64 __double_huge;
extern const f64 __extended_min;
extern const f64 __extended_max;
extern const float __float_max[];
extern const float __float_epsilon[];

30
include/Dolphin/math.h
View File

@ -34,31 +34,31 @@ extern "C" {
#define DEG2RAD (1.0f / 180.0f)
double cos(double);
float cosf(float);
double sin(double);
float sinf(float);
double tan(double);
float tanf(float);
double atan(double);
double atan2(double, double);
f64 cos(f64);
f32 cosf(f32);
f64 sin(f64);
f32 sinf(f32);
f64 tan(f64);
f32 tanf(f32);
f64 atan(f64);
f64 atan2(f64, f64);
/**
* kludges for emulating inlined f versions of funcs.
* Replace these with tanf/sinf/cosf once we have library support in the build chain.
* If my theory is correct, those functions will become inlined by code using libDolphin as a library.
*/
inline float tanf_kludge(float __x) { return tan((double)__x); }
inline float sinf_kludge(float __x) { return sin((double)__x); }
inline float cosf_kludge(float __x) { return cos((double)__x); }
inline f32 tanf_kludge(f32 __x) { return tan((f64)__x); }
inline f32 sinf_kludge(f32 __x) { return sin((f64)__x); }
inline f32 cosf_kludge(f32 __x) { return cos((f64)__x); }
double ceil(double);
f64 ceil(f64);
#ifdef __cplusplus
};
#endif // ifdef __cplusplus
inline int __fpclassifyf(float x)
inline int __fpclassifyf(f32 x)
{
switch ((*(s32*)&x) & 0x7f800000) {
case 0x7f800000: {
@ -78,7 +78,7 @@ inline int __fpclassifyf(float x)
}
return 4;
}
inline int __fpclassifyd(double x)
inline int __fpclassifyd(f64 x)
{
switch (__HI(x) & 0x7ff00000) {
case 0x7ff00000: {
@ -99,7 +99,7 @@ inline int __fpclassifyd(double x)
return 4;
}
#define fpclassify(x) ((sizeof(x) == sizeof(float)) ? __fpclassifyf((float)(x)) : __fpclassifyd((double)(x)))
#define fpclassify(x) ((sizeof(x) == sizeof(f32)) ? __fpclassifyf((f32)(x)) : __fpclassifyd((f64)(x)))
#define isfinite(x) ((fpclassify(x) > 2))

8
include/Dolphin/math_ppc.h
View File

@ -1,8 +1,10 @@
#ifndef _DOLPHIN_MATH_PPC_H
#define _DOLPHIN_MATH_PPC_H
float tanf(float __x);
float sinf(float __x);
float cosf(float __x);
#include "types.h"
f32 tanf(f32 __x);
f32 sinf(f32 __x);
f32 cosf(f32 __x);
#endif

24
include/Dolphin/mtx.h
View File

@ -10,10 +10,10 @@ extern "C" {
#include "Dolphin/vec.h"
// sizeof = 48 or 0x30
typedef float Mtx[3][4];
typedef float Mtx33[3][3];
typedef float Mtx44[4][4];
typedef float PSQuaternion[4];
typedef f32 Mtx[3][4];
typedef f32 Mtx33[3][3];
typedef f32 Mtx44[4][4];
typedef f32 PSQuaternion[4];
#define MTXDegToRad(a) ((a)*0.01745329252f)
void PSMTXConcat(const Mtx, const Mtx, Mtx);
@ -22,22 +22,22 @@ void PSMTXIdentity(Mtx);
void PSMTXTranspose(const Mtx, Mtx);
u32 PSMTXInverse(const Mtx, Mtx);
void PSMTXRotRad(Mtx, char, f32);
void PSMTXRotTrig(Mtx, char, float, float);
void PSMTXRotTrig(Mtx, char, f32, f32);
void __PSMTXRotAxisRadInternal(Mtx, const struct Vec*, f32, f32);
void PSMTXRotAxisRad(Mtx, const struct Vec*, f32);
void PSMTXTrans(Mtx, float, float, float);
void PSMTXTransApply(const Mtx, Mtx, float, float, float);
void PSMTXScale(Mtx, float, float, float);
void PSMTXScaleApply(const Mtx, Mtx, float, float, float);
void PSMTXTrans(Mtx, f32, f32, f32);
void PSMTXTransApply(const Mtx, Mtx, f32, f32, f32);
void PSMTXScale(Mtx, f32, f32, f32);
void PSMTXScaleApply(const Mtx, Mtx, f32, f32, f32);
void PSMTXQuat(Mtx, const PSQuaternion*);
void PSMTXMultVec(Mtx, Vec*, Vec*);
void PSMTXMultVecSR(Mtx, Vec*, Vec*);
/* TODO: Determine what these params are. */
void PSMTXMultVecArraySR(Mtx, float*, float*, float*);
void PSMTXMultVecArraySR(Mtx, f32*, f32*, f32*);
void PSMTX44Copy(Mtx44, Mtx44);
void C_MTXPerspective(float, float, float, float, Mtx);
void C_MTXOrtho(Mtx44, float, float, float, float, float, float);
void C_MTXPerspective(f32, f32, f32, f32, Mtx);
void C_MTXOrtho(Mtx44, f32, f32, f32, f32, f32, f32);
void C_MTXLookAt(Mtx, const Vec*, const Vec*, const Vec*);
#ifdef __cplusplus

2
include/Dolphin/rand.h
View File

@ -12,7 +12,7 @@ extern "C" {
void srand(u32);
int rand();
inline f32 randFloat() { return (float)rand() / RAND_MAX; }
inline f32 randFloat() { return (f32)rand() / RAND_MAX; }
inline f32 randWeightFloat(f32 range) { return (range * (f32)rand()) / RAND_MAX; }
#ifdef __cplusplus

2
include/Dolphin/runtime.h
View File

@ -7,7 +7,7 @@
extern "C" {
#endif // ifdef __cplusplus
unsigned long __cvt_fp2unsigned(double);
unsigned long __cvt_fp2unsigned(f64);
// TODO: The rest
void* __copy(char*, char*, size_t);

4
include/FogMgr.h
View File

@ -21,8 +21,8 @@ struct FogMgr : public CNode {
// _00 = VTBL
// _00-_18 = CNode
GXFogType m_type; // _18
float m_nearZ; // _1C
float m_farZ; // _20
f32 m_nearZ; // _1C
f32 m_farZ; // _20
u_color m_color; // _24
};

4
include/Game/BasePelletMgr.h
View File

@ -27,7 +27,7 @@ struct BasePelletMgr : public GenericObjectMgr, virtual public _BasePelletMgrPar
virtual void doEntry() { } // _0C (weak)
virtual void doSetView(int) { } // _10 (weak)
virtual void doViewCalc() { } // _14 (weak)
virtual void doSimulation(float rate) { } // _18 (weak)
virtual void doSimulation(f32 rate) { } // _18 (weak)
virtual void doDirectDraw(Graphics& gfx) { } // _1C (weak)
virtual void resetMgrAndResources() = 0; // _38
virtual Pellet* birth() = 0; // _3C
@ -96,7 +96,7 @@ struct FixedSizePelletMgr : public BasePelletMgr, public Container<T> {
virtual void doEntry(); // _0C
virtual void doSetView(int viewportNumber); // _10
virtual void doViewCalc(); // _14
virtual void doSimulation(float rate); // _18
virtual void doSimulation(f32 rate); // _18
virtual void doDirectDraw(Graphics& gfx); // _1C
virtual void resetMgr() // _28 (weak)
{

32
include/Game/CPlate.h
View File

@ -31,9 +31,9 @@ struct CPlate : public Container<Creature> {
, p002(this, 'p002', "ポジションの大きさ(最大)", 6.0f, 1.0f, 50.0f)
{
}
Parm<float> p000; // _0C
Parm<float> p001; // _34
Parm<float> p002; // _5C
Parm<f32> p000; // _0C
Parm<f32> p001; // _34
Parm<f32> p002; // _5C
};
CPlate(int);
@ -48,13 +48,13 @@ struct CPlate : public Container<Creature> {
void directDraw(Graphics&);
int getSlot(Creature*, SlotChangeListener*, bool);
void getSlotPosition(int, Vector3f&);
void rearrangeSlot(Vector3f&, float, Vector3f&);
void refresh(int, float);
void refreshSlot(float);
void rearrangeSlot(Vector3f&, f32, Vector3f&);
void refresh(int, f32);
void refreshSlot(f32);
void releaseSlot(Creature*, int);
void setPos(Vector3f&, float, Vector3f&, float);
void setPosGray(Vector3f&, float, Vector3f&, float);
void setPosNeutral(Vector3f&, float, Vector3f&, float);
void setPos(Vector3f&, f32, Vector3f&, f32);
void setPosGray(Vector3f&, f32, Vector3f&, f32);
void setPosNeutral(Vector3f&, f32, Vector3f&, f32);
void shrink();
void sortByColor(Creature*, int);
void swapSlot(int, int);
@ -64,9 +64,9 @@ struct CPlate : public Container<Creature> {
Parms m_parms; // _1C
Vector3f _A4; // _A4
float _B0; // _B0
float _B4; // _B4
float _B8; // _B8
f32 _B0; // _B0
f32 _B4; // _B4
f32 _B8; // _B8
int _BC; // _BC
Slot* m_slots; // _C0
int m_slotLimit; // _C4
@ -74,10 +74,10 @@ struct CPlate : public Container<Creature> {
Vector3f m_position; // _CC
Vector3f _D8; // _D8
Vector3f m_velocity; // _E4
float _F0; // _F0
float _F4; // _F4
float _F8; // _F8
float _FC; // _FC
f32 _F0; // _F0
f32 _F4; // _F4
f32 _F8; // _F8
f32 _FC; // _FC
u8 _100; // _100
u32* _104; // _104
u32 _108; // _108

2
include/Game/Cave/RandMapMgr.h
View File

@ -73,7 +73,7 @@ struct RandItemUnit {
bool isFallCapEnemySetDone(MapNode*);
void setItemDropPositionList(Game::Cave::MapNode**, Game::Cave::BaseGen**);
void getItemDropPosition(Vector3f&, float, int);
void getItemDropPosition(Vector3f&, f32, int);
MapNode* getItemNormalSetMapNode(Game::Cave::BaseGen**);
MapNode* getItemHardSetMapNode(Game::Cave::BaseGen**);
ItemUnit* getItemUnit();

16
include/Game/Cave/RandMapUnit.h
View File

@ -10,14 +10,14 @@
namespace Game {
namespace Cave {
struct EditMapUnit {
float m_chanceOfUse; // _00
u32 _04; // _04
u32 _08; // _08
u32 _0C; // _0C
u32 _10; // _10
u32 _14; // _14
u32 _18; // _18
int _1C; // _1C
f32 m_chanceOfUse; // _00
u32 _04; // _04
u32 _08; // _08
u32 _0C; // _0C
u32 _10; // _10
u32 _14; // _14
u32 _18; // _18
int _1C; // _1C
};
struct EnemyNode;

4
include/Game/Data.h
View File

@ -109,8 +109,8 @@ struct Mgr : public PlayCommonData {
void read(Stream&);
void write(Stream&);
void setBgmVolume(float);
void setSeVolume(float);
void setBgmVolume(f32);
void setSeVolume(f32);
void setSoundModeMono();
void setSoundModeStereo();
void setSoundModeSurround();

28
include/Game/DynCreature.h
View File

@ -16,30 +16,30 @@ struct DynParticle;
struct DynCreature : public Creature {
DynCreature();
virtual Vector3f getPosition(); // _08
virtual void getBoundingSphere(Sys::Sphere&) = 0; // _10
virtual float getFaceDir() = 0; // _64
virtual void setVelocity(Vector3f& vel); // _68
virtual Vector3f getVelocity(); // _6C
virtual void onSetPosition(Vector3f& dest); // _70
virtual void updateTrMatrix() = 0; // _78
virtual void getVelocityAt(Vector3f&, Vector3f&); // _184
virtual float getAngularEffect(Vector3f&, Vector3f&); // _188
virtual void applyImpulse(Vector3f&, Vector3f&); // _18C
virtual void onSetPosition(); // _1B0 (weak)
virtual Vector3f getPosition(); // _08
virtual void getBoundingSphere(Sys::Sphere&) = 0; // _10
virtual f32 getFaceDir() = 0; // _64
virtual void setVelocity(Vector3f& vel); // _68
virtual Vector3f getVelocity(); // _6C
virtual void onSetPosition(Vector3f& dest); // _70
virtual void updateTrMatrix() = 0; // _78
virtual void getVelocityAt(Vector3f&, Vector3f&); // _184
virtual f32 getAngularEffect(Vector3f&, Vector3f&); // _188
virtual void applyImpulse(Vector3f&, Vector3f&); // _18C
virtual void onSetPosition(); // _1B0 (weak)
bool createParticles(int);
void releaseParticles();
void updateParticlePositions();
void computeForces(float);
void computeForces(f32);
void tracemoveCallback(Vector3f&, Vector3f&);
void simulate(float);
void simulate(f32);
// Unused/inlined:
void getContactParticeRatio();
int getContactParticleNum();
int getParticleNum();
void simulateCylinder(Sys::Cylinder&, float);
void simulateCylinder(Sys::Cylinder&, f32);
DynParticle* m_dynParticle; // _178
Rigid m_rigid; // _17C

2
include/Game/Entities/BombSarai.h
View File

@ -36,7 +36,7 @@ struct Obj : public EnemyBase {
virtual void doUpdate(); // _1CC
virtual void doDebugDraw(Graphics&); // _1EC
virtual EnemyTypeID::EEnemyTypeID getEnemyTypeID(); // _258 (weak)
virtual bool bombCallBack(Creature*, Vector3f&, float); // _294
virtual bool bombCallBack(Creature*, Vector3f&, f32); // _294
virtual void doFinishStoneState(); // _2A8
virtual void startCarcassMotion(); // _2C4
virtual void doStartWaitingBirthTypeDrop(); // _2E0

4
include/Game/Entities/Catfish.h
View File

@ -27,8 +27,8 @@ struct Obj : public KochappyBase::Obj {
{
return EnemyTypeID::EnemyID_Catfish;
}
virtual bool pressCallBack(Creature*, float, CollPart*); // _27C
virtual bool hipdropCallBack(Creature*, float, CollPart*); // _284
virtual bool pressCallBack(Creature*, f32, CollPart*); // _27C
virtual bool hipdropCallBack(Creature*, f32, CollPart*); // _284
virtual void resetEnemyNonStone(); // _300
virtual void setEnemyNonStone() { enableEvent(0, EB_IsEnemyNotBitter); } // _304 (weak)
//////////////// VTABLE END

2
include/Game/Entities/Hana.h
View File

@ -35,7 +35,7 @@ struct Obj : public ChappyBase::Obj {
virtual WalkSmokeEffect::Mgr* getWalkSmokeEffectMgr() { return nullptr; } // _234 (weak)
virtual f32 getDownSmokeScale() { return 1.2f; } // _2EC (weak)
virtual EnemyTypeID::EEnemyTypeID getEnemyTypeID() { return EnemyTypeID::EnemyID_Hana; } // _258 (weak)
virtual void setAnimationSpeed(float) { } // _300 (weak)
virtual void setAnimationSpeed(f32) { } // _300 (weak)
virtual void flickAttackFail() { } // _304 (weak)
virtual void startSleepEffect() { } // _324 (weak)
virtual void finishSleepEffect() { } // _328 (weak)

2
include/Game/Entities/ItemGate.h
View File

@ -137,7 +137,7 @@ struct ItemGateMgr : public BaseItemMgr {
virtual void doEntry(); // _0C (weak)
virtual void doSetView(int viewportNumber); // _10 (weak)
virtual void doViewCalc(); // _14 (weak)
virtual void doSimulation(float rate); // _18 (weak)
virtual void doSimulation(f32 rate); // _18 (weak)
virtual void doDirectDraw(Graphics& gfx); // _1C (weak)
virtual void initDependency(); // _38
virtual u32 generatorGetID(); // _58 (weak)

4
include/Game/Entities/ItemHoney.h
View File

@ -44,7 +44,7 @@ struct Item : public CFSMItem {
// vtable 1 (Creature)
virtual void onInit(CreatureInitArg* settings); // _30
virtual void doSimulation(float rate); // _4C
virtual void doSimulation(f32 rate); // _4C
virtual void doDirectDraw(Graphics& gfx); // _50
virtual void onStartCapture(); // _94
virtual void onUpdateCapture(Matrixf&); // _98
@ -57,7 +57,7 @@ struct Item : public CFSMItem {
virtual void makeTrMatrix(); // _1C4
virtual void doAI(); // _1C8
virtual void changeMaterial(); // _1D0
virtual float getMapCollisionRadius(); // _1DC
virtual f32 getMapCollisionRadius(); // _1DC
virtual bool interactAbsorb(InteractAbsorb&); // _1F0
virtual void updateBoundSphere(); // _210
virtual void onSetPosition(); // _21C

2
include/Game/Entities/ItemOnyon.h
View File

@ -74,7 +74,7 @@ struct Onyon : public BaseItem {
virtual void onInit(CreatureInitArg* settings); // _30
virtual void onKill(CreatureKillArg* settings); // _34
virtual void doDirectDraw(Graphics& gfx); // _50
virtual float getFaceDir(); // _64 (weak)
virtual f32 getFaceDir(); // _64 (weak)
virtual bool sound_culling(); // _104
virtual void on_movie_end(bool shouldResetAnims); // _114
virtual void movieUserCommand(u32 command, MoviePlayer* curPlayer); // _130

6
include/Game/Entities/Kabuto.h
View File

@ -44,7 +44,7 @@ struct Obj : public EnemyBase {
virtual void doStartStoneState(); // _2A4
virtual void doFinishStoneState(); // _2A8
virtual void startCarcassMotion(); // _2C4
virtual float getDownSmokeScale(); // _2EC (weak)
virtual f32 getDownSmokeScale(); // _2EC (weak)
virtual void doStartMovie(); // _2F0
virtual void doEndMovie(); // _2F4
virtual void setFSM(FSM*); // _2F8
@ -71,10 +71,10 @@ struct Obj : public EnemyBase {
// _00-_2BC = EnemyBase
FSM* m_kabutoFSM; // _2BC
WalkSmokeEffect::Mgr m_walkSmokeMgr; // _2C0
float _2C8; // _2C8
f32 _2C8; // _2C8
int _2CC; // _2CC
Vector3f m_targetPosition; // _2D0
float _2DC; // _2DC
f32 _2DC; // _2DC
u8 _2E0; // _2E0, unknown
bool m_isUnderground; // _2E1
// _2E4 = PelletView

48
include/Game/Entities/KumaChappy.h
View File

@ -26,29 +26,29 @@ struct Obj : public EnemyBase {
Obj();
////////// VTABLE
virtual void onInit(CreatureInitArg* settings); // _30
virtual void doDirectDraw(Graphics& gfx); // _50
virtual void getShadowParam(ShadowParam& settings); // _134
virtual ~Obj() { } // _1BC (weak)
virtual void setInitialSetting(EnemyInitialParamBase*); // _1C4
virtual void doUpdate(); // _1CC
virtual void doUpdateCarcass(); // _1D4
virtual void doDebugDraw(Graphics&); // _1EC
virtual Vector3f getOffsetForMapCollision(); // _224
virtual void initMouthSlots(); // _22C
virtual void initWalkSmokeEffect(); // _230
virtual WalkSmokeEffect::Mgr* getWalkSmokeEffectMgr(); // _234
virtual EnemyTypeID::EEnemyTypeID getEnemyTypeID(); // _258 (weak)
virtual MouthSlots* getMouthSlots(); // _25C (weak)
virtual void doGetLifeGaugeParam(LifeGaugeParam&); // _260
virtual bool damageCallBack(Creature*, float, CollPart*); // _278
virtual void startCarcassMotion(); // _2C4
virtual bool doBecomeCarcass(); // _2D0
virtual f32 getDownSmokeScale(); // _2EC (weak)
virtual void setFSM(FSM*); // _2F8
virtual void createChappyRelation(); // _2FC
virtual ChappyRelation* getChappyRelation(); // _300 (weak)
virtual void startEnemyRumble(); // _304
virtual void onInit(CreatureInitArg* settings); // _30
virtual void doDirectDraw(Graphics& gfx); // _50
virtual void getShadowParam(ShadowParam& settings); // _134
virtual ~Obj() { } // _1BC (weak)
virtual void setInitialSetting(EnemyInitialParamBase*); // _1C4
virtual void doUpdate(); // _1CC
virtual void doUpdateCarcass(); // _1D4
virtual void doDebugDraw(Graphics&); // _1EC
virtual Vector3f getOffsetForMapCollision(); // _224
virtual void initMouthSlots(); // _22C
virtual void initWalkSmokeEffect(); // _230
virtual WalkSmokeEffect::Mgr* getWalkSmokeEffectMgr(); // _234
virtual EnemyTypeID::EEnemyTypeID getEnemyTypeID(); // _258 (weak)
virtual MouthSlots* getMouthSlots(); // _25C (weak)
virtual void doGetLifeGaugeParam(LifeGaugeParam&); // _260
virtual bool damageCallBack(Creature*, f32, CollPart*); // _278
virtual void startCarcassMotion(); // _2C4
virtual bool doBecomeCarcass(); // _2D0
virtual f32 getDownSmokeScale(); // _2EC (weak)
virtual void setFSM(FSM*); // _2F8
virtual void createChappyRelation(); // _2FC
virtual ChappyRelation* getChappyRelation(); // _300 (weak)
virtual void startEnemyRumble(); // _304
////////// VTABLE END
f32 getViewAngle();
@ -63,7 +63,7 @@ struct Obj : public EnemyBase {
// _00-_2B8 = EnemyBase
FSM* m_fsm; // _2BC
WalkSmokeEffect::Mgr m_walkSmokeMgr; // _2C0
float m_reviveTimer; // _2C8
f32 m_reviveTimer; // _2C8
int _2CC; // _2CC
f32 m_timer; // _2D0
int m_nextState; // _2D4

2
include/Game/Entities/KumaKochappy.h
View File

@ -63,7 +63,7 @@ struct Obj : public EnemyBase {
// _00-_2B8 = EnemyBase
FSM* m_fsm; // _2BC
WalkSmokeEffect::Mgr m_walkSmokeMgr; // _2C0
float _2C8; // _2C8
f32 _2C8; // _2C8
int _2CC; // _2CC
MouthSlots m_mouthSlots; // _2D0
Vector3f m_targetParentPosition; // _2D8

8
include/Game/Entities/MiniHoudai.h
View File

@ -67,7 +67,7 @@ struct Obj : public EnemyBase {
virtual bool doBecomeCarcass(); // _2D0
virtual void doStartWaitingBirthTypeDrop(); // _2E0
virtual void doFinishWaitingBirthTypeDrop(); // _2E4
virtual float getDownSmokeScale(); // _2EC (weak)
virtual f32 getDownSmokeScale(); // _2EC (weak)
virtual void doStartMovie(); // _2F0
virtual void doEndMovie(); // _2F4
virtual void setFSM(FSM*); // _2F8
@ -112,9 +112,9 @@ struct Obj : public EnemyBase {
// _00-_2B8 = EnemyBase
FSM* m_fsm; // _2BC
WalkSmokeEffect::Mgr m_walkSmokeMgr; // _2C0
float _2C8; // _2C8, caution?
float _2CC; // _2CC
float _2D0; // _2D0
f32 _2C8; // _2C8, caution?
f32 _2CC; // _2CC
f32 _2D0; // _2D0
MiniHoudaiStateID m_houdaiStateID; // _2D4
Vector3f m_targetPosition; // _2D8
Vector3f _2E4; // _2E4, shotgun target distance maybe?

2
include/Game/Entities/PelletFruit.h
View File

@ -17,7 +17,7 @@ struct Object : public Pellet {
// _00 = VTBL
// _00-_458 = Pellet
float m_rottingTimer; // _458, seconds before rotting
f32 m_rottingTimer; // _458, seconds before rotting
};
struct Mgr : public FixedSizePelletMgr<Object> {

10
include/Game/Entities/Pelplant.h
View File

@ -223,11 +223,11 @@ struct Obj : public EnemyBase {
// PelletView*: _17C - _180
// EnemyBase: _180 - _2B8
FSM* m_fsm; // _2BC
float _2C0; // _2C0
f32 _2C0; // _2C0
Matrixf* m_rootJointMtx; // _2C4
u8 m_flags; // _2C8
Game::PelletNumber::Object* m_pellet; // _2CC
float m_colorChangeTimer; // _2D0
f32 m_colorChangeTimer; // _2D0
u8 m_color; // _2D4
u8 m_size; // _2D5
s8 m_farmPow; // _2D6, farm power
@ -279,9 +279,9 @@ struct Parms : EnemyParmsBase {
, m_colorChangeTime(this, 'fp03', "ƒJƒ‰<EFBFBD>[•Ï<E280A2>XŽžŠÔ", 1.5f, 0.0f, 5.0f) // color change time
{
}
Parm<float> m_smallToMedGrowth;
Parm<float> m_medToLargeGrowth;
Parm<float> m_colorChangeTime;
Parm<f32> m_smallToMedGrowth;
Parm<f32> m_medToLargeGrowth;
Parm<f32> m_colorChangeTime;
};
Parms()

6
include/Game/FieldVtxColorMgr.h
View File

@ -39,8 +39,8 @@ struct FieldVtxColorMgr : public J3DVtxColorCalc, public CNode {
void initVtxColor();
void setupFieldVtxColorInfoFromStrip(void*, int, int, int, int);
void setupFieldVtxColorInfo(J3DShape*);
FieldVtxColorControl* createNewControl(Vector3f&, float, float);
void setupFieldVtxColorControl(FieldVtxColorControl*, Vector3f&, float, float);
FieldVtxColorControl* createNewControl(Vector3f&, f32, f32);
void setupFieldVtxColorControl(FieldVtxColorControl*, Vector3f&, f32, f32);
// Unused/inlined:
void updateFieldVtxColorControl(FieldVtxColorControl*);
@ -51,7 +51,7 @@ struct FieldVtxColorMgr : public J3DVtxColorCalc, public CNode {
FieldVtxColorInfo* m_info; // _28
int _2C; // _2C
FieldVtxColorControl* m_control; // _30
float _34; // _34
f32 _34; // _34
u8 _38[4]; // _38
};
} // namespace Game

8
include/Game/GameSystem.h
View File

@ -41,15 +41,15 @@ struct GameSystem : public NodeObjectMgr<GenericObjectMgr> {
virtual void doEntry(); // _68 (weak)
virtual void doSetView(int viewportNumber); // _6C (weak)
virtual void doViewCalc(); // _70 (weak)
virtual void doSimulation(float rate); // _74 (weak)
virtual void doSimulation(f32 rate); // _74 (weak)
virtual void doDirectDraw(Graphics& gfx); // _78 (weak)
virtual void startFrame(); // _80
virtual void endFrame(); // _84
virtual void doSimpleDraw(Viewport*); // _88 (weak)
virtual void directDraw(Graphics&); // _8C
virtual void startFadeout(float); // _90
virtual void startFadein(float); // _94
virtual void startFadeoutin(float); // _98
virtual void startFadeout(f32); // _90
virtual void startFadein(f32); // _94
virtual void startFadeoutin(f32); // _98
virtual void startFadeblack(); // _9C
virtual void startFadewhite(); // _A0

10
include/Game/IKSystemBase.h
View File

@ -83,11 +83,11 @@ struct IKSystemBase {
bool m_onGround; // _02
bool _03; // _03
bool m_scaleJoints; // _04
float m_bendRatio; // _08, aka rotation in radians
float m_moveRatio; // _0C
float m_timer; // _10
float m_distance1; // _14, some distance I'm not sure of
float m_distance2; // _18, same as above
f32 m_bendRatio; // _08, aka rotation in radians
f32 m_moveRatio; // _0C
f32 m_timer; // _10
f32 m_distance1; // _14, some distance I'm not sure of
f32 m_distance2; // _18, same as above
Vector3f m_targetPosition; // _1C
Vector3f m_ikPositions[3]; // _28
Matrixf** m_legJointMatrices; // _4C

14
include/Game/MapMgr.h
View File

@ -49,25 +49,25 @@ struct MapMgr : virtual public GenericObjectMgr {
virtual void getBoundBox2d(BoundBox2d&) = 0; // _18
virtual void getBoundBox(BoundBox&) = 0; // _1C
virtual void findRayIntersection(Sys::RayIntersectInfo&); // _20 (weak)
virtual void traceMove(MoveInfo&, float) = 0; // _24
virtual float getMinY(Vector3f&) = 0; // _28
virtual void getCurrTri(CurrTriInfo&) = 0; // _2C
virtual void traceMove(MoveInfo&, f32) = 0; // _24
virtual f32 getMinY(Vector3f&) = 0; // _28
virtual void getCurrTri(CurrTriInfo&) = 0; // _2C
virtual void createTriangles(Sys::CreateTriangleArg&); // _30 (weak)
virtual void setupJUTTextures() {}; // _34 (weak)
virtual bool frozenable(); // _38 (weak)
virtual void update(); // _3C (weak)
virtual void do_update(); // _40 (weak)
virtual void drawCollision(Graphics&, Sys::Sphere&) = 0; // _44
virtual void doSimulation(float rate); // _48 (weak)
virtual void doSimulation(f32 rate); // _48 (weak)
virtual void doDirectDraw(Graphics& gfx); // _4C (weak)
WaterBox* findWater(Sys::Sphere&);
void getMapRotation();
void getBestAngle(Vector3f&, float, float);
void getBestAngle(Vector3f&, f32, f32);
void checkBeamCollision(BeamCollisionArg&);
void clearPerfMonitor();
void traceMove(MapCollision&, Game::MoveInfo&, float);
void traceMove_test1203_cylinder(MapCollision&, Game::MoveInfo&, float);
void traceMove(MapCollision&, Game::MoveInfo&, f32);
void traceMove_test1203_cylinder(MapCollision&, Game::MoveInfo&, f32);
// _00: ptr to _0x24 (GenericObjectMgr)
// _04: vtable 1

24
include/Game/MoveInfo.h
View File

@ -16,7 +16,7 @@ struct DynCreature;
struct TDispTriangleArray;
struct MoveInfo {
inline MoveInfo(Sys::Sphere* sphere, Vector3f* vec, float a)
inline MoveInfo(Sys::Sphere* sphere, Vector3f* vec, f32 a)
: _00(sphere)
, m_velocity(vec)
, _08(a)
@ -40,30 +40,30 @@ struct MoveInfo {
Sys::Sphere* _00; // _00
Vector3f* m_velocity; // _04
float _08; // _08
float _0C; // _0C
f32 _08; // _08
f32 _0C; // _0C
Delegate2<DynCreature, Vector3f&, Vector3f&>* _10; // _10
BaseItem* m_infoOrigin; // _14
u8 _18; // _18
u8 _19; // _19
u8 _1A; // _1A
Vector3f _1C; // _1C
float _28; // _28
float _2C; // _2C
float _30; // _30
f32 _28; // _28
f32 _2C; // _2C
f32 _30; // _30
u8 _34[16]; // _34
Sys::Triangle* m_bounceTriangle; // _44
Sys::Triangle* m_wallTriangle; // _48
Sys::Triangle* _4C; // _4C
Vector3f m_position; // _50
Vector3f m_reflectPosition; // _5C
float _68; // _60
float _6C; // _64
float _70; // _68
f32 _68; // _60
f32 _6C; // _64
f32 _70; // _68
u8 _74; // _74
float _78; // _78
float _7C; // _7C
float _80; // _80
f32 _78; // _78
f32 _7C; // _7C
f32 _80; // _80
Vector3f _84; // _84
u8 _90; // _90
TDispTriangleArray* _94; // _94

8
include/Game/MoviePlayer.h
View File

@ -131,7 +131,7 @@ struct MoviePlayArg {
IDelegate3<MovieConfig*, void*, u32>* m_delegateStart; // _10 /* Second type is unknown. */
u32 _14; // _14
Vector3f m_origin; // _18 /* previously called m_itemPosition */
float m_angle; // _24 /* previously called m_itemFaceDirection */
f32 m_angle; // _24 /* previously called m_itemFaceDirection */
u32 m_naviID; // _28
u32 m_streamID; // _2C
Vector3f* m_soundPosition; // _30
@ -212,9 +212,9 @@ struct MoviePlayer : public JKRDisposer {
u8 m_isPaused; // _88
// TODO: Is this a quat?
Vector3f m_cameraPosition; // _8C
float m_cameraAngle; // _98
f32 m_cameraAngle; // _98
u8 _09C[4]; // _9C
float _0A0; // _A0
f32 _0A0; // _A0
bool m_canFinish; // _A4
Vector3f* m_offset; // _A8
PSM::Demo* m_demoPSM; // _AC
@ -242,7 +242,7 @@ struct MoviePlayer : public JKRDisposer {
int m_messageEndCount; // _1B8
// TODO: Is this a quat?
Vector3f m_transform; // _1BC
float m_transformAngle; // _1C8
f32 m_transformAngle; // _1C8
P2JST::ObjectSystem* m_objectSystem; // _1CC
JStudio::TControl* m_studioControl; // _1D0
JStudio::TFactory* m_studioFactory; // _1D4

30
include/Game/P2JST/ObjectCamera.h
View File

@ -24,20 +24,20 @@ struct ObjectCamera : public JStage::TCamera, public ObjectBase {
virtual u32 JSGGetFlag() const; // _18
virtual void JSGSetFlag(u32); // _1C
virtual void JSGSetData(u32, const void*, u32); // _24
virtual float JSGGetProjectionNear() const; // _44
virtual void JSGSetProjectionNear(float); // _48
virtual float JSGGetProjectionFar() const; // _4C
virtual void JSGSetProjectionFar(float); // _50
virtual float JSGGetProjectionFovy() const; // _54
virtual void JSGSetProjectionFovy(float); // _58
virtual float JSGGetProjectionAspect() const; // _5C
virtual void JSGSetProjectionAspect(float); // _60
virtual f32 JSGGetProjectionNear() const; // _44
virtual void JSGSetProjectionNear(f32); // _48
virtual f32 JSGGetProjectionFar() const; // _4C
virtual void JSGSetProjectionFar(f32); // _50
virtual f32 JSGGetProjectionFovy() const; // _54
virtual void JSGSetProjectionFovy(f32); // _58
virtual f32 JSGGetProjectionAspect() const; // _5C
virtual void JSGSetProjectionAspect(f32); // _60
virtual void JSGGetViewPosition(Vec*) const; // _74
virtual void JSGSetViewPosition(const Vec&); // _78
virtual void JSGGetViewTargetPosition(Vec*) const; // _84
virtual void JSGSetViewTargetPosition(const Vec&); // _88
virtual float JSGGetViewRoll() const; // _8C
virtual void JSGSetViewRoll(float); // _90
virtual f32 JSGGetViewRoll() const; // _8C
virtual void JSGSetViewRoll(f32); // _90
virtual void updateCamera(); // _B0
virtual void setProjection(); // _B4
virtual void setView(); // _B8
@ -64,11 +64,11 @@ struct ObjectCamera : public JStage::TCamera, public ObjectBase {
Matrixf _60; // _60
Vector3f m_viewPos; // _90 - view position?
Vector3f m_viewTargetPos; // _9C - view target position?
float m_viewRoll; // _A8 - view roll?
float m_projectionNear; // _AC - projectionNear?
float m_projectionFar; // _B0 - projectionFar?
float m_projectionFovy; // _B4 - projectionFovy?
float m_projectionAspect; // _BC - projectionAspect?
f32 m_viewRoll; // _A8 - view roll?
f32 m_projectionNear; // _AC - projectionNear?
f32 m_projectionFar; // _B0 - projectionFar?
f32 m_projectionFovy; // _B4 - projectionFovy?
f32 m_projectionAspect; // _BC - projectionAspect?
Camera* _C0; // _C0 - owner?
Camera* _C4; // _C4 - camera obj?
bool m_isRunning; // _C8

2
include/Game/PelletView.h
View File

@ -32,7 +32,7 @@ struct PelletView {
{
}
virtual float viewGetBaseScale() // _08 (weak)
virtual f32 viewGetBaseScale() // _08 (weak)
{
return 1.0f;
}

24
include/Game/Rigid.h
View File

@ -14,16 +14,16 @@ struct RigidConfig {
Vector3f _00; // _00, for m_configs: (_034, _0BC)
Vector3f m_velocity; // _0C, for m_configs: (_040, _0C8)
float _18; // _18, for m_configs: (_04C, _0D4)
float _1C; // _1C, for m_configs: (_050, _0D8)
float _20; // _20, for m_configs: (_054, _0DC)
float _24; // _24, for m_configs: (_058, _0E0)
float _28; // _28, for m_configs: (_05C, _0E4)
float _2C; // _2C, for m_configs: (_060, _0E8)
f32 _18; // _18, for m_configs: (_04C, _0D4)
f32 _1C; // _1C, for m_configs: (_050, _0D8)
f32 _20; // _20, for m_configs: (_054, _0DC)
f32 _24; // _24, for m_configs: (_058, _0E0)
f32 _28; // _28, for m_configs: (_05C, _0E4)
f32 _2C; // _2C, for m_configs: (_060, _0E8)
Vector3f _30; // _30, for m_configs: (_064, _0EC)
float _3C; // _3C, for m_configs: (_070, _0F8)
float _40; // _40, for m_configs: (_074, _0FC)
float _44; // _44, for m_configs: (_078, _100)
f32 _3C; // _3C, for m_configs: (_070, _0F8)
f32 _40; // _40, for m_configs: (_074, _0FC)
f32 _44; // _44, for m_configs: (_078, _100)
Quat _48; // _48, for m_configs: (_07C, _104)
Matrixf _58; // _58, for m_configs: (_08C, _114)
};
@ -34,10 +34,10 @@ struct Rigid {
void initPositionIndex(Vector3f&, int, Vector3f&);
void updateMatrix(int);
void computeForces(int);
void integrate(float, int);
bool resolveCollision(int, Vector3f&, Vector3f&, float);
void integrate(f32, int);
bool resolveCollision(int, Vector3f&, Vector3f&, f32);
float _00; // _000
f32 _00; // _000
Matrixf _04; // _004
RigidConfig m_configs[2]; // _034, [1] at _0BC
Matrixf _144; // _144

4
include/Game/SingleGameSection.h
View File

@ -43,7 +43,7 @@ struct SingleGameSection : public BaseGameSection {
virtual void playMovie_firstexperience(int, Creature*); // _98
virtual void playMovie_bootup(Onyon*); // _9C
virtual void playMovie_helloPikmin(Piki*); // _A0
virtual void enableTimer(float, u32); // _A4
virtual void enableTimer(f32, u32); // _A4
virtual void disableTimer(u32); // _A8
virtual u32 getTimerType(); // _AC (weak)
virtual void onMovieStart(MovieConfig*, u32, u32); // _B0
@ -77,7 +77,7 @@ struct SingleGameSection : public BaseGameSection {
void updateMainMapScreen();
void drawCaveScreen();
float m_timer; // _174
f32 m_timer; // _174
bool m_timerEnabled; // _178
u32 m_timerType; // _17C
u8 m_openMenuFlags; // _180

6
include/Game/WalkSmokeEffect.h
View File

@ -24,12 +24,12 @@ struct Obj {
void update(EnemyBase*);
// unused
void init(Matrixf*, float);
void init(Matrixf*, f32);
void draw(Graphics&);
bool _00; // _00
Matrixf* m_matrix; // _04 - unknown
float _08; // _08 - height?
f32 _08; // _08 - height?
Vector3f m_position; // _0C
};
@ -41,7 +41,7 @@ struct Mgr {
void alloc(int);
void update(EnemyBase*);
void setup(int, SysShape::Model*, char*, float);
void setup(int, SysShape::Model*, char*, f32);
// unused/inlined
void draw(Graphics&);

2
include/Game/gameGenerator.h
View File

@ -374,7 +374,7 @@ struct GenObjectNavi : public GenObject {
static void initialise();
Parm<float> m_rotation; // _24
Parm<f32> m_rotation; // _24
};
extern GeneratorMgr* generatorMgr;

2
include/Game/gameStages.h
View File

@ -87,7 +87,7 @@ struct CourseInfo : public CNode {
char* m_farmPath; // _30
char* m_routePath; // _34
Vector3f m_startPosition; // _38
float m_startAngle; // _44
f32 m_startAngle; // _44
u32 m_courseIndex; // _48
LimitGenInfo m_limitGenInfo; // _4C

2
include/Game/generalEnemyMgr.h
View File

@ -105,7 +105,7 @@ struct GeneralEnemyMgr : public GenericObjectMgr, public CNode {
virtual void doEntry(); // _0C
virtual void doSetView(int viewportNumber); // _10
virtual void doViewCalc(); // _14
virtual void doSimulation(float rate); // _18
virtual void doSimulation(f32 rate); // _18
virtual void doDirectDraw(Graphics& gfx); // _1C
virtual void doSimpleDraw(Viewport*); // _20
// vtable 2 (CNode, _04, _40-_4C)

18
include/Game/itemMgr.h
View File

@ -117,7 +117,7 @@ struct TNodeItemMgr : public BaseItemMgr, public Container<BaseItem> {
virtual void doEntry(); // _0C (weak)
virtual void doSetView(int viewportNumber); // _10 (weak)
virtual void doViewCalc(); // _14 (weak)
virtual void doSimulation(float rate); // _18 (weak)
virtual void doSimulation(f32 rate); // _18 (weak)
virtual void doDirectDraw(Graphics& gfx); // _1C (weak)
virtual void initDependency(); // _38
virtual void killAll(); // _3C
@ -143,14 +143,14 @@ struct ItemMgr : public NodeObjectMgr<GenericObjectMgr> {
// vtable 1
virtual ~ItemMgr(); // _08
// vtable 2
virtual void doAnimation(); // _64 (weak)
virtual void doEntry(); // _68 (weak)
virtual void doSetView(int); // _6C (weak)
virtual void doViewCalc(); // _70 (weak)
virtual void doSimulation(float rate); // _74 (weak)
virtual void doDirectDraw(Graphics&); // _78 (weak)
virtual void loadResources(); // _80 (weak)
virtual void doSimpleDraw(Viewport*); // _84 (weak)
virtual void doAnimation(); // _64 (weak)
virtual void doEntry(); // _68 (weak)
virtual void doSetView(int); // _6C (weak)
virtual void doViewCalc(); // _70 (weak)
virtual void doSimulation(f32 rate); // _74 (weak)
virtual void doDirectDraw(Graphics&); // _78 (weak)
virtual void loadResources(); // _80 (weak)
virtual void doSimpleDraw(Viewport*); // _84 (weak)
void addMgr(BaseItemMgr*);
void initDependency();

4
include/Game/pathfinder.h
View File

@ -33,8 +33,8 @@ struct PathNode {
void pop();
void countLinks(PathNode**);
float _00; // _00
float _04; // _04
f32 _00; // _00
f32 _04; // _04
PathNode* m_child; // _08
PathNode* m_next; // _0C
PathNode* _10; // _10

44
include/Game/pelletMgr.h
View File

@ -81,7 +81,7 @@ struct PelletMgr : public NodeObjectMgr<GenericObjectMgr> {
virtual void doEntry(); // _68 (weak)
virtual void doSetView(int viewportNumber); // _6C (weak)
virtual void doViewCalc(); // _70 (weak)
virtual void doSimulation(float rate); // _74 (weak)
virtual void doSimulation(f32 rate); // _74 (weak)
virtual void doDirectDraw(Graphics& gfx); // _78 (weak)
virtual char* getMgrName() // _80 (weak)
{
@ -217,9 +217,9 @@ struct Pellet : public DynCreature, public SysShape::MotionListener, public Carr
virtual void doEntry(); // _40
virtual void doSetView(int viewportNumber); // _44
virtual void doViewCalc(); // _48
virtual void doSimulation(float rate); // _4C
virtual void doSimulation(f32 rate); // _4C
virtual void doDirectDraw(Graphics& gfx); // _50
virtual float getFaceDir() { return m_faceDir; } // _64 (weak)
virtual f32 getFaceDir() { return m_faceDir; } // _64 (weak)
virtual void setVelocity(Vector3f& vel); // _68
virtual Vector3f getVelocity(); // _6C
virtual void onSetPosition(Vector3f& dest); // _70 (weak)
@ -311,13 +311,13 @@ struct Pellet : public DynCreature, public SysShape::MotionListener, public Carr
void clearClaim();
void sendClaim();
void updateClaim();
float getBuryDepthMax();
float getBuryDepth();
float getBuryRadius(float);
f32 getBuryDepthMax();
f32 getBuryDepth();
f32 getBuryRadius(f32);
float getBottomRadius();
float getPickRadius();
float getCylinderHeight();
f32 getBottomRadius();
f32 getPickRadius();
f32 getCylinderHeight();
int getConfigIndex();
char* getConfigName();
int getPelletConfigMin();
@ -330,7 +330,7 @@ struct Pellet : public DynCreature, public SysShape::MotionListener, public Carr
void setCarryColor(int);
void clearCarryColor();
void allocateTexCaster();
void setPanModokiRotation(float);
void setPanModokiRotation(f32);
void setOrientation(Matrixf&);
int getStateID();
void update();
@ -420,8 +420,8 @@ struct Pellet : public DynCreature, public SysShape::MotionListener, public Carr
// _00 = VTABLE 1
// _04-_314 = DYNCREATURE
// _318 = VTABLE 2? 3?
float m_radius; // _31C
float m_depth; // _320
f32 m_radius; // _31C
f32 m_depth; // _320
u8 _324; // _324 - unknown
bool m_isInWater; // _325
u8 _326[0x2]; // _326 - could be padding
@ -443,7 +443,7 @@ struct Pellet : public DynCreature, public SysShape::MotionListener, public Carr
u8 _39C; // _39C - unknown
u8 _39D[0xF]; // _39D - unknown
Vector3f m_pelletPosition; // _3AC
float m_faceDir; // _3B8
f32 m_faceDir; // _3B8
u8 m_wallTimer; // _3BC
u8 _3BD[0x3]; // _3BD - possibly padding
u32 m_claim; // _3C0
@ -455,14 +455,14 @@ struct Pellet : public DynCreature, public SysShape::MotionListener, public Carr
int m_carryColor; // _3D4
int m_minCarriers; // _3D8, to do with pikmin number
int m_maxCarriers; // _3DC
float _3E0; // _3E0
f32 _3E0; // _3E0
u8 m_slots[16]; // _3E4
short m_slotCount; // _3F4
u8 _3F6; // _3F6
u8 _3F7; // _3F7 - unknown, maybe padding
u32 m_pikminCount[7]; // _3F8, TODO: likely [PikiColorCount]
u32 _414; // _414 - unknown
float m_carryPower; // _418
f32 m_carryPower; // _418
SysShape::Animator m_carryAnim; // _41C
f32 m_animSpeed; // _438
u16 _43C; // _43C
@ -536,9 +536,9 @@ struct PelletAppearState : public PelletState {
f32 m_time; // _10
f32 m_angle; // _14
f32 m_goalScale; // _18
float _1C; // _1C
float _20; // _20
float _24; // _24
f32 _1C; // _1C
f32 _20; // _20
f32 _24; // _24
f32 _28; // _28
bool m_efxMade; // _29
};
@ -650,10 +650,10 @@ struct PelletScaleAppearState : public PelletState {
f32 m_time; // _10
f32 m_angle; // _14
f32 m_goalScale; // _18
float _1C; // _1C
float _20; // _20
float _24; // _24
float _28; // _28
f32 _1C; // _1C
f32 _20; // _20
f32 _24; // _24
f32 _28; // _28
bool m_efxMade; // _2C
};

2
include/Game/routeMgr.h
View File

@ -100,7 +100,7 @@ struct WPCondition : public Condition<WayPoint> {
};
struct WPSearchArg {
WPSearchArg(Vector3f& position, WPCondition* condition, u8 arg3, float arg4)
WPSearchArg(Vector3f& position, WPCondition* condition, u8 arg3, f32 arg4)
{
m_position = position;
m_condition = condition;

10
include/Game/shadowMgr.h
View File

@ -25,14 +25,14 @@ struct JointShadowRootNode;
struct ShadowParam {
Vector3f m_position; // _00
Sys::Sphere m_boundingSphere; // _0C
float m_size; // _1C
f32 m_size; // _1C
};
// Size: 0x60
struct ShadowParms : public Parameters {
Parm<float> m_lodNear; // _0C
Parm<float> m_lodFar; // _34
void* m_end; // _5C
Parm<f32> m_lodNear; // _0C
Parm<f32> m_lodFar; // _34
void* m_end; // _5C
};
// Size: 0x24
@ -74,7 +74,7 @@ struct CylinderBase {
Rectf _10; // _10
Vector3f _20[2]; // _20
Vector3f _38[2]; // _38
float _50; // _50
f32 _50; // _50
};
struct ShadowCylinder2 : public CylinderBase {

26
include/Graphics.h
View File

@ -17,7 +17,7 @@ struct JUTTexture;
struct Plane;
template <typename T>
struct Rect;
typedef Rect<float> Rectf;
typedef Rect<f32> Rectf;
struct Viewport;
namespace Sys {
@ -40,7 +40,7 @@ struct PerspPrintfInfo {
u32 _04; // _04
u32 _08; // _08
int _0C; // _0C
float _10; // _10
f32 _10; // _10
Color4 _14; // _14
Color4 _18; // _18
};
@ -91,30 +91,30 @@ struct Graphics : public _GraphicsParent {
void graphicsTokenCallback(u16);
void setToken(char*);
void drawAxis(float, Matrixf*);
void drawBox(Vector3f&, Vector3f*, float*, float*);
void drawAxis(f32, Matrixf*);
void drawBox(Vector3f&, Vector3f*, f32*, f32*);
void drawBox(Vector3f&, Vector3f&, Vector3f&, Vector3f&);
void drawCone(Vector3f&, Vector3f&, float, int);
void drawCylinder(Vector3f&, Vector3f&, float);
void drawCone(Vector3f&, Vector3f&, f32, int);
void drawCylinder(Vector3f&, Vector3f&, f32);
void drawLine(Vector3f&, Vector3f&);
void drawMarker(float, Matrixf*);
void drawMarker(f32, Matrixf*);
void drawMesh(Matrixf*);
void drawPlane(Plane&, float);
void drawPlane(Plane&, f32);
void drawPoint(Vector3f&);
void drawPoint(Vector3f*, u16);
void drawRect(Rectf&, Color4&);
void drawRect(Rectf&, JUTTexture*);
void drawRectangle(Rectf&, bool);
void drawSphere(Vector3f&, float);
void drawSphere(float, Matrixf*);
void drawTexture(JUTTexture*, float, float, float, float);
void drawSphere(Vector3f&, f32);
void drawSphere(f32, Matrixf*);
void drawTexture(JUTTexture*, f32, f32, f32, f32);
void drawTile(Sys::Sphere&, Sys::Sphere&, JUTTexture*);
void drawTube(Vector3f&, Vector3f&, float, float);
void drawTube(Vector3f&, Vector3f&, f32, f32);
void initPrimDraw(Matrixf*);
void loadPrimViewMtx();
void clearZBuffer(Rectf&);
void fillZBuffer(Rectf&, float);
void fillZBuffer(Rectf&, f32);
void initJ2DOrthoGraph(J2DOrthoGraph*);
void initJ2DPerspGraph(J2DPerspGraph*);

6
include/JStage/TActor.h
View File

@ -21,14 +21,14 @@ struct TActor : public TObject {
virtual int JSGGetAnimation() const; // _5C
virtual void JSGSetAnimation(unsigned long); // _60
virtual f32 JSGGetAnimationFrame() const; // _64
virtual void JSGSetAnimationFrame(float); // _68
virtual void JSGSetAnimationFrame(f32); // _68
virtual f32 JSGGetAnimationFrameMax() const; // _6C
virtual f32 JSGGetAnimationTransition() const; // _70
virtual void JSGSetAnimationTransition(float); // _74
virtual void JSGSetAnimationTransition(f32); // _74
virtual int JSGGetTextureAnimation() const; // _78
virtual void JSGSetTextureAnimation(unsigned long); // _7C
virtual f32 JSGGetTextureAnimationFrame() const; // _80
virtual void JSGSetTextureAnimationFrame(float); // _84
virtual void JSGSetTextureAnimationFrame(f32); // _84
virtual f32 JSGGetTextureAnimationFrameMax() const; // _88
};
} // namespace JStage

24
include/JStage/TCamera.h
View File

@ -15,16 +15,16 @@ struct TCamera : public TObject {
virtual int JSGFGetType() const; // _0C
virtual int JSGGetProjectionType() const; // _3C
virtual void JSGSetProjectionType(TECameraProjection); // _40
virtual float JSGGetProjectionNear() const; // _44
virtual void JSGSetProjectionNear(float); // _48
virtual float JSGGetProjectionFar() const; // _4C
virtual void JSGSetProjectionFar(float); // _50
virtual float JSGGetProjectionFovy() const; // _54
virtual void JSGSetProjectionFovy(float); // _58
virtual float JSGGetProjectionAspect() const; // _5C
virtual void JSGSetProjectionAspect(float); // _60
virtual void JSGGetProjectionField(float*) const; // _64
virtual void JSGSetProjectionField(const float*); // _68
virtual f32 JSGGetProjectionNear() const; // _44
virtual void JSGSetProjectionNear(f32); // _48
virtual f32 JSGGetProjectionFar() const; // _4C
virtual void JSGSetProjectionFar(f32); // _50
virtual f32 JSGGetProjectionFovy() const; // _54
virtual void JSGSetProjectionFovy(f32); // _58
virtual f32 JSGGetProjectionAspect() const; // _5C
virtual void JSGSetProjectionAspect(f32); // _60
virtual void JSGGetProjectionField(f32*) const; // _64
virtual void JSGSetProjectionField(const f32*); // _68
virtual int JSGGetViewType() const; // _6C
virtual void JSGSetViewType(TECameraView); // _70
virtual void JSGGetViewPosition(Vec*) const; // _74
@ -33,8 +33,8 @@ struct TCamera : public TObject {
virtual void JSGSetViewUpVector(const Vec&); // _80
virtual void JSGGetViewTargetPosition(Vec*) const; // _84
virtual void JSGSetViewTargetPosition(const Vec&); // _88
virtual float JSGGetViewRoll() const; // _8C
virtual void JSGSetViewRoll(float); // _90
virtual f32 JSGGetViewRoll() const; // _8C
virtual void JSGSetViewRoll(f32); // _90
};
} // namespace JStage

26
include/JStage/TObject.h
View File

@ -25,19 +25,19 @@
namespace JStage {
struct TObject {
virtual ~TObject() = 0; // _08
virtual int JSGFGetType() const = 0; // _0C
virtual char* JSGGetName() const; // _10
virtual void JSGUpdate(); // _14
virtual u32 JSGGetFlag() const; // _18
virtual void JSGSetFlag(u32); // _1C
virtual void* JSGGetData(u32, void*, u32) const; // _20
virtual void JSGSetData(u32, const void*, u32); // _24
virtual void JSGGetParent(TObject**, u32*) const; // _28
virtual void JSGSetParent(TObject*, u32); // _2C
virtual void JSGSetRelation(bool, TObject*, u32); // _30
virtual int JSGFindNodeID(const char*) const; // _34
virtual bool JSGGetNodeTransformation(u32, float (*)[4]) const; // _38
virtual ~TObject() = 0; // _08
virtual int JSGFGetType() const = 0; // _0C
virtual char* JSGGetName() const; // _10
virtual void JSGUpdate(); // _14
virtual u32 JSGGetFlag() const; // _18
virtual void JSGSetFlag(u32); // _1C
virtual void* JSGGetData(u32, void*, u32) const; // _20
virtual void JSGSetData(u32, const void*, u32); // _24
virtual void JSGGetParent(TObject**, u32*) const; // _28
virtual void JSGSetParent(TObject*, u32); // _2C
virtual void JSGSetRelation(bool, TObject*, u32); // _30
virtual int JSGFindNodeID(const char*) const; // _34
virtual bool JSGGetNodeTransformation(u32, f32 (*)[4]) const; // _38
/** @fabricated */
inline void setFlagOff(u32 flag) { JSGSetFlag(JSGGetFlag() & ~flag); }

4
include/JStudio/TControl.h
View File

@ -40,8 +40,8 @@ struct TControl : stb::TControl {
virtual ~TControl(); // _08
void transformOnSet_setOrigin(const Vec&, float);
void transformOnGet_setOrigin(const Vec&, float);
void transformOnSet_setOrigin(const Vec&, f32);
void transformOnGet_setOrigin(const Vec&, f32);
// unused/inlined:
void forward_value(u32);

10
include/JStudio/TVariableValue.h
View File

@ -9,12 +9,12 @@ struct TVariableValue {
typedef void (*UpdateFunction)(TVariableValue*, f64);
struct TOutput {
// TODO: This still has a non-inline dtor, apparently?
virtual void operator()(float, TAdaptor*) const = 0; // _08
virtual ~TOutput() = 0; // _0C
virtual void operator()(f32, TAdaptor*) const = 0; // _08
virtual ~TOutput() = 0; // _0C
};
struct TOutput_none_ : public TOutput {
virtual void operator()(float, TAdaptor*) const; // _08
virtual ~TOutput_none_(); // _0C
virtual void operator()(f32, TAdaptor*) const; // _08
virtual ~TOutput_none_(); // _0C
};
TVariableValue()
@ -29,7 +29,7 @@ struct TVariableValue {
static void update_functionValue_(TVariableValue*, f64);
// unused/inlined:
void update(double, TAdaptor*);
void update(f64, TAdaptor*);
/**
* @fabricated

6
include/JStudio/functionvalue.h
View File

@ -34,9 +34,9 @@ struct TFunctionValueAttribute_range {
void range_prepare();
void range_getParameter(f64, f64, f64) const;
double m_start; // _00
double m_end; // _08
double m_width; // _10
f64 m_start; // _00
f64 m_end; // _08
f64 m_width; // _10
};
struct TFunctionValueAttribute_refer {

2
include/JStudio/math.h
View File

@ -10,7 +10,7 @@ void getTransformation_SRxyzT(f32 (*)[4], const Vec&, const Vec&, const Vec&);
void getFromTransformation_SRxyzT(Vec*, Vec*, Vec*, const f32 (*)[4]);
// unused/inlined:
void getRotation_xyz(f32 (*)[4], float, float, float);
void getRotation_xyz(f32 (*)[4], f32, f32, f32);
void transform_SRxyzT(f32 (*)[4], const f32 (*)[4], const Vec&, const Vec&, const Vec&);
} // namespace math
} // namespace JStudio

2
include/JSystem/DSP.h
View File

@ -32,7 +32,7 @@ typedef struct _STRUCT_DSP_TASK {
void DSPReleaseHalt2(u32 msg);
void setup_callback(unsigned short p1);
void DsetupTable(unsigned long p1, unsigned long p2, unsigned long p3, unsigned long p4, unsigned long p5);
void DsetMixerLevel(float mixerLevel);
void DsetMixerLevel(f32 mixerLevel);
void DsyncFrame(unsigned long p1, unsigned long p2, unsigned long p3);
// dsptask.c

28
include/JSystem/J2D/J2DAnm.h
View File

@ -36,10 +36,10 @@ struct J2DAnmBase {
virtual void searchUpdateMaterialID(J2DScreen*); // _0C (weak)
// VTBL _00
u8 _04[2]; // _04
short m_maxFrame; // _06
float m_currentFrame; // _08
u32 m_type; // _0C
u8 _04[2]; // _04
short m_maxFrame; // _06
f32 m_currentFrame; // _08
u32 m_type; // _0C
};
struct J2DAnmColor : public J2DAnmBase {
@ -140,10 +140,10 @@ struct J2DAnmTextureSRTKey : public J2DAnmBase {
virtual ~J2DAnmTextureSRTKey() { } // _08 (weak)
virtual void searchUpdateMaterialID(J2DScreen*); // _0C
void calcTransform(float, unsigned short, J3DTextureSRTInfo*) const;
void calcTransform(f32, unsigned short, J3DTextureSRTInfo*) const;
// unused/inlined:
void calcPostTransform(float, unsigned short, J3DTextureSRTInfo*) const;
void calcPostTransform(f32, unsigned short, J3DTextureSRTInfo*) const;
u32 _10;
u16 _14;
@ -151,9 +151,9 @@ struct J2DAnmTextureSRTKey : public J2DAnmBase {
short _1C;
short _1E;
short _20;
float* _24;
f32* _24;
short* _28;
float* _2C;
f32* _2C;
u8* _30;
u16* _34;
JUTNameTab m_nameTab;
@ -161,7 +161,7 @@ struct J2DAnmTextureSRTKey : public J2DAnmBase {
short _4C;
short _4E;
short _50;
float* _54;
f32* _54;
short* _58;
u32 _5C;
short _60;
@ -177,9 +177,9 @@ struct J2DAnmTransform : public J2DAnmBase {
virtual ~J2DAnmTransform() { } // _08 (weak)
virtual void getTransform(unsigned short, J3DTransformInfo*) const { } // _10 (weak)
float* _10; // _10
f32* _10; // _10
short* _14; // _14
float* _18; // _18
f32* _18; // _18
};
// Size: 0x28
@ -193,9 +193,9 @@ struct J2DAnmTransformFull : public J2DAnmTransform {
// Size: 0x2C
struct J2DAnmTransformKey : public J2DAnmTransform {
virtual ~J2DAnmTransformKey() { } // _08 (weak)
virtual void getTransform(unsigned short, J3DTransformInfo*) const; // _10 (weak)
virtual void calcTransform(float, unsigned short, J3DTransformInfo*) const; // _14
virtual ~J2DAnmTransformKey() { } // _08 (weak)
virtual void getTransform(unsigned short, J3DTransformInfo*) const; // _10 (weak)
virtual void calcTransform(f32, unsigned short, J3DTransformInfo*) const; // _14
u8 _1C[8]; // _1C
int _24; // _24

14
include/JSystem/J2D/J2DGrafContext.h
View File

@ -13,7 +13,7 @@
enum J2DGrafType { J2DGraf_Base = 0, J2DGraf_Ortho, J2DGraf_Persp };
struct J2DGrafContext {
J2DGrafContext(float, float, float, float);
J2DGrafContext(f32, f32, f32, f32);
virtual ~J2DGrafContext() { } // _08 (weak)
virtual void place(const JGeometry::TBox2f&); // _0C
@ -70,15 +70,15 @@ struct J2DPerspGraph : public J2DGrafContext {
virtual void setLookat(); // _24
void makeLookat();
void set(float, float, float);
void setFovy(float);
void set(f32, f32, f32);
void setFovy(f32);
// _00 = VTBL
// _00-_BC = J2DGrafContext
float m_fovY; // _BC
float _C0; // _C0
float _C4; // _C4
float _C8; // _C8
f32 m_fovY; // _BC
f32 _C0; // _C0
f32 _C4; // _C4
f32 _C8; // _C8
};
struct J2DOrthoGraph : public J2DGrafContext {

348
include/JSystem/J2D/J2DPane.h
View File

@ -65,10 +65,10 @@ struct J2DScrnBlockHeader {
struct J2DTextBoxBlock {
u32 _00; // _00
u16 _04; // _04
s16 _06; // _06 - converted to float for _114
s16 _08; // _08 - converted to float for _118
u16 _0A; // _0A - converted to float for _11C
u16 _0C; // _0C - converted to float for _120
s16 _06; // _06 - converted to f32 for _114
s16 _08; // _08 - converted to f32 for _118
u16 _0A; // _0A - converted to f32 for _11C
u16 _0C; // _0C - converted to f32 for _120
u8 _0E; // _0E - J2DTextBoxHBinding for _130
u8 _0F; // _0F - J2DTextBoxVBinding for _130
u32 _10; // _10 - color for _104
@ -124,28 +124,28 @@ struct J2DScreenInfoBlock : J2DScrnBlockHeader {
struct J2DPane {
J2DPane();
J2DPane(J2DPane* parent, bool isVisible, u64 tag, const JGeometry::TBox2f& box);
// inline J2DPane(J2DPane* parent, bool isVisible, u64 tag, float x0, float y0, float x1, float y1)
// inline J2DPane(J2DPane* parent, bool isVisible, u64 tag, f32 x0, f32 y0, f32 x1, f32 y1)
// : J2DPane(parent, isVisible, tag, JGeometry::TBox2f(x0, y0, x1, y1)) {};
J2DPane(u64 tag, const JGeometry::TBox2f& box);
J2DPane(J2DPane* parent, JSURandomInputStream* input, u8 version);
virtual ~J2DPane(); // _08
virtual u16 getTypeID() const { return 0x10; } // _0C (weak)
virtual void move(float x, float y); // _10
virtual void add(float x, float y); // _14
virtual void resize(float, float); // _18
virtual void move(f32 x, f32 y); // _10
virtual void add(f32 x, f32 y); // _14
virtual void resize(f32, f32); // _18
virtual void setCullBack(bool shouldCullBack); // _1C (weak)
virtual void setCullBack(GXCullMode cullMode); // _20
virtual void setAlpha(u8 alpha) { m_alpha = alpha; } // _24 (weak)
virtual bool setConnectParent(bool); // _28 (weak)
virtual void calcMtx(); // _2C (weak)
virtual void update() { } // _30 (weak)
virtual void drawSelf(float, float) { } // _34 (weak)
virtual void drawSelf(float, float, float (*)[3][4]) { } // _38 (weak)
virtual void drawSelf(f32, f32) { } // _34 (weak)
virtual void drawSelf(f32, f32, f32 (*)[3][4]) { } // _38 (weak)
virtual J2DPane* search(u64); // _3C
virtual J2DPane* searchUserInfo(u64); // _40
virtual void makeMatrix(float, float); // _44 (weak)
virtual void makeMatrix(float, float, float, float); // _48
virtual void makeMatrix(f32, f32); // _44 (weak)
virtual void makeMatrix(f32, f32, f32, f32); // _48
virtual bool isUsed(const ResTIMG* resource); // _4C
virtual bool isUsed(const ResFONT* resource); // _50
virtual void clearAnmTransform(); // _54
@ -170,15 +170,15 @@ struct J2DPane {
void animationTransform();
void changeUseTrans(J2DPane*);
void clip(const JGeometry::TBox2f&);
void draw(float, float, const J2DGrafContext*, bool, bool);
void draw(f32, f32, const J2DGrafContext*, bool, bool);
void gather(J2DPane** gatheredPanes, u64 minID, u64 maxID, int gatheredLimit, int& gatheredCount);
JGeometry::TBox2f* getBounds();
JGeometry::TVec3f getGlbVtx(u8) const;
void* getPointer(JSURandomInputStream*, u32, JKRArchive*);
u64 getTagName() const;
float getTranslateX() const;
float getTranslateY() const;
f32 getTranslateX() const;
f32 getTranslateY() const;
/**
* @reifiedAddress{80309D98}
@ -197,8 +197,8 @@ struct J2DPane {
void makePaneStream(J2DPane* parent, JSURandomInputStream* input);
void makePaneExStream(J2DPane* parent, JSURandomInputStream* input);
void place(const JGeometry::TBox2f&);
void rotate(float, float, J2DRotateAxis, float);
void rotate(float);
void rotate(f32, f32, J2DRotateAxis, f32);
void rotate(f32);
void updateTransform(const J2DAnmTransform*);
/**
@ -225,7 +225,7 @@ struct J2DPane {
/**
* @fabricated
*/
void centerWithScale(float width, float height)
void centerWithScale(f32 width, f32 height)
{
setBasePosition(POS_CENTER);
m_scale.x = width;
@ -291,7 +291,7 @@ struct J2DPane {
// Unused/inlined:
bool insertChild(J2DPane* before, J2DPane* child);
float getRotate() const;
f32 getRotate() const;
void gatherUserInfo(J2DPane**, u64, u64, int, int&);
// _00 VTBL
@ -303,10 +303,10 @@ struct J2DPane {
u64 m_messageID; // _018
JGeometry::TBox2f _020; // _020
JGeometry::TBox2f _030; // _030
float _040; // _040
float _044; // _044
float _048; // _048
float _04C; // _04C
f32 _040; // _040
f32 _044; // _044
f32 _048; // _048
f32 _04C; // _04C
Mtx _050; // _050
Mtx _080; // _080
bool m_isVisible; // _0B0
@ -317,9 +317,9 @@ struct J2DPane {
u8 _0B5; // _0B5
u8 m_rotationAxisMaybe; // _0B6
u8 m_basePosition; // _0B7
float _0B8; // _0B8
float _0BC; // _0BC
float m_angle; // _0C0
f32 _0B8; // _0B8
f32 _0BC; // _0BC
f32 m_angle; // _0C0
JGeometry::TVec2f m_anchorPoint; // _0C4
JGeometry::TVec2f m_scale; // _0CC
JGeometry::TVec2f m_offset; // _0D4 /* offset X,Y? */
@ -336,7 +336,7 @@ struct J2DScreen : public J2DPane {
virtual ~J2DScreen(); // _08
virtual u16 getTypeID() const { return 0x8; } // _0C (weak)
virtual void calcMtx() { makeMatrix(m_offset.x, m_offset.y); } // _2C (weak)
virtual void drawSelf(float, float, float (*)[3][4]); // _38
virtual void drawSelf(f32, f32, f32 (*)[3][4]); // _38
virtual J2DPane* search(u64); // _3C
virtual J2DPane* searchUserInfo(u64); // _40
virtual bool isUsed(const ResTIMG* resource); // _4C
@ -363,7 +363,7 @@ struct J2DScreen : public J2DPane {
bool checkSignature(JSURandomInputStream*);
void clean();
bool createMaterial(JSURandomInputStream*, u32, JKRArchive*);
void draw(float, float, const J2DGrafContext*);
void draw(f32, f32, const J2DGrafContext*);
u32 gather(J2DPane**, u64, u64, int);
J2DMaterial* getMaterial(u16 index);
u8* getResReference(JSURandomInputStream*, u32);
@ -416,50 +416,50 @@ struct J2DPicture : public J2DPane {
J2DPicture(JUTTexture*);
J2DPicture(u64, const JGeometry::TBox2f&);
virtual ~J2DPicture(); // _08
virtual u16 getTypeID() const { return 0x12; }; // _0C (weak)
virtual void drawSelf(float, float); // _34
virtual void drawSelf(float, float, float (*)[3][4]); // _38
virtual bool isUsed(const ResTIMG* resource); // _4C
virtual bool isUsed(const ResFONT* resource) { return J2DPane::isUsed(resource); } // _50 (weak)
virtual void rewriteAlpha() { } // _58 (weak)
virtual void initiate(const ResTIMG*, const ResTLUT*); // _94
virtual void prepareTexture(u8); // _98
virtual bool append(const ResTIMG*, float); // _9C (weak)
virtual bool append(const ResTIMG*, JUTPalette*, float); // _A0 (weak)
virtual bool append(const char*, float); // _A4 (weak)
virtual bool append(const char*, JUTPalette*, float); // _A8 (weak)
virtual bool append(JUTTexture*, float); // _AC (weak)
virtual bool prepend(const ResTIMG*, float); // _B0 (weak)
virtual bool prepend(const ResTIMG*, JUTPalette*, float); // _B4 (weak)
virtual bool prepend(const char*, float); // _B8 (weak)
virtual bool prepend(const char*, JUTPalette*, float); // _BC (weak)
virtual bool prepend(JUTTexture*, float); // _C0 (weak)
virtual bool insert(const ResTIMG*, u8, float); // _C4 (weak)
virtual bool insert(const ResTIMG*, JUTPalette*, u8, float); // _C8
virtual bool insert(const char*, u8, float); // _CC (weak)
virtual bool insert(const char*, JUTPalette*, u8, float); // _D0
virtual bool insert(JUTTexture*, u8, float); // _D4
virtual int remove(u8); // _D8
virtual int remove(); // _DC (weak)
virtual int remove(JUTTexture*); // _E0
virtual void draw(float, float, bool, bool, bool); // _E4 (weak)
virtual void draw(float, float, u8, bool, bool, bool); // _E8 (weak)
virtual void draw(float, float, float, float, bool, bool, bool); // _EC
virtual void drawOut(float, float, float, float, float, float); // _F0 (weak)
virtual void drawOut(float, float, float, float, float, float, float, float); // _F4 (weak)
virtual void drawOut(const JGeometry::TBox2f&, const JGeometry::TBox2f&); // _F8
virtual void load(GXTexMapID, u8); // _FC (weak)
virtual void load(u8); // _100 (weak)
virtual void setBlendRatio(float, float, float, float, float, float, float, float); // _104 (weak)
virtual void setBlendColorRatio(float, float, float, float, float, float, float, float); // _108
virtual void setBlendAlphaRatio(float, float, float, float, float, float, float, float); // _10C
virtual ResTIMG* changeTexture(const ResTIMG*, u8); // _110
virtual ResTIMG* changeTexture(const char*, u8); // _114
virtual ResTIMG* changeTexture(const ResTIMG*, u8, JUTPalette*); // _118
virtual ResTIMG* changeTexture(const char*, u8, JUTPalette*); // _11C
virtual JUTTexture* getTexture(u8) const; // _120 (weak)
virtual u8 getTextureCount() const { return m_textureCount; } // _124 (weak)
virtual ~J2DPicture(); // _08
virtual u16 getTypeID() const { return 0x12; }; // _0C (weak)
virtual void drawSelf(f32, f32); // _34
virtual void drawSelf(f32, f32, f32 (*)[3][4]); // _38
virtual bool isUsed(const ResTIMG* resource); // _4C
virtual bool isUsed(const ResFONT* resource) { return J2DPane::isUsed(resource); } // _50 (weak)
virtual void rewriteAlpha() { } // _58 (weak)
virtual void initiate(const ResTIMG*, const ResTLUT*); // _94
virtual void prepareTexture(u8); // _98
virtual bool append(const ResTIMG*, f32); // _9C (weak)
virtual bool append(const ResTIMG*, JUTPalette*, f32); // _A0 (weak)
virtual bool append(const char*, f32); // _A4 (weak)
virtual bool append(const char*, JUTPalette*, f32); // _A8 (weak)
virtual bool append(JUTTexture*, f32); // _AC (weak)
virtual bool prepend(const ResTIMG*, f32); // _B0 (weak)
virtual bool prepend(const ResTIMG*, JUTPalette*, f32); // _B4 (weak)
virtual bool prepend(const char*, f32); // _B8 (weak)
virtual bool prepend(const char*, JUTPalette*, f32); // _BC (weak)
virtual bool prepend(JUTTexture*, f32); // _C0 (weak)
virtual bool insert(const ResTIMG*, u8, f32); // _C4 (weak)
virtual bool insert(const ResTIMG*, JUTPalette*, u8, f32); // _C8
virtual bool insert(const char*, u8, f32); // _CC (weak)
virtual bool insert(const char*, JUTPalette*, u8, f32); // _D0
virtual bool insert(JUTTexture*, u8, f32); // _D4
virtual int remove(u8); // _D8
virtual int remove(); // _DC (weak)
virtual int remove(JUTTexture*); // _E0
virtual void draw(f32, f32, bool, bool, bool); // _E4 (weak)
virtual void draw(f32, f32, u8, bool, bool, bool); // _E8 (weak)
virtual void draw(f32, f32, f32, f32, bool, bool, bool); // _EC
virtual void drawOut(f32, f32, f32, f32, f32, f32); // _F0 (weak)
virtual void drawOut(f32, f32, f32, f32, f32, f32, f32, f32); // _F4 (weak)
virtual void drawOut(const JGeometry::TBox2f&, const JGeometry::TBox2f&); // _F8
virtual void load(GXTexMapID, u8); // _FC (weak)
virtual void load(u8); // _100 (weak)
virtual void setBlendRatio(f32, f32, f32, f32, f32, f32, f32, f32); // _104 (weak)
virtual void setBlendColorRatio(f32, f32, f32, f32, f32, f32, f32, f32); // _108
virtual void setBlendAlphaRatio(f32, f32, f32, f32, f32, f32, f32, f32); // _10C
virtual ResTIMG* changeTexture(const ResTIMG*, u8); // _110
virtual ResTIMG* changeTexture(const char*, u8); // _114
virtual ResTIMG* changeTexture(const ResTIMG*, u8, JUTPalette*); // _118
virtual ResTIMG* changeTexture(const char*, u8, JUTPalette*); // _11C
virtual JUTTexture* getTexture(u8) const; // _120 (weak)
virtual u8 getTextureCount() const { return m_textureCount; } // _124 (weak)
virtual bool setBlack(JUtility::TColor black) // _128 (weak)
{
@ -477,12 +477,12 @@ struct J2DPicture : public J2DPane {
m_white = white;
return true;
}
virtual JUtility::TColor getBlack() const { return m_black; } // _134 (weak)
virtual JUtility::TColor getWhite() const { return m_white; } // _138 (weak)
virtual J2DMaterial* getMaterial() const { return nullptr; } // _13C (weak)
virtual void drawFullSet(float, float, float, float, float (*)[3][4]); // _140
virtual void drawTexCoord(float, float, float, float, short, short, short, short, short, short, short, short, float (*)[3][4]); // _144
virtual u8 getUsableTlut(u8); // _148
virtual JUtility::TColor getBlack() const { return m_black; } // _134 (weak)
virtual JUtility::TColor getWhite() const { return m_white; } // _138 (weak)
virtual J2DMaterial* getMaterial() const { return nullptr; } // _13C (weak)
virtual void drawFullSet(f32, f32, f32, f32, f32 (*)[3][4]); // _140
virtual void drawTexCoord(f32, f32, f32, f32, short, short, short, short, short, short, short, short, f32 (*)[3][4]); // _144
virtual u8 getUsableTlut(u8); // _148
void initinfo();
void private_readStream(J2DPane*, JSURandomInputStream*, JKRArchive*);
@ -577,71 +577,71 @@ struct J2DPictureEx : public J2DPicture {
J2DPictureEx(u64, const JGeometry::TBox2f&, const ResTIMG*, u32);
J2DPictureEx(u64, const JGeometry::TBox2f&, const char*, u32);
virtual ~J2DPictureEx(); // _08
virtual void setCullBack(bool shouldCullBack); // _1C (weak)
virtual void setCullBack(GXCullMode cullMode); // _20
virtual void setAlpha(u8); // _24
virtual void drawSelf(float, float, float (*)[3][4]); // _38
virtual bool isUsed(const ResTIMG* resource); // _4C
virtual bool isUsed(const ResFONT* resource); // _50 (weak)
virtual void rewriteAlpha(); // _58
virtual void setAnimation(J2DAnmBase* animation); // _5C (weak)
virtual void setAnimation(J2DAnmTransform* animation); // _60 (weak)
virtual void setAnimation(J2DAnmColor* animation); // _64
virtual void setAnimation(J2DAnmTexPattern* animation); // _68
virtual void setAnimation(J2DAnmTextureSRTKey* animation); // _6C
virtual void setAnimation(J2DAnmTevRegKey* animation); // _70
virtual void setAnimation(J2DAnmVisibilityFull* animation); // _74
virtual void setAnimation(J2DAnmVtxColor* animation); // _78
virtual const J2DAnmTransform* animationPane(const J2DAnmTransform* animation); // _90
virtual void initiate(const ResTIMG*, const ResTLUT*); // _94
virtual void prepareTexture(u8); // _98
virtual bool append(const ResTIMG*, float); // _9C (weak)
virtual bool append(const ResTIMG*, JUTPalette*, float); // _A0
virtual bool append(const char*, float); // _A4 (weak)
virtual bool append(const char*, JUTPalette*, float); // _A8
virtual bool append(JUTTexture*, float); // _AC
virtual bool prepend(const ResTIMG*, float); // _B0 (weak)
virtual bool prepend(const ResTIMG*, JUTPalette*, float); // _B4 (weak)
virtual bool prepend(const char*, float); // _B8 (weak)
virtual bool prepend(const char*, JUTPalette*, float); // _BC (weak)
virtual bool prepend(JUTTexture*, float); // _C0 (weak)
virtual bool insert(const ResTIMG*, u8, float); // _C4 (weak)
virtual bool insert(const ResTIMG*, JUTPalette*, u8, float); // _C8
virtual bool insert(const char*, u8, float); // _CC (weak)
virtual bool insert(const char*, JUTPalette*, u8, float); // _D0
virtual bool insert(JUTTexture*, u8, float); // _D4
virtual int remove(u8); // _D8
virtual int remove(); // _DC
virtual int remove(JUTTexture*); // _E0
virtual void draw(float, float, bool, bool, bool); // _E4 (weak)
virtual void draw(float, float, u8, bool, bool, bool); // _E8
virtual void draw(float, float, float, float, bool, bool, bool); // _EC
virtual void drawOut(float, float, float, float, float, float); // _F0 (weak)
virtual void drawOut(float, float, float, float, float, float, float, float); // _F4 (weak)
virtual void drawOut(const JGeometry::TBox2f&, const JGeometry::TBox2f&); // _F8
virtual void load(GXTexMapID, u8); // _FC
virtual void load(u8); // _100 (weak)
virtual void setBlendColorRatio(float, float, float, float, float, float, float, float); // _108
virtual void setBlendAlphaRatio(float, float, float, float, float, float, float, float); // _10C
virtual ResTIMG* changeTexture(const ResTIMG*, u8); // _110
virtual ResTIMG* changeTexture(const char*, u8); // _114
virtual ResTIMG* changeTexture(const ResTIMG*, u8, JUTPalette*); // _118
virtual ResTIMG* changeTexture(const char*, u8, JUTPalette*); // _11C
virtual JUTTexture* getTexture(u8) const; // _120
virtual u8 getTextureCount() const; // _124
virtual bool setBlack(JUtility::TColor black); // _128
virtual bool setWhite(JUtility::TColor white); // _12C
virtual bool setBlackWhite(JUtility::TColor black, JUtility::TColor white); // _130
virtual JUtility::TColor getBlack() const; // _134
virtual JUtility::TColor getWhite() const; // _138
virtual J2DMaterial* getMaterial() const; // _13C (weak)
virtual void drawFullSet(float, float, float, float, float (*)[3][4]); // _140
virtual void drawTexCoord(float, float, float, float, short, short, short, short, short, short, short, short, float (*)[3][4]); // _144
virtual u8 getUsableTlut(u8); // _148
virtual ~J2DPictureEx(); // _08
virtual void setCullBack(bool shouldCullBack); // _1C (weak)
virtual void setCullBack(GXCullMode cullMode); // _20
virtual void setAlpha(u8); // _24
virtual void drawSelf(f32, f32, f32 (*)[3][4]); // _38
virtual bool isUsed(const ResTIMG* resource); // _4C
virtual bool isUsed(const ResFONT* resource); // _50 (weak)
virtual void rewriteAlpha(); // _58
virtual void setAnimation(J2DAnmBase* animation); // _5C (weak)
virtual void setAnimation(J2DAnmTransform* animation); // _60 (weak)
virtual void setAnimation(J2DAnmColor* animation); // _64
virtual void setAnimation(J2DAnmTexPattern* animation); // _68
virtual void setAnimation(J2DAnmTextureSRTKey* animation); // _6C
virtual void setAnimation(J2DAnmTevRegKey* animation); // _70
virtual void setAnimation(J2DAnmVisibilityFull* animation); // _74
virtual void setAnimation(J2DAnmVtxColor* animation); // _78
virtual const J2DAnmTransform* animationPane(const J2DAnmTransform* animation); // _90
virtual void initiate(const ResTIMG*, const ResTLUT*); // _94
virtual void prepareTexture(u8); // _98
virtual bool append(const ResTIMG*, f32); // _9C (weak)
virtual bool append(const ResTIMG*, JUTPalette*, f32); // _A0
virtual bool append(const char*, f32); // _A4 (weak)
virtual bool append(const char*, JUTPalette*, f32); // _A8
virtual bool append(JUTTexture*, f32); // _AC
virtual bool prepend(const ResTIMG*, f32); // _B0 (weak)
virtual bool prepend(const ResTIMG*, JUTPalette*, f32); // _B4 (weak)
virtual bool prepend(const char*, f32); // _B8 (weak)
virtual bool prepend(const char*, JUTPalette*, f32); // _BC (weak)
virtual bool prepend(JUTTexture*, f32); // _C0 (weak)
virtual bool insert(const ResTIMG*, u8, f32); // _C4 (weak)
virtual bool insert(const ResTIMG*, JUTPalette*, u8, f32); // _C8
virtual bool insert(const char*, u8, f32); // _CC (weak)
virtual bool insert(const char*, JUTPalette*, u8, f32); // _D0
virtual bool insert(JUTTexture*, u8, f32); // _D4
virtual int remove(u8); // _D8
virtual int remove(); // _DC
virtual int remove(JUTTexture*); // _E0
virtual void draw(f32, f32, bool, bool, bool); // _E4 (weak)
virtual void draw(f32, f32, u8, bool, bool, bool); // _E8
virtual void draw(f32, f32, f32, f32, bool, bool, bool); // _EC
virtual void drawOut(f32, f32, f32, f32, f32, f32); // _F0 (weak)
virtual void drawOut(f32, f32, f32, f32, f32, f32, f32, f32); // _F4 (weak)
virtual void drawOut(const JGeometry::TBox2f&, const JGeometry::TBox2f&); // _F8
virtual void load(GXTexMapID, u8); // _FC
virtual void load(u8); // _100 (weak)
virtual void setBlendColorRatio(f32, f32, f32, f32, f32, f32, f32, f32); // _108
virtual void setBlendAlphaRatio(f32, f32, f32, f32, f32, f32, f32, f32); // _10C
virtual ResTIMG* changeTexture(const ResTIMG*, u8); // _110
virtual ResTIMG* changeTexture(const char*, u8); // _114
virtual ResTIMG* changeTexture(const ResTIMG*, u8, JUTPalette*); // _118
virtual ResTIMG* changeTexture(const char*, u8, JUTPalette*); // _11C
virtual JUTTexture* getTexture(u8) const; // _120
virtual u8 getTextureCount() const; // _124
virtual bool setBlack(JUtility::TColor black); // _128
virtual bool setWhite(JUtility::TColor white); // _12C
virtual bool setBlackWhite(JUtility::TColor black, JUtility::TColor white); // _130
virtual JUtility::TColor getBlack() const; // _134
virtual JUtility::TColor getWhite() const; // _138
virtual J2DMaterial* getMaterial() const; // _13C (weak)
virtual void drawFullSet(f32, f32, f32, f32, f32 (*)[3][4]); // _140
virtual void drawTexCoord(f32, f32, f32, f32, short, short, short, short, short, short, short, short, f32 (*)[3][4]); // _144
virtual u8 getUsableTlut(u8); // _148
void initialize(u32);
void insertCommon(u8, float);
void insertCommon(u8, f32);
bool isInsert(u8) const;
bool isRemove(u8) const;
void setTevOrder(u8, u8, bool);
@ -650,7 +650,7 @@ struct J2DPictureEx : public J2DPicture {
void setTevKColor(u8);
void setTevKColorSel(u8);
void setTevKAlphaSel(u8);
void shiftSetBlendRatio(u8, float, bool, bool);
void shiftSetBlendRatio(u8, f32, bool, bool);
bool getBlackWhite(JUtility::TColor*, JUtility::TColor*) const;
bool isSetBlackWhite(JUtility::TColor, JUtility::TColor) const;
@ -673,14 +673,14 @@ struct J2DPictureEx : public J2DPicture {
u16 _16C; // _16C
u16 _16E; // _16E
u16 _170[4]; // _170
float _178; // _178
float _17C; // _17C
float _180; // _180
float _184; // _184
float _188; // _188
float _18C; // _18C
float _190; // _190
float _194; // _194
f32 _178; // _178
f32 _17C; // _17C
f32 _180; // _180
f32 _184; // _184
f32 _188; // _188
f32 _18C; // _18C
f32 _190; // _190
f32 _194; // _194
bool _198; // _198
J2DAnmVisibilityFull* m_anmVisibility; // _19C
J2DAnmVtxColor* m_anmVtxColor; // _1A0
@ -701,15 +701,15 @@ struct J2DTextBox : public J2DPane {
virtual ~J2DTextBox(); // _08
virtual u16 getTypeID() const { return 0x13; } // _0C (weak)
virtual void resize(float, float); // _18
virtual void resize(f32, f32); // _18
virtual bool setConnectParent(bool); // _28
virtual void drawSelf(float, float); // _34
virtual void drawSelf(float, float, float (*)[3][4]); // _38
virtual void drawSelf(f32, f32); // _34
virtual void drawSelf(f32, f32, f32 (*)[3][4]); // _38
virtual bool isUsed(const ResTIMG* resource) { return J2DPane::isUsed(resource); } // _4C (weak)
virtual bool isUsed(const ResFONT* resource); // _50
virtual void rewriteAlpha() { } // _58 (weak)
virtual void draw(float, float); // _94
virtual void draw(float, float, float, J2DTextBoxHBinding); // _98
virtual void draw(f32, f32); // _94
virtual void draw(f32, f32, f32, J2DTextBoxHBinding); // _98
virtual void setFont(JUTFont* font); // _9C
virtual JUTResFont* getFont() const { return m_font; } // _A0 (weak)
virtual bool setBlack(JUtility::TColor black) // _A4 (weak)
@ -766,12 +766,12 @@ struct J2DTextBox : public J2DPane {
JUTResFont* m_font; // _100
JUtility::TColor m_color1; // _104
JUtility::TColor m_color2; // _108
float _10C; // _10C
float _110; // _110
float _114; // _114
float _118; // _118
float _11C; // _11C
float _120; // _120
f32 _10C; // _10C
f32 _110; // _110
f32 _114; // _114
f32 _118; // _118
f32 _11C; // _11C
f32 _120; // _120
char* _124; // _124
JUtility::TColor m_white; // _128
JUtility::TColor m_black; // _12C
@ -791,7 +791,7 @@ struct J2DTextBoxEx : public J2DTextBox {
virtual void setCullBack(bool shouldCullBack); // _1C (weak)
virtual void setCullBack(_GXCullMode cullMode); // _20
virtual void setAlpha(u8 alpha); // _24
virtual void drawSelf(float, float, float (*)[3][4]); // _38
virtual void drawSelf(f32, f32, f32 (*)[3][4]); // _38
virtual bool isUsed(const ResTIMG* resource); // _4C (weak)
virtual bool isUsed(const ResFONT* resource); // _50
virtual void rewriteAlpha(); // _58
@ -804,8 +804,8 @@ struct J2DTextBoxEx : public J2DTextBox {
virtual void setAnimation(J2DAnmVisibilityFull* animation); // _74
virtual void setAnimation(J2DAnmVtxColor* animation); // _78 (weak)
virtual const J2DAnmTransform* animationPane(const J2DAnmTransform* animation); // _90
virtual void draw(float, float); // _94
virtual void draw(float, float, float, J2DTextBoxHBinding); // _98
virtual void draw(f32, f32); // _94
virtual void draw(f32, f32, f32, J2DTextBoxHBinding); // _98
virtual void setFont(JUTFont* font); // _9C
virtual JUTResFont* getFont() const; // _A0
virtual bool setBlack(JUtility::TColor black); // _A4
@ -844,15 +844,15 @@ struct J2DWindow : public J2DPane {
virtual ~J2DWindow(); // _08
virtual u16 getTypeID() const { return 0x11; } // _0C (weak)
virtual void resize(float, float); // _18
virtual void drawSelf(float, float); // _34
virtual void drawSelf(float, float, float (*)[3][4]); // _38
virtual void resize(f32, f32); // _18
virtual void drawSelf(f32, f32); // _34
virtual void drawSelf(f32, f32, f32 (*)[3][4]); // _38
virtual bool isUsed(const ResTIMG* resource); // _4C
virtual bool isUsed(const ResFONT* resource) { return J2DPane::isUsed(resource); } // _50 (weak)
virtual void rewriteAlpha() { } // _58 (weak)
virtual void draw(const JGeometry::TBox2f&); // _94
virtual void draw(const JGeometry::TBox2f&, const JGeometry::TBox2f&); // _98
virtual void draw(float, float, float, float); // _9C (weak)
virtual void draw(f32, f32, f32, f32); // _9C (weak)
virtual bool setBlack(JUtility::TColor black) // _A0 (weak)
{
m_black = black;
@ -892,9 +892,9 @@ struct J2DWindow : public J2DPane {
void initinfo2();
void draw_private(const JGeometry::TBox2f&, const JGeometry::TBox2f&);
void setContentsColor(JUtility::TColor, JUtility::TColor, JUtility::TColor, JUtility::TColor);
void drawFrameTexture(JUTTexture*, float, float, float, float, u16, u16, u16, u16, bool);
void drawFrameTexture(JUTTexture*, float, float, bool, bool, bool);
void drawContentsTexture(float, float, float, float);
void drawFrameTexture(JUTTexture*, f32, f32, f32, f32, u16, u16, u16, u16, bool);
void drawFrameTexture(JUTTexture*, f32, f32, bool, bool, bool);
void drawContentsTexture(f32, f32, f32, f32);
void setTevMode(JUTTexture*, JUtility::TColor, JUtility::TColor);
// J2DPane _000
@ -927,7 +927,7 @@ struct J2DWindowEx : public J2DWindow {
virtual void setCullBack(bool shouldCullBack); // _1C (weak)
virtual void setCullBack(_GXCullMode cullMode); // _20
virtual void setAlpha(unsigned char); // _24
virtual void drawSelf(float, float, float (*)[3][4]); // _38
virtual void drawSelf(f32, f32, f32 (*)[3][4]); // _38
virtual bool isUsed(const ResTIMG* resource); // _4C
virtual bool isUsed(const ResFONT* resource) { return J2DPane::isUsed(resource); } // _50 (weak)
virtual void rewriteAlpha(); // _58
@ -942,7 +942,7 @@ struct J2DWindowEx : public J2DWindow {
virtual const J2DAnmTransform* animationPane(const J2DAnmTransform*); // _90
virtual void draw(const JGeometry::TBox2f&); // _94
virtual void draw(const JGeometry::TBox2f&, const JGeometry::TBox2f&); // _98
virtual void draw(float, float, float, float); // _9C (weak)
virtual void draw(f32, f32, f32, f32); // _9C (weak)
virtual bool setBlack(JUtility::TColor black); // _A0
virtual bool setWhite(JUtility::TColor white); // _A4
virtual bool setBlackWhite(JUtility::TColor black, JUtility::TColor white); // _A8
@ -957,7 +957,7 @@ struct J2DWindowEx : public J2DWindow {
void setMinSize();
void draw_private(const JGeometry::TBox2f&, const JGeometry::TBox2f&);
void drawFrameTexture(float, float, float, float, u16, u16, u16, u16, J2DMaterial*, bool);
void drawFrameTexture(f32, f32, f32, f32, u16, u16, u16, u16, J2DMaterial*, bool);
void setTevStage(bool);
void setStage(J2DTevStage*, J2DWindowEx::stage_enum);
void getBlackWhite(JUtility::TColor*, JUtility::TColor*) const;

50
include/JSystem/J2D/J2DPrint.h
View File

@ -8,43 +8,43 @@
struct J2DPrint {
struct TSize;
J2DPrint(JUTFont*, float);
J2DPrint(JUTFont*, f32);
J2DPrint(JUTFont*, JUtility::TColor, JUtility::TColor);
J2DPrint(JUTFont*, float, float, JUtility::TColor, JUtility::TColor, JUtility::TColor, JUtility::TColor);
J2DPrint(JUTFont*, float, float); // unused/inlined
J2DPrint(JUTFont*, float, float, JUtility::TColor, JUtility::TColor); // unused/inlined
J2DPrint(JUTFont*, f32, f32, JUtility::TColor, JUtility::TColor, JUtility::TColor, JUtility::TColor);
J2DPrint(JUTFont*, f32, f32); // unused/inlined
J2DPrint(JUTFont*, f32, f32, JUtility::TColor, JUtility::TColor); // unused/inlined
virtual ~J2DPrint(); // _08
// virtual void _0C() = 0; // _0C - possibly
void initiate();
void private_initiate(JUTFont*, float, float, JUtility::TColor, JUtility::TColor, JUtility::TColor, JUtility::TColor, bool);
void private_initiate(JUTFont*, f32, f32, JUtility::TColor, JUtility::TColor, JUtility::TColor, JUtility::TColor, bool);
JUTFont* setFont(JUTFont* font);
void setBuffer(u32);
void setFontSize();
void locate(float, float);
double print(float, float, char const*, ...);
void print(float, float, u8, const char*, ...);
void locate(f32, f32);
f64 print(f32, f32, char const*, ...);
void print(f32, f32, u8, const char*, ...);
void getWidth(const char*, ...);
void printReturn(const char*, float, float, J2DTextBoxHBinding, J2DTextBoxVBinding, float, float, u8);
void printReturn(const char*, f32, f32, J2DTextBoxHBinding, J2DTextBoxVBinding, f32, f32, u8);
void parse(const u8*, int, int, u16*, J2DPrint::TSize&, u8, bool);
void doCtrlCode(int);
void doEscapeCode(const u8**, u8);
void initchar();
void getNumberS32(const u8**, long, long, int);
void getNumberF32(const u8**, float, float, int);
void getNumberF32(const u8**, f32, f32, int);
// unused/inlined:
void setBuffer(char*, u32);
void putChar(int);
void putChar(float, float, int);
void putChar(f32, f32, int);
void print(const char*, ...);
void print(u8, const char*, ...);
void getSize(TSize&, const char*, ...);
void getHeight(const char*, ...);
/** @fabricated */
inline void setFontSize(float p1, float p2)
inline void setFontSize(f32 p1, f32 p2)
{
m_glyphWidth = (p1 > 0.0f) ? p1 : 0.0f;
m_glyphHeight = (p2 > 0.0f) ? p2 : 0.0f;
@ -54,26 +54,26 @@ struct J2DPrint {
JUTFont* m_font; // _04
JUtility::TColor _08; // _08
JUtility::TColor _0C; // _0C
float _10; // _10
float _14; // _14
float _18; // _18
float _1C; // _1C
f32 _10; // _10
f32 _14; // _14
f32 _18; // _18
f32 _1C; // _1C
short _20; // _20
u8 _22; // _22 - could be padding
u8 _23; // _23 - could be padding
float _24; // _24
float _28; // _28
float _2C; // _2C
float _30; // _30
float _34; // _34
f32 _24; // _24
f32 _28; // _28
f32 _2C; // _2C
f32 _30; // _30
f32 _34; // _34
JUtility::TColor _38; // _38
JUtility::TColor _3C; // _3C
JUtility::TColor _40; // _40
JUtility::TColor _44; // _44
float _48; // _48
float _4C; // _4C
float m_glyphWidth; // _50
float m_glyphHeight; // _54
f32 _48; // _48
f32 _4C; // _4C
f32 m_glyphWidth; // _50
f32 m_glyphHeight; // _54
short _58; // _58
u8 _5A; // _5A
};

4
include/JSystem/J2D/J2DTexMtx.h
View File

@ -27,8 +27,8 @@ struct J2DTexMtx {
void load(u32);
void calc();
void getTextureMtx(const J2DTextureSRTInfo&, Vec, float (*)[4]);
void getTextureMtxMaya(const J2DTextureSRTInfo&, float (*)[4]);
void getTextureMtx(const J2DTextureSRTInfo&, Vec, f32 (*)[4]);
void getTextureMtxMaya(const J2DTextureSRTInfo&, f32 (*)[4]);
J2DTexMtxInfo m_info;
Mtx m_mtx;

12
include/JSystem/J3D/J3DAnmBase.h
View File

@ -8,7 +8,7 @@
struct J3DAnmKeyTableBase;
template <typename T>
float J3DGetKeyFrameInterpolation(float, J3DAnmKeyTableBase*, T*);
f32 J3DGetKeyFrameInterpolation(f32, J3DAnmKeyTableBase*, T*);
/**
* @fabricated
@ -50,10 +50,10 @@ struct J3DAnmBase {
virtual J3DAnmKind getKind() const = 0; // _0C
// _00 VTBL
u8 _04; // _04
u8 _05; // _05
s16 m_time; // _06
float m_fTime; // _08
u8 _04; // _04
u8 _05; // _05
s16 m_time; // _06
f32 m_fTime; // _08
};
/**
@ -76,7 +76,7 @@ struct J3DAnmKeyTableBase {
* @fabricated
* TODO: This is wrong. It's not generating the paired instructions that I was hoping it'd generate.
*/
inline void getColorField(float fTime, s16* result, s16* values)
inline void getColorField(f32 fTime, s16* result, s16* values)
{
switch (_00) {
case 0:

6
include/JSystem/J3D/J3DAnmCluster.h
View File

@ -16,7 +16,7 @@ struct J3DAnmCluster : public J3DAnmBase {
virtual ~J3DAnmCluster() { } // _08 (weak)
virtual J3DAnmKind getKind() const { return J3DAnmKind_Cluster; } // _0C (weak)
virtual float getWeight(unsigned short) const; // _10 (weak)
virtual f32 getWeight(unsigned short) const; // _10 (weak)
f32* _0C; // _0C
};
@ -39,7 +39,7 @@ struct J3DAnmClusterFull : public J3DAnmCluster {
virtual ~J3DAnmClusterFull() { } // _08 (weak)
virtual J3DAnmKind getKind() const { return J3DAnmKind_ClusterFull; } // _0C (weak)
virtual float getWeight(unsigned short) const; // _10
virtual f32 getWeight(unsigned short) const; // _10
J3DAnmClusterFullTable* _10; // _10
@ -62,7 +62,7 @@ struct J3DAnmClusterKey : public J3DAnmCluster {
virtual ~J3DAnmClusterKey() { } // _08 (weak)
virtual J3DAnmKind getKind() const { return J3DAnmKind_ClusterKey; } // _0C (weak)
virtual float getWeight(unsigned short) const; // _10
virtual f32 getWeight(unsigned short) const; // _10
J3DAnmClusterKeyTable* _10; // _10
};

2
include/JSystem/J3D/J3DAnmTextureSRTKey.h
View File

@ -45,7 +45,7 @@ struct J3DAnmTextureSRTKey : public J3DAnmBase {
return J3DAnmKind_TextureSRTKey;
}
void calcTransform(float, unsigned short, struct J3DTextureSRTInfo*) const;
void calcTransform(f32, unsigned short, struct J3DTextureSRTInfo*) const;
void searchUpdateMaterialID(struct J3DModelData*);
u32 _0C; // _0C

2
include/JSystem/J3D/J3DAnmTransform.h
View File

@ -99,7 +99,7 @@ struct J3DAnmTransformKey : public J3DAnmTransform {
}
virtual void getTransform(unsigned short p1, J3DTransformInfo* p2) const { calcTransform(m_fTime, p1, p2); } // _10 (weak)
void calcTransform(float, unsigned short, J3DTransformInfo*) const;
void calcTransform(f32, unsigned short, J3DTransformInfo*) const;
int _20; // _20
J3DAnmTransformKeyTable* _24; // _24

6
include/JSystem/J3D/J3DDrawBuffer.h
View File

@ -33,9 +33,9 @@ struct J3DDrawBuffer {
u32 _04; // _04
u32 _08; // _08
int _0C; // _0C
float _10; // _10
float _14; // _14
float _18; // _18
f32 _10; // _10
f32 _14; // _14
f32 _18; // _18
u32 _1C; // _1C
J3DPacket* _20; // _20
};

4
include/JSystem/J3D/J3DFrameCtrl.h
View File

@ -17,8 +17,8 @@ struct J3DFrameCtrl {
// TODO: Rename to m_endFrame
short _08; // _08
short _0A; // _0A
float _0C; // _0C
float _10; // _10
f32 _0C; // _0C
f32 _10; // _10
};
#endif

26
include/JSystem/J3D/J3DGD.h
View File

@ -22,14 +22,14 @@ typedef u32 _GXTexCacheSize;
void J3DGDSetGenMode(unsigned char, unsigned char, unsigned char, unsigned char, _GXCullMode);
void J3DGDSetGenMode_3Param(unsigned char, unsigned char, unsigned char);
void J3DGDSetLightAttn(_GXLightID, float, float, float, float, float, float);
void J3DGDSetLightAttn(_GXLightID, f32, f32, f32, f32, f32, f32);
void J3DGDSetLightColor(_GXLightID, _GXColor);
void J3DGDSetLightPos(_GXLightID, float, float, float);
void J3DGDSetLightDir(_GXLightID, float, float, float);
void J3DGDSetLightPos(_GXLightID, f32, f32, f32);
void J3DGDSetLightDir(_GXLightID, f32, f32, f32);
void J3DGDSetVtxAttrFmtv(_GXVtxFmt, const _GXVtxAttrFmtList*, bool);
void J3DGDSetTexCoordGen(_GXTexGenType, _GXTexGenSrc);
void J3DGDSetTexCoordScale2(_GXTexCoordID, unsigned short, unsigned char, unsigned char, unsigned short, unsigned char, unsigned char);
void J3DGDSetTexLookupMode(_GXTexMapID, _GXTexWrapMode, _GXTexWrapMode, _GXTexFilter, _GXTexFilter, float, float, float, unsigned char,
void J3DGDSetTexLookupMode(_GXTexMapID, _GXTexWrapMode, _GXTexWrapMode, _GXTexFilter, _GXTexFilter, f32, f32, f32, unsigned char,
unsigned char, _GXAnisotropy);
void J3DGDSetTexImgAttr(_GXTexMapID, unsigned short, unsigned short, _GXTexFmt);
void J3DGDSetTexImgPtr(_GXTexMapID, void*);
@ -41,19 +41,19 @@ void J3DGDSetIndTexOrder(unsigned long, _GXTexCoordID, _GXTexMapID, _GXTexCoordI
void J3DGDSetTevOrder(_GXTevStageID, _GXTexCoordID, _GXTexMapID, _GXChannelID, _GXTexCoordID, _GXTexMapID, _GXChannelID);
void J3DGDSetTevKColor(_GXTevKColorID, _GXColor);
void J3DGDSetTevColorS10(_GXTevRegID, _GXColorS10);
void J3DGDSetFog(_GXFogType, float, float, float, float, _GXColor);
void J3DGDSetFog(_GXFogType, f32, f32, f32, f32, _GXColor);
void J3DGDSetFogRangeAdj(unsigned char, unsigned short, _GXFogAdjTable*);
void J3DGDLoadTlut(void*, unsigned long, _GXTlutSize);
void J3DGDLoadTexMtxImm(float (*)[4], u32, _GXTexMtxType);
void J3DGDLoadPostTexMtxImm(float (*)[4], u32);
void J3DGDLoadTexMtxImm(f32 (*)[4], u32, _GXTexMtxType);
void J3DGDLoadPostTexMtxImm(f32 (*)[4], u32);
void J3DGDSetIndTexMtx(_GXIndTexMtxID, float (*)[3], char);
void J3DGDSetIndTexMtx(_GXIndTexMtxID, f32 (*)[3], char);
void J3DFifoLoadTexCached(_GXTexMapID, unsigned long, _GXTexCacheSize, unsigned long, _GXTexCacheSize);
void J3DFifoLoadPosMtxImm(float (*)[4], u32);
void J3DFifoLoadNrmMtxImm(float (*)[4], u32);
void J3DFifoLoadNrmMtxImm3x3(float (*)[3], u32);
void J3DFifoLoadNrmMtxToTexMtx(float (*)[4], u32);
void J3DFifoLoadNrmMtxToTexMtx3x3(float (*)[3], u32);
void J3DFifoLoadPosMtxImm(f32 (*)[4], u32);
void J3DFifoLoadNrmMtxImm(f32 (*)[4], u32);
void J3DFifoLoadNrmMtxImm3x3(f32 (*)[3], u32);
void J3DFifoLoadNrmMtxToTexMtx(f32 (*)[4], u32);
void J3DFifoLoadNrmMtxToTexMtx3x3(f32 (*)[3], u32);
#endif

4
include/JSystem/J3D/J3DJointTree.h
View File

@ -18,7 +18,7 @@ struct Vec;
struct J3DJointTree {
J3DJointTree();
virtual void calc(J3DMtxBuffer*, const Vec&, const float (&)[3][4]); // _08
virtual void calc(J3DMtxBuffer*, const Vec&, const f32 (&)[3][4]); // _08
/**
* @reifiedAddress{80083874}
* @reifiedFile{JSystem/J3D/J3DModelData.cpp}
@ -44,7 +44,7 @@ struct J3DJointTree {
u16 m_envelopeCnt; // _1E
u8* _20; // _20
u16* m_maxBillBoardCnt; // _24
float* _28; // _28
f32* _28; // _28
Mtx* _2C; // _2C
u16* _30; // _30
J3DDrawMtxData m_mtxData; // _34

38
include/JSystem/J3D/J3DMaterial.h
View File

@ -39,16 +39,16 @@ struct J3DMaterial {
~J3DMaterial();
virtual void calc(const float (*)[4]); // _08
virtual void calcDiffTexMtx(const float (*)[4]); // _0C
virtual void makeDisplayList(); // _10
virtual void makeSharedDisplayList(); // _14
virtual void load(); // _18
virtual void loadSharedDL(); // _1C
virtual void patch(); // _20
virtual void diff(u32); // _24
virtual void reset(); // _28
virtual void change(); // _2C
virtual void calc(const f32 (*)[4]); // _08
virtual void calcDiffTexMtx(const f32 (*)[4]); // _0C
virtual void makeDisplayList(); // _10
virtual void makeSharedDisplayList(); // _14
virtual void load(); // _18
virtual void loadSharedDL(); // _1C
virtual void patch(); // _20
virtual void diff(u32); // _24
virtual void reset(); // _28
virtual void change(); // _2C
void calcCurrentMtx();
static u32 calcSizeColorBlock(u32);
@ -100,15 +100,15 @@ struct J3DLockedMaterial : public J3DMaterial {
initialize();
}
virtual void calc(const float (*)[4]); // _08
virtual void makeDisplayList(); // _10
virtual void makeSharedDisplayList(); // _14
virtual void load(); // _18
virtual void loadSharedDL(); // _1C
virtual void patch(); // _20
virtual void diff(u32); // _24
virtual void reset(); // _28
virtual void change(); // _2C
virtual void calc(const f32 (*)[4]); // _08
virtual void makeDisplayList(); // _10
virtual void makeSharedDisplayList(); // _14
virtual void load(); // _18
virtual void loadSharedDL(); // _1C
virtual void patch(); // _20
virtual void diff(u32); // _24
virtual void reset(); // _28
virtual void change(); // _2C
void initialize();
};

22
include/JSystem/J3D/J3DMaterialFactory.h
View File

@ -35,10 +35,10 @@ struct J3DFogInfo {
u8 _00; // _00
u8 _01; // _01
u16 _02; // _02
float _04; // _04
float _08; // _08
float _0C; // _0C
float _10; // _10
f32 _04; // _04
f32 _08; // _08
f32 _0C; // _0C
f32 _10; // _10
u8 _14; // _14
u8 _15; // _15
u8 _16; // _16
@ -89,14 +89,14 @@ struct J3DTexMtxInfo {
u8 _01; // _01
u8 _02; // _02
u8 _03; // _03
float _04; // _04
float _08; // _08
float _0C; // _0C
float _10; // _10
float _14; // _14
f32 _04; // _04
f32 _08; // _08
f32 _0C; // _0C
f32 _10; // _10
f32 _14; // _14
u16 _18; // _18
float _1C; // _1C
float _20; // _20
f32 _1C; // _1C
f32 _20; // _20
Mtx44 _24; // _24
};

2
include/JSystem/J3D/J3DModel.h
View File

@ -37,7 +37,7 @@ struct J3DModelData {
void newSharedDisplayList(u32);
void indexToPtr();
void makeSharedDL();
void simpleCalcMaterial(u16, float (*)[4]);
void simpleCalcMaterial(u16, f32 (*)[4]);
void syncJ3DSysFlags() const;
inline u16 getShapeCount() { return m_shapeTable.m_count; }

36
include/JSystem/J3D/J3DMtxCalc.h
View File

@ -17,10 +17,10 @@ struct J3DMtxCalc {
virtual J3DAnmTransform* getAnmTransform(); // _10
virtual void setAnmTransform(unsigned char, J3DAnmTransform*); // _14
virtual J3DAnmTransform* getAnmTransform(unsigned char); // _18
virtual void setWeight(unsigned char, float); // _1C
virtual void setWeight(unsigned char, f32); // _1C
virtual void getWeight(unsigned char) const; // _20
virtual void init(const Vec&, const float (&)[3][4]) = 0; // _24
virtual void calc() = 0; // _28
virtual void init(const Vec&, const f32 (&)[3][4]) = 0; // _24
virtual void calc() = 0; // _28
/**
* @reifiedAddress{80088650}
@ -44,9 +44,9 @@ struct J3DMtxCalcNoAnmBase : public J3DMtxCalc {
template <typename Calc, typename Init>
struct J3DMtxCalcNoAnm : public J3DMtxCalcNoAnmBase {
virtual ~J3DMtxCalcNoAnm() { } // _08
virtual void init(const Vec& p1, const float (&p2)[3][4]) { Init::init(p1, p2); } // _24
virtual void calc() { Calc::calcTransform(mJoint->m_transformInfo); } // _28
virtual ~J3DMtxCalcNoAnm() { } // _08
virtual void init(const Vec& p1, const f32 (&p2)[3][4]) { Init::init(p1, p2); } // _24
virtual void calc() { Calc::calcTransform(mJoint->m_transformInfo); } // _28
};
struct J3DMtxCalcAnmBase : public J3DMtxCalc {
@ -71,10 +71,10 @@ struct J3DMtxCalcAnimation : public J3DMtxCalcAnmBase {
{
}
virtual ~J3DMtxCalcAnimation() {}; // _08
virtual void setAnmTransform(J3DAnmTransform* p1) { _04 = p1; } // _0C
virtual void init(const Vec& p1, const float (&p2)[3][4]) { Init::init(p1, p2); } // _24
virtual void calc() // _28
virtual ~J3DMtxCalcAnimation() {}; // _08
virtual void setAnmTransform(J3DAnmTransform* p1) { _04 = p1; } // _0C
virtual void init(const Vec& p1, const f32 (&p2)[3][4]) { Init::init(p1, p2); } // _24
virtual void calc() // _28
{
Adaptor::calc(this);
// J3DTransformInfo* pInfo;
@ -97,16 +97,16 @@ struct J3DMtxCalcBlendAnmBase : public J3DMtxCalcAnmBase {
virtual J3DAnmTransform* getAnmTransform(); // _10 (weak)
virtual void setAnmTransform(unsigned char, J3DAnmTransform*); // _14 (weak)
virtual J3DAnmTransform* getAnmTransform(unsigned char); // _18 (weak)
virtual void setWeight(unsigned char, float); // _1C (weak)
virtual void setWeight(unsigned char, f32); // _1C (weak)
virtual void getWeight(unsigned char) const; // _20 (weak)
J3DAnmTransform* _08; // _08
J3DAnmTransform* _0C; // _0C
J3DAnmTransform* _10; // _10
float _14; // _14
float _18; // _18
float _1C; // _1C
float _20; // _20
f32 _14; // _14
f32 _18; // _18
f32 _1C; // _1C
f32 _20; // _20
};
template <typename Calc>
@ -136,10 +136,10 @@ struct J3DMtxCalcCalcTransformMaya {
static void calcTransform(const J3DTransformInfo&);
};
struct J3DMtxCalcJ3DSysInitBasic {
static void init(const Vec& p1, const float (&p2)[3][4]);
static void init(const Vec& p1, const f32 (&p2)[3][4]);
};
struct J3DMtxCalcJ3DSysInitSoftimage {
static void init(const Vec& p1, const float (&p2)[3][4])
static void init(const Vec& p1, const f32 (&p2)[3][4])
{
J3DSys::mCurrentS.x = p1.x;
J3DSys::mCurrentS.y = p1.y;
@ -147,7 +147,7 @@ struct J3DMtxCalcJ3DSysInitSoftimage {
}
};
struct J3DMtxCalcJ3DSysInitMaya {
static void init(const Vec& p1, const float (&p2)[3][4]);
static void init(const Vec& p1, const f32 (&p2)[3][4]);
};
#endif

38
include/JSystem/J3D/J3DShape.h
View File

@ -26,7 +26,7 @@ struct J3DShapeInitData {
u16 m_vtxDescListIndex; // _04
u16 m_shapeMtxInitDataIndex; // _06
u16 m_shapeDrawInitDataIndex; // _08
float _0C; // _0C
f32 _0C; // _0C
JGeometry::TVec3f _10; // _10
JGeometry::TVec3f _1C; // _1C
};
@ -77,12 +77,12 @@ struct J3DShape {
struct J3DShapeMtx {
typedef void (J3DShapeMtx::*LoadMtxIndxFunction)(int, u16) const;
virtual ~J3DShapeMtx() { } // _08 (weak)
virtual int getType() const { return 'SMTX'; } // _0C (weak)
virtual int getUseMtxNum() const { return 1; } // _10 (weak)
virtual u16 getUseMtxIndex(u16) const { return m_useMtxIndex; } // _14 (weak)
virtual void load() const; // _18
virtual void calcNBTScale(const Vec&, float (*)[3][3], float (*)[3][3]); // _1C
virtual ~J3DShapeMtx() { } // _08 (weak)
virtual int getType() const { return 'SMTX'; } // _0C (weak)
virtual int getUseMtxNum() const { return 1; } // _10 (weak)
virtual u16 getUseMtxIndex(u16) const { return m_useMtxIndex; } // _14 (weak)
virtual void load() const; // _18
virtual void calcNBTScale(const Vec&, f32 (*)[3][3], f32 (*)[3][3]); // _1C
void loadMtxIndx_PNGP(int, u16) const;
void loadMtxIndx_PCPU(int, u16) const;
@ -148,12 +148,12 @@ struct J3DShapeTable {
};
struct J3DShapeMtxMulti : public J3DShapeMtx {
virtual ~J3DShapeMtxMulti() { } // _08 (weak)
virtual int getType() const { return 'SMML'; } // _0C (weak)
virtual int getUseMtxNum() const { return m_useMtxNum; } // _10 (weak)
virtual u16 getUseMtxIndex(unsigned short p1) const { return _0C[p1]; } // _14 (weak)
virtual void load() const; // _18
virtual void calcNBTScale(const Vec&, float (*)[3][3], float (*)[3][3]); // _1C
virtual ~J3DShapeMtxMulti() { } // _08 (weak)
virtual int getType() const { return 'SMML'; } // _0C (weak)
virtual int getUseMtxNum() const { return m_useMtxNum; } // _10 (weak)
virtual u16 getUseMtxIndex(unsigned short p1) const { return _0C[p1]; } // _14 (weak)
virtual void load() const; // _18
virtual void calcNBTScale(const Vec&, f32 (*)[3][3], f32 (*)[3][3]); // _1C
u16 m_useMtxNum; // _08
u16* _0C; // _0C
@ -162,11 +162,11 @@ struct J3DShapeMtxMulti : public J3DShapeMtx {
struct J3DShapeMtxConcatView : public J3DShapeMtx {
typedef void (J3DShapeMtxConcatView::*LoadMtxConcatViewFunction)(int, u16) const;
virtual ~J3DShapeMtxConcatView() { } // _08 (weak)
virtual int getType() const { return 'SMCV'; } // _0C (weak)
virtual void load() const; // _18
virtual void loadNrmMtx(int, unsigned short) const; // _20 (weak)
virtual void loadNrmMtx(int, unsigned short, float (*)[4]) const; // _24
virtual ~J3DShapeMtxConcatView() { } // _08 (weak)
virtual int getType() const { return 'SMCV'; } // _0C (weak)
virtual void load() const; // _18
virtual void loadNrmMtx(int, unsigned short) const; // _20 (weak)
virtual void loadNrmMtx(int, unsigned short, f32 (*)[4]) const; // _24
void loadMtxConcatView_PNGP(int, unsigned short) const;
void loadMtxConcatView_PCPU(int, unsigned short) const;
@ -186,7 +186,7 @@ struct J3DShapeMtxMultiConcatView : public J3DShapeMtxConcatView {
virtual u16 getUseMtxIndex(unsigned short index) const { return _0C[index]; } // _14 (weak)
virtual void load() const; // _18
virtual void loadNrmMtx(int, unsigned short) const; // _20 (weak)
virtual void loadNrmMtx(int, unsigned short, float (*)[4]) const; // _24
virtual void loadNrmMtx(int, unsigned short, f32 (*)[4]) const; // _24
u16 m_useMtxNum; // _08
u16* _0C; // _0C

90
include/JSystem/J3D/J3DTexGenBlock.h
View File

@ -8,20 +8,20 @@ struct J3DNBTScale;
struct J3DTexMtx;
struct J3DTexGenBlock {
virtual void reset(J3DTexGenBlock*); // _08 (weak)
virtual void calc(const float (*)[4]) = 0; // _0C
virtual void calcWithoutViewMtx(const float (*)[4]) = 0; // _10
virtual void calcPostTexMtx(const float (*)[4]) = 0; // _14
virtual void calcPostTexMtxWithoutViewMtx(const float (*)[4]) = 0; // _18
virtual void load() = 0; // _1C
virtual void patch() = 0; // _20
virtual void diff(u32) = 0; // _24
virtual void diffTexMtx() = 0; // _28
virtual void diffTexGen() = 0; // _2C
virtual u32 countDLSize(); // _30 (weak)
virtual JBlockType getType() = 0; // _34
virtual void setTexGenNum(const u32*); // _38 (weak)
virtual void setTexGenNum(u32); // _3C (weak)
virtual void reset(J3DTexGenBlock*); // _08 (weak)
virtual void calc(const f32 (*)[4]) = 0; // _0C
virtual void calcWithoutViewMtx(const f32 (*)[4]) = 0; // _10
virtual void calcPostTexMtx(const f32 (*)[4]) = 0; // _14
virtual void calcPostTexMtxWithoutViewMtx(const f32 (*)[4]) = 0; // _18
virtual void load() = 0; // _1C
virtual void patch() = 0; // _20
virtual void diff(u32) = 0; // _24
virtual void diffTexMtx() = 0; // _28
virtual void diffTexGen() = 0; // _2C
virtual u32 countDLSize(); // _30 (weak)
virtual JBlockType getType() = 0; // _34
virtual void setTexGenNum(const u32*); // _38 (weak)
virtual void setTexGenNum(u32); // _3C (weak)
/**
* @reifiedAddress{800602D0}
* @reifiedFile{JSystem/J3D/J3DPacket.cpp}
@ -52,16 +52,16 @@ struct J3DTexGenBlock {
* @size{0x4}
*/
struct J3DTexGenBlockNull : public J3DTexGenBlock {
virtual void calc(const float (*)[4]); // _0C (weak)
virtual void calcWithoutViewMtx(const float (*)[4]); // _10 (weak)
virtual void calcPostTexMtx(const float (*)[4]); // _14 (weak)
virtual void calcPostTexMtxWithoutViewMtx(const float (*)[4]); // _18 (weak)
virtual void load(); // _1C (weak)
virtual void patch(); // _20 (weak)
virtual void diff(u32); // _24 (weak)
virtual void diffTexMtx(); // _28 (weak)
virtual void diffTexGen(); // _2C (weak)
virtual JBlockType getType(); // _34 (weak)
virtual void calc(const f32 (*)[4]); // _0C (weak)
virtual void calcWithoutViewMtx(const f32 (*)[4]); // _10 (weak)
virtual void calcPostTexMtx(const f32 (*)[4]); // _14 (weak)
virtual void calcPostTexMtxWithoutViewMtx(const f32 (*)[4]); // _18 (weak)
virtual void load(); // _1C (weak)
virtual void patch(); // _20 (weak)
virtual void diff(u32); // _24 (weak)
virtual void diffTexMtx(); // _28 (weak)
virtual void diffTexGen(); // _2C (weak)
virtual JBlockType getType(); // _34 (weak)
/**
* @reifiedAddress{8006F5FC}
* @reifiedFile{JSystem/J3D/J3DMaterialFactory.cpp}
@ -77,27 +77,27 @@ struct J3DTexGenBlockPatched : public J3DTexGenBlock {
initialize();
}
virtual void reset(J3DTexGenBlock*); // _08
virtual void calc(const float (*)[4]); // _0C
virtual void calcWithoutViewMtx(const float (*)[4]); // _10
virtual void calcPostTexMtx(const float (*)[4]); // _14
virtual void calcPostTexMtxWithoutViewMtx(const float (*)[4]); // _18
virtual void load(); // _1C (weak)
virtual void patch(); // _20
virtual void diff(u32); // _24
virtual void diffTexMtx(); // _28
virtual void diffTexGen(); // _2C
virtual u32 countDLSize(); // _30
virtual JBlockType getType(); // _34 (weak)
virtual void setTexGenNum(const u32*); // _38 (weak)
virtual void setTexGenNum(u32); // _3C (weak)
virtual u32 getTexGenNum() const; // _40 (weak)
virtual void setTexCoord(u32, const J3DTexCoord*); // _44 (weak)
virtual J3DTexCoord* getTexCoord(u32); // _48 (weak)
virtual void setTexMtx(u32, J3DTexMtx*); // _4C (weak)
virtual J3DTexMtx* getTexMtx(u32); // _50 (weak)
virtual u32 getTexMtxOffset() const; // _60 (weak)
virtual void setTexMtxOffset(u32); // _64 (weak)
virtual void reset(J3DTexGenBlock*); // _08
virtual void calc(const f32 (*)[4]); // _0C
virtual void calcWithoutViewMtx(const f32 (*)[4]); // _10
virtual void calcPostTexMtx(const f32 (*)[4]); // _14
virtual void calcPostTexMtxWithoutViewMtx(const f32 (*)[4]); // _18
virtual void load(); // _1C (weak)
virtual void patch(); // _20
virtual void diff(u32); // _24
virtual void diffTexMtx(); // _28
virtual void diffTexGen(); // _2C
virtual u32 countDLSize(); // _30
virtual JBlockType getType(); // _34 (weak)
virtual void setTexGenNum(const u32*); // _38 (weak)
virtual void setTexGenNum(u32); // _3C (weak)
virtual u32 getTexGenNum() const; // _40 (weak)
virtual void setTexCoord(u32, const J3DTexCoord*); // _44 (weak)
virtual J3DTexCoord* getTexCoord(u32); // _48 (weak)
virtual void setTexMtx(u32, J3DTexMtx*); // _4C (weak)
virtual J3DTexMtx* getTexMtx(u32); // _50 (weak)
virtual u32 getTexMtxOffset() const; // _60 (weak)
virtual void setTexMtxOffset(u32); // _64 (weak)
/**
* @reifiedAddress{800619A0}
* @reifiedFile{JSystem/J3D/J3DMaterial.cpp}

8
include/JSystem/J3D/J3DTexMtx.h
View File

@ -9,9 +9,9 @@
#include "types.h"
struct J3DTexMtx {
void calc(const float (*)[4]);
void calcTexMtx(const float (*)[4]);
void calcPostTexMtx(const float (*)[4]);
void calc(const f32 (*)[4]);
void calcTexMtx(const f32 (*)[4]);
void calcPostTexMtx(const f32 (*)[4]);
void load(unsigned long) const;
void loadTexMtx(unsigned long) const;
@ -28,7 +28,7 @@ struct J3DTexMtx {
};
namespace J3DDifferedTexMtx {
void loadExecute(const float (*)[4]);
void loadExecute(const f32 (*)[4]);
extern J3DTexGenBlock* sTexGenBlock;
extern J3DShapePacket_0x24* sTexMtxObj;
} // namespace J3DDifferedTexMtx

26
include/JSystem/J3D/J3DTransform.h
View File

@ -6,19 +6,19 @@
extern Mtx j3dDefaultMtx;
void J3DCalcBBoardMtx(float (*)[4]);
void J3DCalcYBBoardMtx(float (*)[4]);
void J3DPSCalcInverseTranspose(float (*)[4], float (*)[3]);
void J3DGetTranslateRotateMtx(const J3DTransformInfo&, float (*)[4]);
void J3DGetTranslateRotateMtx(short, short, short, float, float, float, float (*)[4]);
void J3DGetTextureMtx(const J3DTextureSRTInfo&, const Vec&, float (*)[4]);
void J3DGetTextureMtxOld(const J3DTextureSRTInfo&, const Vec&, float (*)[4]);
void J3DGetTextureMtxMaya(const J3DTextureSRTInfo&, float (*)[4]);
void J3DGetTextureMtxMayaOld(const J3DTextureSRTInfo&, float (*)[4]);
void J3DScaleNrmMtx(float (*)[4], const Vec&);
void J3DScaleNrmMtx33(float (*)[3], const Vec&);
void J3DMtxProjConcat(float (*)[4], float (*)[4], float (*)[4]);
void J3DPSMtxArrayConcat(float (*)[4], float (*)[4], float (*)[4], unsigned long);
void J3DCalcBBoardMtx(f32 (*)[4]);
void J3DCalcYBBoardMtx(f32 (*)[4]);
void J3DPSCalcInverseTranspose(f32 (*)[4], f32 (*)[3]);
void J3DGetTranslateRotateMtx(const J3DTransformInfo&, f32 (*)[4]);
void J3DGetTranslateRotateMtx(short, short, short, f32, f32, f32, f32 (*)[4]);
void J3DGetTextureMtx(const J3DTextureSRTInfo&, const Vec&, f32 (*)[4]);
void J3DGetTextureMtxOld(const J3DTextureSRTInfo&, const Vec&, f32 (*)[4]);
void J3DGetTextureMtxMaya(const J3DTextureSRTInfo&, f32 (*)[4]);
void J3DGetTextureMtxMayaOld(const J3DTextureSRTInfo&, f32 (*)[4]);
void J3DScaleNrmMtx(f32 (*)[4], const Vec&);
void J3DScaleNrmMtx33(f32 (*)[3], const Vec&);
void J3DMtxProjConcat(f32 (*)[4], f32 (*)[4], f32 (*)[4]);
void J3DPSMtxArrayConcat(f32 (*)[4], f32 (*)[4], f32 (*)[4], unsigned long);
// clang-format off
/**

4
include/JSystem/J3D/J3DTypes.h
View File

@ -372,8 +372,8 @@ struct J3DNBTScaleInfo {
u8 _00; // _00
JGeometry::TVec3f _04; // _04
// float _08; // _08
// float _0C; // _0C
// f32 _08; // _08
// f32 _0C; // _0C
};
extern const J3DNBTScaleInfo j3dDefaultNBTScaleInfo;

10
include/JSystem/J3D/J3DUShadow.h
View File

@ -20,8 +20,8 @@ struct J3DUShadowInfo {
void setViewportAndScissor(bool) const;
void gxConfig(const _GXColor&, _GXTevColorArg, _GXTevAlphaArg) const;
void renderShape() const;
void getTexMtx(float (*)[4]) const;
void getTexMtxForGX(float (*)[4]) const;
void getTexMtx(f32 (*)[4]) const;
void getTexMtxForGX(f32 (*)[4]) const;
};
struct J3DUShadowTextureSizeRatioCalcBase {
@ -77,9 +77,9 @@ struct ViewportBackup {
~ViewportBackup();
};
void calcSphereIncludingTwoSpheres(Vec*, float, Vec*, float, Vec*, float*);
void calcSphereIncludingTwoSpheres(Vec*, float, Vec*, float*);
void calcSphereIncludingTwoSpheres(Vec*, f32, Vec*, f32, Vec*, f32*);
void calcSphereIncludingTwoSpheres(Vec*, f32, Vec*, f32*);
void calcSphereIncludingModel(const J3DModel*, Vec*);
void J3DUIsShadowInViewFrustum(const J3DUShadowInfo&, float (*)[4], const J3DUClipper&, const JGeometry::TPartition3<float>&);
void J3DUIsShadowInViewFrustum(const J3DUShadowInfo&, f32 (*)[4], const J3DUClipper&, const JGeometry::TPartition3<f32>&);
#endif

38
include/JSystem/JAI/JAIAnimeSound.h
View File

@ -30,26 +30,26 @@ struct JAIAnimeSound : public JAInter::Object {
JAIAnimeSound(Vec*, JKRHeap*, unsigned char);
// virtual ~JAIAnimeSound() { } // _08 (weak)
virtual void handleStop(u8, u32); // _34
virtual void playActorAnimSound(JAInter::Actor*, float, u8); // _3C
virtual void startAnimSound(u32, JAISound**, JAInter::Actor*, u8); // _40
virtual void setSpeedModifySound(JAISound*, JAIAnimeFrameSoundData*, float); // _44
virtual void handleStop(u8, u32); // _34
virtual void playActorAnimSound(JAInter::Actor*, f32, u8); // _3C
virtual void startAnimSound(u32, JAISound**, JAInter::Actor*, u8); // _40
virtual void setSpeedModifySound(JAISound*, JAIAnimeFrameSoundData*, f32); // _44
void initActorAnimSound(JAIAnimeSoundData*, unsigned long, float, float);
int checkLoopStartCount(float);
void checkLoopEndCount(float);
void setAnimSoundActor(JAInter::Actor*, float, float, unsigned char);
void initActorAnimSound(JAIAnimeSoundData*, unsigned long, f32, f32);
int checkLoopStartCount(f32);
void checkLoopEndCount(f32);
void setAnimSoundActor(JAInter::Actor*, f32, f32, unsigned char);
// Unused/inlined:
void initActorAnimSound(JAIAnimeSoundData*, JAInter::Actor, unsigned long, float, float);
void setLoopStartFrame(float);
void setLoopEndFrame(float);
void setLoopFrame(float, float);
void setAnimSound(float, float, unsigned char);
void setAnimSound(JAIBasic*, float, float, unsigned char);
void setAnimObjectSound(float, float, unsigned char);
void setAnimSoundVec(Vec*, float, float, unsigned long, unsigned char);
void setAnimSoundVec(JAIBasic*, Vec*, float, float, unsigned long, unsigned char);
void initActorAnimSound(JAIAnimeSoundData*, JAInter::Actor, unsigned long, f32, f32);
void setLoopStartFrame(f32);
void setLoopEndFrame(f32);
void setLoopFrame(f32, f32);
void setAnimSound(f32, f32, unsigned char);
void setAnimSound(JAIBasic*, f32, f32, unsigned char);
void setAnimObjectSound(f32, f32, unsigned char);
void setAnimSoundVec(Vec*, f32, f32, unsigned long, unsigned char);
void setAnimSoundVec(JAIBasic*, Vec*, f32, f32, unsigned long, unsigned char);
// _00 VTBL
u8* _40; // _40
@ -63,8 +63,8 @@ struct JAIAnimeSound : public JAInter::Object {
u8 _60[8]; // _60
u32 _68; // _68
int _6C; // _6C
float _70; // _70
float _74; // _74
f32 _70; // _70
f32 _74; // _74
JAIAnimeSoundData* m_soundData; // _78
};

12
include/JSystem/JAI/JAIBasic.h
View File

@ -21,7 +21,7 @@ struct JAIBasic {
virtual JAIStream* makeStream(); // _10
virtual BOOL getMapInfoFxline(u32); // _14
virtual BOOL getMapInfoGround(u32); // _18
virtual float getMapInfoFxParameter(u32); // _1C
virtual f32 getMapInfoFxParameter(u32); // _1C
virtual void setSeExtParameter(JAISound*); // _20
virtual void setRegisterTrackCallback(); // _24
@ -34,7 +34,7 @@ struct JAIBasic {
void initHeap();
JKRArchive* initArchive();
void initResourcePath();
void setCameraInfo(Vec*, Vec*, float (*)[4], u32);
void setCameraInfo(Vec*, Vec*, f32 (*)[4], u32);
void initAudioThread(JKRSolidHeap*, u32, u8);
void initCamera();
void setInitFileLoadSwitch(u8);
@ -123,10 +123,10 @@ struct JAIBasic {
static JKRHeap* msCurrentHeap;
static bool msStopMode;
static u32 msAudioStopTime;
static float msDspLevel;
static float msAutoLevel;
static float msAutoDif;
static float msDspDif;
static f32 msDspLevel;
static f32 msAutoLevel;
static f32 msAutoDif;
static f32 msDspDif;
static u8 msStopStatus;
};

68
include/JSystem/JAI/JAIGlobalParameter.h
View File

@ -11,9 +11,9 @@ void setParamSeqPlayTrackMax(u32);
void setParamSeqControlBufferMax(u32);
void setParamAutoHeapMax(u32);
void setParamStayHeapMax(u32);
void setParamDistanceMax(float);
void setParamMaxVolumeDistance(float);
void setParamMinDistanceVolume(float);
void setParamDistanceMax(f32);
void setParamMaxVolumeDistance(f32);
void setParamMinDistanceVolume(f32);
void setParamStreamInsideBufferCut(bool);
void setParamAutoHeapRoomSize(u32);
void setParamStayHeapSize(u32);
@ -33,13 +33,13 @@ u32 getParamSeqControlBufferMax();
u32 getParamAutoHeapMax();
u32 getParamStayHeapMax();
u32 getParamSeqPlayTrackMax();
float getParamDistanceMax();
float getParamMaxVolumeDistance();
float getParamMinDistanceVolume();
f32 getParamDistanceMax();
f32 getParamMaxVolumeDistance();
f32 getParamMinDistanceVolume();
u32 getParamStreamDecodedBufferBlocks();
u32 getParamAutoHeapRoomSize();
u32 getParamStayHeapSize();
float getParamSeDolbyCenterValue();
f32 getParamSeDolbyCenterValue();
char* getParamInitDataFileName();
char* getParamWavePath();
char* getParamSequenceArchivesPath();
@ -64,8 +64,8 @@ void setParamAudioResPath(char*);
u8 getParamAudioSystemThreadPriority();
void setParamAudioSystemThreadPriority(u8);
void setParamDopplarMoveTime(u32);
float getParamDopplarParameter();
void setParamDopplarParameter(float);
f32 getParamDopplarParameter();
void setParamDopplarParameter(f32);
void setParamDummyObjectLifeTime(u32);
void setParamDummyObjectMax(u32);
bool getParamInitDataLoadOffFlag();
@ -73,23 +73,23 @@ void setParamInitDataLoadOffFlag(bool);
void* getParamInitDataPointer();
u8 getParamInitFileLoadSwitch();
void setParamInitFileLoadSwitch(u8);
float getParamInputGainDown();
void setParamInputGainDown(float);
f32 getParamInputGainDown();
void setParamInputGainDown(f32);
u32 getParamInterfaceHeapSize();
void setParamInterfaceHeapSize(u32);
float getParamOutputGainUp();
void setParamOutputGainUp(float);
void setParamPanAngleParameter(float);
void setParamPanDistanceMax(float);
f32 getParamOutputGainUp();
void setParamOutputGainUp(f32);
void setParamPanAngleParameter(f32);
void setParamPanDistanceMax(f32);
u16 getParamSeDistanceFxParameter();
void setParamSeDistanceFxParameter(u16);
void setParamSeDistancepitchMax(float);
void setParamSeDistancepitchMax(f32);
void setParamSeDistanceWaitMax(u16);
float getParamSeDolbyBehindDistanceMax();
void setParamSeDolbyBehindDistanceMax(float);
f32 getParamSeDolbyBehindDistanceMax();
void setParamSeDolbyBehindDistanceMax(f32);
void setParamSeDolbyCenterValue(u8);
float getParamSeDolbyFrontDistanceMax();
void setParamSeDolbyFrontDistanceMax(float);
f32 getParamSeDolbyFrontDistanceMax();
void setParamSeDolbyFrontDistanceMax(f32);
bool getParamSeqEntryCancelFlag();
void setParamSeqEntryCancelFlag(bool);
void setParamSeqMuteMoveSpeedSePlay(u32);
@ -142,13 +142,13 @@ extern char* sequenceArchivesPath;
extern char* streamPath;
extern char* audioResPath;
extern char* sequenceArchivesFileName;
extern float inputGainDown;
extern float outputGainUp;
extern float distanceMax;
extern float maxVolumeDistance;
extern float seDolbyCenterValue;
extern float seDolbyFrontDistanceMax;
extern float seDolbyBehindDistanceMax;
extern f32 inputGainDown;
extern f32 outputGainUp;
extern f32 distanceMax;
extern f32 maxVolumeDistance;
extern f32 seDolbyCenterValue;
extern f32 seDolbyFrontDistanceMax;
extern f32 seDolbyBehindDistanceMax;
extern u32 dopplarMoveTime;
extern u32 dummyObjectLifeTime;
extern u32 dummyObjectMax;
@ -156,17 +156,17 @@ extern u32 seqMuteMoveSpeedSePlay;
extern u32 audioCameraMax;
extern long systemTrackMax;
extern long systemRootTrackMax;
extern float panDistanceMax;
extern float panDistance2Max;
extern float panAngleParameter;
extern float panAngleParameter2;
extern float dopplarParameter;
extern f32 panDistanceMax;
extern f32 panDistance2Max;
extern f32 panAngleParameter;
extern f32 panAngleParameter2;
extern f32 dopplarParameter;
extern u16 seDistanceWaitMax;
extern float seDistancepitchMax;
extern f32 seDistancepitchMax;
extern u16 seDefaultFx;
extern u32 interfaceHeapSize;
extern float minDistanceVolume;
extern f32 minDistanceVolume;
} // namespace JAIGlobalParameter
#endif

32
include/JSystem/JAI/JAISe.h
View File

@ -11,16 +11,16 @@ struct JAISe : public JAISound {
virtual void setPortData(u8, u16); // _08 (weak)
virtual u16 getPortData(u8); // _0C (weak)
virtual void stop(u32); // _14 (weak)
virtual void setVolume(float, u32, u8); // _1C (weak)
virtual float getVolume(u8); // _20 (weak)
virtual void setPan(float, u32, u8); // _24 (weak)
virtual float getPan(u8); // _28 (weak)
virtual void setPitch(float, u32, u8); // _2C (weak)
virtual float getPitch(u8); // _30 (weak)
virtual void setFxmix(float, u32, u8); // _34 (weak)
virtual float getFxmix(u8); // _38 (weak)
virtual void setDolby(float, u32, u8); // _3C (weak)
virtual float getDolby(u8); // _40 (weak)
virtual void setVolume(f32, u32, u8); // _1C (weak)
virtual f32 getVolume(u8); // _20 (weak)
virtual void setPan(f32, u32, u8); // _24 (weak)
virtual f32 getPan(u8); // _28 (weak)
virtual void setPitch(f32, u32, u8); // _2C (weak)
virtual f32 getPitch(u8); // _30 (weak)
virtual void setFxmix(f32, u32, u8); // _34 (weak)
virtual f32 getFxmix(u8); // _38 (weak)
virtual void setDolby(f32, u32, u8); // _3C (weak)
virtual f32 getDolby(u8); // _40 (weak)
virtual void setVolumeU7(u8, u32, u8); // _4C (weak)
virtual u8 getVolumeU7(u8); // _50 (weak)
virtual void setPanU7(u8, u32, u8); // _54 (weak)
@ -40,14 +40,14 @@ struct JAISe : public JAISound {
virtual void setSePositionDopplar(); // _F0
u32 getSeCategoryNumber();
void setSeInterVolume(u8, float, u32, u8);
void setSeInterPan(u8, float, u32, u8);
void setSeInterDolby(u8, float, u32, u8);
void setSeInterVolume(u8, f32, u32, u8);
void setSeInterPan(u8, f32, u32, u8);
void setSeInterDolby(u8, f32, u32, u8);
// unused/inlined:
void setSeInterRandomPara(float*, unsigned long, float, float);
void setSeInterPitch(unsigned char, float, unsigned long, float);
void setSeInterFxmix(unsigned char, float, unsigned long, unsigned char);
void setSeInterRandomPara(f32*, unsigned long, f32, f32);
void setSeInterPitch(unsigned char, f32, unsigned long, f32);
void setSeInterFxmix(unsigned char, f32, unsigned long, unsigned char);
void setSeInterFir(unsigned char, unsigned char, unsigned long, unsigned char);
void setSePortData(unsigned char, unsigned short);
void getSePortData(unsigned char);

86
include/JSystem/JAI/JAISequence.h
View File

@ -10,60 +10,60 @@
struct JAISequence : public JAISound {
JAISequence();
virtual void setPortData(u8, u16); // _08 (weak)
virtual u16 getPortData(u8); // _0C (weak)
virtual void stop(u32); // _14 (weak)
virtual void setVolume(float, u32, u8); // _1C (weak)
virtual float getVolume(u8 p1) { return getSeqInterVolume(p1); } // _20 (weak)
virtual void setPan(float, u32, u8); // _24 (weak)
virtual float getPan(u8); // _28 (weak)
virtual void setPitch(float, u32, u8); // _2C (weak)
virtual float getPitch(u8); // _30 (weak)
virtual void setFxmix(float, u32, u8); // _34 (weak)
virtual float getFxmix(u8); // _38 (weak)
virtual void setDolby(float, u32, u8); // _3C (weak)
virtual float getDolby(u8); // _40 (weak)
virtual void setTempoProportion(float, u32); // _44 (weak)
virtual float getTempoProportion(); // _48 (weak)
virtual void setVolumeU7(u8, u32, u8); // _4C (weak)
virtual u8 getVolumeU7(u8); // _50 (weak)
virtual void setPanU7(u8, u32, u8); // _54 (weak)
virtual u8 getPanU7(u8); // _58 (weak)
virtual void setFxmixU7(u8, u32, u8); // _5C (weak)
virtual u8 getFxmixU7(u8); // _60 (weak)
virtual void setDolbyU7(u8, u32, u8); // _64 (weak)
virtual u8 getDolbyU7(u8); // _68 (weak)
virtual u32 getFadeCounter(); // _A4
virtual void setPrepareFlag(u8); // _A8 (weak)
virtual void checkReady(); // _AC (weak)
virtual void setPortData(u8, u16); // _08 (weak)
virtual u16 getPortData(u8); // _0C (weak)
virtual void stop(u32); // _14 (weak)
virtual void setVolume(f32, u32, u8); // _1C (weak)
virtual f32 getVolume(u8 p1) { return getSeqInterVolume(p1); } // _20 (weak)
virtual void setPan(f32, u32, u8); // _24 (weak)
virtual f32 getPan(u8); // _28 (weak)
virtual void setPitch(f32, u32, u8); // _2C (weak)
virtual f32 getPitch(u8); // _30 (weak)
virtual void setFxmix(f32, u32, u8); // _34 (weak)
virtual f32 getFxmix(u8); // _38 (weak)
virtual void setDolby(f32, u32, u8); // _3C (weak)
virtual f32 getDolby(u8); // _40 (weak)
virtual void setTempoProportion(f32, u32); // _44 (weak)
virtual f32 getTempoProportion(); // _48 (weak)
virtual void setVolumeU7(u8, u32, u8); // _4C (weak)
virtual u8 getVolumeU7(u8); // _50 (weak)
virtual void setPanU7(u8, u32, u8); // _54 (weak)
virtual u8 getPanU7(u8); // _58 (weak)
virtual void setFxmixU7(u8, u32, u8); // _5C (weak)
virtual u8 getFxmixU7(u8); // _60 (weak)
virtual void setDolbyU7(u8, u32, u8); // _64 (weak)
virtual u8 getDolbyU7(u8); // _68 (weak)
virtual u32 getFadeCounter(); // _A4
virtual void setPrepareFlag(u8); // _A8 (weak)
virtual void checkReady(); // _AC (weak)
void setSeqInterVolume(u8, float, u32);
void setSeqInterPan(u8, float, u32);
void setSeqInterPitch(u8, float, u32);
void setSeqInterVolume(u8, f32, u32);
void setSeqInterPan(u8, f32, u32);
void setSeqInterPitch(u8, f32, u32);
void setTrackInterruptSwitch(u8, u8);
void setTrackFxmix(u8, float, u32);
void setTrackFxmix(u8, f32, u32);
void setTrackPortData(u8, u8, u16);
void setSeqPrepareFlag(u8);
bool checkSeqReady();
float getSeqInterVolume(u8);
f32 getSeqInterVolume(u8);
// unused/inlined:
void setSeqInterFxmix(unsigned char, float, unsigned long);
void setSeqInterDolby(unsigned char, float, unsigned long);
void setSeqTempoProportion(float, unsigned long);
void setSeqInterFxmix(unsigned char, f32, unsigned long);
void setSeqInterDolby(unsigned char, f32, unsigned long);
void setSeqTempoProportion(f32, unsigned long);
void setSeqPortData(unsigned char, unsigned short, unsigned long);
void setWaveReadMode(long, long);
void setTrackVolume(unsigned char, float, unsigned long);
void setTrackVolumeMulti(unsigned char, unsigned long, float, unsigned long);
void setTrackVolume(unsigned char, f32, unsigned long);
void setTrackVolumeMulti(unsigned char, unsigned long, f32, unsigned long);
void setTrackMuteSwitch(unsigned char, unsigned char);
void setTrackMuteSwitchMulti(unsigned long, unsigned char);
void setTrackPan(unsigned char, float, unsigned long);
void setTrackPanMulti(unsigned char, unsigned long, float, unsigned long);
void setTrackPitch(unsigned char, float, unsigned long);
void setTrackPitchMulti(unsigned char, unsigned long, float, unsigned long);
void setTrackFxmixMulti(unsigned char, unsigned long, float, unsigned long);
void setTrackDolby(unsigned char, float, unsigned long);
void setTrackDolbyMulti(unsigned char, unsigned long, float, unsigned long);
void setTrackPan(unsigned char, f32, unsigned long);
void setTrackPanMulti(unsigned char, unsigned long, f32, unsigned long);
void setTrackPitch(unsigned char, f32, unsigned long);
void setTrackPitchMulti(unsigned char, unsigned long, f32, unsigned long);
void setTrackFxmixMulti(unsigned char, unsigned long, f32, unsigned long);
void setTrackDolby(unsigned char, f32, unsigned long);
void setTrackDolbyMulti(unsigned char, unsigned long, f32, unsigned long);
void getSeqInterPan(unsigned char);
void getSeqInterPitch(unsigned char);
void getSeqInterFxmix(unsigned char);

98
include/JSystem/JAI/JAISound.h
View File

@ -33,61 +33,61 @@ struct JAISound_0x34 {
struct JAISound : public JSULink<JAISound> {
JAISound();
virtual void setPortData(u8, u16) = 0; // _08
virtual u16 getPortData(u8) = 0; // _0C
virtual void start(u32); // _10
virtual void stop(u32); // _14
virtual void release(); // _18
virtual void setVolume(float, u32, u8) = 0; // _1C
virtual float getVolume(u8) = 0; // _20
virtual void setPan(float, u32, u8) = 0; // _24
virtual float getPan(u8) = 0; // _28
virtual void setPitch(float, u32, u8) = 0; // _2C
virtual float getPitch(u8) = 0; // _30
virtual void setFxmix(float, u32, u8) = 0; // _34
virtual float getFxmix(u8) = 0; // _38
virtual void setDolby(float, u32, u8) = 0; // _3C
virtual float getDolby(u8) = 0; // _40
virtual void setTempoProportion(float, u32); // _44 (weak)
virtual float getTempoProportion(); // _48 (weak)
virtual void setVolumeU7(u8, u32, u8) = 0; // _4C
virtual u8 getVolumeU7(u8) = 0; // _50
virtual void setPanU7(u8, u32, u8) = 0; // _54
virtual u8 getPanU7(u8) = 0; // _58
virtual void setFxmixU7(u8, u32, u8) = 0; // _5C
virtual u8 getFxmixU7(u8) = 0; // _60
virtual void setDolbyU7(u8, u32, u8) = 0; // _64
virtual u8 getDolbyU7(u8) = 0; // _68
virtual void setDirectVolume(float, u32); // _6C (weak)
virtual void setDirectPan(float, u32); // _70 (weak)
virtual void setDirectPitch(float, u32); // _74 (weak)
virtual void setDirectFxmix(float, u32); // _78 (weak)
virtual void setDirectDolby(float, u32); // _7C (weak)
virtual void setDemoVolume(float, u32); // _80 (weak)
virtual void setDemoPan(float, u32); // _84 (weak)
virtual void setDemoPitch(float, u32); // _88 (weak)
virtual void setDemoFxmix(float, u32); // _8C (weak)
virtual void setDemoDolby(float, u32); // _90 (weak)
virtual void setDemoVolumeU7(u8, u32); // _94 (weak)
virtual void setDemoPanU7(u8, u32); // _98 (weak)
virtual void setDemoFxmixU7(u8, u32); // _9C (weak)
virtual void setDemoDolbyU7(u8, u32); // _A0 (weak)
virtual u32 getFadeCounter() = 0; // _A4
virtual void setPrepareFlag(u8); // _A8
virtual void checkReady(); // _AC
virtual void setDistanceParameterMoveTime(u8); // _B0 (weak)
virtual void setAdjustPriority(short); // _B4 (weak)
virtual float setPositionDopplarCommon(u32); // _B8
virtual float setDistanceVolumeCommon(float, u8); // _BC
virtual float setDistancePanCommon(); // _C0
virtual float setDistanceDolbyCommon(); // _C4
virtual void setPortData(u8, u16) = 0; // _08
virtual u16 getPortData(u8) = 0; // _0C
virtual void start(u32); // _10
virtual void stop(u32); // _14
virtual void release(); // _18
virtual void setVolume(f32, u32, u8) = 0; // _1C
virtual f32 getVolume(u8) = 0; // _20
virtual void setPan(f32, u32, u8) = 0; // _24
virtual f32 getPan(u8) = 0; // _28
virtual void setPitch(f32, u32, u8) = 0; // _2C
virtual f32 getPitch(u8) = 0; // _30
virtual void setFxmix(f32, u32, u8) = 0; // _34
virtual f32 getFxmix(u8) = 0; // _38
virtual void setDolby(f32, u32, u8) = 0; // _3C
virtual f32 getDolby(u8) = 0; // _40
virtual void setTempoProportion(f32, u32); // _44 (weak)
virtual f32 getTempoProportion(); // _48 (weak)
virtual void setVolumeU7(u8, u32, u8) = 0; // _4C
virtual u8 getVolumeU7(u8) = 0; // _50
virtual void setPanU7(u8, u32, u8) = 0; // _54
virtual u8 getPanU7(u8) = 0; // _58
virtual void setFxmixU7(u8, u32, u8) = 0; // _5C
virtual u8 getFxmixU7(u8) = 0; // _60
virtual void setDolbyU7(u8, u32, u8) = 0; // _64
virtual u8 getDolbyU7(u8) = 0; // _68
virtual void setDirectVolume(f32, u32); // _6C (weak)
virtual void setDirectPan(f32, u32); // _70 (weak)
virtual void setDirectPitch(f32, u32); // _74 (weak)
virtual void setDirectFxmix(f32, u32); // _78 (weak)
virtual void setDirectDolby(f32, u32); // _7C (weak)
virtual void setDemoVolume(f32, u32); // _80 (weak)
virtual void setDemoPan(f32, u32); // _84 (weak)
virtual void setDemoPitch(f32, u32); // _88 (weak)
virtual void setDemoFxmix(f32, u32); // _8C (weak)
virtual void setDemoDolby(f32, u32); // _90 (weak)
virtual void setDemoVolumeU7(u8, u32); // _94 (weak)
virtual void setDemoPanU7(u8, u32); // _98 (weak)
virtual void setDemoFxmixU7(u8, u32); // _9C (weak)
virtual void setDemoDolbyU7(u8, u32); // _A0 (weak)
virtual u32 getFadeCounter() = 0; // _A4
virtual void setPrepareFlag(u8); // _A8
virtual void checkReady(); // _AC
virtual void setDistanceParameterMoveTime(u8); // _B0 (weak)
virtual void setAdjustPriority(short); // _B4 (weak)
virtual f32 setPositionDopplarCommon(u32); // _B8
virtual f32 setDistanceVolumeCommon(f32, u8); // _BC
virtual f32 setDistancePanCommon(); // _C0
virtual f32 setDistanceDolbyCommon(); // _C4
virtual void initParameter(void*, JAInter::Actor*, u32, u32, u8,
JAInter::SoundInfo*); // _C8
virtual void onGet(); // _CC (weak)
virtual void onRelease(); // _D0 (weak)
~JAISound();
void initMultiMoveParameter(JAInter::MoveParaSet*, u8, u32, float, float, u32);
void initMultiMoveParameter(JAInter::MoveParaSet*, u8, u32, f32, f32, u32);
u32 getSwBit();
u32 checkSwBit(u32);
u8 getInfoPriority();

44
include/JSystem/JAI/JAIStream.h
View File

@ -9,10 +9,10 @@
struct JAIStream : public JAISound {
JAIStream();
virtual void setPortData(u8, u16); // _08 (weak)
virtual u16 getPortData(u8); // _0C (weak)
virtual void stop(u32); // _14 (weak)
virtual void setVolume(float p1, u32 p2, u8 p3) // _1C (weak)
virtual void setPortData(u8, u16); // _08 (weak)
virtual u16 getPortData(u8); // _0C (weak)
virtual void stop(u32); // _14 (weak)
virtual void setVolume(f32 p1, u32 p2, u8 p3) // _1C (weak)
{
int result = _64[p3].set(p1, p2);
if (result == 1) {
@ -22,15 +22,15 @@ struct JAIStream : public JAISound {
_1B4->_18 |= 0x40000;
}
}
virtual float getVolume(u8); // _20 (weak)
virtual void setPan(float, u32, u8); // _24 (weak)
virtual float getPan(u8); // _28 (weak)
virtual void setPitch(float, u32, u8); // _2C (weak)
virtual float getPitch(u8); // _30 (weak)
virtual void setFxmix(float, u32, u8); // _34 (weak)
virtual float getFxmix(u8); // _38 (weak)
virtual void setDolby(float, u32, u8); // _3C (weak)
virtual float getDolby(u8); // _40 (weak)
virtual f32 getVolume(u8); // _20 (weak)
virtual void setPan(f32, u32, u8); // _24 (weak)
virtual f32 getPan(u8); // _28 (weak)
virtual void setPitch(f32, u32, u8); // _2C (weak)
virtual f32 getPitch(u8); // _30 (weak)
virtual void setFxmix(f32, u32, u8); // _34 (weak)
virtual f32 getFxmix(u8); // _38 (weak)
virtual void setDolby(f32, u32, u8); // _3C (weak)
virtual f32 getDolby(u8); // _40 (weak)
virtual void setVolumeU7(u8 p1, u32 p2, u8 p3) { setVolume(p1 / 127.0f, p2, p3); } // _4C (weak)
virtual u8 getVolumeU7(u8); // _50 (weak)
virtual void setPanU7(u8, u32, u8); // _54 (weak)
@ -45,18 +45,18 @@ struct JAIStream : public JAISound {
void setStreamPrepareFlag(u8);
bool checkStreamReady();
void setChannelVolume(u8, float, u32);
void setChannelPan(u8, float, u32);
void setChannelVolume(u8, f32, u32);
void setChannelPan(u8, f32, u32);
// unused/inlined:
void setStreamMode(unsigned long);
void setStreamInterVolume(unsigned char, float, unsigned long);
void setStreamInterPan(unsigned char, float, unsigned long);
void setStreamInterPitch(unsigned char, float, unsigned long);
void setStreamInterFxmix(unsigned char, float, unsigned long);
void setStreamInterDolby(unsigned char, float, unsigned long);
void setChannelFxmix(unsigned char, float, unsigned long);
void setChannelDolby(unsigned char, float, unsigned long);
void setStreamInterVolume(unsigned char, f32, unsigned long);
void setStreamInterPan(unsigned char, f32, unsigned long);
void setStreamInterPitch(unsigned char, f32, unsigned long);
void setStreamInterFxmix(unsigned char, f32, unsigned long);
void setStreamInterDolby(unsigned char, f32, unsigned long);
void setChannelFxmix(unsigned char, f32, unsigned long);
void setChannelDolby(unsigned char, f32, unsigned long);
void getChannelVolume(unsigned char);
void getChannelPan(unsigned char);
void getChannelFxmix(unsigned char);

28
include/JSystem/JAI/JAInter.h
View File

@ -49,10 +49,10 @@ SeqUpdateData* getPlayTrackInfo(unsigned long);
// unused/inlined:
void checkPlayingSeqUpdateMultiplication(unsigned long, unsigned char, unsigned long, JAInter::MoveParaSet*, unsigned long*, unsigned char,
float*);
void checkPlayingSeqUpdateAddition(unsigned long, unsigned char, unsigned long, JAInter::MoveParaSet*, unsigned long*, unsigned char,
float*, float);
void checkPlayingSeqUpdateTrack(unsigned long, unsigned long, JAInter::MoveParaSet*, unsigned long*, unsigned char, float*);
f32*);
void checkPlayingSeqUpdateAddition(unsigned long, unsigned char, unsigned long, JAInter::MoveParaSet*, unsigned long*, unsigned char, f32*,
f32);
void checkPlayingSeqUpdateTrack(unsigned long, unsigned long, JAInter::MoveParaSet*, unsigned long*, unsigned char, f32*);
void checkCustomDvdPreloadArc(unsigned long, unsigned long);
void stopPlayingSeq(unsigned long);
void checkPlayingSoundTrack(unsigned long);
@ -204,12 +204,12 @@ struct SeParameter {
MoveParaSetInitZero _2A4[8]; // _2A4
MoveParaSetInitZero _324[8]; // _324
MoveParaSet _3A4[8]; // _3A4
float* _424; // _424
float* _428; // _428
float* _42C; // _42C
float* _430; // _430
f32* _424; // _424
f32* _428; // _428
f32* _42C; // _42C
f32* _430; // _430
u32 _434; // _434
float* _438; // _438
f32* _438; // _438
};
struct SeqUpdateData {
@ -243,9 +243,9 @@ struct SeqParameter : MoveParaSet {
~SeqParameter();
void init();
// float _00; // _00
// float _04; // _04 - tempo proportion?
// float _08; // _08 - affected by tempo?
// f32 _00; // _00
// f32 _04; // _04 - tempo proportion?
// f32 _08; // _08 - affected by tempo?
// u32 _0C; // _0C
MoveParaSet _10[16]; // _10
MoveParaSet _110[20]; // _110
@ -290,8 +290,8 @@ struct SoundInfo {
unsigned long v1;
unsigned char v2[4];
unsigned short v3[2];
} count; // _04
float pitch; // _08
} count; // _04
f32 pitch; // _08
union volume_t {
unsigned long v1;
unsigned char v2[4];

12
include/JSystem/JAI/JAInter/MoveParaSet.h
View File

@ -9,14 +9,14 @@ namespace JAInter {
* @size = 0x10
*/
struct MoveParaSet {
MoveParaSet(float v1 = 1.0f)
MoveParaSet(f32 v1 = 1.0f)
{
_04 = v1;
_00 = v1;
_0C = 0;
}
int set(float, unsigned long);
int set(f32, unsigned long);
BOOL move();
/** @fabricated */
@ -28,10 +28,10 @@ struct MoveParaSet {
return *this;
}
float _00; // _00
float _04; // _04
float _08; // _08 - unknown
u32 _0C; // _0C - unknown
f32 _00; // _00
f32 _04; // _04
f32 _08; // _08 - unknown
u32 _0C; // _0C - unknown
};
/**

8
include/JSystem/JAI/JAInter/Object.h
View File

@ -53,10 +53,10 @@ struct Object : public ObjectBase {
// _00 = VTABLE
// _04-_18 = JKRDisposer
// _18-_28 = ObjectBase
Vec _28; // _28
float _34; // _34
float _38; // _38
float _3C; // _3C
Vec _28; // _28
f32 _34; // _34
f32 _38; // _38
f32 _3C; // _3C
};
} // namespace JAInter

2
include/JSystem/JAI/JAInter/SeMgr.h
View File

@ -56,7 +56,7 @@ extern LinkSound* seRegist;
extern JAISequence* seHandle;
extern u8 seScene;
extern u32 seqMuteFlagFromSe;
extern float* seCategoryVolume;
extern f32* seCategoryVolume;
extern u8* seEntryCancel;
} // namespace SeMgr
} // namespace JAInter

22
include/JSystem/JAL/JALCalc.h
View File

@ -11,23 +11,23 @@ enum CurveSign {
CS_1 = 1,
};
float linearTransform(float, float, float, float, float, bool);
float getParamByExp(float, float, float, float, float, float, CurveSign);
float getRandom(float, float, float);
float getRandom_0_1();
f32 linearTransform(f32, f32, f32, f32, f32, bool);
f32 getParamByExp(f32, f32, f32, f32, f32, f32, CurveSign);
f32 getRandom(f32, f32, f32);
f32 getRandom_0_1();
// {
// static JMath::TRandom_fast_ oRandom(0);
// u32 next = (oRandom.next() >> 9) | 0x3F800000;
// return *(float*)(void*)&next - 1.0f;
// return *(f32*)(void*)&next - 1.0f;
// }
// Unused/inlined:
float getParamByExp_0_1(float, float, float, float, CurveSign);
float getRandom_Sign();
float pow2(float);
int getRint(float);
float getDist(Vec*, Vec*);
float getDistPow(Vec*, Vec*);
f32 getParamByExp_0_1(f32, f32, f32, f32, CurveSign);
f32 getRandom_Sign();
f32 pow2(f32);
int getRint(f32);
f32 getDist(Vec*, Vec*);
f32 getDistPow(Vec*, Vec*);
} // namespace JALCalc
#endif

2
include/JSystem/JAS/JASCalc.h
View File

@ -33,7 +33,7 @@ void bcopyfast(const void*, void*, unsigned long);
void bzerofast(void*, unsigned long);
void hannWindow(short*, unsigned long);
void hammWindow(short*, unsigned long);
void fft(float*, float*, unsigned long, long);
void fft(f32*, f32*, unsigned long, long);
} // namespace JASCalc
#endif

26
include/JSystem/JAS/JASChannel.h
View File

@ -14,9 +14,9 @@ struct JASChannel : JSUPtrLink, JASPoolAllocObject<JASChannel, JASCreationPolicy
struct EffectOscParam {
};
struct PanVector {
float x;
float y;
float z;
f32 x;
f32 y;
f32 z;
};
JASChannel(Callback*, void*);
@ -32,7 +32,7 @@ struct JASChannel : JSUPtrLink, JASPoolAllocObject<JASChannel, JASCreationPolicy
void overwriteOsc(int, JASOscillator::Data*);
void setKeySweepTarget(unsigned char, unsigned long);
void setPauseFlag(bool);
void setPanPower(float, float, float);
void setPanPower(f32, f32, f32);
bool play();
bool playForce();
void release(unsigned short);
@ -40,10 +40,10 @@ struct JASChannel : JSUPtrLink, JASPoolAllocObject<JASChannel, JASCreationPolicy
static long dspUpdateCallback(unsigned long, JASDsp::TChannel*, void*);
void initialUpdateDSPChannel(JASDsp::TChannel*);
long updateDSPChannel(JASDsp::TChannel*);
float calcEffect(const PanVector*, const PanVector*, unsigned char);
float calcPan(const PanVector*, const PanVector*, unsigned char);
void updateAutoMixer(JASDsp::TChannel*, float, float, float, float);
void updateMixer(float, float, float, float, unsigned short*);
f32 calcEffect(const PanVector*, const PanVector*, unsigned char);
f32 calcPan(const PanVector*, const PanVector*, unsigned char);
void updateAutoMixer(JASDsp::TChannel*, f32, f32, f32, f32);
void updateMixer(f32, f32, f32, f32, unsigned short*);
void sweepProc();
void free();
@ -104,11 +104,11 @@ struct JASChannelUpdater {
void initialUpdateChannel(JASChannel*, JASDsp::TChannel*);
void updateChannel(JASChannel*, JASDsp::TChannel*);
float _00; // _00
float _04; // _04
float _08; // _08
float _0C; // _0C
float _10; // _10
f32 _00; // _00
f32 _04; // _04
f32 _08; // _08
f32 _0C; // _0C
f32 _10; // _10
short _14; // _14
u16 _16[7]; // _16 - unknown
short _24; // _24

20
include/JSystem/JAS/JASDriver.h
View File

@ -10,15 +10,15 @@ typedef s32 JASOutputRate;
typedef s32 JASMixMode;
namespace JASDriver {
float key2pitch_c5(int);
void setLevel(float, float, float);
void setMixerLevel(float, float);
void setAutoLevel(float);
void setDSPLevel(float);
f32 key2pitch_c5(int);
void setLevel(f32, f32, f32);
void setMixerLevel(f32, f32);
void setAutoLevel(f32);
void setDSPLevel(f32);
u16 getChannelLevel();
u16 getAutoLevel();
float getAutoLevel_f32();
float getDSPLevel_f32();
f32 getAutoLevel_f32();
f32 getDSPLevel_f32();
void setOutputMode(unsigned long);
u32 getOutputMode();
bool rejectCallback(long (*)(void*), void*);
@ -36,7 +36,7 @@ void updateDSP();
void readDspBuffer(short*, unsigned long);
void finishDSPFrame();
void registerMixCallback(short* (*)(long), JASMixMode);
float getDacRate();
f32 getDacRate();
int getSubFrames();
int getDacSize();
int getFrameSamples();
@ -46,9 +46,9 @@ void mixExtraTrack(short*, unsigned long, short* (*)(long));
void mixInterleaveTrack(short*, unsigned long, short* (*)(long));
// unused/inlined:
void setChannelLevel(float);
void setChannelLevel(f32);
s16 getDSPLevel();
float getChannelLevel_f32();
f32 getChannelLevel_f32();
bool registerUpdateDacCallback(long (*)(void*), void*);
void setOutputRate(JASOutputRate);
void setSubFrames(u32);

6
include/JSystem/JAS/JASDsp.h
View File

@ -139,8 +139,8 @@ void boot(void (*)(void*));
void releaseHalt(u32);
void finishWork(u16);
void syncFrame(u32, u32, u32);
void setDSPMixerLevel(float);
float getDSPMixerLevel();
void setDSPMixerLevel(f32);
f32 getDSPMixerLevel();
TChannel* getDSPHandle(int index);
void invalChannelAll();
void initBuffer();
@ -158,7 +158,7 @@ void changeFXLineParam(u8, u8, u32);
extern u8* CH_BUF;
extern Fxline* FX_BUF;
extern float sDSPVolume;
extern f32 sDSPVolume;
extern const s16 SEND_TABLE[12];
extern const u16 DSPADPCM_FILTER[32];
extern const u16 DSPRES_FILTER[640];

34
include/JSystem/JAS/JASInst.h
View File

@ -10,7 +10,7 @@ struct JASInstEffect {
{
}
virtual float getY(int, int) const = 0; // _08
virtual f32 getY(int, int) const = 0; // _08
// virtual void _0C(); // _0C - maybe.
void setTarget(int);
@ -29,11 +29,11 @@ struct JASInstRand : public JASInstEffect {
{
}
virtual float getY(int, int) const; // _08
virtual f32 getY(int, int) const; // _08
// virtual void _0C(); // _0C - maybe.
float _08;
float _0C;
f32 _08;
f32 _0C;
};
/**
@ -49,15 +49,15 @@ struct JASInstSense : public JASInstEffect {
{
}
virtual float getY(int, int) const; // _08
virtual f32 getY(int, int) const; // _08
// virtual void _0C(); // _0C - maybe.
void setParams(int, int, float, float);
void setParams(int, int, f32, f32);
u8 _08; // _08
u8 _09; // _09
float _0C; // _0C
float _10; // _10
u8 _08; // _08
u8 _09; // _09
f32 _0C; // _0C
f32 _10; // _10
};
/**
@ -83,11 +83,11 @@ struct JASInstParam {
u32 _04; // _04
JASOscillator::Data** m_oscData; // _08
int m_oscCount; // _0C - possibly oscillator count?
float _10; // _10
float _14; // _14
float _18; // _18
float _1C; // _1C
float _20; // _20
f32 _10; // _10
f32 _14; // _14
f32 _18; // _18
f32 _1C; // _1C
f32 _20; // _20
u8 _24; // _24
u8 _25; // _25
short _26; // _26
@ -156,8 +156,8 @@ struct JASBasicInst : public JASInst {
TKeymap* getKeyRegion(int) const;
// _00 = VTABLE
float _04; // _04
float _08; // _08
f32 _04; // _04
f32 _08; // _08
JASInstEffect** m_effects; // _0C
u32 m_effectCount; // _10
JASOscillator::Data** m_oscData; // _14

16
include/JSystem/JAS/JASOscillator.h
View File

@ -6,11 +6,11 @@
struct JASOscillator {
struct Data {
u32 _00; // _00 - unknown
float _04; // _04
f32 _04; // _04
short* _08; // _08 - unknown
short* _0C; // _0C - unknown pointer
float _10; // _10
float _14; // _14
f32 _10; // _10
f32 _14; // _14
};
JASOscillator();
@ -26,11 +26,11 @@ struct JASOscillator {
void forceStop();
const Data* m_data; // _00
float _04; // _04
float _08; // _08
float _0C; // _0C
float _10; // _10
float _14; // _14
f32 _04; // _04
f32 _08; // _08
f32 _0C; // _0C
f32 _10; // _10
f32 _14; // _14
short _18; // _18
u16 _1A; // _1A
u8 _1C; // _1C

10
include/JSystem/JAS/JASProbe.h
View File

@ -13,11 +13,11 @@ struct JASProbe {
char* m_name; // _00
long m_startTime; // _04
float _08; // _08
float _0C; // _0C
float _10; // _10
float _14; // _14
float _18[100]; // _18
f32 _08; // _08
f32 _0C; // _0C
f32 _10; // _10
f32 _14; // _14
f32 _18[100]; // _18
u32 _1A8; // _1A8
};

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