falso
/
tp
mirror of https://github.com/zeldaret/tp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix enum

This commit is contained in:
lepelog 2022-01-17 20:58:30 +01:00
parent 36e7f7639e
commit ce5a8c47ad
2 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
include/JSystem/J2DGraph/J2DAnimation.h
View File

@ -11,13 +11,13 @@
class J2DScreen;
enum J2DAnmKind {
J2DAnmTransformKind = 0,
J2DAnmColorKind = 1,
J2DAnmTexPatternKind = 2,
J2DAnmTextureSRTKeyKind = 4,
J2DAnmTevRegKeyKind = 5,
J2DAnmVisibilityFullKind = 6,
J2DAnmVtxColorKind = 7
KIND_TRANSFORM = 0,
KIND_COLOR = 1,
KIND_TEX_PATTERN = 2,
KIND_TEXTURE_SRT = 4,
KIND_TEV_REG = 5,
KIND_VISIBILITY = 6,
KIND_VTX_COLOR = 7
};
class J2DAnmBase {
@ -45,7 +45,7 @@ public:
class J2DAnmVtxColor : public J2DAnmBase {
public:
J2DAnmVtxColor() {
mKind = J2DAnmVtxColorKind;
mKind = KIND_VTX_COLOR;
for (s32 i = 0; i < ARRAY_SIZE(mAnmTableNum); i++) {
mAnmTableNum[i] = NULL;
}
@ -105,7 +105,7 @@ public:
mTable = NULL;
field_0x12 = 0;
mValues = NULL;
mKind = J2DAnmVisibilityFullKind;
mKind = KIND_VISIBILITY;
}
/* 8030A3B4 */ virtual ~J2DAnmVisibilityFull() {}
/* 8030C048 */ void getVisibility(u16, u8*) const;
@ -122,7 +122,7 @@ public:
mScaleValues = pScaleValues;
mRotationValues = pRotationValues;
mTranslateValues = pTranslateValues;
mKind = J2DAnmTransformKind;
mKind = KIND_TRANSFORM;
}
/* 80184370 */ virtual ~J2DAnmTransform() {}
/* 80191130 */ virtual void getTransform(u16, J3DTransformInfo*) const;
@ -182,7 +182,7 @@ public:
field_0x50 = NULL;
field_0x54 = NULL;
field_0x7c = 0;
mKind = J2DAnmTextureSRTKeyKind;
mKind = KIND_TEXTURE_SRT;
}
/* 8030B9F0 */ void calcTransform(f32, u16, J3DTextureSRTInfo*) const;
@ -231,7 +231,7 @@ public:
J2DAnmTexPattern() {
mValues = NULL;
mAnmTable = NULL;
mKind = J2DAnmTexPatternKind;
mKind = KIND_TEX_PATTERN;
mUpdateMaterialNum = 0;
mUpdaterMaterialID = NULL;
mTIMGPtrArray = NULL;
@ -277,7 +277,7 @@ public:
mKBValues = NULL;
mKGValues = NULL;
mKRValues = NULL;
mKind = J2DAnmTevRegKeyKind;
mKind = KIND_TEV_REG;
}
/* 8030C0F0 */ void getTevColorReg(u16, _GXColorS10*) const;
/* 8030C3B4 */ void getTevKonstReg(u16, _GXColor*) const;
@ -320,7 +320,7 @@ public:
field_0x10 = 0;
mUpdateMaterialNum = 0;
mUpdateMaterialID = NULL;
mKind = J2DAnmColorKind;
mKind = KIND_COLOR;
}
/* 801842FC */ virtual ~J2DAnmColor() {}
/* 8030AF24 */ virtual void searchUpdateMaterialID(J2DScreen*);

20
libs/JSystem/J2DGraph/J2DAnmLoader_nonmatching.cpp
View File

@ -134,28 +134,28 @@ void J2DAnmKeyLoader_v15::setResource(J2DAnmBase* pAnm, void const* param_1) {
for (s32 i = 0; i < hdr->mCount; i++) {
switch (dataPtr->mType) {
case 'ANK1':
if (pAnm->getKind() == J2DAnmTransformKind) {
if (pAnm->getKind() == KIND_TRANSFORM) {
this->setAnmTransform((J2DAnmTransformKey*)pAnm, (J3DAnmTransformKeyData*)dataPtr);
}
break;
case 'PAK1':
if (pAnm->getKind() == J2DAnmColorKind) {
if (pAnm->getKind() == KIND_COLOR) {
this->setAnmColor((J2DAnmColorKey*)pAnm, (J3DAnmColorKeyData*)dataPtr);
}
break;
case 'TTK1':
if (pAnm->getKind() == J2DAnmTextureSRTKeyKind) {
if (pAnm->getKind() == KIND_TEXTURE_SRT) {
this->setAnmTextureSRT((J2DAnmTextureSRTKey*)pAnm,
(J3DAnmTextureSRTKeyData*)dataPtr);
}
break;
case 'TRK1':
if (pAnm->getKind() == J2DAnmTevRegKeyKind) {
if (pAnm->getKind() == KIND_TEV_REG) {
this->setAnmTevReg((J2DAnmTevRegKey*)pAnm, (J3DAnmTevRegKeyData*)dataPtr);
}
break;
case 'VCK1':
if (pAnm->getKind() == J2DAnmVtxColorKind) {
if (pAnm->getKind() == KIND_VTX_COLOR) {
this->setAnmVtxColor((J2DAnmVtxColorKey*)pAnm, (J3DAnmVtxColorKeyData*)dataPtr);
}
break;
@ -342,25 +342,25 @@ void J2DAnmFullLoader_v15::setResource(J2DAnmBase* pAnm, void const* pData) {
for (s32 i = 0; i < hdr->mCount; i++) {
switch (dataPtr->mType) {
case 'ANF1':
if (pAnm->getKind() == J2DAnmTransformKind)
if (pAnm->getKind() == KIND_TRANSFORM)
this->setAnmTransform((J2DAnmTransformFull*)pAnm,
(J3DAnmTransformFullData*)dataPtr);
break;
case 'PAF1':
if (pAnm->getKind() == J2DAnmColorKind)
if (pAnm->getKind() == KIND_COLOR)
this->setAnmColor((J2DAnmColorFull*)pAnm, (J3DAnmColorFullData*)dataPtr);
break;
case 'TPT1':
if (pAnm->getKind() == J2DAnmTexPatternKind)
if (pAnm->getKind() == KIND_TEX_PATTERN)
this->setAnmTexPattern((J2DAnmTexPattern*)pAnm, (J3DAnmTexPatternFullData*)dataPtr);
break;
case 'VAF1':
if (pAnm->getKind() == J2DAnmVisibilityFullKind)
if (pAnm->getKind() == KIND_VISIBILITY)
this->setAnmVisibility((J2DAnmVisibilityFull*)pAnm,
(J3DAnmVisibilityFullData*)dataPtr);
break;
case 'VCF1':
if (pAnm->getKind() == J2DAnmVtxColorKind)
if (pAnm->getKind() == KIND_VTX_COLOR)
this->setAnmVtxColor((J2DAnmVtxColorFull*)pAnm, (J3DAnmVtxColorFullData*)dataPtr);
break;
}