26 02 27 pjb dev 2 (#41)

* fix kankyo UB

* Fix TEV Stage DL writing

BE issue

* BE Fixes in materials/shapes

* Move to Aurora GD impl

* JUTDataFileHeader

* j3d: load vertex and texture not through GD

* Endian swap vertex data (mostly)

* Just exit(0) when closing the game

Fix crashes :godo:

* fix fopAcM_ct_placement and remove memcpy

* J3D: track vertex arrays correctly, swap work

* fix visibility, turn off overridden new/delete when we call into aurora

* event: cut name be

* Default window improvements

Double size, allow OS to decide position

* survive TParse::parseHeader_next

* color swap fix

* swap endian/fixes oob function pointer

* Remove GXGetViewportv stub

Aurora has it now

* Set array pointers via GD again

Relies on https://github.com/encounter/aurora/pull/35

* Let Aurora decide graphics backend

* disable procbar drawing

* Fix TColor endianness conversion issues

Fixes the wrong color for the flashing logo

* cam param swap

* simplify vtx loading, mat/amb color fix

* endian swap stb/fvb data

* aurora stat changes

* fix storage buffer crash

dont unnecessarily reassign vertex buffers in a way that forces aurora to recache things

* set bgobj spec fix

* add camera debug, endian swap more stb data, d_a_bg_obj::spec_data_c swapped

* JKRExpHeap: fix bad allocator slowdown

* solid tex

* texture caching

* log level

* fix window aspect ratio, disable bloom, endian swap camera type data

camera is now actually playing opening cutscene!!!!

* add GXDestroyTexObj to a couple stack init'd GXTexObjs, remove some diag printfs

* endian swap joint weight envelope data

* move to dusk config

* verbose arg errors

* better stub logging (for now)

* less logging, more BE

* more stubbing, move logging stuff around

* move all logging to aurora logging

* fix STUB_LOG, __FUNCTION__ isn't a string literal, wasn't building as it
was.

* update aurora

* fix heap alignment mismatch and always head align for now

* prevent them from fucking up my shit

* forward jut warning to DuskLog

* remove report logging

* maybe and i must emphasize maybe fix JMessage parsing

* this was a dumb idea

* preserve negative alignment for JKRHeap

* use normal free on macos and linux

* ^

* fix JMAHermiteInterpolation c impl

* endian swap J2DScreen mColor (oops)

* swap more J3D anim data, remove weird pointer addr check in J3DMaterial getMaterialAnm

* typo fix

* Fix aligned_alloc() size issues on POSIX

aligned_alloc() requires its input size to be a multiple of alignment. This wasn't being upheld so there were allocation failures in init code that made the game fail to start outside Windows.

Also just cleaned up some of this code a bit and removed fallback cases that *shouldn't* get hit.

* _Exit instead of exit()

Seriously I don't want destructors to run. Let the OS reclaim that shit.

* Reapply "Isolate JKRHeap operator overloads" (#39)

This reverts commit 3623b27f37.

* Fix some oopsies

* Fix hardcoded pointer size in JUTCacheFont::allocArray

* More operator overload fixes

Add void template specialization for jkrDelete

Add new[] placement overload. Apparently.

* Fix delete macros on nullptr

TIL C++ allows that.

* fix delete[]

* fix new(std::nothrow) overload

* fix avoid ub

* swap remaining anim data needed for title logo

* get rid of op 7

* move aurora_end_frame to correct spot

* juttexture destroy tex

* j2d animation be

* shutdown crash

* link warp material fix

* mDoExt_3DlineMat1_c fix

* hacky keyboard controls

* endian swap J2DResReference, add kb_pad to files.cmake

* fix some missing endian swaps in J2D, remove addr alignment check

* Remove heap unsetting in aurora calls

Never worked properly and not the right solution even if it did

* Don't print in DC stubs

They're fine to never implement

* Fix alignment stuff again

* Compile GF from dolphin lib

Doesn't seem to break anything and shuts up some stub warnings

* j3dtexture tlut obj fix

* addTexMtxIndexInDL fix

* don't recreate null tex data every frame

* the actual fix i wanted to push

* its kinda fakematch city over here

* insert hte efb copy

* limited window size / viewport support

* IsDelete FIX

---------

Co-authored-by: madeline <qwertytrogi@gmail.com>
Co-authored-by: Jasper St. Pierre <jstpierre@mecheye.net>
Co-authored-by: Jeffrey Crowell <jeff@crowell.biz>
Co-authored-by: TakaRikka <takarikka@outlook.com>
Co-authored-by: CraftyBoss <talibabdulmaalik@gmail.com>
Co-authored-by: Lurs <2795933+Lurs@users.noreply.github.com>

libs/JSystem/include/JSystem/J3DGraphBase/J3DMatBlock.h

@@ -587,6 +587,9 @@ public:
     virtual void patchTexNoAndTexCoordScale() {}
     virtual void ptrToIndex() = 0;
     virtual void indexToPtr() = 0;
+#if TARGET_PC
+    virtual void loadTexture() = 0;
+#endif
     virtual u32 getType() = 0;
     virtual s32 countDLSize() { return 0; }
     virtual void setTexNo(u32, u16 const*) {}
@@ -644,6 +647,7 @@ public:
     virtual void reset(J3DTevBlock*) {}
     virtual void ptrToIndex() {}
     virtual void indexToPtr() { indexToPtr_private(mTexNoOffset); }
+    virtual void loadTexture() {}
     virtual u32 getType() { return 'TVNL'; }
     virtual ~J3DTevBlockNull() {}
 };
@@ -671,6 +675,9 @@ public:
     virtual void patchTevReg();
     virtual void patchTexNoAndTexCoordScale();
     virtual void ptrToIndex();
+#if TARGET_PC
+    virtual void loadTexture();
+#endif
     virtual void indexToPtr() { indexToPtr_private(mTexNoOffset); }
     virtual u32 getType() { return 'TVPT'; }
     virtual void setTevStageNum(u8 const* num) {
@@ -814,6 +821,9 @@ public:
     virtual void patchTexNoAndTexCoordScale();
     virtual void ptrToIndex() {}
     virtual void indexToPtr() { indexToPtr_private(mTexNoOffset); }
+#if TARGET_PC
+    virtual void loadTexture();
+#endif
     virtual u32 getType() { return 'TVB1'; }
     virtual s32 countDLSize();
     virtual void setTexNo(u32 idx, u16 const* no) {
@@ -904,6 +914,9 @@ public:
     virtual void patchTexNoAndTexCoordScale();
     virtual void ptrToIndex() {}
     virtual void indexToPtr() { indexToPtr_private(mTexNoOffset); }
+#if TARGET_PC
+    virtual void loadTexture();
+#endif
     virtual u32 getType() { return 'TVB2'; }
     virtual s32 countDLSize();
     virtual void setTexNo(u32 idx, u16 const* texNo) {
@@ -1080,6 +1093,9 @@ public:
     virtual void patchTexNoAndTexCoordScale();
     virtual void ptrToIndex() {}
     virtual void indexToPtr() { indexToPtr_private(mTexNoOffset); }
+#if TARGET_PC
+    virtual void loadTexture();
+#endif
     virtual u32 getType() { return 'TVB4'; }
     virtual s32 countDLSize();
     virtual void setTexNo(u32 idx, u16 const* texNo) {
@@ -1256,6 +1272,9 @@ public:
     virtual void patchTexNoAndTexCoordScale();
     virtual void ptrToIndex();
     virtual void indexToPtr() { indexToPtr_private(mTexNoOffset); }
+#if TARGET_PC
+    virtual void loadTexture();
+#endif
     virtual u32 getType() { return 'TV16'; }
     virtual s32 countDLSize();
     virtual void setTexNo(u32 idx, u16 const* texNo) {

libs/JSystem/include/JSystem/J3DGraphBase/J3DMaterial.h

@@ -56,7 +56,11 @@ public:
     J3DIndBlock* getIndBlock() { return mIndBlock; }
     J3DJoint* getJoint() { return mJoint; }
     J3DMaterialAnm* getMaterialAnm() {
+#if TARGET_PC
+        return mMaterialAnm;
+#else
         return (uintptr_t)mMaterialAnm < 0xC0000000 ? mMaterialAnm : NULL;
+#endif
     }
     u32 getMaterialMode() { return mMaterialMode; }
     J3DNBTScale* getNBTScale() { return mTexGenBlock->getNBTScale(); }

libs/JSystem/include/JSystem/J3DGraphBase/J3DShape.h

@@ -15,8 +15,8 @@ class J3DShapeMtx;
  */
 class J3DCurrentMtxInfo {
 public:
-    u32 mMtxIdxRegA;
-    u32 mMtxIdxRegB;
+    BE(u32) mMtxIdxRegA;
+    BE(u32) mMtxIdxRegB;
 };
 
 /**
@@ -122,7 +122,11 @@ public:
         initialize();
     }
 
+#if TARGET_PC
+    static const int kVcdVatDLSize = 0x180;
+#else
     static const int kVcdVatDLSize = 0xC0;
+#endif
 
     void initialize();
     void addTexMtxIndexInDL(GXAttr, u32);

libs/JSystem/include/JSystem/J3DGraphBase/J3DSys.h

@@ -65,6 +65,11 @@ struct J3DSys {
     /* 0x10C */ void* mVtxPos;
     /* 0x110 */ void* mVtxNrm;
     /* 0x114 */ GXColor* mVtxCol;
+#if TARGET_PC
+    int mVtxPosNum = 0;
+    int mVtxNrmNum = 0;
+    int mVtxColNum = 0;
+#endif
     /* 0x118 */ BE(Vec)* mNBTScale;
 
     J3DSys();
@@ -151,21 +156,34 @@ struct J3DSys {
     void setModelNrmMtx(Mtx33* pMtxArr) {
         J3D_ASSERT_NULLPTR(241, pMtxArr);
         mModelNrmMtx = pMtxArr;
-        GXSETARRAY(GX_POS_MTX_ARRAY, mModelNrmMtx, sizeof(*mModelNrmMtx), sizeof(*mModelNrmMtx));
+        GXSETARRAY(GX_NRM_MTX_ARRAY, mModelNrmMtx, sizeof(*mModelNrmMtx), sizeof(*mModelNrmMtx));
     }
 
     void* getVtxPos() { return mVtxPos; }
 
-    void setVtxPos(void* pVtxPos) {
+    void setVtxPos(void* pVtxPos, int num) {
         J3D_ASSERT_NULLPTR(252, pVtxPos != NULL);
         mVtxPos = pVtxPos;
+#if TARGET_PC
+        mVtxPosNum = num;
+#endif
     }
 
     void* getVtxNrm() { return mVtxNrm; }
-    void setVtxNrm(void* pVtxNrm) { mVtxNrm = pVtxNrm; }
+    void setVtxNrm(void* pVtxNrm, int num) {
+        mVtxNrm = pVtxNrm;
+#if TARGET_PC
+        mVtxNrmNum = num;
+#endif
+    }
 
     void* getVtxCol() { return mVtxCol; }
-    void setVtxCol(GXColor* pVtxCol) { mVtxCol = pVtxCol; }
+    void setVtxCol(GXColor* pVtxCol, int num) {
+        mVtxCol = pVtxCol;
+#if TARGET_PC
+        mVtxColNum = num;
+#endif
+    }
 
     Mtx& getModelDrawMtx(u16 no) { return mModelDrawMtx[no]; }
     J3DShapePacket* getShapePacket() { return mShapePacket; }

libs/JSystem/include/JSystem/J3DGraphBase/J3DTevs.h

@@ -112,8 +112,8 @@ struct J3DTevStage {
     void setTexSel(u8 tex_sel) { mTevSwapModeInfo = (mTevSwapModeInfo & ~0xc) | (tex_sel << 2); }
 
     void load(u32 param_1) const {
-        J3DGDWriteBPCmd(*(u32*)&field_0x0);
-        J3DGDWriteBPCmd(*(u32*)&field_0x4);
+        J3DGDWriteBPCmd(*(BE(u32)*)&field_0x0);
+        J3DGDWriteBPCmd(*(BE(u32)*)&field_0x4);
     }
 
     J3DTevStage& operator=(const J3DTevStage& other) {

libs/JSystem/include/JSystem/J3DGraphBase/J3DTexture.h

@@ -17,15 +17,45 @@ private:
     /* 0x2 */ u16 unk_0x2;
     /* 0x4 */ ResTIMG* mpRes;
 
+#if TARGET_PC
+    GXTlutObj* mpTlutObj;
+    GXTexObj* mpTexObj;
+    u8** mpImgDataPtr;
+    u8** mpTlutDataPtr;
+#endif
+
 public:
     J3DTexture(u16 num, ResTIMG* res) : mNum(num), unk_0x2(0), mpRes(res) {
         J3D_ASSERT_NULLPTR(52, res != NULL || num == 0);
+#if TARGET_PC
+        mpTexObj = new GXTexObj[num];
+        mpTlutObj = new GXTlutObj[num];
+        mpImgDataPtr = new u8*[num];
+        mpTlutDataPtr = new u8*[num];
+        for (u16 i = 0; i < num; i++) {
+            mpImgDataPtr[i] = (u8*)(&mpRes[i]) + mpRes[i].imageOffset;
+            mpTlutDataPtr[i] = (u8*)(&mpRes[i]) + mpRes[i].paletteOffset;
+            loadGXTexObj(i);
+        }
+#endif
     }
 
     void loadGX(u16, GXTexMapID) const;
+#if TARGET_PC
+    void loadGXTexObj(u16);
+#endif
     void entryNum(u16);
     void addResTIMG(u16, ResTIMG const*);
-    virtual ~J3DTexture() {}
+    virtual ~J3DTexture(){
+#if TARGET_PC
+        for (int i = 0; i < mNum; i++)
+            GXDestroyTexObj(&mpTexObj[i]);
+        delete[] mpTexObj;
+        delete[] mpTlutObj;
+        delete[] mpImgDataPtr;
+        delete[] mpTlutDataPtr;
+#endif
+    }
 
     u16 getNum() const { return mNum; }
 
@@ -34,11 +64,24 @@ public:
         return &mpRes[index];
     }
 
+#if TARGET_PC
+    u8* getImgDataPtr(u16 index) const {
+        return mpImgDataPtr[index];
+    }
+#endif
+
     void setResTIMG(u16 index, const ResTIMG& timg) {
         J3D_ASSERT_RANGE(81, index < mNum);
         mpRes[index] = timg;
+
+#if TARGET_PC
+        mpImgDataPtr[index] = ((u8*)&timg) + timg.imageOffset;
+        mpTlutDataPtr[index] = ((u8*)&timg) + timg.paletteOffset;
+        loadGXTexObj(index);
+#else
         mpRes[index].imageOffset = ((mpRes[index].imageOffset + (uintptr_t)&timg - (uintptr_t)(mpRes + index)));
         mpRes[index].paletteOffset = ((mpRes[index].paletteOffset + (uintptr_t)&timg - (uintptr_t)(mpRes + index)));
+#endif
     }
 };
 

libs/JSystem/include/JSystem/J3DGraphBase/J3DVertex.h

@@ -52,6 +52,22 @@ public:
     void setVtxNrmFrac(u8 frac) { mVtxNrmFrac = frac; }
     void setVtxNrmType(GXCompType type) { mVtxNrmType = type; }
 
+#if TARGET_PC
+    u32 getVtxArrNum(GXAttr attr) const {
+        JUT_ASSERT(1234, attr >= GX_VA_POS && attr <= GX_VA_TEX7);
+        return mVtxArrNum[attr - GX_VA_POS];
+    }
+
+    u32 getVtxArrStride(GXAttr attr) const {
+        JUT_ASSERT(1234, attr >= GX_VA_POS && attr <= GX_VA_TEX7);
+        return mVtxArrStride[attr - GX_VA_POS];
+    }
+
+    u32 getVtxArrByteSize(GXAttr attr) const {
+        return getVtxArrNum(attr) * getVtxArrStride(attr);
+    }
+#endif
+
 private:
     friend class J3DModelLoader;
     
@@ -70,6 +86,12 @@ private:
     /* 0x50 */ GXCompType mVtxPosType;
     /* 0x54 */ u8 mVtxNrmFrac;
     /* 0x58 */ GXCompType mVtxNrmType;
+
+#if TARGET_PC
+    bool mHasReadInformation = false;
+    u32 mVtxArrStride[12]{};
+    u32 mVtxArrNum[12]{};
+#endif
 };
 
 /**