mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-05-31 17:01:36 -04:00
Pieter-Jan Briers
15732e241c
* Undo array allocation changes from #43 Doesn't work * Expand dmeter heap sizes, give names * Fix manual operator delete call in resource.cpp * Disable map rendering for now Aurora can't handle lines * Re-enable assert heap on DVD thread Should be fine? * Some basic debug groups with the new Aurora API * Allow Aurora backend to be set via CLI * Give materials debug groups * More debug groups * JKRHeap separation: array edition Pain
83 lines
2.3 KiB
C++
83 lines
2.3 KiB
C++
#include "JSystem/JSystem.h" // IWYU pragma: keep
|
|
|
|
#include "JSystem/J3DGraphBase/J3DShapeDraw.h"
|
|
#include "JSystem/JKernel/JKRHeap.h"
|
|
#include <cstring>
|
|
#include <stdint.h>
|
|
#include <gx.h>
|
|
|
|
u32 J3DShapeDraw::countVertex(u32 stride) {
|
|
u32 count = 0;
|
|
u8* dlStart = (u8*)getDisplayList();
|
|
|
|
for (u8* dl = dlStart; (dl - dlStart) < getDisplayListSize();) {
|
|
u8 cmd = *(u8*)dl;
|
|
dl++;
|
|
if (cmd != GX_TRIANGLEFAN && cmd != GX_TRIANGLESTRIP)
|
|
break;
|
|
int vtxNum = be16(*((u16*)(dl)));
|
|
dl += 2;
|
|
count += vtxNum;
|
|
dl = (u8*)dl + stride * vtxNum;
|
|
}
|
|
|
|
return count;
|
|
}
|
|
|
|
void J3DShapeDraw::addTexMtxIndexInDL(u32 stride, u32 attrOffs, u32 valueBase) {
|
|
u32 byteNum = countVertex(stride);
|
|
u32 oldSize = mDisplayListSize;
|
|
u32 newSize = ALIGN_NEXT(oldSize + byteNum, 0x20);
|
|
u8* newDLStart = JKR_NEW_ARRAY_ARGS(u8, newSize, 0x20);
|
|
u8* oldDLStart = (u8*)mDisplayList;
|
|
u8* oldDL = oldDLStart;
|
|
u8* newDL = newDLStart;
|
|
|
|
for (; (oldDL - oldDLStart) < mDisplayListSize;) {
|
|
// Copy command
|
|
u8 cmd = *(u8*)oldDL;
|
|
oldDL++;
|
|
*newDL++ = cmd;
|
|
|
|
if (cmd != GX_TRIANGLEFAN && cmd != GX_TRIANGLESTRIP)
|
|
break;
|
|
|
|
// Copy count
|
|
int vtxNum = *(u16*)oldDL;
|
|
oldDL += 2;
|
|
*(u16*)newDL = vtxNum;
|
|
newDL += 2;
|
|
|
|
for (int i = 0; i < be16(vtxNum); i++) {
|
|
u8* oldDLVtx = &oldDL[stride * i];
|
|
u8 pnmtxidx = *oldDLVtx;
|
|
memcpy(newDL, oldDLVtx, (int)attrOffs);
|
|
newDL += attrOffs;
|
|
*newDL++ = valueBase + pnmtxidx;
|
|
memcpy(newDL, oldDLVtx + attrOffs, stride - attrOffs);
|
|
newDL += (stride - attrOffs);
|
|
}
|
|
|
|
oldDL = (u8*)oldDL + stride * be16(vtxNum);
|
|
}
|
|
|
|
u32 realSize = ALIGN_NEXT((uintptr_t)newDL - (uintptr_t)newDLStart, 0x20);
|
|
for (; (newDL - newDLStart) < newSize; newDL++)
|
|
*newDL = 0;
|
|
|
|
mDisplayListSize = realSize;
|
|
mDisplayList = newDLStart;
|
|
DCStoreRange(newDLStart, mDisplayListSize);
|
|
}
|
|
|
|
J3DShapeDraw::J3DShapeDraw(const u8* displayList, u32 displayListSize) {
|
|
mDisplayList = (void*)displayList;
|
|
mDisplayListSize = displayListSize;
|
|
}
|
|
|
|
void J3DShapeDraw::draw() const {
|
|
GXCallDisplayList(mDisplayList, mDisplayListSize);
|
|
}
|
|
|
|
J3DShapeDraw::~J3DShapeDraw() {}
|