mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-08-21 22:10:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Some m_Do_ext progress

Browse Source
This commit is contained in:
LagoLunatic
2023-10-19 15:36:21 -04:00
parent 9c667f2223
commit 57d4fc32b4
7 changed files with 126 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/JAZelAudio/JAIZelBasic.h
+1 -38
View File
@@ -4,15 +4,10 @@
#include "dolphin/types.h"
#include "JAZelAudio/JAZelAudio_SE.h"
#include "JAZelAudio/JAZelAudio_BGM.h"
#include "JSystem/JAudio/JAIAnimation.h"
#include "dolphin/mtx/mtx.h"
class Vec;
class JAISound;
class JKRSolidHeap;
namespace JAInter {
class Actor;
};
class JAIAnimeFrameSoundData;
class JAIZelBasic {
public:
@@ -254,38 +249,6 @@ public:
/* 0x1F44 */ u8 field_0x1F44[0x20F4 - 0x1F44];
};
struct JAIAnimeSound__Slot {
/* 0x0 */ u8 mbIsPlaying;
/* 0x4 */ JAISound* mpSound;
/* 0x8 */ void* mpData;
};
class JAIAnimeSound {
public:
JAIAnimeSound();
public:
/* 0x00 */ JAIAnimeSound__Slot mSlots[8];
/* 0x60 */ u32 m60;
/* 0x64 */ u32 m64;
/* 0x68 */ u32 m68;
/* 0x6C */ u32 m6C;
/* 0x70 */ void* m70[2];
/* 0x78 */ int mDataCounterInc;
/* 0x7C */ int mDataCounterLimit;
/* 0x80 */ u32 mDataCounter;
/* 0x84 */ int mLoopCount;
/* 0x88 */ f32 mCurrentTime;
/* 0x8C */ u8 m8C[0x90 - 0x8C];
/* 0x90 */ u16* mpData;
/* 0x94 */ /* vtable */
virtual void startAnimSound(void*, u32, JAISound**, JAInter::Actor*, u8);
virtual void setSpeedModifySound(JAISound*, JAIAnimeFrameSoundData*, f32);
void stop();
}; // Size: 0x98
class JAIZelAnime : public JAIAnimeSound {
public:
JAIZelAnime() { }
include/JSystem/J3DGraphAnimator/J3DAnimation.h
+1 -1
View File
@@ -614,7 +614,7 @@ public:
};
J3DFrameCtrl() { this->init(0); }
void init(s16);
void init(s16 end);
BOOL checkPass(f32);
void update();
virtual ~J3DFrameCtrl() {}
include/JSystem/J3DGraphAnimator/J3DJoint.h
+1 -1
View File
@@ -125,7 +125,7 @@ public:
J3DMaterial* getMesh() { return mMesh; }
u16 getJntNo() const { return mJntNo; }
u8 getKind() const { return mKind & 0x0F; }
u8 getMtxType() const { return mKind >> 4; }
u8 getMtxType() const { return (mKind >> 4) & 0x0F; }
u8 getScaleCompensate() const { return mScaleCompensate; }
void setCurrentMtxCalc(J3DMtxCalc* pMtxCalc) { mCurrentMtxCalc = pMtxCalc; }
J3DTransformInfo& getTransformInfo() { return mTransformInfo; }
include/JSystem/JAudio/JAIAnimation.h
+48
View File
@@ -0,0 +1,48 @@
#ifndef JAIANIMATION_H
#define JAIANIMATION_H
#include "global.h"
class Vec;
class JAISound;
class JAIBasic;
namespace JAInter {
class Actor;
};
class JAIAnimeFrameSoundData;
struct JAIAnimeSound__Slot {
/* 0x0 */ u8 mbIsPlaying;
/* 0x4 */ JAISound* mpSound;
/* 0x8 */ void* mpData;
};
class JAIAnimeSound {
public:
JAIAnimeSound();
void initActorAnimSound(void*, u32, f32);
void setAnimSoundVec(JAIBasic*, Vec*, f32, f32, u32, u8);
void setAnimSoundActor(JAIBasic*, JAInter::Actor*, f32, f32, u8);
void playActorAnimSound(JAIBasic*, JAInter::Actor*, f32, u8);
void startAnimSound(void*, u32, JAISound**, JAInter::Actor*, u8);
void setSpeedModifySound(JAISound*, JAIAnimeFrameSoundData*, f32);
void stop();
public:
/* 0x00 */ JAIAnimeSound__Slot mSlots[8];
/* 0x60 */ u32 m60;
/* 0x64 */ u32 m64;
/* 0x68 */ u32 m68;
/* 0x6C */ u32 m6C;
/* 0x70 */ void* m70[2];
/* 0x78 */ int mDataCounterInc;
/* 0x7C */ int mDataCounterLimit;
/* 0x80 */ u32 mDataCounter;
/* 0x84 */ int mLoopCount;
/* 0x88 */ f32 mCurrentTime;
/* 0x8C */ u8 m8C[0x90 - 0x8C];
/* 0x90 */ u16* mpData;
/* 0x94 */ /* vtable */
}; // Size: 0x98
#endif /* JAIANIMATION_H */
include/m_Do/m_Do_ext.h
+2 -2
View File
@@ -324,7 +324,7 @@ public:
mDoExt_zelAnime() { }
public:
/* 0x98 */ u8 m8C[0x9C - 0x98];
/* 0x98 */ void* mpBasAnm;
}; // Size: 0x9C
class mDoExt_McaMorf : public J3DMtxCalcMaya {
@@ -334,7 +334,7 @@ public:
void calc();
void calc(u16);
void setAnm(J3DAnmTransform* bckAnm, int loopMode, f32 morf, f32 speed, f32, f32, void* soundAnm);
void setAnm(J3DAnmTransform* bckAnm, int loopMode, f32 morf, f32 playSpeed, f32 startFrame, f32 endFrame, void* basAnm);
void setMorf(f32);
void update();
void updateDL();