__sinit_d_com_inf_game_cpp OK (#140)

* mass mng header

* d_cc_d start

* c_cc_d ok

* tmp commit

* almost, reordering of vtable functions

* progress

* more progress

* cleanup, still non matching

* mark all of d_cc_d as nonmatching to OK

* c_cc_s

* c_cc_s OK

* d_cc_mass_s OK

* cleanup

* gameinfo __sinit, not OK

* a bit of cleanup

* format

* remove asm

Co-authored-by: lepelog <lepelog@users.noreply.github.com>
This commit is contained in:
lepelog
2021-08-16 20:59:00 -04:00
committed by GitHub
co-authored by lepelog
parent 9765844d92
commit 38eca47ad5
114 changed files with 2085 additions and 5680 deletions
@@ -3,13 +3,13 @@
#include "dolphin/types.h"
#pragma pack(push, 1)
class J3DFrameCtrl {
public:
J3DFrameCtrl() { this->init(0); }
void init(s16);
BOOL checkPass(f32);
void update();
~J3DFrameCtrl();
virtual ~J3DFrameCtrl() {}
float getRate() const { return mRate; }
void setAttribute(u8 pAttr) { mAttribute = pAttr; }
@@ -23,7 +23,7 @@ public:
void setLoop(s16 pLoop) { mLoop = pLoop; }
private:
void* vtable;
/* vtable */;
u8 mAttribute;
bool mState;
s16 mStart;
@@ -32,6 +32,5 @@ private:
float mRate;
float mFrame;
};
#pragma pack(pop)
#endif /* J3DANIMATION_H */
+10 -5
View File
@@ -5,11 +5,13 @@
#include "dolphin/gx/GXTexture.h"
#include "dolphin/types.h"
struct J3DLightInfo {
class J3DLightInfo {
public:
J3DLightInfo(J3DLightInfo const& other) { *this = other; }
/* 803256C4 */ void operator=(J3DLightInfo const&);
/* 0x00 */ cXyz mLightPosition;
/* 0x0C */ cXyz mLightDirection;
/* 0x00 */ Vec mLightPosition;
/* 0x0C */ Vec mLightDirection;
/* 0x18 */ _GXColor mColor;
/* 0x1C */ f32 mA0;
/* 0x20 */ f32 mA1;
@@ -19,8 +21,11 @@ struct J3DLightInfo {
/* 0x30 */ f32 mK2;
}; // Size = 0x34
struct J3DLightObj {
/* 80018C0C */ J3DLightObj();
extern "C" extern J3DLightInfo const j3dDefaultLightInfo;
class J3DLightObj {
public:
/* 80018C0C */ J3DLightObj() : mInfo(j3dDefaultLightInfo) {}
/* 0x00 */ J3DLightInfo mInfo;
/* 0x34 */ u8 field_0x34[64];