J3D setup (#155)

* setup j3d classes

* remove asm

* fixes

* fix newDifferedDisplayList
This commit is contained in:
TakaRikka
2021-10-11 09:38:53 -07:00
committed by GitHub
parent f51c495cf4
commit f51935c034
134 changed files with 3399 additions and 4786 deletions
+6 -9
View File
@@ -29,11 +29,10 @@ class J2DScreen;
class J2DPane;
class J2DAnmBase;
class daAlink_lockCursor_c {
class daAlink_lockCursor_c : public dDlst_base_c {
public:
/* 80125F14 */ void create();
/* 80126358 */ void update();
virtual void temp(); // temp to build OK, remove later
/* 80126424 */ virtual void draw();
/* 800CFE68 */ virtual ~daAlink_lockCursor_c();
@@ -58,10 +57,10 @@ private:
class daAlink_sight_c : public daPy_sightPacket_c {
public:
/* 80126650 */ void create();
virtual void test(); // temp to build OK, remove later
/* 80126710 */ void onLockFlg();
/* 801266C0 */ virtual void draw();
/* 800CFDF4 */ virtual ~daAlink_sight_c();
/* 80126710 */ void onLockFlg();
private:
/* 0x4C */ bool mLockFlag;
@@ -74,7 +73,7 @@ public:
/* 801256EC */ void initBlur(f32, int, cXyz const*, cXyz const*, cXyz const*);
/* 8012589C */ void copyBlur(cXyz const*, cXyz const*, cXyz const*);
/* 80125B0C */ void traceBlur(cXyz const*, cXyz const*, s16);
virtual void temp(); // temp to build OK, remove later
/* 80125BF4 */ virtual void draw();
/* 800CFD58 */ virtual ~daAlink_blur_c();
@@ -93,9 +92,8 @@ private:
class dAlink_bottleWaterPcallBack_c : public JPAParticleCallBack {
public:
virtual void temp(); // temp to build OK, remove later
/* 800CFCF8 */ virtual ~dAlink_bottleWaterPcallBack_c();
/* 80124A2C */ virtual void execute(JPABaseEmitter*, JPABaseParticle*);
/* 800CFCF8 */ virtual ~dAlink_bottleWaterPcallBack_c();
private:
/* 0x04 */ s16 mHitFlg;
@@ -2010,7 +2008,6 @@ public:
/* 80140984 */ void statusWindowDraw();
/* 80140AC8 */ void resetStatusWindow();
virtual void unk();
virtual bool getMidnaAtnPos(void) const;
virtual void setMidnaMsgNum(fopAc_ac_c*, u16);
virtual Mtx* getModelMtx(void);
@@ -2079,7 +2076,7 @@ public:
virtual void setOutPower(float, short, int);
virtual void setGrabCollisionOffset(float, float, cBgS_PolyInfo*);
virtual void onFrollCrashFlg(u8, int);
virtual Mtx* getModelJointMtx(u16);
virtual MtxP getModelJointMtx(u16);
virtual bool getHeadMtx(void);
virtual bool setHookshotCarryOffset(unsigned int, cXyz const*);
virtual bool checkIronBallReturn(void) const;
+4 -5
View File
@@ -11,10 +11,10 @@
#include "dolphin/types.h"
#include "f_op/f_op_actor.h"
class daPy_sightPacket_c {
/* 80140CDC */ ~daPy_sightPacket_c();
virtual void test(); // temp to build OK, remove later
class daPy_sightPacket_c : public dDlst_base_c {
/* 8015F1A0 */ virtual void draw();
/* 80140CDC */ virtual ~daPy_sightPacket_c();
/* 8015F2FC */ void setSight();
/* 8015F384 */ void setSightImage(ResTIMG*);
@@ -80,7 +80,6 @@ private:
fopAc_ac_c* mActor;
};
#pragma pack(push, 1)
class daPy_frameCtrl_c : public J3DFrameCtrl {
public:
/* 80140D24 */ ~daPy_frameCtrl_c();
@@ -103,7 +102,6 @@ private:
/* 0x14 */ u16 mEndFlg;
/* 0x16 */ u16 mNowSetFlg;
};
#pragma pack(pop)
class daPy_demo_c {
public:
@@ -294,6 +292,7 @@ public:
virtual bool getModelJointMtx(u16);
virtual bool getHeadMtx(void);
virtual bool setHookshotCarryOffset(unsigned int, cXyz const*);
// virtual void checkCutJumpCancelTurn() const;
virtual bool checkIronBallReturn(void) const;
virtual bool checkIronBallGroundStop(void) const;
virtual bool checkSingleBoarBattleSecondBowReady(void) const;
-2
View File
@@ -7,8 +7,6 @@
#include "dolphin/types.h"
#include "m_Do/m_Do_ext.h"
struct J3DTransformInfo {};
class dAttHint_c {
public:
dAttHint_c() {}
-4
View File
@@ -91,8 +91,4 @@ public:
/* 0x1200 */ dRes_info_c mStageInfo[0x40];
}; // Size: 0x1B00
struct J3DAnmBase {
/* 8003C734 */ ~J3DAnmBase();
};
#endif /* D_D_RESORCE_H */