mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-05-27 23:45:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into 26-02-27-allocator-isolation

Browse Source
This commit is contained in:
PJB3005
2026-03-05 00:15:09 +01:00
parent 038ef4216f 3c6552dbd2
commit 3ffc3266d7
5530 changed files with 252979 additions and 26830 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/d_map_path.cpp
+9 -5
View File
@@ -12,6 +12,7 @@
#include "d/d_com_inf_game.h"
#include "d/d_map_path.h"
#include "m_Do/m_Do_lib.h"
#include <cstring>
void dMpath_n::dTexObjAggregate_c::create() {
static int const data[7] = {
@@ -36,7 +37,7 @@ void dMpath_n::dTexObjAggregate_c::remove() {
}
}
void dMpath_ColorCnv_n::convertRGB5A3_To_GXColor(_GXColor& color32, const dMpath_RGB5A3_s& color16) {
void dMpath_ColorCnv_n::convertRGB5A3_To_GXColor(GXColor& color32, const dMpath_RGB5A3_s& color16) {
int r, g, b, a;
u16 color = color16.color;
if (color & 0x8000) {
@@ -94,10 +95,12 @@ void dMpath_HIO_n::hioList_c::update(JORMContext* mctx) {
u32 dMpath_HIO_n::hioList_c::addString(char* param_1, u32 param_2, u32 param_3) const {
// DEBUG NONMATCHING
return param_2;
}
u32 dMpath_HIO_n::hioList_c::addStringBinary(char* param_1, u32 param_2, u32 param_3) const {
// DEBUG NONMATCHING
return param_2;
}
BOOL dMpath_HIO_file_base_c::writeHostioTextFile(const char* param_1) {
@@ -235,7 +238,7 @@ void dDrawPath_c::rendering(dDrawPath_c::line_class const* p_line) {
GXSetTevColor(GX_TEVREG0, *getLineColor(p_line->field_0x0 & 0x3F, p_line->field_0x1));
GXBegin(GX_LINESTRIP, GX_VTXFMT0, p_line->mDataNum);
u16* tmp = p_line->mpData;
BE(u16)* tmp = p_line->mpData;
for (int i = 0; i < p_line->mDataNum; i++) {
GXPosition1x16(*tmp);
tmp++;
@@ -252,7 +255,7 @@ void dDrawPath_c::rendering(dDrawPath_c::poly_class const* p_poly) {
if (p_poly->mDataNum >= 3) {
GXBegin(GX_TRIANGLESTRIP, GX_VTXFMT0, p_poly->mDataNum);
u16* tmp = p_poly->mpData;
BE(u16)* tmp = p_poly->mpData;
for (int i = 0; i < p_poly->mDataNum; i++) {
GXPosition1x16(*tmp);
tmp++;
@@ -292,7 +295,8 @@ void dDrawPath_c::rendering(dDrawPath_c::floor_class const* p_floor) {
void dDrawPath_c::rendering(dDrawPath_c::room_class const* room) {
JUT_ASSERT(1043, room != NULL);
if (room != NULL) {
GXSetArray(GX_VA_POS, room->mpFloatData, 8);
// TODO: FILL IN SIZE.
GXSETARRAY(GX_VA_POS, room->mpFloatData, 0, 8);
floor_class* floor = room->mpFloor;
if (floor != NULL) {
@@ -457,7 +461,7 @@ void dRenderingFDAmap_c::renderingDecoration(dDrawPath_c::line_class const* p_li
GXSetNumTevStages(1);
GXLoadTexObj(dMpath_n::m_texObjAgg.getTexObjPointer(6), GX_TEXMAP0);
u16* data_p = p_line->mpData;
BE(u16)* data_p = p_line->mpData;
s32 data_num = p_line->mDataNum;
GXSetLineWidth(width, GX_TO_ONE);
GXSetPointSize(width, GX_TO_ONE);