Files
Pieter-Jan Briers b289dece80 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>
2026-03-08 15:27:15 -07:00

245 lines
5.7 KiB
C++

#ifndef F_AP_F_AP_GAME_H
#define F_AP_F_AP_GAME_H
#include "JSystem/JUtility/TColor.h"
#include "JSystem/JHostIO/JORReflexible.h"
#include "JSystem/JFramework/JFWDisplay.h"
#include "JSystem/JUtility/JUTAssert.h"
#include "CaptureScreen.h"
#include <cstring>
#include "JSystem/JKernel/JKRHeap.h"
void fapGm_After();
void fapGm_Create();
void fapGm_Execute();
class fapGm_HIO_c : public JORReflexible {
public:
fapGm_HIO_c();
#if DEBUG
virtual void listenPropertyEvent(const JORPropertyEvent*);
virtual void genMessage(JORMContext*);
#endif
virtual ~fapGm_HIO_c() {}
static void startCpuTimer();
static void stopCpuTimer(const char*);
static void printCpuTimer(const char*);
static void executeCaptureScreen() {}
static void createCaptureScreen() {
mCaptureScreen = JKR_NEW CaptureScreen(JFWDisplay::getManager());
JUT_ASSERT(46, mCaptureScreen != NULL);
}
static bool isCaptureScreen() {
#if DEBUG
return mCaptureScreenFlag;
#else
return false;
#endif
}
static void onCpuTimer() {
m_CpuTimerOn = TRUE;
}
static void offCpuTimer() {
m_CpuTimerOff = FALSE;
}
static u8 getCaptureScreenNumH() { return mCaptureScreenNumH; }
static u8 getCaptureScreenNumV() { return mCaptureScreenNumV; }
static u8 getCaptureScreenDivH() { return mCaptureScreenDivH; }
static u8 getCaptureScreenDivV() { return mCaptureScreenDivV; }
static u8 m_CpuTimerOn;
static u8 m_CpuTimerOff;
static u8 m_CpuTimerStart;
static u32 m_CpuTimerTick;
static CaptureScreen* mCaptureScreen;
static void* mCaptureScreenBuffer;
static s16 mCaptureScreenFlag;
static u16 mCaptureScreenWidth;
static u16 mCaptureScreenHeight;
static u16 mCaptureScreenLinePf;
static u16 mCaptureScreenLineNum;
static u8 mCaptureScreenNumH;
static u8 mCaptureScreenNumV;
static u8 mParticle254Fix;
static u8 mCaptureMagnification;
static u8 mCaptureScreenDivH;
static u8 mCaptureScreenDivV;
static u8 mPackArchiveMode;
/* 0x04 */ s8 field_0x04;
/* 0x05 */ u8 field_0x03[3];
/* 0x08 */ JUtility::TColor mColor;
/* 0x0C */ f32 mLROnValue;
/* 0x10 */ f32 mLROffValue;
/* 0x14 */ u8 mUsingHostIO;
/* 0x15 */ u8 mDisplayMeter;
/* 0x16 */ u8 mDisplayPrint;
/* 0x17 */ u8 mDisplay2D;
/* 0x18 */ u8 mDisplayParticle;
/* 0x19 */ u8 mDisplayProcessID;
#if PLATFORM_WII || PLATFORM_SHIELD
/* 0x1A */ u8 mTrapFilter;
/* 0x1B */ u8 mGammaCorrection;
#endif
/* 0x1A */ u8 mMemBlockOff;
/* 0x1C */ s16 mRegister0;
/* 0x1E */ s16 mRegister1;
/* 0x20 */ s16 mRegister2;
/* 0x22 */ s16 mRegister3;
#if DEBUG
/* 0x26 */ u8 field_0x26[2];
#endif
/* 0x24 */ JUtility::TColor mLetterTopColor;
/* 0x28 */ JUtility::TColor mLetterBottomColor;
/* 0x2C */ JUtility::TColor mLetterTopShadowColor;
/* 0x30 */ JUtility::TColor mLetterBottomShadowColor;
/* 0x34 */ s16 mLetterPositionX;
/* 0x36 */ s16 mLetterPositionY;
/* 0x38 */ s16 mLineSpacing;
/* 0x3A */ s16 mLetterSpacing;
/* 0x3C */ s16 mLetterFontSize;
/* 0x3E */ u8 mBackgroundAlpha;
}; // Size: 0x40
extern fapGm_HIO_c g_HIO;
inline void fapGmHIO_offMenu() {
g_HIO.mDisplayPrint &= (u8)~2;
}
inline void fapGmHIO_onMenu() {
g_HIO.mDisplayPrint |= (u8)2;
}
inline BOOL fapGmHIO_isMenu() {
return g_HIO.mDisplayPrint & 2;
}
inline BOOL fapGmHIO_isPrint() {
return g_HIO.mDisplayPrint & 1;
}
inline u8 fapGmHIO_getMeter() {
return g_HIO.mDisplayMeter;
}
inline f32 fapGmHIO_getLROnValue() {
return g_HIO.mLROnValue;
}
inline f32 fapGmHIO_getLROffValue() {
return g_HIO.mLROffValue;
}
inline u8 fapGmHIO_getHostIO() {
return g_HIO.mUsingHostIO;
}
inline void fapGmHIO_set2Ddraw(u8 param_0) {
g_HIO.mDisplay2D = param_0;
}
inline u8 fapGmHIO_get2Ddraw() {
#if DEBUG
return g_HIO.mDisplay2D;
#else
return TRUE;
#endif
}
inline void fapGmHIO_offPrint() {
g_HIO.mDisplayPrint &= (u8)~0x1;
}
inline void fapGmHIO_onPrint() {
g_HIO.mDisplayPrint |= (u8)0x1;
}
inline u8 fapGmHIO_getParticle() {
#if DEBUG
return g_HIO.mDisplayParticle;
#else
return TRUE;
#endif
}
#if PLATFORM_WII || PLATFORM_SHIELD
inline u8 fapGmHIO_getTrapFilter() {
return g_HIO.mTrapFilter;
}
inline u8 fapGmHIO_getGamma() {
return g_HIO.mGammaCorrection;
}
#endif
inline u8 fapGmHIO_getMemoryBlockOff() {
return g_HIO.mMemBlockOff;
}
struct fapGm_dataMem {
enum HeapType_e {
HeapType_Error_e,
HeapType_ARAM_e,
HeapType_Root_e,
HeapType_System_e,
HeapType_Zelda_e,
HeapType_Archive_e,
HeapType_Game_e,
HeapType_Command_e,
HeapType_Stage_e,
HeapType_J2D_e,
HeapType_Dynamic_e,
};
enum TagAttribute_e {
TagAtt_Fixed_e,
TagAtt_Variable_e,
};
enum TagType_e {
TagType_Audio_e,
TagType_Particle_e,
TagType_System_e,
TagType_Unknown_e,
TagType_Message_e,
TagType_2D_e,
TagType_Player_e,
TagType_Archive_e,
TagType_ArchiveSub_e,
TagType_ArchiveStage_e,
TagType_ArchiveStageSub_e,
TagType_Program_e,
TagType_Object_e,
TagType_Stage_e,
TagType_Heap_e,
};
static void printfTag(int, int, int, const char*, void*, u32, const char*, const char*);
static int findParentHeap(void*);
static void dumpTag();
static void dumpCsv();
static int getCsvSize() { return strlen(mCsv); }
static char* getCsv() { return mCsv; }
static inline char* getCsvEnd() { return mCsv + strlen(mCsv); }
static char mCsv[0x8000];
};
#endif /* F_AP_F_AP_GAME_H */