mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-09 02:15:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

26 02 27 pjb dev 2 (#41)

Browse Source 
* 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>
This commit is contained in:
Pieter-Jan Briers
2026-03-08 23:27:15 +01:00
committed by GitHub
parent 820e2e3df6
commit b289dece80
726 changed files with 5289 additions and 4237 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libs/JSystem/src/J2DGraph/J2DAnimation.cpp
+33 -33
View File
@@ -152,7 +152,7 @@ void J2DAnmTransformKey::calcTransform(f32 param_0, u16 param_1,
transformInfo->mScale.x = mScaleValues[xInf->mScaleInfo.mOffset];
break;
default:
transformInfo->mScale.x = J2DGetKeyFrameInterpolation<f32>(
transformInfo->mScale.x = J2DGetKeyFrameInterpolation<BE(f32)>(
param_0, &xInf->mScaleInfo, &mScaleValues[xInf->mScaleInfo.mOffset]);
}
switch (yInf->mScaleInfo.mMaxFrame) {
@@ -163,7 +163,7 @@ void J2DAnmTransformKey::calcTransform(f32 param_0, u16 param_1,
transformInfo->mScale.y = mScaleValues[yInf->mScaleInfo.mOffset];
break;
default:
transformInfo->mScale.y = J2DGetKeyFrameInterpolation<f32>(
transformInfo->mScale.y = J2DGetKeyFrameInterpolation<BE(f32)>(
param_0, &yInf->mScaleInfo, &mScaleValues[yInf->mScaleInfo.mOffset]);
}
switch (zInf->mScaleInfo.mMaxFrame) {
@@ -174,7 +174,7 @@ void J2DAnmTransformKey::calcTransform(f32 param_0, u16 param_1,
transformInfo->mScale.z = mScaleValues[zInf->mScaleInfo.mOffset];
break;
default:
transformInfo->mScale.z = J2DGetKeyFrameInterpolation<f32>(
transformInfo->mScale.z = J2DGetKeyFrameInterpolation<BE(f32)>(
param_0, &zInf->mScaleInfo, &mScaleValues[zInf->mScaleInfo.mOffset]);
}
switch (xInf->mRotationInfo.mMaxFrame) {
@@ -186,7 +186,7 @@ void J2DAnmTransformKey::calcTransform(f32 param_0, u16 param_1,
break;
default:
transformInfo->mRotation.x =
static_cast<s32>(J2DGetKeyFrameInterpolation<s16>(
static_cast<s32>(J2DGetKeyFrameInterpolation<BE(s16)>(
param_0, &xInf->mRotationInfo, &mRotationValues[xInf->mRotationInfo.mOffset]))
<< field_0x24;
}
@@ -199,7 +199,7 @@ void J2DAnmTransformKey::calcTransform(f32 param_0, u16 param_1,
break;
default:
transformInfo->mRotation.y =
static_cast<s32>(J2DGetKeyFrameInterpolation<s16>(
static_cast<s32>(J2DGetKeyFrameInterpolation<BE(s16)>(
param_0, &yInf->mRotationInfo, &mRotationValues[yInf->mRotationInfo.mOffset]))
<< field_0x24;
}
@@ -212,7 +212,7 @@ void J2DAnmTransformKey::calcTransform(f32 param_0, u16 param_1,
break;
default:
transformInfo->mRotation.z =
static_cast<s32>(J2DGetKeyFrameInterpolation<s16>(
static_cast<s32>(J2DGetKeyFrameInterpolation<BE(s16)>(
param_0, &zInf->mRotationInfo, &mRotationValues[zInf->mRotationInfo.mOffset]))
<< field_0x24;
}
@@ -224,7 +224,7 @@ void J2DAnmTransformKey::calcTransform(f32 param_0, u16 param_1,
transformInfo->mTranslate.x = mTranslateValues[xInf->mTranslateInfo.mOffset];
break;
default:
transformInfo->mTranslate.x = J2DGetKeyFrameInterpolation<f32>(
transformInfo->mTranslate.x = J2DGetKeyFrameInterpolation<BE(f32)>(
param_0, &xInf->mTranslateInfo, &mTranslateValues[xInf->mTranslateInfo.mOffset]);
}
switch (yInf->mTranslateInfo.mMaxFrame) {
@@ -235,7 +235,7 @@ void J2DAnmTransformKey::calcTransform(f32 param_0, u16 param_1,
transformInfo->mTranslate.y = mTranslateValues[yInf->mTranslateInfo.mOffset];
break;
default:
transformInfo->mTranslate.y = J2DGetKeyFrameInterpolation<f32>(
transformInfo->mTranslate.y = J2DGetKeyFrameInterpolation<BE(f32)>(
param_0, &yInf->mTranslateInfo, &mTranslateValues[yInf->mTranslateInfo.mOffset]);
}
switch (zInf->mTranslateInfo.mMaxFrame) {
@@ -246,7 +246,7 @@ void J2DAnmTransformKey::calcTransform(f32 param_0, u16 param_1,
transformInfo->mTranslate.z = mTranslateValues[zInf->mTranslateInfo.mOffset];
break;
default:
transformInfo->mTranslate.z = J2DGetKeyFrameInterpolation<f32>(
transformInfo->mTranslate.z = J2DGetKeyFrameInterpolation<BE(f32)>(
param_0, &zInf->mTranslateInfo, &mTranslateValues[zInf->mTranslateInfo.mOffset]);
}
}
@@ -315,7 +315,7 @@ void J2DAnmColorKey::getColor(u16 param_0, GXColor* pColor) const {
pColor->r = mRValues[info->mRInfo.mOffset];
break;
default:
val = J2DGetKeyFrameInterpolation<s16>(mFrame, &info->mRInfo,
val = J2DGetKeyFrameInterpolation<BE(s16)>(mFrame, &info->mRInfo,
&mRValues[info->mRInfo.mOffset]);
if (val < 0) {
pColor->r = 0;
@@ -333,7 +333,7 @@ void J2DAnmColorKey::getColor(u16 param_0, GXColor* pColor) const {
pColor->g = mGValues[info->mGInfo.mOffset];
break;
default:
val = J2DGetKeyFrameInterpolation<s16>(mFrame, &info->mGInfo,
val = J2DGetKeyFrameInterpolation<BE(s16)>(mFrame, &info->mGInfo,
&mGValues[info->mGInfo.mOffset]);
if (val < 0) {
pColor->g = 0;
@@ -351,7 +351,7 @@ void J2DAnmColorKey::getColor(u16 param_0, GXColor* pColor) const {
pColor->b = mBValues[info->mBInfo.mOffset];
break;
default:
val = J2DGetKeyFrameInterpolation<s16>(mFrame, &info->mBInfo,
val = J2DGetKeyFrameInterpolation<BE(s16)>(mFrame, &info->mBInfo,
&mBValues[info->mBInfo.mOffset]);
if (val < 0) {
pColor->b = 0;
@@ -369,7 +369,7 @@ void J2DAnmColorKey::getColor(u16 param_0, GXColor* pColor) const {
pColor->a = mAValues[info->mAInfo.mOffset];
break;
default:
val = J2DGetKeyFrameInterpolation<s16>(mFrame, &info->mAInfo,
val = J2DGetKeyFrameInterpolation<BE(s16)>(mFrame, &info->mAInfo,
&mAValues[info->mAInfo.mOffset]);
if (val < 0) {
pColor->a = 0;
@@ -430,7 +430,7 @@ void J2DAnmVtxColorKey::getColor(u8 param_0, u16 param_1, GXColor* pColor) const
pColor->r = mRValues[info->mRInfo.mOffset];
break;
default:
val = J2DGetKeyFrameInterpolation<s16>(mFrame, &info->mRInfo,
val = J2DGetKeyFrameInterpolation<BE(s16)>(mFrame, &info->mRInfo,
&mRValues[info->mRInfo.mOffset]);
if ((val <= 0)) {
pColor->r = 0;
@@ -448,7 +448,7 @@ void J2DAnmVtxColorKey::getColor(u8 param_0, u16 param_1, GXColor* pColor) const
pColor->g = mGValues[info->mGInfo.mOffset];
break;
default:
val = J2DGetKeyFrameInterpolation<s16>(mFrame, &info->mGInfo,
val = J2DGetKeyFrameInterpolation<BE(s16)>(mFrame, &info->mGInfo,
&mGValues[info->mGInfo.mOffset]);
if (val <= 0) {
pColor->g = 0;
@@ -466,7 +466,7 @@ void J2DAnmVtxColorKey::getColor(u8 param_0, u16 param_1, GXColor* pColor) const
pColor->b = mBValues[info->mBInfo.mOffset];
break;
default:
val = J2DGetKeyFrameInterpolation<s16>(mFrame, &info->mBInfo,
val = J2DGetKeyFrameInterpolation<BE(s16)>(mFrame, &info->mBInfo,
&mBValues[info->mBInfo.mOffset]);
if (val <= 0) {
pColor->b = 0;
@@ -484,7 +484,7 @@ void J2DAnmVtxColorKey::getColor(u8 param_0, u16 param_1, GXColor* pColor) const
pColor->a = mAValues[info->mAInfo.mOffset];
break;
default:
val = J2DGetKeyFrameInterpolation<s16>(mFrame, &info->mAInfo,
val = J2DGetKeyFrameInterpolation<BE(s16)>(mFrame, &info->mAInfo,
&mAValues[info->mAInfo.mOffset]);
if (val <= 0) {
pColor->a = 0;
@@ -511,7 +511,7 @@ void J2DAnmTextureSRTKey::calcTransform(f32 param_0, u16 param_1, J3DTextureSRTI
pInfo->mScaleX = mScaleValues[xInf->mScaleInfo.mOffset];
break;
default:
pInfo->mScaleX = J2DGetKeyFrameInterpolation<f32>(param_0, &xInf->mScaleInfo,
pInfo->mScaleX = J2DGetKeyFrameInterpolation<BE(f32)>(param_0, &xInf->mScaleInfo,
&mScaleValues[xInf->mScaleInfo.mOffset]);
}
switch (yInf->mScaleInfo.mMaxFrame) {
@@ -522,7 +522,7 @@ void J2DAnmTextureSRTKey::calcTransform(f32 param_0, u16 param_1, J3DTextureSRTI
pInfo->mScaleY = mScaleValues[yInf->mScaleInfo.mOffset];
break;
default:
pInfo->mScaleY = J2DGetKeyFrameInterpolation<f32>(param_0, &yInf->mScaleInfo,
pInfo->mScaleY = J2DGetKeyFrameInterpolation<BE(f32)>(param_0, &yInf->mScaleInfo,
&mScaleValues[yInf->mScaleInfo.mOffset]);
}
switch (zInf->mRotationInfo.mMaxFrame) {
@@ -534,7 +534,7 @@ void J2DAnmTextureSRTKey::calcTransform(f32 param_0, u16 param_1, J3DTextureSRTI
break;
default:
pInfo->mRotation =
static_cast<s32>(J2DGetKeyFrameInterpolation<s16>(
static_cast<s32>(J2DGetKeyFrameInterpolation<BE(s16)>(
param_0, &zInf->mRotationInfo, &mRotationValues[zInf->mRotationInfo.mOffset]))
<< field_0x10;
}
@@ -546,7 +546,7 @@ void J2DAnmTextureSRTKey::calcTransform(f32 param_0, u16 param_1, J3DTextureSRTI
pInfo->mTranslationX = mTranslationValues[xInf->mTranslateInfo.mOffset];
break;
default:
pInfo->mTranslationX = J2DGetKeyFrameInterpolation<f32>(
pInfo->mTranslationX = J2DGetKeyFrameInterpolation<BE(f32)>(
param_0, &xInf->mTranslateInfo, &mTranslationValues[xInf->mTranslateInfo.mOffset]);
}
switch (yInf->mTranslateInfo.mMaxFrame) {
@@ -557,7 +557,7 @@ void J2DAnmTextureSRTKey::calcTransform(f32 param_0, u16 param_1, J3DTextureSRTI
pInfo->mTranslationY = mTranslationValues[yInf->mTranslateInfo.mOffset];
break;
default:
pInfo->mTranslationY = J2DGetKeyFrameInterpolation<f32>(
pInfo->mTranslationY = J2DGetKeyFrameInterpolation<BE(f32)>(
param_0, &yInf->mTranslateInfo, &mTranslationValues[yInf->mTranslateInfo.mOffset]);
}
}
@@ -585,8 +585,8 @@ void J2DAnmTexPattern::searchUpdateMaterialID(J2DScreen* pScreen) {
mUpdateMaterialID[entry] = 0xFFFF;
}
}
delete[] mTIMGPtrArray;
mTIMGPtrArray = new J2DAnmTexPatternTIMGPointer[pScreen->mTexRes->mCount];
JKR_DELETE_ARRAY(mTIMGPtrArray);
mTIMGPtrArray = JKR_NEW J2DAnmTexPatternTIMGPointer[pScreen->mTexRes->mCount];
if (mTIMGPtrArray != NULL) {
JUTResReference resRef;
for (u16 i = 0; i < pScreen->mTexRes->mCount; i++) {
@@ -601,7 +601,7 @@ void J2DAnmTexPattern::searchUpdateMaterialID(J2DScreen* pScreen) {
}
mTIMGPtrArray[i].mRes = var2;
if (var2 != NULL && var2->indexTexture) {
mTIMGPtrArray[i].mPalette = new JUTPalette(
mTIMGPtrArray[i].mPalette = JKR_NEW JUTPalette(
GX_TLUT0,
GXTlutFmt(var2->colorFormat),
JUTTransparency(var2->alphaEnabled),
@@ -676,7 +676,7 @@ void J2DAnmTevRegKey::getTevColorReg(u16 param_0, GXColorS10* pColor) const {
pColor->r = mCRValues[info->mRTable.mOffset];
break;
default:
val = J2DGetKeyFrameInterpolation<s16>(mFrame, &info->mRTable,
val = J2DGetKeyFrameInterpolation<BE(s16)>(mFrame, &info->mRTable,
&mCRValues[info->mRTable.mOffset]);
if (val < -0x400) {
pColor->r = -0x400;
@@ -694,7 +694,7 @@ void J2DAnmTevRegKey::getTevColorReg(u16 param_0, GXColorS10* pColor) const {
pColor->g = mCGValues[info->mGTable.mOffset];
break;
default:
val = J2DGetKeyFrameInterpolation<s16>(mFrame, &info->mGTable,
val = J2DGetKeyFrameInterpolation<BE(s16)>(mFrame, &info->mGTable,
&mCGValues[info->mGTable.mOffset]);
if (val < -0x400) {
pColor->g = -0x400;
@@ -712,7 +712,7 @@ void J2DAnmTevRegKey::getTevColorReg(u16 param_0, GXColorS10* pColor) const {
pColor->b = mCBValues[info->mBTable.mOffset];
break;
default:
val = J2DGetKeyFrameInterpolation<s16>(mFrame, &info->mBTable,
val = J2DGetKeyFrameInterpolation<BE(s16)>(mFrame, &info->mBTable,
&mCBValues[info->mBTable.mOffset]);
if (val < -0x400) {
pColor->b = -0x400;
@@ -730,7 +730,7 @@ void J2DAnmTevRegKey::getTevColorReg(u16 param_0, GXColorS10* pColor) const {
pColor->a = mCAValues[info->mATable.mOffset];
break;
default:
val = J2DGetKeyFrameInterpolation<s16>(mFrame, &info->mATable,
val = J2DGetKeyFrameInterpolation<BE(s16)>(mFrame, &info->mATable,
&mCAValues[info->mATable.mOffset]);
if (val < -0x400) {
pColor->a = -0x400;
@@ -755,7 +755,7 @@ void J2DAnmTevRegKey::getTevKonstReg(u16 param_0, GXColor* pColor) const {
pColor->r = mKRValues[info->mRTable.mOffset];
break;
default:
val = J2DGetKeyFrameInterpolation<s16>(mFrame, &info->mRTable,
val = J2DGetKeyFrameInterpolation<BE(s16)>(mFrame, &info->mRTable,
&mKRValues[info->mRTable.mOffset]);
if (val < 0) {
pColor->r = 0;
@@ -773,7 +773,7 @@ void J2DAnmTevRegKey::getTevKonstReg(u16 param_0, GXColor* pColor) const {
pColor->g = mKGValues[info->mGTable.mOffset];
break;
default:
val = J2DGetKeyFrameInterpolation<s16>(mFrame, &info->mGTable,
val = J2DGetKeyFrameInterpolation<BE(s16)>(mFrame, &info->mGTable,
&mKGValues[info->mGTable.mOffset]);
if (val < 0) {
pColor->g = 0;
@@ -791,7 +791,7 @@ void J2DAnmTevRegKey::getTevKonstReg(u16 param_0, GXColor* pColor) const {
pColor->b = mKBValues[info->mBTable.mOffset];
break;
default:
val = J2DGetKeyFrameInterpolation<s16>(mFrame, &info->mBTable,
val = J2DGetKeyFrameInterpolation<BE(s16)>(mFrame, &info->mBTable,
&mKBValues[info->mBTable.mOffset]);
if (val < 0) {
pColor->b = 0;
@@ -809,7 +809,7 @@ void J2DAnmTevRegKey::getTevKonstReg(u16 param_0, GXColor* pColor) const {
pColor->a = mKAValues[info->mATable.mOffset];
break;
default:
val = J2DGetKeyFrameInterpolation<s16>(mFrame, &info->mATable,
val = J2DGetKeyFrameInterpolation<BE(s16)>(mFrame, &info->mATable,
&mKAValues[info->mATable.mOffset]);
if (val < 0) {
pColor->a = 0;
libs/JSystem/src/J2DGraph/J2DAnmLoader.cpp
+52 -75
View File
@@ -18,13 +18,13 @@ J2DAnmBase* J2DAnmLoaderDataBase::load(void const* p_data) {
switch (hdr->mType) {
case 'bck1': {
J2DAnmKeyLoader_v15 loader;
loader.mpResource = new J2DAnmTransformKey();
loader.mpResource = JKR_NEW J2DAnmTransformKey();
return (J2DAnmBase*)loader.load(p_data);
break;
}
case 'bpk1': {
J2DAnmKeyLoader_v15 loader;
loader.mpResource = new J2DAnmColorKey();
loader.mpResource = JKR_NEW J2DAnmColorKey();
return (J2DAnmBase*)loader.load(p_data);
break;
}
@@ -33,42 +33,42 @@ J2DAnmBase* J2DAnmLoaderDataBase::load(void const* p_data) {
return NULL;
case 'btk1': {
J2DAnmKeyLoader_v15 loader;
loader.mpResource = new J2DAnmTextureSRTKey();
loader.mpResource = JKR_NEW J2DAnmTextureSRTKey();
return (J2DAnmBase*)loader.load(p_data);
break;
}
case 'brk1': {
J2DAnmKeyLoader_v15 loader;
loader.mpResource = new J2DAnmTevRegKey();
loader.mpResource = JKR_NEW J2DAnmTevRegKey();
return (J2DAnmBase*)loader.load(p_data);
break;
}
case 'bxk1': {
J2DAnmKeyLoader_v15 loader;
loader.mpResource = new J2DAnmVtxColorKey();
loader.mpResource = JKR_NEW J2DAnmVtxColorKey();
return (J2DAnmBase*)loader.load(p_data);
break;
}
case 'bca1': {
J2DAnmFullLoader_v15 loader;
loader.mpResource = new J2DAnmTransformFull();
loader.mpResource = JKR_NEW J2DAnmTransformFull();
return (J2DAnmBase*)loader.load(p_data);
break;
}
case 'bpa1': {
J2DAnmFullLoader_v15 loader;
loader.mpResource = new J2DAnmColorFull();
loader.mpResource = JKR_NEW J2DAnmColorFull();
return (J2DAnmBase*)loader.load(p_data);
break;
}
case 'btp1': {
J2DAnmFullLoader_v15 loader;
loader.mpResource = new J2DAnmTexPattern();
loader.mpResource = JKR_NEW J2DAnmTexPattern();
return (J2DAnmBase*)loader.load(p_data);
}
case 'bva1': {
J2DAnmFullLoader_v15 loader;
loader.mpResource = new J2DAnmVisibilityFull();
loader.mpResource = JKR_NEW J2DAnmVisibilityFull();
return (J2DAnmBase*)loader.load(p_data);
break;
}
@@ -77,7 +77,7 @@ J2DAnmBase* J2DAnmLoaderDataBase::load(void const* p_data) {
return NULL;
case 'bxa1': {
J2DAnmFullLoader_v15 loader;
loader.mpResource = new J2DAnmVtxColorFull();
loader.mpResource = JKR_NEW J2DAnmVtxColorFull();
return (J2DAnmBase*)loader.load(p_data);
}
default:
@@ -175,25 +175,6 @@ void J2DAnmKeyLoader_v15::readAnmTransform(J3DAnmTransformKeyData const* p_data)
setAnmTransform(p_anm, p_data);
}
#if TARGET_LITTLE_ENDIAN
static void ByteSwapTransformKeyData(
J2DAnmTransformKey& target,
const J3DAnmTransformKeyData& source) {
for (int i = 0; i < source.mSCount; i += 1) {
be_swap(target.mScaleValues[i]);
}
for (int i = 0; i < source.mRCount; i += 1) {
be_swap(target.mRotationValues[i]);
}
for (int i = 0; i < source.mTCount; i += 1) {
be_swap(target.mTranslateValues[i]);
}
}
#endif
void J2DAnmKeyLoader_v15::setAnmTransform(J2DAnmTransformKey* p_anm,
J3DAnmTransformKeyData const* p_data) {
J3D_PANIC(439, p_anm, "Error : null pointer.");
@@ -205,14 +186,10 @@ void J2DAnmKeyLoader_v15::setAnmTransform(J2DAnmTransformKey* p_anm,
p_anm->mFrame = 0;
p_anm->mInfoTable =
JSUConvertOffsetToPtr<J3DAnmTransformKeyTable>(p_data, p_data->mJointAnimationTableOffs);
p_anm->mScaleValues = JSUConvertOffsetToPtr<f32>(p_data, p_data->mSTableOffs);
p_anm->mRotationValues = JSUConvertOffsetToPtr<s16>(p_data, p_data->mRTableOffs);
p_anm->mScaleValues = JSUConvertOffsetToPtr<BE(f32)>(p_data, p_data->mSTableOffs);
p_anm->mRotationValues = JSUConvertOffsetToPtr<BE(s16)>(p_data, p_data->mRTableOffs);
p_anm->mTranslateValues =
JSUConvertOffsetToPtr<f32>(p_data, p_data->mTTableOffs);
#if TARGET_LITTLE_ENDIAN
ByteSwapTransformKeyData(*p_anm, *p_data);
#endif
JSUConvertOffsetToPtr<BE(f32)>(p_data, p_data->mTTableOffs);
}
void J2DAnmKeyLoader_v15::readAnmTextureSRT(J3DAnmTextureSRTKeyData const* p_data) {
@@ -235,14 +212,14 @@ void J2DAnmKeyLoader_v15::setAnmTextureSRT(J2DAnmTextureSRTKey* p_anm,
p_anm->field_0x1e = p_data->field_0x12;
p_anm->mInfoTable =
JSUConvertOffsetToPtr<J3DAnmTransformKeyTable>(p_data, p_data->mTableOffset);
p_anm->mUpdateMaterialID = JSUConvertOffsetToPtr<u16>(p_data, p_data->mUpdateMatIDOffset);
p_anm->mUpdateMaterialID = JSUConvertOffsetToPtr<BE(u16)>(p_data, p_data->mUpdateMatIDOffset);
p_anm->field_0x34.setResource(
JSUConvertOffsetToPtr<ResNTAB>(p_data, p_data->mNameTab1Offset));
p_anm->mUpdateTexMtxID = JSUConvertOffsetToPtr<u8>(p_data, p_data->mUpdateTexMtxIDOffset);
p_anm->field_0x44 = JSUConvertOffsetToPtr<Vec>(p_data, p_data->unkOffset);
p_anm->mScaleValues = JSUConvertOffsetToPtr<f32>(p_data, p_data->mScaleValOffset);
p_anm->mRotationValues = JSUConvertOffsetToPtr<s16>(p_data, p_data->mRotValOffset);
p_anm->mTranslationValues = JSUConvertOffsetToPtr<f32>(p_data, p_data->mTransValOffset);
p_anm->field_0x44 = JSUConvertOffsetToPtr<BE(Vec)>(p_data, p_data->unkOffset);
p_anm->mScaleValues = JSUConvertOffsetToPtr<BE(f32)>(p_data, p_data->mScaleValOffset);
p_anm->mRotationValues = JSUConvertOffsetToPtr<BE(s16)>(p_data, p_data->mRotValOffset);
p_anm->mTranslationValues = JSUConvertOffsetToPtr<BE(f32)>(p_data, p_data->mTransValOffset);
if (p_data->mNameTab2Offset != 0) {
p_anm->field_0x68.setResource(
JSUConvertOffsetToPtr<ResNTAB>(p_data, p_data->mNameTab2Offset));
@@ -253,12 +230,12 @@ void J2DAnmKeyLoader_v15::setAnmTextureSRT(J2DAnmTextureSRTKey* p_anm,
p_anm->field_0x4c = p_data->field_0x3a;
p_anm->field_0x5c =
JSUConvertOffsetToPtr<J3DAnmTransformKeyTable>(p_data, p_data->mInfoTable2Offset);
p_anm->field_0x64 = JSUConvertOffsetToPtr<u16>(p_data, p_data->field_0x40);
p_anm->field_0x64 = JSUConvertOffsetToPtr<BE(u16)>(p_data, p_data->field_0x40);
p_anm->field_0x60 = JSUConvertOffsetToPtr<u8>(p_data, p_data->field_0x48);
p_anm->field_0x78 = JSUConvertOffsetToPtr<Vec>(p_data, p_data->field_0x4c);
p_anm->field_0x50 = JSUConvertOffsetToPtr<f32>(p_data, p_data->field_0x50);
p_anm->field_0x54 = JSUConvertOffsetToPtr<s16>(p_data, p_data->field_0x54);
p_anm->field_0x58 = JSUConvertOffsetToPtr<f32>(p_data, p_data->field_0x58);
p_anm->field_0x78 = JSUConvertOffsetToPtr<BE(Vec)>(p_data, p_data->field_0x4c);
p_anm->field_0x50 = JSUConvertOffsetToPtr<BE(f32)>(p_data, p_data->field_0x50);
p_anm->field_0x54 = JSUConvertOffsetToPtr<BE(s16)>(p_data, p_data->field_0x54);
p_anm->field_0x58 = JSUConvertOffsetToPtr<BE(f32)>(p_data, p_data->field_0x58);
switch (p_data->field_0x5c) {
case 0:
p_anm->field_0x7c = 0;
@@ -290,12 +267,12 @@ void J2DAnmKeyLoader_v15::setAnmColor(J2DAnmColorKey* p_anm, J3DAnmColorKeyData
p_anm->field_0x16 = p_data->field_0x16;
p_anm->mInfoTable =
JSUConvertOffsetToPtr<J3DAnmColorKeyTable>(p_data, p_data->mTableOffset);
p_anm->mRValues = JSUConvertOffsetToPtr<s16>(p_data, p_data->mRValOffset);
p_anm->mGValues = JSUConvertOffsetToPtr<s16>(p_data, p_data->mGValOffset);
p_anm->mBValues = JSUConvertOffsetToPtr<s16>(p_data, p_data->mBValOffset);
p_anm->mAValues = JSUConvertOffsetToPtr<s16>(p_data, p_data->mAValOffset);
p_anm->mRValues = JSUConvertOffsetToPtr<BE(s16)>(p_data, p_data->mRValOffset);
p_anm->mGValues = JSUConvertOffsetToPtr<BE(s16)>(p_data, p_data->mGValOffset);
p_anm->mBValues = JSUConvertOffsetToPtr<BE(s16)>(p_data, p_data->mBValOffset);
p_anm->mAValues = JSUConvertOffsetToPtr<BE(s16)>(p_data, p_data->mAValOffset);
p_anm->mUpdateMaterialID =
JSUConvertOffsetToPtr<u16>(p_data, p_data->mUpdateMaterialIDOffset);
JSUConvertOffsetToPtr<BE(u16)>(p_data, p_data->mUpdateMaterialIDOffset);
p_anm->field_0x20.setResource(
JSUConvertOffsetToPtr<ResNTAB>(p_data, p_data->mNameTabOffset));
}
@@ -323,13 +300,13 @@ void J2DAnmKeyLoader_v15::setAnmVtxColor(J2DAnmVtxColorKey* p_anm,
p_anm->mVtxColorIndexData[1] = JSUConvertOffsetToPtr<J3DAnmVtxColorIndexData>(
p_data, p_data->mVtxColoIndexDataOffset[1]);
p_anm->mVtxColorIndexPointer[0] =
JSUConvertOffsetToPtr<u16>(p_data, p_data->mVtxColoIndexPointerOffset[0]);
JSUConvertOffsetToPtr<BE(u16)>(p_data, p_data->mVtxColoIndexPointerOffset[0]);
p_anm->mVtxColorIndexPointer[1] =
JSUConvertOffsetToPtr<u16>(p_data, p_data->mVtxColoIndexPointerOffset[1]);
p_anm->mRValues = JSUConvertOffsetToPtr<s16>(p_data, p_data->mRValOffset);
p_anm->mGValues = JSUConvertOffsetToPtr<s16>(p_data, p_data->mGValOffset);
p_anm->mBValues = JSUConvertOffsetToPtr<s16>(p_data, p_data->mBValOffset);
p_anm->mAValues = JSUConvertOffsetToPtr<s16>(p_data, p_data->mAValOffset);
JSUConvertOffsetToPtr<BE(u16)>(p_data, p_data->mVtxColoIndexPointerOffset[1]);
p_anm->mRValues = JSUConvertOffsetToPtr<BE(s16)>(p_data, p_data->mRValOffset);
p_anm->mGValues = JSUConvertOffsetToPtr<BE(s16)>(p_data, p_data->mGValOffset);
p_anm->mBValues = JSUConvertOffsetToPtr<BE(s16)>(p_data, p_data->mBValOffset);
p_anm->mAValues = JSUConvertOffsetToPtr<BE(s16)>(p_data, p_data->mAValOffset);
}
void* J2DAnmFullLoader_v15::load(void const* p_data) {
@@ -419,9 +396,9 @@ void J2DAnmFullLoader_v15::setAnmTransform(J2DAnmTransformFull* p_anm,
p_anm->mFrame = 0;
p_anm->mTableInfo =
JSUConvertOffsetToPtr<J3DAnmTransformFullTable>(p_data, p_data->mTableOffset);
p_anm->mScaleValues = JSUConvertOffsetToPtr<f32>(p_data, p_data->mScaleValOffset);
p_anm->mRotationValues = JSUConvertOffsetToPtr<s16>(p_data, p_data->mRotValOffset);
p_anm->mTranslateValues = JSUConvertOffsetToPtr<f32>(p_data, p_data->mTransValOffset);
p_anm->mScaleValues = JSUConvertOffsetToPtr<BE(f32)>(p_data, p_data->mScaleValOffset);
p_anm->mRotationValues = JSUConvertOffsetToPtr<BE(s16)>(p_data, p_data->mRotValOffset);
p_anm->mTranslateValues = JSUConvertOffsetToPtr<BE(f32)>(p_data, p_data->mTransValOffset);
}
void J2DAnmFullLoader_v15::readAnmColor(J3DAnmColorFullData const* p_data) {
@@ -443,7 +420,7 @@ void J2DAnmFullLoader_v15::setAnmColor(J2DAnmColorFull* p_anm, J3DAnmColorFullDa
p_anm->mBValues = JSUConvertOffsetToPtr<u8>(p_data, p_data->mBValuesOffset);
p_anm->mAValues = JSUConvertOffsetToPtr<u8>(p_data, p_data->mAValuesOffset);
p_anm->mUpdateMaterialID =
JSUConvertOffsetToPtr<u16>(p_data, p_data->mUpdateMaterialIDOffset);
JSUConvertOffsetToPtr<BE(u16)>(p_data, p_data->mUpdateMaterialIDOffset);
p_anm->field_0x20.setResource(
JSUConvertOffsetToPtr<ResNTAB>(p_data, p_data->mNameTabOffset));
}
@@ -464,9 +441,9 @@ void J2DAnmFullLoader_v15::setAnmTexPattern(J2DAnmTexPattern* p_anm,
p_anm->field_0x18 = p_data->field_0xe;
p_anm->mAnmTable =
JSUConvertOffsetToPtr<J3DAnmTexPatternFullTable>(p_data, p_data->mTableOffset);
p_anm->mValues = JSUConvertOffsetToPtr<u16>(p_data, p_data->mValuesOffset);
p_anm->mValues = JSUConvertOffsetToPtr<BE(u16)>(p_data, p_data->mValuesOffset);
p_anm->mUpdateMaterialID =
JSUConvertOffsetToPtr<u16>(p_data, p_data->mUpdateMaterialIDOffset);
JSUConvertOffsetToPtr<BE(u16)>(p_data, p_data->mUpdateMaterialIDOffset);
p_anm->field_0x20.setResource(
JSUConvertOffsetToPtr<ResNTAB>(p_data, p_data->mNameTabOffset));
}
@@ -486,32 +463,32 @@ void J2DAnmKeyLoader_v15::setAnmTevReg(J2DAnmTevRegKey* p_anm, J3DAnmTevRegKeyDa
p_anm->mAnmCRegKeyTable =
JSUConvertOffsetToPtr<J3DAnmCRegKeyTable>(p_data, p_data->mCRegTableOffset);
p_anm->mCRegUpdateMaterialID =
JSUConvertOffsetToPtr<u16>(p_data, p_data->mCRegUpdateMaterialIDOffset);
JSUConvertOffsetToPtr<BE(u16)>(p_data, p_data->mCRegUpdateMaterialIDOffset);
p_anm->mCRegNameTab.setResource(
JSUConvertOffsetToPtr<ResNTAB>(p_data, p_data->mCRegNameTabOffset));
p_anm->mKRegUpdateMaterialNum = p_data->mKRegUpdateMaterialNum;
p_anm->mAnmKRegKeyTable =
JSUConvertOffsetToPtr<J3DAnmKRegKeyTable>(p_data, p_data->mKRegTableOffset);
p_anm->mKRegUpdateMaterialID =
JSUConvertOffsetToPtr<u16>(p_data, p_data->mKRegUpdateMaterialIDOffset);
JSUConvertOffsetToPtr<BE(u16)>(p_data, p_data->mKRegUpdateMaterialIDOffset);
p_anm->mKRegNameTab.setResource(
JSUConvertOffsetToPtr<ResNTAB>(p_data, p_data->mKRegNameTabOffset));
p_anm->field_0x14 = p_data->field_0x10;
p_anm->field_0x16 = p_data->field_0x12;
p_anm->field_0x18 = p_data->field_0x14;
p_anm->field_0x1a = p_data->field_0x16;
p_anm->mCRValues = JSUConvertOffsetToPtr<s16>(p_data, p_data->mCRValuesOffset);
p_anm->mCGValues = JSUConvertOffsetToPtr<s16>(p_data, p_data->mCGValuesOffset);
p_anm->mCBValues = JSUConvertOffsetToPtr<s16>(p_data, p_data->mCBValuesOffset);
p_anm->mCAValues = JSUConvertOffsetToPtr<s16>(p_data, p_data->mCAValuesOffset);
p_anm->mCRValues = JSUConvertOffsetToPtr<BE(s16)>(p_data, p_data->mCRValuesOffset);
p_anm->mCGValues = JSUConvertOffsetToPtr<BE(s16)>(p_data, p_data->mCGValuesOffset);
p_anm->mCBValues = JSUConvertOffsetToPtr<BE(s16)>(p_data, p_data->mCBValuesOffset);
p_anm->mCAValues = JSUConvertOffsetToPtr<BE(s16)>(p_data, p_data->mCAValuesOffset);
p_anm->field_0x1c = p_data->field_0x18;
p_anm->field_0x1e = p_data->field_0x1a;
p_anm->field_0x20 = p_data->field_0x1c;
p_anm->field_0x22 = p_data->field_0x1e;
p_anm->mKRValues = JSUConvertOffsetToPtr<s16>(p_data, p_data->mKRValuesOffset);
p_anm->mKGValues = JSUConvertOffsetToPtr<s16>(p_data, p_data->mKGValuesOffset);
p_anm->mKBValues = JSUConvertOffsetToPtr<s16>(p_data, p_data->mKBValuesOffset);
p_anm->mKAValues = JSUConvertOffsetToPtr<s16>(p_data, p_data->mKAValuesOffset);
p_anm->mKRValues = JSUConvertOffsetToPtr<BE(s16)>(p_data, p_data->mKRValuesOffset);
p_anm->mKGValues = JSUConvertOffsetToPtr<BE(s16)>(p_data, p_data->mKGValuesOffset);
p_anm->mKBValues = JSUConvertOffsetToPtr<BE(s16)>(p_data, p_data->mKBValuesOffset);
p_anm->mKAValues = JSUConvertOffsetToPtr<BE(s16)>(p_data, p_data->mKAValuesOffset);
}
void J2DAnmFullLoader_v15::readAnmVisibility(J3DAnmVisibilityFullData const* p_data) {
@@ -556,9 +533,9 @@ void J2DAnmFullLoader_v15::setAnmVtxColor(J2DAnmVtxColorFull* p_anm,
p_anm->mVtxColorIndexData[1] = JSUConvertOffsetToPtr<J3DAnmVtxColorIndexData>(
p_data, p_data->mVtxColorIndexDataOffsets[1]);
p_anm->mVtxColorIndexPointer[0] =
JSUConvertOffsetToPtr<u16>(p_data, p_data->mVtxColorIndexPointerOffsets[0]);
JSUConvertOffsetToPtr<BE(u16)>(p_data, p_data->mVtxColorIndexPointerOffsets[0]);
p_anm->mVtxColorIndexPointer[1] =
JSUConvertOffsetToPtr<u16>(p_data, p_data->mVtxColorIndexPointerOffsets[1]);
JSUConvertOffsetToPtr<BE(u16)>(p_data, p_data->mVtxColorIndexPointerOffsets[1]);
p_anm->mRValues = JSUConvertOffsetToPtr<u8>(p_data, p_data->mRValuesOffset);
p_anm->mGValues = JSUConvertOffsetToPtr<u8>(p_data, p_data->mGValuesOffset);
p_anm->mBValues = JSUConvertOffsetToPtr<u8>(p_data, p_data->mBValuesOffset);
libs/JSystem/src/J2DGraph/J2DMatBlock.cpp
+101 -99
View File
@@ -7,6 +7,8 @@
#include "JSystem/JUtility/JUTTexture.h"
#include <gx.h>
#include "JSystem/JKernel/JKRHeap.h"
void J2DColorBlock::initialize() {
for (int i = 0; i < 2; i++) {
mMatColor[i] = JUtility::TColor(j2dDefaultColInfo);
@@ -56,7 +58,7 @@ void J2DTexGenBlock::setGX() {
J2DTexGenBlock::~J2DTexGenBlock() {
for (int i = 0; i < 8; i++) {
delete mTexMtx[i];
JKR_DELETE(mTexMtx[i]);
}
}
@@ -64,7 +66,7 @@ void J2DTexGenBlock::setTexMtx(u32 param_0, J2DTexMtx& param_1) {
J3D_PANIC(103, param_0 < 8, "Error : range over.");
if (!mTexMtx[param_0]) {
mTexMtx[param_0] = new J2DTexMtx(param_1.getTexMtxInfo());
mTexMtx[param_0] = JKR_NEW J2DTexMtx(param_1.getTexMtxInfo());
if (!mTexMtx[param_0]) {
return;
}
@@ -101,13 +103,13 @@ J2DTevBlock1::J2DTevBlock1() {
J2DTevBlock1::~J2DTevBlock1() {
if (mUndeleteFlag & 1) {
delete mTexture[0];
JKR_DELETE(mTexture[0]);
}
delete mPalette[0];
JKR_DELETE(mPalette[0]);
if (mUndeleteFlag & 0x80) {
delete mFont;
JKR_DELETE(mFont);
}
}
@@ -139,7 +141,7 @@ bool J2DTevBlock1::prepareTexture(u8 param_0) {
}
if (mTexture[0] == NULL) {
mTexture[0] = new JUTTexture();
mTexture[0] = JKR_NEW JUTTexture();
if (mTexture[0] == NULL) {
return false;
@@ -166,7 +168,7 @@ bool J2DTevBlock1::insertTexture(u32 param_0, ResTIMG const* p_timg, JUTPalette*
}
if (mTexture[0] == NULL) {
mTexture[0] = new JUTTexture(p_timg, 0);
mTexture[0] = JKR_NEW JUTTexture(p_timg, 0);
if (mTexture[0] == NULL) {
return false;
@@ -197,7 +199,7 @@ bool J2DTevBlock1::insertTexture(u32 param_0, JUTTexture* p_tex) {
}
if (mUndeleteFlag & 1) {
delete mTexture[0];
JKR_DELETE(mTexture[0]);
}
mTexture[0] = p_tex;
@@ -214,7 +216,7 @@ bool J2DTevBlock1::setTexture(u32 param_0, ResTIMG const* p_timg) {
if (mTexture[0] == NULL) {
if (p_timg != NULL) {
mTexture[0] = new JUTTexture(p_timg, 0);
mTexture[0] = JKR_NEW JUTTexture(p_timg, 0);
if (mTexture[0] == NULL) {
return false;
@@ -228,7 +230,7 @@ bool J2DTevBlock1::setTexture(u32 param_0, ResTIMG const* p_timg) {
if (p_timg != NULL) {
mTexture[0]->storeTIMG(p_timg, (u8)0);
} else {
delete mTexture[0];
JKR_DELETE(mTexture[0]);
mTexture[0] = NULL;
mUndeleteFlag &= 0x80;
}
@@ -236,7 +238,7 @@ bool J2DTevBlock1::setTexture(u32 param_0, ResTIMG const* p_timg) {
mTexture[0] = NULL;
if (p_timg != NULL) {
mTexture[0] = new JUTTexture(p_timg, 0);
mTexture[0] = JKR_NEW JUTTexture(p_timg, 0);
if (mTexture[0] == NULL) {
return false;
@@ -246,7 +248,7 @@ bool J2DTevBlock1::setTexture(u32 param_0, ResTIMG const* p_timg) {
}
}
delete mPalette[0];
JKR_DELETE(mPalette[0]);
mPalette[0] = NULL;
mTexNo[0] = -1;
return true;
@@ -258,12 +260,12 @@ bool J2DTevBlock1::setTexture(u32 param_0, JUTTexture* p_tex) {
}
if (mUndeleteFlag & 1) {
delete mTexture[0];
JKR_DELETE(mTexture[0]);
}
mTexture[0] = p_tex;
mUndeleteFlag &= 0x80;
delete mPalette[0];
JKR_DELETE(mPalette[0]);
mPalette[0] = NULL;
mTexNo[0] = -1;
return true;
@@ -275,12 +277,12 @@ bool J2DTevBlock1::removeTexture(u32 param_0) {
}
if (mUndeleteFlag & 1) {
delete mTexture[0];
JKR_DELETE(mTexture[0]);
}
mTexture[0] = NULL;
mUndeleteFlag &= 0x80;
delete mPalette[0];
JKR_DELETE(mPalette[0]);
mTexNo[0] = -1;
return true;
}
@@ -290,13 +292,13 @@ bool J2DTevBlock1::setFont(ResFONT* p_font) {
return false;
}
JUTResFont* resFont = new JUTResFont(p_font, NULL);
JUTResFont* resFont = JKR_NEW JUTResFont(p_font, NULL);
if (resFont == NULL) {
return false;
}
if (mUndeleteFlag & 0x80) {
delete mFont;
JKR_DELETE(mFont);
}
mFont = resFont;
@@ -310,7 +312,7 @@ bool J2DTevBlock1::setFont(JUTFont* p_font) {
}
if (mUndeleteFlag & 0x80) {
delete mFont;
JKR_DELETE(mFont);
}
mFont = (JUTResFont*)p_font;
@@ -325,7 +327,7 @@ bool J2DTevBlock1::setPalette(u32 param_0, ResTLUT const* p_tlut) {
if (p_tlut != NULL) {
if (mPalette[0] == NULL) {
mPalette[0] = new JUTPalette(GX_TLUT0, (ResTLUT*)p_tlut);
mPalette[0] = JKR_NEW JUTPalette(GX_TLUT0, (ResTLUT*)p_tlut);
if (mPalette[0] == NULL) {
return false;
@@ -338,7 +340,7 @@ bool J2DTevBlock1::setPalette(u32 param_0, ResTLUT const* p_tlut) {
mTexture[0]->attachPalette(mPalette[0]);
}
} else {
delete mPalette[0];
JKR_DELETE(mPalette[0]);
mPalette[0] = NULL;
}
@@ -403,18 +405,18 @@ J2DTevBlock2::J2DTevBlock2() {
J2DTevBlock2::~J2DTevBlock2() {
if (mUndeleteFlag & 1) {
delete mTexture[0];
JKR_DELETE(mTexture[0]);
}
if (mUndeleteFlag & 2) {
delete mTexture[1];
JKR_DELETE(mTexture[1]);
}
delete mPalette[0];
delete mPalette[1];
JKR_DELETE(mPalette[0]);
JKR_DELETE(mPalette[1]);
if (mUndeleteFlag & 0x80) {
delete mFont;
JKR_DELETE(mFont);
}
}
@@ -454,7 +456,7 @@ bool J2DTevBlock2::prepareTexture(u8 param_0) {
}
if (mTexture[i] == NULL) {
mTexture[i] = new JUTTexture();
mTexture[i] = JKR_NEW JUTTexture();
if (mTexture[i] == NULL) {
return false;
@@ -499,7 +501,7 @@ bool J2DTevBlock2::insertTexture(u32 param_0, ResTIMG const* p_timg, JUTPalette*
JUTTexture* tex;
if (mTexture[texNo] == NULL) {
tex = new JUTTexture(p_timg, tlutid);
tex = JKR_NEW JUTTexture(p_timg, tlutid);
if (tex == NULL) {
return false;
@@ -575,7 +577,7 @@ bool J2DTevBlock2::insertTexture(u32 param_0, JUTTexture* p_tex) {
if (mTexture[1] != NULL && mTexture[1]->getTexInfo() == NULL) {
if (mUndeleteFlag & 2) {
delete mTexture[1];
JKR_DELETE(mTexture[1]);
}
mUndeleteFlag &= ~2;
@@ -617,7 +619,7 @@ bool J2DTevBlock2::setTexture(u32 param_0, ResTIMG const* p_timg) {
if (mTexture[param_0] == NULL) {
if (p_timg != NULL) {
mTexture[param_0] = new JUTTexture(p_timg, tlutid);
mTexture[param_0] = JKR_NEW JUTTexture(p_timg, tlutid);
if (mTexture[param_0] == NULL) {
return false;
@@ -631,7 +633,7 @@ bool J2DTevBlock2::setTexture(u32 param_0, ResTIMG const* p_timg) {
if (p_timg != NULL) {
mTexture[param_0]->storeTIMG(p_timg, tlutid);
} else {
delete mTexture[param_0];
JKR_DELETE(mTexture[param_0]);
mTexture[param_0] = NULL;
mUndeleteFlag &= ~(1 << param_0);
}
@@ -639,7 +641,7 @@ bool J2DTevBlock2::setTexture(u32 param_0, ResTIMG const* p_timg) {
mTexture[param_0] = NULL;
if (p_timg != NULL) {
mTexture[param_0] = new JUTTexture(p_timg, 0);
mTexture[param_0] = JKR_NEW JUTTexture(p_timg, 0);
if (mTexture[param_0] == NULL) {
return false;
@@ -649,7 +651,7 @@ bool J2DTevBlock2::setTexture(u32 param_0, ResTIMG const* p_timg) {
}
}
delete mPalette[param_0];
JKR_DELETE(mPalette[param_0]);
mPalette[param_0] = NULL;
mTexNo[param_0] = -1;
return true;
@@ -661,12 +663,12 @@ bool J2DTevBlock2::setTexture(u32 param_0, JUTTexture* p_tex) {
}
if (mUndeleteFlag & (1 << param_0)) {
delete mTexture[param_0];
JKR_DELETE(mTexture[param_0]);
}
mTexture[param_0] = p_tex;
mUndeleteFlag &= ~(1 << param_0);
delete mPalette[param_0];
JKR_DELETE(mPalette[param_0]);
mPalette[param_0] = NULL;
mTexNo[param_0] = -1;
return true;
@@ -678,9 +680,9 @@ bool J2DTevBlock2::removeTexture(u32 param_0) {
}
if (mUndeleteFlag & (1 << param_0)) {
delete mTexture[param_0];
JKR_DELETE(mTexture[param_0]);
}
delete mPalette[param_0];
JKR_DELETE(mPalette[param_0]);
if (param_0 == 0) {
mTexture[0] = mTexture[1];
@@ -700,13 +702,13 @@ bool J2DTevBlock2::setFont(ResFONT* p_font) {
return false;
}
JUTResFont* resFont = new JUTResFont(p_font, NULL);
JUTResFont* resFont = JKR_NEW JUTResFont(p_font, NULL);
if (resFont == NULL) {
return false;
}
if (mUndeleteFlag & 0x80) {
delete mFont;
JKR_DELETE(mFont);
}
mFont = resFont;
@@ -720,7 +722,7 @@ bool J2DTevBlock2::setFont(JUTFont* p_font) {
}
if (mUndeleteFlag & 0x80) {
delete mFont;
JKR_DELETE(mFont);
}
mFont = (JUTResFont*)p_font;
@@ -735,7 +737,7 @@ bool J2DTevBlock2::setPalette(u32 param_0, ResTLUT const* p_tlut) {
if (p_tlut != NULL) {
if (mPalette[param_0] == NULL) {
mPalette[param_0] = new JUTPalette((GXTlut)param_0, (ResTLUT*)p_tlut);
mPalette[param_0] = JKR_NEW JUTPalette((GXTlut)param_0, (ResTLUT*)p_tlut);
if (mPalette[param_0] == NULL) {
return false;
@@ -748,7 +750,7 @@ bool J2DTevBlock2::setPalette(u32 param_0, ResTLUT const* p_tlut) {
mTexture[param_0]->attachPalette(mPalette[param_0]);
}
} else {
delete mPalette[param_0];
JKR_DELETE(mPalette[param_0]);
mPalette[param_0] = NULL;
}
@@ -841,13 +843,13 @@ J2DTevBlock4::J2DTevBlock4() {
J2DTevBlock4::~J2DTevBlock4() {
for (int i = 0; i < 4; i++) {
if (mUndeleteFlag & (1 << i)) {
delete mTexture[i];
JKR_DELETE(mTexture[i]);
}
delete mPalette[i];
JKR_DELETE(mPalette[i]);
}
if (mUndeleteFlag & 0x80) {
delete mFont;
JKR_DELETE(mFont);
}
}
@@ -892,7 +894,7 @@ bool J2DTevBlock4::prepareTexture(u8 param_0) {
}
if (mTexture[i] == NULL) {
mTexture[i] = new JUTTexture();
mTexture[i] = JKR_NEW JUTTexture();
if (mTexture[i] == NULL) {
return false;
@@ -949,7 +951,7 @@ bool J2DTevBlock4::insertTexture(u32 param_0, ResTIMG const* p_timg, JUTPalette*
}
JUTTexture* texture;
if (!mTexture[idx]) {
texture = new JUTTexture(p_timg, local_43);
texture = JKR_NEW JUTTexture(p_timg, local_43);
if (!texture) {
return false;
}
@@ -1017,7 +1019,7 @@ bool J2DTevBlock4::insertTexture(u32 param_0, JUTTexture* p_tex) {
if (mTexture[3] != NULL && mTexture[3]->getTexInfo() == NULL) {
if (mUndeleteFlag & 8) {
delete mTexture[3];
JKR_DELETE(mTexture[3]);
}
mUndeleteFlag &= ~8;
@@ -1069,7 +1071,7 @@ bool J2DTevBlock4::setTexture(u32 param_0, ResTIMG const* p_timg) {
if (mTexture[param_0] == NULL) {
if (p_timg != NULL) {
mTexture[param_0] = new JUTTexture(p_timg, tlutid);
mTexture[param_0] = JKR_NEW JUTTexture(p_timg, tlutid);
if (mTexture[param_0] == NULL) {
return false;
@@ -1083,7 +1085,7 @@ bool J2DTevBlock4::setTexture(u32 param_0, ResTIMG const* p_timg) {
if (p_timg != NULL) {
mTexture[param_0]->storeTIMG(p_timg, tlutid);
} else {
delete mTexture[param_0];
JKR_DELETE(mTexture[param_0]);
mTexture[param_0] = NULL;
mUndeleteFlag &= ~(1 << param_0);
}
@@ -1091,7 +1093,7 @@ bool J2DTevBlock4::setTexture(u32 param_0, ResTIMG const* p_timg) {
mTexture[param_0] = NULL;
if (p_timg != NULL) {
mTexture[param_0] = new JUTTexture(p_timg, 0);
mTexture[param_0] = JKR_NEW JUTTexture(p_timg, 0);
if (mTexture[param_0] == NULL) {
return false;
@@ -1101,7 +1103,7 @@ bool J2DTevBlock4::setTexture(u32 param_0, ResTIMG const* p_timg) {
}
}
delete mPalette[param_0];
JKR_DELETE(mPalette[param_0]);
mPalette[param_0] = NULL;
mTexNo[param_0] = -1;
return true;
@@ -1113,12 +1115,12 @@ bool J2DTevBlock4::setTexture(u32 param_0, JUTTexture* p_tex) {
}
if (mUndeleteFlag & (1 << param_0)) {
delete mTexture[param_0];
JKR_DELETE(mTexture[param_0]);
}
mTexture[param_0] = p_tex;
mUndeleteFlag &= ~(1 << param_0);
delete mPalette[param_0];
JKR_DELETE(mPalette[param_0]);
mPalette[param_0] = NULL;
mTexNo[param_0] = -1;
return true;
@@ -1130,9 +1132,9 @@ bool J2DTevBlock4::removeTexture(u32 param_0) {
}
if (mUndeleteFlag & (1 << param_0)) {
delete mTexture[param_0];
JKR_DELETE(mTexture[param_0]);
}
delete mPalette[param_0];
JKR_DELETE(mPalette[param_0]);
for (u32 i = param_0; i < 3; i++) {
mTexture[i] = mTexture[i + 1];
@@ -1152,13 +1154,13 @@ bool J2DTevBlock4::setFont(ResFONT* p_font) {
return false;
}
JUTResFont* resFont = new JUTResFont(p_font, NULL);
JUTResFont* resFont = JKR_NEW JUTResFont(p_font, NULL);
if (resFont == NULL) {
return false;
}
if (mUndeleteFlag & 0x80) {
delete mFont;
JKR_DELETE(mFont);
}
mFont = resFont;
@@ -1172,7 +1174,7 @@ bool J2DTevBlock4::setFont(JUTFont* p_font) {
}
if (mUndeleteFlag & 0x80) {
delete mFont;
JKR_DELETE(mFont);
}
mFont = (JUTResFont*)p_font;
@@ -1187,7 +1189,7 @@ bool J2DTevBlock4::setPalette(u32 param_0, ResTLUT const* p_tlut) {
if (p_tlut != NULL) {
if (mPalette[param_0] == NULL) {
mPalette[param_0] = new JUTPalette((GXTlut)param_0, (ResTLUT*)p_tlut);
mPalette[param_0] = JKR_NEW JUTPalette((GXTlut)param_0, (ResTLUT*)p_tlut);
if (mPalette[param_0] == NULL) {
return false;
@@ -1200,7 +1202,7 @@ bool J2DTevBlock4::setPalette(u32 param_0, ResTLUT const* p_tlut) {
mTexture[param_0]->attachPalette(mPalette[param_0]);
}
} else {
delete mPalette[param_0];
JKR_DELETE(mPalette[param_0]);
mPalette[param_0] = NULL;
}
@@ -1285,13 +1287,13 @@ J2DTevBlock8::J2DTevBlock8() {
J2DTevBlock8::~J2DTevBlock8() {
for (int i = 0; i < 8; i++) {
if (mUndeleteFlag & (1 << i)) {
delete mTexture[i];
JKR_DELETE(mTexture[i]);
}
delete mPalette[i];
JKR_DELETE(mPalette[i]);
}
if (mFontUndeleteFlag) {
delete mFont;
JKR_DELETE(mFont);
}
}
@@ -1337,7 +1339,7 @@ bool J2DTevBlock8::prepareTexture(u8 param_0) {
}
if (mTexture[i] == NULL) {
mTexture[i] = new JUTTexture();
mTexture[i] = JKR_NEW JUTTexture();
if (mTexture[i] == NULL) {
return false;
@@ -1394,7 +1396,7 @@ bool J2DTevBlock8::insertTexture(u32 param_0, ResTIMG const* p_timg, JUTPalette*
}
JUTTexture* texture;
if (!mTexture[idx]) {
texture = new JUTTexture(p_timg, local_43);
texture = JKR_NEW JUTTexture(p_timg, local_43);
if (!texture) {
return false;
}
@@ -1462,7 +1464,7 @@ bool J2DTevBlock8::insertTexture(u32 param_0, JUTTexture* p_tex) {
if (mTexture[7] != NULL && mTexture[7]->getTexInfo() == NULL) {
if (mUndeleteFlag & 0x80) {
delete mTexture[7];
JKR_DELETE(mTexture[7]);
}
mUndeleteFlag &= ~0x80;
@@ -1514,7 +1516,7 @@ bool J2DTevBlock8::setTexture(u32 param_0, ResTIMG const* p_timg) {
if (mTexture[param_0] == NULL) {
if (p_timg != NULL) {
mTexture[param_0] = new JUTTexture(p_timg, tlutid);
mTexture[param_0] = JKR_NEW JUTTexture(p_timg, tlutid);
if (mTexture[param_0] == NULL) {
return false;
@@ -1528,7 +1530,7 @@ bool J2DTevBlock8::setTexture(u32 param_0, ResTIMG const* p_timg) {
if (p_timg != NULL) {
mTexture[param_0]->storeTIMG(p_timg, tlutid);
} else {
delete mTexture[param_0];
JKR_DELETE(mTexture[param_0]);
mTexture[param_0] = NULL;
mUndeleteFlag &= ~(1 << param_0);
}
@@ -1536,7 +1538,7 @@ bool J2DTevBlock8::setTexture(u32 param_0, ResTIMG const* p_timg) {
mTexture[param_0] = NULL;
if (p_timg != NULL) {
mTexture[param_0] = new JUTTexture(p_timg, 0);
mTexture[param_0] = JKR_NEW JUTTexture(p_timg, 0);
if (mTexture[param_0] == NULL) {
return false;
@@ -1546,7 +1548,7 @@ bool J2DTevBlock8::setTexture(u32 param_0, ResTIMG const* p_timg) {
}
}
delete mPalette[param_0];
JKR_DELETE(mPalette[param_0]);
mPalette[param_0] = NULL;
mTexNo[param_0] = -1;
return true;
@@ -1558,12 +1560,12 @@ bool J2DTevBlock8::setTexture(u32 param_0, JUTTexture* p_tex) {
}
if (mUndeleteFlag & (1 << param_0)) {
delete mTexture[param_0];
JKR_DELETE(mTexture[param_0]);
}
mTexture[param_0] = p_tex;
mUndeleteFlag &= ~(1 << param_0);
delete mPalette[param_0];
JKR_DELETE(mPalette[param_0]);
mPalette[param_0] = NULL;
mTexNo[param_0] = -1;
return true;
@@ -1575,9 +1577,9 @@ bool J2DTevBlock8::removeTexture(u32 param_0) {
}
if (mUndeleteFlag & (1 << param_0)) {
delete mTexture[param_0];
JKR_DELETE(mTexture[param_0]);
}
delete mPalette[param_0];
JKR_DELETE(mPalette[param_0]);
for (u32 i = param_0; i < 7; i++) {
mTexture[i] = mTexture[i + 1];
@@ -1597,13 +1599,13 @@ bool J2DTevBlock8::setFont(ResFONT* p_font) {
return false;
}
JUTResFont* resFont = new JUTResFont(p_font, NULL);
JUTResFont* resFont = JKR_NEW JUTResFont(p_font, NULL);
if (resFont == NULL) {
return false;
}
if (mFontUndeleteFlag) {
delete mFont;
JKR_DELETE(mFont);
}
mFont = resFont;
@@ -1617,7 +1619,7 @@ bool J2DTevBlock8::setFont(JUTFont* p_font) {
}
if (mFontUndeleteFlag) {
delete mFont;
JKR_DELETE(mFont);
}
mFont = (JUTResFont*)p_font;
@@ -1632,7 +1634,7 @@ bool J2DTevBlock8::setPalette(u32 param_0, ResTLUT const* p_tlut) {
if (p_tlut != NULL) {
if (mPalette[param_0] == NULL) {
mPalette[param_0] = new JUTPalette((GXTlut)param_0, (ResTLUT*)p_tlut);
mPalette[param_0] = JKR_NEW JUTPalette((GXTlut)param_0, (ResTLUT*)p_tlut);
if (mPalette[param_0] == NULL) {
return false;
@@ -1645,7 +1647,7 @@ bool J2DTevBlock8::setPalette(u32 param_0, ResTLUT const* p_tlut) {
mTexture[param_0]->attachPalette(mPalette[param_0]);
}
} else {
delete mPalette[param_0];
JKR_DELETE(mPalette[param_0]);
mPalette[param_0] = NULL;
}
@@ -1725,13 +1727,13 @@ J2DTevBlock16::J2DTevBlock16() {
J2DTevBlock16::~J2DTevBlock16() {
for (int i = 0; i < 8; i++) {
if (mUndeleteFlag & (1 << i)) {
delete mTexture[i];
JKR_DELETE(mTexture[i]);
}
delete mPalette[i];
JKR_DELETE(mPalette[i]);
}
if (mFontUndeleteFlag) {
delete mFont;
JKR_DELETE(mFont);
}
}
@@ -1777,7 +1779,7 @@ bool J2DTevBlock16::prepareTexture(u8 param_0) {
}
if (mTexture[i] == NULL) {
mTexture[i] = new JUTTexture();
mTexture[i] = JKR_NEW JUTTexture();
if (mTexture[i] == NULL) {
return false;
@@ -1834,7 +1836,7 @@ bool J2DTevBlock16::insertTexture(u32 param_0, ResTIMG const* p_timg, JUTPalette
}
JUTTexture* texture;
if (!mTexture[idx]) {
texture = new JUTTexture(p_timg, local_43);
texture = JKR_NEW JUTTexture(p_timg, local_43);
if (!texture) {
return false;
}
@@ -1902,7 +1904,7 @@ bool J2DTevBlock16::insertTexture(u32 param_0, JUTTexture* p_tex) {
if (mTexture[7] != NULL && mTexture[7]->getTexInfo() == NULL) {
if (mUndeleteFlag & 0x80) {
delete mTexture[7];
JKR_DELETE(mTexture[7]);
}
mUndeleteFlag &= ~0x80;
@@ -1954,7 +1956,7 @@ bool J2DTevBlock16::setTexture(u32 param_0, ResTIMG const* p_timg) {
if (mTexture[param_0] == NULL) {
if (p_timg != NULL) {
mTexture[param_0] = new JUTTexture(p_timg, tlutid);
mTexture[param_0] = JKR_NEW JUTTexture(p_timg, tlutid);
if (mTexture[param_0] == NULL) {
return false;
@@ -1968,7 +1970,7 @@ bool J2DTevBlock16::setTexture(u32 param_0, ResTIMG const* p_timg) {
if (p_timg != NULL) {
mTexture[param_0]->storeTIMG(p_timg, tlutid);
} else {
delete mTexture[param_0];
JKR_DELETE(mTexture[param_0]);
mTexture[param_0] = NULL;
mUndeleteFlag &= ~(1 << param_0);
}
@@ -1976,7 +1978,7 @@ bool J2DTevBlock16::setTexture(u32 param_0, ResTIMG const* p_timg) {
mTexture[param_0] = NULL;
if (p_timg != NULL) {
mTexture[param_0] = new JUTTexture(p_timg, 0);
mTexture[param_0] = JKR_NEW JUTTexture(p_timg, 0);
if (mTexture[param_0] == NULL) {
return false;
@@ -1986,7 +1988,7 @@ bool J2DTevBlock16::setTexture(u32 param_0, ResTIMG const* p_timg) {
}
}
delete mPalette[param_0];
JKR_DELETE(mPalette[param_0]);
mPalette[param_0] = NULL;
mTexNo[param_0] = -1;
return true;
@@ -1998,12 +2000,12 @@ bool J2DTevBlock16::setTexture(u32 param_0, JUTTexture* p_tex) {
}
if (mUndeleteFlag & (1 << param_0)) {
delete mTexture[param_0];
JKR_DELETE(mTexture[param_0]);
}
mTexture[param_0] = p_tex;
mUndeleteFlag &= ~(1 << param_0);
delete mPalette[param_0];
JKR_DELETE(mPalette[param_0]);
mPalette[param_0] = NULL;
mTexNo[param_0] = -1;
return true;
@@ -2015,9 +2017,9 @@ bool J2DTevBlock16::removeTexture(u32 param_0) {
}
if (mUndeleteFlag & (1 << param_0)) {
delete mTexture[param_0];
JKR_DELETE(mTexture[param_0]);
}
delete mPalette[param_0];
JKR_DELETE(mPalette[param_0]);
for (u32 i = param_0; i < 7; i++) {
mTexture[i] = mTexture[i + 1];
@@ -2037,13 +2039,13 @@ bool J2DTevBlock16::setFont(ResFONT* p_font) {
return false;
}
JUTResFont* resFont = new JUTResFont(p_font, NULL);
JUTResFont* resFont = JKR_NEW JUTResFont(p_font, NULL);
if (resFont == NULL) {
return false;
}
if (mFontUndeleteFlag) {
delete mFont;
JKR_DELETE(mFont);
}
mFont = resFont;
@@ -2057,7 +2059,7 @@ bool J2DTevBlock16::setFont(JUTFont* p_font) {
}
if (mFontUndeleteFlag) {
delete mFont;
JKR_DELETE(mFont);
}
mFont = (JUTResFont*)p_font;
@@ -2072,7 +2074,7 @@ bool J2DTevBlock16::setPalette(u32 param_0, ResTLUT const* p_tlut) {
if (p_tlut != NULL) {
if (mPalette[param_0] == NULL) {
mPalette[param_0] = new JUTPalette((GXTlut)param_0, (ResTLUT*)p_tlut);
mPalette[param_0] = JKR_NEW JUTPalette((GXTlut)param_0, (ResTLUT*)p_tlut);
if (mPalette[param_0] == NULL) {
return false;
@@ -2085,7 +2087,7 @@ bool J2DTevBlock16::setPalette(u32 param_0, ResTLUT const* p_tlut) {
mTexture[param_0]->attachPalette(mPalette[param_0]);
}
} else {
delete mPalette[param_0];
JKR_DELETE(mPalette[param_0]);
mPalette[param_0] = NULL;
}
libs/JSystem/src/J2DGraph/J2DMaterial.cpp
+18 -18
View File
@@ -18,9 +18,9 @@ J2DMaterial::J2DMaterial() {
}
J2DMaterial::~J2DMaterial() {
delete mTevBlock;
delete mIndBlock;
delete mAnmPointer;
JKR_DELETE(mTevBlock);
JKR_DELETE(mIndBlock);
JKR_DELETE(mAnmPointer);
}
void J2DMaterial::setGX() {
@@ -45,27 +45,27 @@ J2DTevBlock* J2DMaterial::createTevBlock(int block_type, bool noAlign) {
if (noAlign) {
if (block_type <= 1) {
block = new J2DTevBlock1();
block = JKR_NEW J2DTevBlock1();
} else if (block_type == 2) {
block = new J2DTevBlock2();
block = JKR_NEW J2DTevBlock2();
} else if (block_type <= 4) {
block = new J2DTevBlock4();
block = JKR_NEW J2DTevBlock4();
} else if (block_type <= 8) {
block = new J2DTevBlock8();
block = JKR_NEW J2DTevBlock8();
} else {
block = new J2DTevBlock16();
block = JKR_NEW J2DTevBlock16();
}
} else {
if (block_type <= 1) {
block = new (-4) J2DTevBlock1();
block = JKR_NEW_ARGS (-4) J2DTevBlock1();
} else if (block_type == 2) {
block = new (-4) J2DTevBlock2();
block = JKR_NEW_ARGS (-4) J2DTevBlock2();
} else if (block_type <= 4) {
block = new (-4) J2DTevBlock4();
block = JKR_NEW_ARGS (-4) J2DTevBlock4();
} else if (block_type <= 8) {
block = new (-4) J2DTevBlock8();
block = JKR_NEW_ARGS (-4) J2DTevBlock8();
} else {
block = new (-4) J2DTevBlock16();
block = JKR_NEW_ARGS (-4) J2DTevBlock16();
}
}
ASSERTMSGLINE(101, block, "Error : allocate memory.");
@@ -78,15 +78,15 @@ J2DIndBlock* J2DMaterial::createIndBlock(int block_type, bool noAlign) {
if (noAlign) {
if (block_type != 0) {
block = new J2DIndBlockFull();
block = JKR_NEW J2DIndBlockFull();
} else {
block = new J2DIndBlockNull();
block = JKR_NEW J2DIndBlockNull();
}
} else {
if (block_type != 0) {
block = new (-4) J2DIndBlockFull();
block = JKR_NEW_ARGS (-4) J2DIndBlockFull();
} else {
block = new (-4) J2DIndBlockNull();
block = JKR_NEW_ARGS (-4) J2DIndBlockNull();
}
}
ASSERTMSGLINE(133, block, "Error : allocate memory.");
@@ -122,7 +122,7 @@ void J2DMaterial::makeAnmPointer() {
int r29;
int r28;
if (mAnmPointer == NULL) {
mAnmPointer = new J2DMaterialAnmPointer();
mAnmPointer = JKR_NEW J2DMaterialAnmPointer();
r29 = 1;
if (mAnmPointer == NULL) {
OS_PANIC(171, "Error : allocate memory.");
libs/JSystem/src/J2DGraph/J2DMaterialFactory.cpp
+1 -1
View File
@@ -228,7 +228,7 @@ J2DTexMtx* J2DMaterialFactory::newTexMtx(int param_0, int param_1) const {
J2DTexMtx* rv = NULL;
J2DMaterialInitData* iVar2 = &mpMaterialInitData[mpMaterialID[param_0]];
if (iVar2->field_0x24[param_1] != 0xffff) {
rv = new J2DTexMtx(mpTexMtxInfo[iVar2->field_0x24[param_1]]);
rv = JKR_NEW J2DTexMtx(mpTexMtxInfo[iVar2->field_0x24[param_1]]);
rv->calc();
}
return rv;
libs/JSystem/src/J2DGraph/J2DPane.cpp
+1 -1
View File
@@ -210,7 +210,7 @@ void J2DPane::changeUseTrans(J2DPane* p_pane) {
J2DPane::~J2DPane() {
JSUTreeIterator<J2DPane> iterator = mPaneTree.getFirstChild();
for (; iterator != mPaneTree.getEndChild();) {
delete (iterator++).getObject();
JKR_DELETE((iterator++).getObject());
}
}
libs/JSystem/src/J2DGraph/J2DPicture.cpp
+10 -10
View File
@@ -208,12 +208,12 @@ void J2DPicture::private_readStream(J2DPane* parent, JSURandomInputStream* strea
field_0x109 = 1;
if (img != NULL) {
mTexture[0] = new JUTTexture(img, 0);
mTexture[0] = JKR_NEW JUTTexture(img, 0);
mTextureNum++;
}
if (lut != NULL) {
mPalette = new JUTPalette(GX_TLUT0, lut);
mPalette = JKR_NEW JUTPalette(GX_TLUT0, lut);
mTexture[0]->attachPalette(mPalette);
}
@@ -237,7 +237,7 @@ void J2DPicture::private_initiate(const ResTIMG* timg, const ResTLUT* tlut) {
if (timg != NULL) {
if (mTexture[0] == NULL) {
mTexture[0] = new JUTTexture(timg, 0);
mTexture[0] = JKR_NEW JUTTexture(timg, 0);
if (mTexture[0] != NULL) {
mTextureNum++;
field_0x109 = (field_0x109 & 2) | 1;
@@ -251,7 +251,7 @@ void J2DPicture::private_initiate(const ResTIMG* timg, const ResTLUT* tlut) {
mPalette = NULL;
if (tlut && mPalette == NULL) {
mPalette = new JUTPalette(GX_TLUT0, const_cast<ResTLUT*>(tlut));
mPalette = JKR_NEW JUTPalette(GX_TLUT0, const_cast<ResTLUT*>(tlut));
if (mTexture[0] != NULL) {
mTexture[0]->attachPalette(mPalette);
}
@@ -272,11 +272,11 @@ void J2DPicture::initinfo() {
J2DPicture::~J2DPicture() {
for (int i = 0; i < 2; i++) {
if ((int)(field_0x109 & 1 << i) != 0) {
delete mTexture[i];
JKR_DELETE(mTexture[i]);
}
}
delete mPalette;
JKR_DELETE(mPalette);
}
bool J2DPicture::prepareTexture(u8 param_0) {
@@ -286,7 +286,7 @@ bool J2DPicture::prepareTexture(u8 param_0) {
}
if (mTexture[i] == NULL) {
mTexture[i] = new JUTTexture();
mTexture[i] = JKR_NEW JUTTexture();
if (mTexture[i] == NULL) {
return 0;
@@ -309,7 +309,7 @@ bool J2DPicture::insert(ResTIMG const* img, JUTPalette* palette, u8 param_2, f32
JUTTexture* var_r31;
if (mTexture[mTextureNum] == NULL) {
var_r31 = new JUTTexture(img, var_r26);
var_r31 = JKR_NEW JUTTexture(img, var_r26);
if (palette != NULL) {
var_r31->storeTIMG(img, palette);
@@ -381,7 +381,7 @@ bool J2DPicture::insert(JUTTexture* texture, u8 param_1, f32 param_2) {
}
if (mTexture[1] != NULL && field_0x109 & 2) {
delete mTexture[1];
JKR_DELETE(mTexture[1]);
field_0x109 &= 1;
}
@@ -417,7 +417,7 @@ bool J2DPicture::remove(u8 param_0) {
}
if (field_0x109 & (1 << param_0)) {
delete mTexture[param_0];
JKR_DELETE(mTexture[param_0]);
}
for (u8 i = param_0; i < mTextureNum - 1; i++) {
libs/JSystem/src/J2DGraph/J2DPictureEx.cpp
+5 -5
View File
@@ -62,7 +62,7 @@ J2DPictureEx::J2DPictureEx(J2DPane* param_0, JSURandomInputStream* param_1, u32
J2DPictureEx::~J2DPictureEx() {
if (field_0x190) {
delete mMaterial;
JKR_DELETE(mMaterial);
}
}
@@ -1136,11 +1136,11 @@ void J2DPictureEx::setAnimation(J2DAnmVtxColor* anm) {
for (u16 j = 0; j < anm_table_num; j++) {
#if DEBUG
J3DAnmVtxColorIndexData* data = anm->getAnmVtxColorIndexData(0, j);
u16* index2 = anm->getVtxColorIndexPointer(0) + (uintptr_t)data->mpData;
BE(u16)* index2 = anm->getVtxColorIndexPointer(0) + (uintptr_t)data->mpData;
#else
J3DAnmVtxColorIndexData* data = anm->getAnmVtxColorIndexData(0, j);
u16* index = anm->getVtxColorIndexPointer(0);
u16* index2 = index + (uintptr_t)data->mpData;
BE(u16)* index = anm->getVtxColorIndexPointer(0);
BE(u16)* index2 = index + (uintptr_t)data->mpData;
#endif
for (u16 k = 0; k < data->mNum; k++) {
if (index2[k] == field_0x158[i]) {
@@ -1177,7 +1177,7 @@ const J2DAnmTransform* J2DPictureEx::animationPane(J2DAnmTransform const* anm) {
if (field_0x19c & (1 << i)) {
for (u16 j = 0; j < anm_table_num; j++) {
J3DAnmVtxColorIndexData* data = field_0x198->getAnmVtxColorIndexData(0, j);
u16* index = field_0x198->getVtxColorIndexPointer(0) + (uintptr_t)data->mpData;
BE(u16)* index = field_0x198->getVtxColorIndexPointer(0) + (uintptr_t)data->mpData;
for (u16 k = 0; k < data->mNum; k++) {
if (index[k] == field_0x158[i]) {
field_0x198->getColor(0, j, &mCornerColor[i]);
libs/JSystem/src/J2DGraph/J2DPrint.cpp
+2 -2
View File
@@ -90,10 +90,10 @@ u8* J2DPrint::setBuffer(size_t size) {
u8* u8Buff = (u8*)mStrBuff;
if (sStrBufInitialized) {
delete mStrBuff;
JKR_DELETE(mStrBuff);
}
mStrBuff = new (JKRGetSystemHeap(), 0) char[size];
mStrBuff = JKR_NEW_ARGS (JKRGetSystemHeap(), 0) char[size];
mStrBuffSize = size;
sStrBufInitialized = true;
return u8Buff;
libs/JSystem/src/J2DGraph/J2DScreen.cpp
+27 -27
View File
@@ -27,19 +27,19 @@ J2DScreen::~J2DScreen() {
}
void J2DScreen::clean() {
delete[] mMaterials;
JKR_DELETE_ARRAY(mMaterials);
mMaterialNum = 0;
mMaterials = NULL;
delete[] mTexRes;
JKR_DELETE_ARRAY(mTexRes);
mTexRes = NULL;
delete[] mFontRes;
JKR_DELETE_ARRAY(mFontRes);
mFontRes = NULL;
if (mNameTable != NULL) {
delete[] mNameTable->getResNameTable();
delete mNameTable;
JKR_DELETE_ARRAY(mNameTable->getResNameTable());
JKR_DELETE(mNameTable);
mNameTable = NULL;
}
}
@@ -176,40 +176,40 @@ J2DPane* J2DScreen::createPane(J2DScrnBlockHeader const& header, JSURandomInputS
switch (header.mTag) {
case 'PAN1':
newPane = new J2DPane(p_basePane, p_stream, 0);
newPane = JKR_NEW J2DPane(p_basePane, p_stream, 0);
break;
case 'WIN1':
newPane = new J2DWindow(p_basePane, p_stream, p_archive);
newPane = JKR_NEW J2DWindow(p_basePane, p_stream, p_archive);
break;
case 'PIC1':
newPane = new J2DPicture(p_basePane, p_stream, p_archive);
newPane = JKR_NEW J2DPicture(p_basePane, p_stream, p_archive);
break;
case 'TBX1':
newPane = new J2DTextBox(p_basePane, p_stream, p_archive);
newPane = JKR_NEW J2DTextBox(p_basePane, p_stream, p_archive);
break;
case 'PAN2':
newPane = new J2DPane(p_basePane, p_stream, 1);
newPane = JKR_NEW J2DPane(p_basePane, p_stream, 1);
break;
case 'WIN2':
if (param_3 & 0x1F0000) {
newPane = new J2DWindowEx(p_basePane, p_stream, param_3, mMaterials);
newPane = JKR_NEW J2DWindowEx(p_basePane, p_stream, param_3, mMaterials);
break;
}
newPane = new J2DWindow(p_basePane, p_stream, mMaterials);
newPane = JKR_NEW J2DWindow(p_basePane, p_stream, mMaterials);
break;
case 'PIC2':
if (param_3 & 0x1F0000) {
newPane = new J2DPictureEx(p_basePane, p_stream, param_3, mMaterials);
newPane = JKR_NEW J2DPictureEx(p_basePane, p_stream, param_3, mMaterials);
break;
}
newPane = new J2DPicture(p_basePane, p_stream, mMaterials);
newPane = JKR_NEW J2DPicture(p_basePane, p_stream, mMaterials);
break;
case 'TBX2':
if (param_3 & 0x1F0000) {
newPane = new J2DTextBoxEx(p_basePane, p_stream, param_3, mMaterials);
newPane = JKR_NEW J2DTextBoxEx(p_basePane, p_stream, param_3, mMaterials);
break;
}
newPane = new J2DTextBox(p_basePane, p_stream, param_3, mMaterials);
newPane = JKR_NEW J2DTextBox(p_basePane, p_stream, param_3, mMaterials);
break;
default:
JUT_WARN(446, "%s", "unknown pane");
@@ -217,7 +217,7 @@ J2DPane* J2DScreen::createPane(J2DScrnBlockHeader const& header, JSURandomInputS
s32 size = header.mSize;
s32 start = size + position;
newPane = new J2DPane(p_basePane, p_stream, 0);
newPane = JKR_NEW J2DPane(p_basePane, p_stream, 0);
p_stream->seek(start, JSUStreamSeekFrom_SET);
break;
}
@@ -321,9 +321,9 @@ J2DResReference* J2DScreen::getResReference(JSURandomInputStream* p_stream, u32
char* buffer;
if (param_1 & 0x1F0000) {
buffer = new char[size1];
buffer = JKR_NEW char[size1];
} else {
buffer = new (-4) char[size1];
buffer = JKR_NEW_ARGS (-4) char[size1];
}
if (buffer != NULL) {
@@ -343,12 +343,12 @@ bool J2DScreen::createMaterial(JSURandomInputStream* p_stream, u32 param_1, JKRA
p_stream->skip(2);
if (param_1 & 0x1F0000) {
mMaterials = new J2DMaterial[mMaterialNum];
mMaterials = JKR_NEW J2DMaterial[mMaterialNum];
} else {
mMaterials = new (-4) J2DMaterial[mMaterialNum];
mMaterials = JKR_NEW_ARGS (-4) J2DMaterial[mMaterialNum];
}
u8* buffer = new (-4) u8[header.mSize];
u8* buffer = JKR_NEW_ARGS (-4) u8[header.mSize];
if (mMaterials != NULL && buffer != NULL) {
J2DMaterialBlock* pBlock = (J2DMaterialBlock*)buffer;
p_stream->seek(position, JSUStreamSeekFrom_SET);
@@ -372,7 +372,7 @@ bool J2DScreen::createMaterial(JSURandomInputStream* p_stream, u32 param_1, JKRA
}
size++;
u8* nametab = new u8[size];
u8* nametab = JKR_NEW u8[size];
if (nametab == NULL) {
goto failure;
}
@@ -380,20 +380,20 @@ bool J2DScreen::createMaterial(JSURandomInputStream* p_stream, u32 param_1, JKRA
nametab[i] = (buffer + offset)[i];
}
mNameTable = new JUTNameTab((ResNTAB*)nametab);
mNameTable = JKR_NEW JUTNameTab((ResNTAB*)nametab);
if (mNameTable == NULL) {
delete[] nametab;
JKR_DELETE_ARRAY(nametab);
goto failure;
}
}
success:
delete[] buffer;
JKR_DELETE_ARRAY(buffer);
return true;
}
failure:
delete[] buffer;
JKR_DELETE_ARRAY(buffer);
clean();
return false;
}
libs/JSystem/src/J2DGraph/J2DTextBox.cpp
+13 -13
View File
@@ -74,13 +74,13 @@ J2DTextBox::J2DTextBox(J2DPane* p_pane, JSURandomInputStream* p_stream, u32 para
mStringPtr = NULL;
if (strLength != 0) {
mStringPtr = new char[strLength];
mStringPtr = JKR_NEW char[strLength];
}
if (mStringPtr != NULL) {
mStringLength = strLength;
u16 var_r26_2 = strLength - 1 < info.field_0x1e ? u16(strLength - 1) : info.field_0x1e;
u16 var_r26_2 = strLength - 1 < info.field_0x1e ? u16(strLength - 1) : (u16)info.field_0x1e;
p_stream->peek(mStringPtr, var_r26_2);
mStringPtr[var_r26_2] = 0;
@@ -121,7 +121,7 @@ J2DTextBox::J2DTextBox(u64 tag, JGeometry::TBox2<f32> const& bounds, ResFONT con
void J2DTextBox::initiate(ResFONT const* p_font, char const* string, s16 length,
J2DTextBoxHBinding hBind, J2DTextBoxVBinding vBind) {
if (p_font != NULL) {
mFont = new JUTResFont(p_font, NULL);
mFont = JKR_NEW JUTResFont(p_font, NULL);
}
mCharColor.set(0xFFFFFFFF);
@@ -144,7 +144,7 @@ void J2DTextBox::initiate(ResFONT const* p_font, char const* string, s16 length,
stringLen = len + 1;
}
mStringPtr = new char[stringLen];
mStringPtr = JKR_NEW char[stringLen];
if (stringLen != 0 && mStringPtr != NULL) {
strncpy(mStringPtr, string, stringLen - 1);
@@ -185,7 +185,7 @@ void J2DTextBox::private_readStream(J2DPane* p_pane, JSURandomInputStream* p_str
ResFONT* fontPtr = (ResFONT*)getPointer(p_stream, 'FONT', p_archive);
if (fontPtr != NULL) {
mFont = new JUTResFont(fontPtr, NULL);
mFont = JKR_NEW JUTResFont(fontPtr, NULL);
}
mCharColor.set(p_stream->read32b());
@@ -198,7 +198,7 @@ void J2DTextBox::private_readStream(J2DPane* p_pane, JSURandomInputStream* p_str
mFontSizeY = p_stream->read16b();
s16 stringLen = p_stream->read16b();
mStringPtr = new char[stringLen + 1];
mStringPtr = JKR_NEW char[stringLen + 1];
if (mStringPtr != NULL) {
p_stream->read(mStringPtr, stringLen);
@@ -240,16 +240,16 @@ void J2DTextBox::private_readStream(J2DPane* p_pane, JSURandomInputStream* p_str
J2DTextBox::~J2DTextBox() {
if (mTextFontOwned) {
delete mFont;
JKR_DELETE(mFont);
}
delete[] mStringPtr;
JKR_DELETE_ARRAY(mStringPtr);
}
void J2DTextBox::setFont(JUTFont* p_font) {
if (p_font) {
if (mTextFontOwned) {
delete mFont;
JKR_DELETE(mFont);
}
mFont = p_font;
mTextFontOwned = false;
@@ -317,7 +317,7 @@ s32 J2DTextBox::setString(char const* string, ...) {
va_list args;
va_start(args, string);
delete[] mStringPtr;
JKR_DELETE_ARRAY(mStringPtr);
u32 len = strlen(string);
@@ -326,7 +326,7 @@ s32 J2DTextBox::setString(char const* string, ...) {
}
mStringLength = 0;
mStringPtr = new char[len + 1];
mStringPtr = JKR_NEW char[len + 1];
if (mStringPtr) {
mStringLength = len + 1;
@@ -341,7 +341,7 @@ s32 J2DTextBox::setString(s16 length, char const* string, ...) {
va_list args;
va_start(args, string);
delete[] mStringPtr;
JKR_DELETE_ARRAY(mStringPtr);
mStringPtr = NULL;
u32 len = strlen(string);
@@ -357,7 +357,7 @@ s32 J2DTextBox::setString(s16 length, char const* string, ...) {
mStringLength = 0;
if (stringLen != 0) {
mStringPtr = new char[stringLen];
mStringPtr = JKR_NEW char[stringLen];
}
if (mStringPtr != NULL) {
libs/JSystem/src/J2DGraph/J2DTextBoxEx.cpp
+3 -3
View File
@@ -65,13 +65,13 @@ J2DTextBoxEx::J2DTextBoxEx(J2DPane* p_pane, JSURandomInputStream* p_stream, u32
mStringPtr = NULL;
if (strLength != 0) {
mStringPtr = new char[strLength];
mStringPtr = JKR_NEW char[strLength];
}
if (mStringPtr != NULL) {
mStringLength = strLength;
u16 var_r26_2 = strLength - 1 < info.field_0x1e ? u16(strLength - 1) : info.field_0x1e;
u16 var_r26_2 = strLength - 1 < info.field_0x1e ? u16(strLength - 1) : (u16)info.field_0x1e;
p_stream->peek(mStringPtr, var_r26_2);
mStringPtr[var_r26_2] = 0;
@@ -88,7 +88,7 @@ J2DTextBoxEx::J2DTextBoxEx(J2DPane* p_pane, JSURandomInputStream* p_stream, u32
J2DTextBoxEx::~J2DTextBoxEx() {
if (field_0x140 != 0) {
delete mMaterial;
JKR_DELETE(mMaterial);
}
}
libs/JSystem/src/J2DGraph/J2DWindow.cpp
+17 -17
View File
@@ -150,19 +150,19 @@ J2DWindow::J2DWindow(u64 param_0, const JGeometry::TBox2<f32>& param_1, const ch
void J2DWindow::initiate(const ResTIMG* param_0, const ResTIMG* param_1, const ResTIMG* param_2, const ResTIMG* param_3, const ResTLUT* param_4, J2DWindowMirror param_5, const JGeometry::TBox2<f32>& param_6) {
if (param_0) {
field_0x100 = new JUTTexture(param_0, 0);
field_0x100 = JKR_NEW JUTTexture(param_0, 0);
}
if (param_1) {
field_0x104 = new JUTTexture(param_1, 0);
field_0x104 = JKR_NEW JUTTexture(param_1, 0);
}
if (param_2) {
field_0x108 = new JUTTexture(param_2, 0);
field_0x108 = JKR_NEW JUTTexture(param_2, 0);
}
if (param_3) {
field_0x10c = new JUTTexture(param_3, 0);
field_0x10c = JKR_NEW JUTTexture(param_3, 0);
}
if (param_4) {
mPalette = new JUTPalette(GX_TLUT0, const_cast<ResTLUT*>(param_4));
mPalette = JKR_NEW JUTPalette(GX_TLUT0, const_cast<ResTLUT*>(param_4));
}
field_0x144 = param_5;
if (field_0x100 && field_0x104 && field_0x108 && field_0x10c) {
@@ -189,23 +189,23 @@ void J2DWindow::private_readStream(J2DPane* param_0, JSURandomInputStream* param
field_0x114.set(f31, f30, f29, f28);
ResTIMG* timg = (ResTIMG*)getPointer(param_1, 'TIMG', param_2);
if (timg) {
field_0x100 = new JUTTexture(timg, 0);
field_0x100 = JKR_NEW JUTTexture(timg, 0);
}
timg = (ResTIMG*)getPointer(param_1, 'TIMG', param_2);
if (timg) {
field_0x104 = new JUTTexture(timg, 0);
field_0x104 = JKR_NEW JUTTexture(timg, 0);
}
timg = (ResTIMG*)getPointer(param_1, 'TIMG', param_2);
if (timg) {
field_0x108 = new JUTTexture(timg, 0);
field_0x108 = JKR_NEW JUTTexture(timg, 0);
}
timg = (ResTIMG*)getPointer(param_1, 'TIMG', param_2);
if (timg) {
field_0x10c = new JUTTexture(timg, 0);
field_0x10c = JKR_NEW JUTTexture(timg, 0);
}
ResTLUT* tlut = (ResTLUT*)getPointer(param_1, 'TLUT', param_2);
if (tlut) {
mPalette = new JUTPalette(GX_TLUT0, tlut);
mPalette = JKR_NEW JUTPalette(GX_TLUT0, tlut);
}
field_0x144 = param_1->read8b();
field_0x128.set(param_1->read32b());
@@ -218,7 +218,7 @@ void J2DWindow::private_readStream(J2DPane* param_0, JSURandomInputStream* param
int unused;
timg = (ResTIMG*)getPointer(param_1, 'TIMG', param_2);
if (timg) {
field_0x110 = new JUTTexture(timg, 0);
field_0x110 = JKR_NEW JUTTexture(timg, 0);
}
r27--;
}
@@ -288,12 +288,12 @@ J2DWindowMirror J2DWindow::convertMirror(J2DTextureBase texBase) {
}
J2DWindow::~J2DWindow() {
delete field_0x100;
delete field_0x104;
delete field_0x108;
delete field_0x10c;
delete mPalette;
delete field_0x110;
JKR_DELETE(field_0x100);
JKR_DELETE(field_0x104);
JKR_DELETE(field_0x108);
JKR_DELETE(field_0x10c);
JKR_DELETE(mPalette);
JKR_DELETE(field_0x110);
}
void J2DWindow::draw(JGeometry::TBox2<f32> const& param_0) {
libs/JSystem/src/J2DGraph/J2DWindowEx.cpp
+4 -4
View File
@@ -112,12 +112,12 @@ void J2DWindowEx::setMinSize() {
J2DWindowEx::~J2DWindowEx() {
for (u8 i = 0; i < 4; i++) {
if (field_0x170 & (1 << i)) {
delete mFrameMaterial[i];
JKR_DELETE(mFrameMaterial[i]);
}
}
if (field_0x170 & 0x10) {
delete mContentsMaterial;
JKR_DELETE(mContentsMaterial);
}
}
@@ -759,7 +759,7 @@ void J2DWindowEx::setAnimation(J2DAnmVtxColor* param_0) {
if (field_0x168[i] != 0xffff) {
for (u16 j = 0; j < uVar3; j++) {
J3DAnmVtxColorIndexData* puVar1 = param_0->getAnmVtxColorIndexData(0, j);
u16* indexPointer2 =
BE(u16)* indexPointer2 =
param_0->getVtxColorIndexPointer(0) + (uintptr_t)puVar1->mpData;
for (u16 k = 0; k < puVar1->mNum; k++) {
if (indexPointer2[k] == field_0x168[i]) {
@@ -803,7 +803,7 @@ const J2DAnmTransform* J2DWindowEx::animationPane(J2DAnmTransform const* param_0
if ((field_0x17c & (1 << i))) {
for (u16 j = 0; j < uVar3; j++) {
J3DAnmVtxColorIndexData* puVar1 = mAnmVtxColor->getAnmVtxColorIndexData(0, j);
u16* indexPointer2 =
BE(u16)* indexPointer2 =
mAnmVtxColor->getVtxColorIndexPointer(0) + (uintptr_t)puVar1->mpData;
for (u16 k = 0; k < puVar1->mNum; k++) {
if (indexPointer2[k] == field_0x168[i]) {