mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-07-25 05:58:42 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
gymnast86
2026-07-15 01:08:32 -07:00
parent 0b23015ddb 0f2a00cd1f
commit 7766739df1
243 changed files with 2746 additions and 1741 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libs/JSystem/include/JSystem/J2DGraph/J2DMaterialFactory.h
+1 -1
View File
@@ -4,7 +4,7 @@
#include "JSystem/J2DGraph/J2DManage.h"
#include "JSystem/J2DGraph/J2DMatBlock.h"
#include "dusk/endian.h"
#include "helpers/endian.h"
/**
* @ingroup jsystem-j2d
libs/JSystem/include/JSystem/J2DGraph/J2DPane.h
+1 -1
View File
@@ -5,7 +5,7 @@
#include "JSystem/JSupport/JSUList.h"
#include <gx.h>
#include <mtx.h>
#include "dusk/endian.h"
#include "helpers/endian.h"
class J2DAnmBase;
class J2DAnmColor;
libs/JSystem/include/JSystem/J2DGraph/J2DPicture.h
+1 -1
View File
@@ -4,7 +4,7 @@
#include "JSystem/J2DGraph/J2DPane.h"
#include "JSystem/JUtility/JUTTexture.h"
#include "JSystem/JUtility/TColor.h"
#include "dusk/endian.h"
#include "helpers/endian.h"
class J2DMaterial;
class JUTPalette;
libs/JSystem/include/JSystem/J2DGraph/J2DScreen.h
+1 -1
View File
@@ -4,7 +4,7 @@
#include "JSystem/J2DGraph/J2DManage.h"
#include "JSystem/J2DGraph/J2DPane.h"
#include "JSystem/JUtility/TColor.h"
#include "dusk/endian.h"
#include "helpers/endian.h"
class J2DMaterial;
class JUTNameTab;
libs/JSystem/include/JSystem/J2DGraph/J2DTevs.h
+1 -1
View File
@@ -4,7 +4,7 @@
#include <gx.h>
#include <mtx.h>
#include "global.h"
#include "dusk/endian.h"
#include "helpers/endian.h"
/**
* @ingroup jsystem-j2d
libs/JSystem/include/JSystem/J2DGraph/J2DTextBox.h
+3 -3
View File
@@ -3,8 +3,8 @@
#include "JSystem/J2DGraph/J2DMaterial.h"
#include "JSystem/J2DGraph/J2DPane.h"
#include "dusk/endian.h"
#include "dusk/string.hpp"
#include "helpers/endian.h"
#include "helpers/string.hpp"
class J2DMaterial;
class JUTFont;
@@ -100,7 +100,7 @@ public:
J2DTextBoxVBinding);
void private_readStream(J2DPane*, JSURandomInputStream*, JKRArchive*);
TEXT_SPAN getStringPtr() const;
dusk::TextSpan getSpan() const;
TextSpan getSpan() const;
s32 setString(s16, char const*, ...);
s32 setString(char const*, ...);
libs/JSystem/include/JSystem/J3DGraphAnimator/J3DAnimation.h
+1 -1
View File
@@ -6,7 +6,7 @@
#include <mtx.h>
#include "global.h"
#include "dusk/endian.h"
#include "helpers/endian.h"
#if TARGET_PC
#define OFFSET_PTR_V0 BE(u32)
libs/JSystem/include/JSystem/J3DGraphAnimator/J3DCluster.h
+1 -1
View File
@@ -3,7 +3,7 @@
#include "JSystem/J3DAssert.h"
#include "JSystem/J3DGraphLoader/J3DClusterLoader.h"
#include "dusk/endian.h"
#include "helpers/endian.h"
class J3DDeformer;
class J3DClusterKey;
libs/JSystem/include/JSystem/J3DGraphAnimator/J3DJointTree.h
+1 -1
View File
@@ -3,7 +3,7 @@
#include "JSystem/J3DAssert.h"
#include "JSystem/J3DGraphBase/J3DTransform.h"
#include "dusk/endian.h"
#include "helpers/endian.h"
class J3DJoint;
class J3DMtxBuffer;
libs/JSystem/include/JSystem/J3DGraphAnimator/J3DModel.h
+4 -4
View File
@@ -3,7 +3,6 @@
#include "JSystem/J3DGraphAnimator/J3DSkinDeform.h"
#include "JSystem/J3DGraphBase/J3DPacket.h"
#include "dusk/frame_interpolation.h"
#include <types.h>
enum J3DMdlFlag {
@@ -106,12 +105,13 @@ public:
void setUserArea(uintptr_t area) { mUserArea = area; }
uintptr_t getUserArea() const { return mUserArea; }
Vec* getBaseScale() { return &mBaseScale; }
#if TARGET_PC
void setAnmMtx(int jointNo, Mtx m);
#else
void setAnmMtx(int jointNo, Mtx m) {
mMtxBuffer->setAnmMtx(jointNo, m);
#ifdef TARGET_PC
dusk::frame_interp::record_final_mtx(mMtxBuffer->getAnmMtx(jointNo));
#endif
}
#endif
MtxP getAnmMtx(int jointNo) { return mMtxBuffer->getAnmMtx(jointNo); }
MtxP getWeightAnmMtx(int i) { return mMtxBuffer->getWeightAnmMtx(i); }
J3DSkinDeform* getSkinDeform() { return mSkinDeform; }
libs/JSystem/include/JSystem/J3DGraphBase/J3DShape.h
+1 -1
View File
@@ -7,7 +7,7 @@
#include "JSystem/JMath/JMath.h"
#include "global.h"
#include <mtx.h>
#include "dusk/endian_gx.hpp"
#include "helpers/endian_gx.hpp"
class J3DShapeMtx;
libs/JSystem/include/JSystem/J3DGraphBase/J3DShapeMtx.h
+1 -1
View File
@@ -4,7 +4,7 @@
#include "JSystem/J3DGraphBase/J3DShape.h"
#include "JSystem/J3DAssert.h"
#include <mtx.h>
#include "dusk/endian.h"
#include "helpers/endian.h"
class J3DTexMtx;
class J3DTexGenBlock;
libs/JSystem/include/JSystem/J3DGraphBase/J3DStruct.h
+1 -1
View File
@@ -7,7 +7,7 @@
#include "global.h"
#include "JSystem/JMath/JMath.h"
#include "dusk/endian.h"
#include "helpers/endian.h"
/**
* @ingroup jsystem-j3d
libs/JSystem/include/JSystem/J3DGraphBase/J3DSys.h
+5 -8
View File
@@ -6,8 +6,7 @@
#include "JSystem/J3DAssert.h"
#include "JSystem/JMath/JMath.h"
#include "dusk/frame_interpolation.h"
#include "dusk/endian.h"
#include "helpers/endian.h"
#include "global.h"
enum J3DSysDrawBuf {
@@ -190,15 +189,13 @@ struct J3DSys {
Mtx& getModelDrawMtx(u16 no) { return mModelDrawMtx[no]; }
J3DShapePacket* getShapePacket() { return mShapePacket; }
#if TARGET_PC
void setViewMtx(const Mtx m);
#else
void setViewMtx(const Mtx m) {
#ifdef TARGET_PC
Mtx patched;
if (dusk::frame_interp::lookup_replacement(m, patched)) {
m = patched;
}
#endif
MTXCopy(m, mViewMtx);
}
#endif
J3DModel* getModel() { return mModel; }
libs/JSystem/include/JSystem/J3DGraphBase/J3DTexture.h
+1 -1
View File
@@ -7,7 +7,7 @@
#include "global.h"
#include <stdint.h>
#include "dusk/gx_helper.h"
#include "helpers/gx_helper.h"
/**
* @ingroup jsystem-j3d
libs/JSystem/include/JSystem/J3DGraphBase/J3DVertex.h
+1 -1
View File
@@ -3,7 +3,7 @@
#include <gx.h>
#include <mtx.h>
#include "dusk/endian_gx.hpp"
#include "helpers/endian_gx.hpp"
class J3DModel;
class J3DAnmVtxColor;
libs/JSystem/include/JSystem/J3DGraphLoader/J3DClusterLoader.h
+1 -1
View File
@@ -4,7 +4,7 @@
#include "JSystem/J3DGraphAnimator/J3DAnimation.h"
#include "JSystem/J3DGraphAnimator/J3DAnimation.h"
#include "dusk/endian.h"
#include "helpers/endian.h"
#if TARGET_PC
#define OFFSET_PTR_V0 BE(u32)
libs/JSystem/include/JSystem/J3DGraphLoader/J3DModelLoader.h
+1 -1
View File
@@ -4,7 +4,7 @@
#include "JSystem/J3DGraphBase/J3DSys.h"
#include <mtx.h>
#include "dusk/endian.h"
#include "helpers/endian.h"
class J3DModelData;
class J3DMaterialTable;
libs/JSystem/include/JSystem/JAudio2/JAISound.h
+1 -1
View File
@@ -5,7 +5,7 @@
#include "JSystem/JAudio2/JAIAudible.h"
#include "JSystem/JUtility/JUTAssert.h"
#include "global.h"
#include "dusk/endian.h"
#include "helpers/endian.h"
#include <cstdint>
class JAISound;
libs/JSystem/include/JSystem/JAudio2/JASAramStream.h
+1 -1
View File
@@ -4,7 +4,7 @@
#include "JSystem/JAudio2/JASTaskThread.h"
#include "JSystem/JUtility/JUTAssert.h"
#include <dvd.h>
#include "dusk/endian.h"
#include "helpers/endian.h"
class JASChannel;
libs/JSystem/include/JSystem/JAudio2/JASOscillator.h
+1 -1
View File
@@ -2,7 +2,7 @@
#define JASOSCILLATOR_H
#include <types.h>
#include "dusk/endian.h"
#include "helpers/endian.h"
/**
* @ingroup jsystem-jaudio
libs/JSystem/include/JSystem/JAudio2/JAUAudibleParam.h
+1 -1
View File
@@ -2,7 +2,7 @@
#define JAUAUDIBLEPARAM_H
#include <types.h>
#include "dusk/endian.h"
#include "helpers/endian.h"
/**
* @ingroup jsystem-jaudio
libs/JSystem/include/JSystem/JAudio2/JAUAudioArcInterpreter.h
+1 -1
View File
@@ -2,7 +2,7 @@
#define JAUAUDIOARCINTERPRETER_H
#include <types.h>
#include "dusk/endian.h"
#include "helpers/endian.h"
/**
* @ingroup jsystem-jaudio
libs/JSystem/include/JSystem/JAudio2/JAUSoundAnimator.h
+1 -1
View File
@@ -2,7 +2,7 @@
#define JAUSOUNDANIMATOR_H
#include "JSystem/JAudio2/JAISound.h"
#include "dusk/offset_ptr.h"
#include "helpers/offset_ptr.h"
class JAUSoundAnimation;
libs/JSystem/include/JSystem/JAudio2/JAUSoundTable.h
+1 -1
View File
@@ -3,7 +3,7 @@
#include "JSystem/JAudio2/JAISound.h"
#include "JSystem/JAudio2/JASGadget.h"
#include "dusk/endian.h"
#include "helpers/endian.h"
/**
* @ingroup jsystem-jaudio
libs/JSystem/include/JSystem/JGadget/binary.h
+1 -1
View File
@@ -3,7 +3,7 @@
#include "JSystem/JUtility/JUTAssert.h"
#include "JSystem/JGadget/search.h"
#include "dusk/endian.h"
#include "helpers/endian.h"
namespace JGadget {
namespace binary {
libs/JSystem/include/JSystem/JHostIO/JHICommonMem.h
+1 -1
View File
@@ -2,7 +2,7 @@
#define JHICOMMONMEM_H
#include <types.h>
#include "dusk/endian.h"
#include "helpers/endian.h"
inline u32 JHIhtonl(u32 v) {
return BSWAP32(v);
libs/JSystem/include/JSystem/JKernel/JKRArchive.h
+1 -1
View File
@@ -4,7 +4,7 @@
#include "JSystem/JKernel/JKRCompression.h"
#include "JSystem/JKernel/JKRFileLoader.h"
#include "global.h"
#include "dusk/endian.h"
#include "helpers/endian.h"
class JKRHeap;
libs/JSystem/include/JSystem/JMath/JMath.h
+1 -1
View File
@@ -4,7 +4,7 @@
#include <mtx.h>
#include <cmath>
#include "dusk/math.h"
#include "helpers/math.h"
typedef f32 Mtx33[3][3];
typedef f32 Mtx23[2][3];
libs/JSystem/include/JSystem/JMessage/JMessage.h
+1 -1
View File
@@ -6,7 +6,7 @@
#else
#include <dolphin.h>
#endif
#include "dusk/endian.h"
#include "helpers/endian.h"
// Struct definitions might be wrong
typedef struct bmg_header_t {
libs/JSystem/include/JSystem/JParticle/JPADynamicsBlock.h
+1 -1
View File
@@ -4,7 +4,7 @@
#include "JSystem/JGeometry.h"
#include <types.h>
#include "dusk/endian.h"
#include "helpers/endian.h"
struct JPAEmitterWorkData;
libs/JSystem/include/JSystem/JParticle/JPAResource.h
+1 -1
View File
@@ -2,7 +2,7 @@
#define JPARESOURCE_H
#include <types.h>
#include "dusk/endian.h"
#include "helpers/endian.h"
class JKRHeap;
struct JPAEmitterWorkData;
libs/JSystem/include/JSystem/JStudio/JStudio/jstudio-math.h
+1 -1
View File
@@ -6,7 +6,7 @@
#define m_PI_D 3.141592653589793
#ifndef __MWERKS__
#include "dusk/math.h"
#include "helpers/math.h"
#endif
namespace JStudio {
libs/JSystem/include/JSystem/JSupport/JSUInputStream.h
+1 -1
View File
@@ -2,7 +2,7 @@
#define JSUINPUTSTREAM_H
#include "JSystem/JSupport/JSUIosBase.h"
#include "dusk/endian.h"
#include "helpers/endian.h"
/**
* @ingroup jsystem-jsupport
libs/JSystem/include/JSystem/JUtility/JUTFont.h
+1 -1
View File
@@ -3,7 +3,7 @@
#include "JSystem/JUtility/TColor.h"
#include <cstring>
#include "dusk/endian.h"
#include "helpers/endian.h"
#if TARGET_PC
struct FontDrawContext {
libs/JSystem/include/JSystem/JUtility/JUTNameTab.h
+1 -1
View File
@@ -2,7 +2,7 @@
#define JUTNAMETAB_H
#include <types.h>
#include "dusk/endian.h"
#include "helpers/endian.h"
/**
* @ingroup jsystem-jutility
libs/JSystem/include/JSystem/JUtility/JUTPalette.h
+1 -1
View File
@@ -3,7 +3,7 @@
#include <gx.h>
#include "dusk/endian.h"
#include "helpers/endian.h"
enum JUTTransparency { UNK0, UNK1 };
libs/JSystem/include/JSystem/JUtility/JUTResFont.h
+1 -1
View File
@@ -2,7 +2,7 @@
#define JUTRESFONT_H
#include "JSystem/JUtility/JUTFont.h"
#include "dusk/gx_helper.h"
#include "helpers/gx_helper.h"
class JKRHeap;
libs/JSystem/include/JSystem/JUtility/JUTTexture.h
+2 -2
View File
@@ -3,8 +3,8 @@
#include <gx.h>
#include <stdint.h>
#include "dusk/endian.h"
#include "dusk/gx_helper.h"
#include "helpers/endian.h"
#include "helpers/gx_helper.h"
class JUTPalette;
libs/JSystem/include/JSystem/JUtility/TColor.h
+1 -1
View File
@@ -2,7 +2,7 @@
#define TCOLOR_H
#include <gx.h>
#include "dusk/endian.h"
#include "helpers/endian.h"
namespace JUtility {