mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-20 05:16:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into tphd

Browse Source
This commit is contained in:
Lurs
2026-08-11 17:07:13 +02:00
parent 6bab72092b 0fc05028cc
commit 524f7ec2b1
1291 changed files with 32756 additions and 20945 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libs/JSystem/src/J3DGraphAnimator/J3DJoint.cpp
+3 -3
View File
@@ -25,9 +25,9 @@ void J3DMtxCalcJ3DSysInitMaya::init(Vec const& scale, Mtx const& mtx) {
JMAMTXApplyScale(mtx, J3DSys::mCurrentMtx, scale.x, scale.y, scale.z);
}
J3DMtxBuffer* J3DMtxCalc::mMtxBuffer;
DUSK_GAME_DATA J3DMtxBuffer* J3DMtxCalc::mMtxBuffer;
J3DJoint* J3DMtxCalc::mJoint;
DUSK_GAME_DATA J3DJoint* J3DMtxCalc::mJoint;
void J3DMtxCalcCalcTransformBasic::calcTransform(J3DTransformInfo const& transInfo) {
J3DJoint* joint = J3DMtxCalc::getJoint();
@@ -208,7 +208,7 @@ void J3DJoint::entryIn() {
}
}
J3DMtxCalc* J3DJoint::mCurrentMtxCalc;
DUSK_GAME_DATA J3DMtxCalc* J3DJoint::mCurrentMtxCalc;
void J3DJoint::recursiveCalc() {
J3DMtxCalc* prevMtxCalc = NULL;
libs/JSystem/src/J3DGraphAnimator/J3DModel.cpp
+8
View File
@@ -8,7 +8,10 @@
#include "JSystem/J3DGraphBase/J3DShapeMtx.h"
#include "JSystem/J3DGraphBase/J3DSys.h"
#include "JSystem/JKernel/JKRHeap.h"
#if TARGET_PC
#include "dusk/frame_interpolation.h"
#endif
#define J3D_ASSERTMSG(LINE, COND, MSG) JUT_ASSERT_MSG(LINE, (COND) != 0, MSG)
#define J3D_WARN1(LINE, MSG, ARG1) JUT_WARN(LINE, MSG, ARG1)
@@ -105,6 +108,11 @@ void J3DModel::interp_callback(bool isSimFrame, void* pUserWork) {
i_this->diff();
}
}
void J3DModel::setAnmMtx(int jointNo, Mtx m) {
mMtxBuffer->setAnmMtx(jointNo, m);
dusk::frame_interp::record_final_mtx(mMtxBuffer->getAnmMtx(jointNo));
}
#endif
s32 J3DModel::createShapePacket(J3DModelData* pModelData) {
libs/JSystem/src/J3DGraphAnimator/J3DMtxBuffer.cpp
+4 -4
View File
@@ -6,13 +6,13 @@
#include "JSystem/J3DGraphLoader/J3DModelLoader.h"
#include "JSystem/JKernel/JKRHeap.h"
Mtx J3DMtxBuffer::sNoUseDrawMtx;
DUSK_GAME_DATA Mtx J3DMtxBuffer::sNoUseDrawMtx;
Mtx33 J3DMtxBuffer::sNoUseNrmMtx;
DUSK_GAME_DATA Mtx33 J3DMtxBuffer::sNoUseNrmMtx;
Mtx* J3DMtxBuffer::sNoUseDrawMtxPtr = &J3DMtxBuffer::sNoUseDrawMtx;
DUSK_GAME_DATA Mtx* J3DMtxBuffer::sNoUseDrawMtxPtr = &J3DMtxBuffer::sNoUseDrawMtx;
Mtx33* J3DMtxBuffer::sNoUseNrmMtxPtr = &J3DMtxBuffer::sNoUseNrmMtx;
DUSK_GAME_DATA Mtx33* J3DMtxBuffer::sNoUseNrmMtxPtr = &J3DMtxBuffer::sNoUseNrmMtx;
// force .sdata2 order
static f32 dummy1() {
libs/JSystem/src/J3DGraphAnimator/J3DSkinDeform.cpp
+3 -3
View File
@@ -79,9 +79,9 @@ J3DSkinDeform::J3DSkinDeform() {
mSkinNList = NULL;
}
BE(u16)* J3DSkinDeform::sWorkArea_WEvlpMixMtx[1024];
DUSK_GAME_DATA BE(u16)* J3DSkinDeform::sWorkArea_WEvlpMixMtx[1024];
BE(f32)* J3DSkinDeform::sWorkArea_WEvlpMixWeight[1024];
DUSK_GAME_DATA BE(f32)* J3DSkinDeform::sWorkArea_WEvlpMixWeight[1024];
void J3DSkinDeform::initSkinInfo(J3DModelData* pModelData) {
J3D_ASSERT_NULLPTR(322, pModelData != NULL);
@@ -194,7 +194,7 @@ void J3DSkinDeform::initSkinInfo(J3DModelData* pModelData) {
}
}
u16 J3DSkinDeform::sWorkArea_MtxReg[1024];
DUSK_GAME_DATA u16 J3DSkinDeform::sWorkArea_MtxReg[1024];
int J3DSkinDeform::initMtxIndexArray(J3DModelData* pModelData) {
J3D_ASSERT_NULLPTR(507, pModelData != NULL);