Merge branch 'main' of https://github.com/TwilitRealm/dusk into randomizer

libs/JSystem/src/J2DGraph/J2DMaterialFactory.cpp

@@ -8,7 +8,7 @@
 #include <cstring>
 #include <types.h>
 
-#include "dusk/string.hpp"
+#include "helpers/string.hpp"
 
 J2DMaterialFactory::J2DMaterialFactory(J2DMaterialBlock const& param_0) {
     mMaterialNum = param_0.field_0x8;

libs/JSystem/src/J2DGraph/J2DPane.cpp

@@ -8,7 +8,7 @@
 #include "JSystem/JSupport/JSURandomInputStream.h"
 #include "JSystem/JUtility/JUTResource.h"
 #ifndef __MWERKS__
-#include "dusk/math.h"
+#include "helpers/math.h"
 #endif
 
 J2DPane::J2DPane() : mBounds(), mGlobalBounds(), mClipRect(), mPaneTree(this) {

libs/JSystem/src/J2DGraph/J2DTevs.cpp

@@ -9,7 +9,7 @@
 #ifdef __MWERKS__
 #include <cmath>
 #else
-#include <dusk/math.h>
+#include <helpers/math.h>
 #endif
 #include <gx.h>
 

libs/JSystem/src/J2DGraph/J2DWindowEx.cpp

@@ -3,7 +3,7 @@
 #include "JSystem/J2DGraph/J2DWindowEx.h"
 #include "JSystem/JUtility/JUTTexture.h"
 #include "JSystem/JSupport/JSURandomInputStream.h"
-#include "dusk/endian.h"
+#include "helpers/endian.h"
 
 struct J2DWindowExDef {
     BE(u32) field_0x0[4];

libs/JSystem/src/J3DGraphAnimator/J3DModel.cpp

@@ -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/J3DGraphBase/J3DSys.cpp

@@ -4,10 +4,14 @@
 #include "JSystem/J3DGraphBase/J3DSys.h"
 #include "JSystem/J3DGraphBase/J3DTevs.h"
 #include "JSystem/J3DGraphBase/J3DTexture.h"
-#include "dusk/gx_helper.h"
+#include "helpers/gx_helper.h"
 #include "global.h"
 #include "tracy/Tracy.hpp"
 
+#if TARGET_PC
+#include "dusk/frame_interpolation.h"
+#endif
+
 DUSK_GAME_DATA J3DSys j3dSys;
 
 DUSK_GAME_DATA Mtx J3DSys::mCurrentMtx;
@@ -370,3 +374,13 @@ void J3DSys::reinitPixelProc() {
     GXSetZMode(GX_TRUE, GX_LEQUAL, GX_TRUE);
     GXSetZCompLoc(GX_TRUE);
 }
+
+#if TARGET_PC
+void J3DSys::setViewMtx(const Mtx m) {
+    Mtx patched;
+    if (dusk::frame_interp::lookup_replacement(m, patched)) {
+        m = patched;
+    }
+    MTXCopy(m, mViewMtx);
+}
+#endif

libs/JSystem/src/JAHostIO/JAHVirtualNode.cpp

@@ -2,7 +2,7 @@
 #include <JSystem/JUtility/JUTAssert.h>
 #include <cstring>
 
-#include "dusk/string.hpp"
+#include "helpers/string.hpp"
 
 DUSK_GAME_DATA u32 JAHVirtualNode::smVirNodeNum;
 

libs/JSystem/src/JAHostIO/JAHioNode.cpp

@@ -6,7 +6,7 @@
 #include "JSystem/JAHostIO/JAHioNode.h"
 
 #include "JSystem/JHostIO/JORServer.h"
-#include "dusk/string.hpp"
+#include "helpers/string.hpp"
 
 DUSK_GAME_DATA JAHioNode* JAHioNode::smCurrentNode;
 

libs/JSystem/src/JAudio2/JASWaveArcLoader.cpp

@@ -9,7 +9,7 @@
 #include <os.h>
 #include <stdint.h>
 
-#include "dusk/string.hpp"
+#include "helpers/string.hpp"
 
 DUSK_GAME_DATA JASHeap* JASWaveArcLoader::sAramHeap;
 

libs/JSystem/src/JFramework/JFWDisplay.cpp

@@ -14,11 +14,12 @@
 
 #ifdef TARGET_PC
 #include "dusk/dusk.h"
-#include "dusk/gx_helper.h"
+#include "dusk/frame_interpolation.h"
 #include "dusk/logging.h"
 #include "dusk/settings.h"
 #include "dusk/time.h"
 #include "f_op/f_op_overlap_mng.h"
+#include "helpers/gx_helper.h"
 
 #include "SDL3/SDL_timer.h"
 #include "tracy/Tracy.hpp"

libs/JSystem/src/JKernel/JKRFileCache.cpp

@@ -8,7 +8,7 @@
 
 #include <cctype>
 #include <cstring>
-#include "dusk/string.hpp"
+#include "helpers/string.hpp"
 #include "global.h"
 
 JKRFileCache* JKRFileCache::mount(const char* path, JKRHeap* heap, const char* param_3) {

libs/JSystem/src/JKernel/JKRFileLoader.cpp

@@ -8,7 +8,7 @@
 #include <cstring>
 #include <string>
 #include "JSystem/JKernel/JKRHeap.h"
-#include "dusk/string.hpp"
+#include "helpers/string.hpp"
 #include "global.h"
 
 DUSK_GAME_DATA JKRFileLoader* JKRFileLoader::sCurrentVolume;

libs/JSystem/src/JKernel/JKRHeap.cpp

@@ -15,7 +15,7 @@
 
 #include "JSystem/JUtility/JUTAssert.h"
 #include "JSystem/JUtility/JUTException.h"
-#include "dusk/string.hpp"
+#include "helpers/string.hpp"
 #ifdef __MWERKS__
 #include <stdint.h>
 #else
@@ -702,7 +702,7 @@ JKRHeap* JKRHeap::getCurrentHeap() {
 }
 
 void JKRHeap::setName(const char* name) {
-    dusk::SafeStringCopyTruncate(mName, name);
+    SafeStringCopyTruncate(mName, name);
 }
 
 void JKRHeap::setNamef(const char* fmt, ...) {

libs/JSystem/src/JKernel/JKRThread.cpp

@@ -7,7 +7,7 @@
 #include "global.h"
 #include <stdint.h>
 
-#include "dusk/string.hpp"
+#include "helpers/string.hpp"
 
 #if TARGET_PC
 #include "dusk/os.h"

libs/JSystem/src/JParticle/JPAParticle.cpp

@@ -7,6 +7,10 @@
 #include "JSystem/JParticle/JPAEmitterManager.h"
 #include "JSystem/JParticle/JPAExtraShape.h"
 
+#if TARGET_PC
+#include "dusk/frame_interpolation.h"
+#endif
+
 JPAParticleCallBack::~JPAParticleCallBack() {
     /* empty function */
 }

libs/JSystem/src/JParticle/JPAResource.cpp

@@ -19,6 +19,8 @@
 #include "tracy/Tracy.hpp"
 
 #if TARGET_PC
+#include "dusk/frame_interpolation.h"
+
 #define JPA_DRAW_CTX_ARG , &ctx
 #else
 #define JPA_DRAW_CTX_ARG

libs/JSystem/src/JStudio/JStudio/stb-data.cpp

@@ -1,5 +1,5 @@
 #include "JSystem/JSystem.h" // IWYU pragma: keep
-#include "dusk/endian.h"
+#include "helpers/endian.h"
 #include "JSystem/JStudio/JStudio/stb-data.h"
 
 DUSK_GAME_DATA const s32 JStudio::stb::data::gauDataSize_TEParagraph_data[8] = {0x0, 0x1, 0x2, 0x4, 0x8, 0x10, 0x20, 0x40};

libs/JSystem/src/JUtility/JUTConsole.cpp

@@ -8,7 +8,7 @@
 #include "JSystem/JUtility/JUTConsole.h"
 #include "JSystem/JUtility/JUTDirectPrint.h"
 #include "JSystem/JUtility/JUTVideo.h"
-#include "dusk/string.hpp"
+#include "helpers/string.hpp"
 #include "global.h"
 
 DUSK_GAME_DATA JUTConsoleManager* JUTConsoleManager::sManager;

libs/JSystem/src/JUtility/JUTException.cpp

@@ -10,7 +10,7 @@
 #include <cstdio>
 #include <cstdlib>
 
-#include "dusk/string.hpp"
+#include "helpers/string.hpp"
 #ifdef __REVOLUTION_SDK__
 #include <revolution.h>
 #else

libs/JSystem/src/JUtility/JUTFader.cpp

@@ -10,6 +10,7 @@
 
 #ifdef TARGET_PC
 #include <algorithm>
+#include "dusk/frame_interpolation.h"
 #endif
 
 JUTFader::JUTFader(int x, int y, int width, int height, JUtility::TColor pColor)