mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-07-30 23:44:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

Animation/joint loading BE fixes

Browse Source
This commit is contained in:
PJB3005
2026-03-02 20:00:46 +01:00
parent d17066acc4
commit a32717c8d9
4 changed files with 86 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libs/JSystem/src/J3DGraphLoader/J3DAnmLoader.cpp
+30 -8
View File
@@ -476,22 +476,44 @@ void J3DAnmKeyLoader_v15::readAnmTransform(const J3DAnmTransformKeyData* param_1
setAnmTransform(anm, param_1);
}
#if TARGET_LITTLE_ENDIAN
static void ByteSwapTransformKeyData(
J3DAnmTransformKey& target,
const J3DAnmTransformKeyData& source) {
for (int i = 0; i < source.mSCount; i += 1) {
be_swap(target.mScaleData[i]);
}
for (int i = 0; i < source.mRCount; i += 1) {
be_swap(target.mRotData[i]);
}
for (int i = 0; i < source.mTCount; i += 1) {
be_swap(target.mTransData[i]);
}
}
#endif
void J3DAnmKeyLoader_v15::setAnmTransform(J3DAnmTransformKey* param_1,
const J3DAnmTransformKeyData* param_2) {
J3D_ASSERT_NULLPTR(944, param_1);
J3D_ASSERT_NULLPTR(945, param_2);
param_1->field_0x1e = param_2->field_0xc;
param_1->field_0x1e = param_2->mJointAnimationTableCount;
param_1->mFrameMax = param_2->mFrameMax;
param_1->mAttribute = param_2->field_0x8;
param_1->mDecShift = param_2->field_0x9;
param_1->mAttribute = param_2->mLoopMode;
param_1->mDecShift = param_2->mRotationDecimal;
param_1->mFrame = 0.0f;
param_1->mAnmTable =
JSUConvertOffsetToPtr<J3DAnmTransformKeyTable>(param_2, param_2->mTableOffset);
param_1->mScaleData = JSUConvertOffsetToPtr<f32>(param_2, param_2->field_0x18);
param_1->mRotData = JSUConvertOffsetToPtr<s16>(param_2, param_2->field_0x1c);
param_1->mTransData = JSUConvertOffsetToPtr<f32>(param_2, param_2->field_0x20);
}
JSUConvertOffsetToPtr<J3DAnmTransformKeyTable>(param_2, param_2->mJointAnimationTableOffs);
param_1->mScaleData = JSUConvertOffsetToPtr<f32>(param_2, param_2->mSTableOffs);
param_1->mRotData = JSUConvertOffsetToPtr<s16>(param_2, param_2->mRTableOffs);
param_1->mTransData = JSUConvertOffsetToPtr<f32>(param_2, param_2->mTTableOffs);
#if TARGET_LITTLE_ENDIAN
ByteSwapTransformKeyData(*param_1, *param_2);
#endif
}
void J3DAnmKeyLoader_v15::readAnmTextureSRT(const J3DAnmTextureSRTKeyData* param_1) {
J3DAnmTextureSRTKey* anm = (J3DAnmTextureSRTKey*)mAnm;
libs/JSystem/src/J3DGraphLoader/J3DJointFactory.cpp
+16
View File
@@ -8,6 +8,22 @@
J3DJointFactory::J3DJointFactory(J3DJointBlock const& block) {
mJointInitData = JSUConvertOffsetToPtr<J3DJointInitData>(&block, (uintptr_t)block.mpJointInitData);
mIndexTable = JSUConvertOffsetToPtr<u16>(&block, (uintptr_t)block.mpIndexTable);
#if TARGET_LITTLE_ENDIAN
for (int i = 0; i < block.mJointNum; i++) {
auto& index = mIndexTable[i];
be_swap(index);
auto initData = &mJointInitData[index];
be_swap(initData->mKind);
be_swap(initData->mTransformInfo.mScale);
be_swap(initData->mTransformInfo.mRotation);
be_swap(initData->mTransformInfo.mTranslate);
be_swap(initData->mRadius);
be_swap(initData->mMin);
be_swap(initData->mMax);
}
#endif
}
J3DJoint* J3DJointFactory::create(int no) {