summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/00_Core/Item/ItemManager.cpp2
-rw-r--r--src/00_Core/Render/ModelRender.cpp85
-rw-r--r--src/58_Bombchu/Player/EquipBombchu.cpp4
-rw-r--r--src/59_Hammer/Actor/Navi/ActorNaviBase_59.cpp2
-rw-r--r--src/Main/Game/Game.cpp2
5 files changed, 46 insertions, 49 deletions
diff --git a/src/00_Core/Item/ItemManager.cpp b/src/00_Core/Item/ItemManager.cpp
index 2e1f3c01..396f42e2 100644
--- a/src/00_Core/Item/ItemManager.cpp
+++ b/src/00_Core/Item/ItemManager.cpp
@@ -556,7 +556,7 @@ THUMB void ItemManager::LoadFanfareItem(ItemId id) {
strcat(textureName, sSpecialItemModelNames[6]);
model = LoadNsbTexturedModel(mFanfareItemModel, modelName, textureName, 0, 0, 0, true);
}
- mUnk_114->Init_ModelRender_UnkStruct_4(model);
+ mUnk_114->Init_RenderObject(model);
}
THUMB bool ItemManager::GetFanfareItemScale(Vec3p *scale) const {
diff --git a/src/00_Core/Render/ModelRender.cpp b/src/00_Core/Render/ModelRender.cpp
index cd984739..37a4ce30 100644
--- a/src/00_Core/Render/ModelRender.cpp
+++ b/src/00_Core/Render/ModelRender.cpp
@@ -1,32 +1,30 @@
#include "Render/ModelRender.hpp"
-#include "DTCM/UnkStruct_027e037c.hpp"
-
-extern "C" void func_020189dc(ModelRender_UnkStruct_4 *unkStruct4, ItemModel *model);
-extern "C" void func_02018c3c(ModelRender_UnkStruct_4 *unkStruct4, void *param2);
-extern "C" void UnkInit_ModelRender_Struct4_Params(ModelRender_UnkStruct_4 *unkStruct4,
- void (*func)(ModelRenderCommandsData *), unk32 param3, u8 param4,
- u8 param5);
-extern "C" void ExecModelRenderCommands(ModelRender_UnkStruct_4 *unkStruct4);
+#include "DTCM/UnkStruct_027e037c.h"
+#include "nds/g3d/sbc.h"
+
+extern "C" void func_020189dc(G3d_RenderObject *unkStruct4, ItemModel *model);
+extern "C" void func_02018c3c(G3d_RenderObject *unkStruct4, void *param2);
+extern "C" void UnkInit_ModelRender_Struct4_Params(G3d_RenderObject *unkStruct4, void (*func)(ModelRenderCommandsData *),
+ unk32 param3, u8 param4, u8 param5);
extern "C" void CopySingle288(Mat3p *src, Mat3p *dest);
extern "C" void SetGeometryScale(Vec3p *scale);
extern "C" void SetGeometryTranslation(Vec3p *translation);
extern "C" void PushGeometryCommand(u32 command, void *data, s32 length);
-extern "C" void func_ov000_020c0d70(UnkStruct_ov000_020c0c08 *param1, ModelRender_UnkStruct_4 *param2);
+extern "C" void func_ov000_020c0d70(UnkStruct_ov000_020c0c08 *param1, G3d_RenderObject *param2);
extern "C" void func_ov000_020b3ea8(void *param1);
extern "C" unk32 func_0201e388(void *param1, const char *param2);
extern "C" u8 *GetModelUnknownHeader(ModelRender *modelRender);
extern "C" Mat3p gGeomMatrix;
extern "C" Vec3p gGeomTranslation;
extern "C" Vec3p gGeomScale;
-extern "C" UnkStruct_027e037c data_027e037c;
-extern "C" void *data_027e03c8;
+extern "C" const Mat4x3p *data_027e03c8;
extern "C" Vec3p gDefaultScale;
extern "C" Mat3p gDefaultMatrix;
extern "C" u32 *data_027e0ce0[];
THUMB ModelRender::ModelRender(ItemModel *itemModel) {
this->unkBoneMatrixArray2 = NULL;
- this->Init_ModelRender_UnkStruct_4(itemModel);
+ this->Init_RenderObject(itemModel);
}
THUMB ModelRender::~ModelRender() {
@@ -37,19 +35,19 @@ THUMB ModelRender::~ModelRender() {
}
ARM void *ModelRender::GetLcdcAddress() {
- return mUnk_04.mLcdcAddr;
+ return renderObj.model;
}
-void ModelRender::Init_ModelRender_UnkStruct_4(ItemModel *model) {
- func_020189dc(&this->mUnk_04, model);
+void ModelRender::Init_RenderObject(ItemModel *model) {
+ func_020189dc(&this->renderObj, model);
}
-ModelRender_UnkBoneMatrixStruct *ModelRender::UnkGetBoneMatrix(s32 index) {
+G3d_BoneMtxStruct *ModelRender::UnkGetBoneMatrix(s32 index) {
if (this->unkBoneMatrixArray2 != NULL) {
return &this->unkBoneMatrixArray2[index];
}
- if (this->mUnk_04.unkBoneMatrixArray1 != NULL) {
- return &this->mUnk_04.unkBoneMatrixArray1[index];
+ if (this->renderObj.cacheJntAnm != NULL) {
+ return &this->renderObj.cacheJntAnm[index];
}
return NULL;
}
@@ -88,40 +86,40 @@ void ModelRender::PushGeometryCommands() {
}
void ModelRender::ExecRenderCommands() {
- ExecModelRenderCommands(&this->mUnk_04);
+ G3d_Render(&this->renderObj);
}
void ModelRender::vfunc_24(UnkStruct_ov000_020c0c08 *param1) {
- func_ov000_020c0d70(param1, &this->mUnk_04);
+ func_ov000_020c0d70(param1, &this->renderObj);
}
void ModelRender::vfunc_28() {
- while (this->mUnk_04.mUnk_10 != NULL) {
- func_02018c3c(&this->mUnk_04, this->mUnk_04.mUnk_10);
+ while (this->renderObj.jntAnim != NULL) {
+ func_02018c3c(&this->renderObj, this->renderObj.jntAnim);
}
- while (this->mUnk_04.mUnk_08 != NULL) {
- func_02018c3c(&this->mUnk_04, this->mUnk_04.mUnk_08);
+ while (this->renderObj.matAnim != NULL) {
+ func_02018c3c(&this->renderObj, this->renderObj.matAnim);
}
- while (this->mUnk_04.mUnk_18 != NULL) {
- func_02018c3c(&this->mUnk_04, this->mUnk_04.mUnk_18);
+ while (this->renderObj.mUnk_18 != NULL) {
+ func_02018c3c(&this->renderObj, this->renderObj.mUnk_18);
}
}
void ModelRender::vfunc_2c() {
- while (this->mUnk_04.mUnk_10 != NULL) {
- func_02018c3c(&this->mUnk_04, this->mUnk_04.mUnk_10);
+ while (this->renderObj.jntAnim != NULL) {
+ func_02018c3c(&this->renderObj, this->renderObj.jntAnim);
}
}
void ModelRender::vfunc_34() {
- while (this->mUnk_04.mUnk_18 != NULL) {
- func_02018c3c(&this->mUnk_04, this->mUnk_04.mUnk_18);
+ while (this->renderObj.mUnk_18 != NULL) {
+ func_02018c3c(&this->renderObj, this->renderObj.mUnk_18);
}
}
void ModelRender::vfunc_30() {
- while (this->mUnk_04.mUnk_08 != NULL) {
- func_02018c3c(&this->mUnk_04, this->mUnk_04.mUnk_08);
+ while (this->renderObj.matAnim != NULL) {
+ func_02018c3c(&this->renderObj, this->renderObj.matAnim);
}
}
@@ -146,29 +144,28 @@ THUMB void ModelRender::InitBoneMatrixArrays(u32 idLength) {
u8 *unkPtr = GetModelUnknownHeader(this);
u8 boneMatrixCount = *(unkPtr + 3);
- ModelRender_UnkBoneMatrixStruct *boneMatrixArray =
- (ModelRender_UnkBoneMatrixStruct *) SysObject::operator new[](boneMatrixCount * 0x58, id, idLength);
- this->unkBoneMatrixArray2 = boneMatrixArray;
- this->mUnk_04.unkBoneMatrixArray1 = boneMatrixArray;
+ G3d_BoneMtxStruct *boneMatrixArray = (G3d_BoneMtxStruct *) SysObject::operator new[](boneMatrixCount * 0x58, id, idLength);
+ this->unkBoneMatrixArray2 = boneMatrixArray;
+ this->renderObj.cacheJntAnm = boneMatrixArray;
}
-ARM void ModelRender::SetUnkBoneMatrixArray1(ModelRender_UnkBoneMatrixStruct *boneMatrix) {
- this->mUnk_04.unkBoneMatrixArray1 = boneMatrix;
+ARM void ModelRender::SetUnkBoneMatrixArray1(G3d_BoneMtxStruct *boneMatrix) {
+ this->renderObj.cacheJntAnm = boneMatrix;
}
void ModelRender::vfunc_38() {
- this->mUnk_04.flags |= 3;
- ExecModelRenderCommands(&this->mUnk_04);
- this->mUnk_04.flags &= 0xfffffffd;
+ this->renderObj.flag |= 3;
+ G3d_Render(&this->renderObj);
+ this->renderObj.flag &= 0xfffffffd;
}
void ModelRender::vfunc_3c(ModelRenderCommandsData *renderData) {}
void func_ov000_020a99c0(ModelRenderCommandsData *renderData) {
- renderData->unkStruct4->mUnk_2c->vfunc_3c(renderData);
+ ((ModelRender *) renderData->unkStruct4->modelRender)->vfunc_3c(renderData);
}
void ModelRender::UnkInit_Struct4_Params(u8 param1, u8 param2) {
- this->mUnk_04.mUnk_2c = this;
- UnkInit_ModelRender_Struct4_Params(&this->mUnk_04, &func_ov000_020a99c0, 0, param1, param2);
+ this->renderObj.modelRender = this;
+ UnkInit_ModelRender_Struct4_Params(&this->renderObj, &func_ov000_020a99c0, 0, param1, param2);
} \ No newline at end of file
diff --git a/src/58_Bombchu/Player/EquipBombchu.cpp b/src/58_Bombchu/Player/EquipBombchu.cpp
index d52dc6c7..3850cb61 100644
--- a/src/58_Bombchu/Player/EquipBombchu.cpp
+++ b/src/58_Bombchu/Player/EquipBombchu.cpp
@@ -87,8 +87,8 @@ static const ItemManager_Unk1 sEquipBombchu_Unk1 = {
};
THUMB void EquipBombchu::vfunc_00() {
- gModelRenderBombchu.Init_ModelRender_UnkStruct_4(gItemManager->GetItemModel(ItemModelId_Bombchu));
- gModelRenderBombchuPt.Init_ModelRender_UnkStruct_4(gItemManager->GetItemModel(ItemModelId_BombchuPt));
+ gModelRenderBombchu.Init_RenderObject(gItemManager->GetItemModel(ItemModelId_Bombchu));
+ gModelRenderBombchuPt.Init_RenderObject(gItemManager->GetItemModel(ItemModelId_BombchuPt));
data_ov058_0219b0a0.mUnk_08 = gItemManager->GetItemModel(ItemModelId_BombchuPt);
data_ov058_0219b0a0.func_ov000_020c0c44(gItemManager->func_ov00_020ad538(&sEquipBombchu_Unk1));
data_ov058_0219b0a0.func_ov000_020c0e5c(0);
diff --git a/src/59_Hammer/Actor/Navi/ActorNaviBase_59.cpp b/src/59_Hammer/Actor/Navi/ActorNaviBase_59.cpp
index 9df98e3d..2e1ca4db 100644
--- a/src/59_Hammer/Actor/Navi/ActorNaviBase_59.cpp
+++ b/src/59_Hammer/Actor/Navi/ActorNaviBase_59.cpp
@@ -45,7 +45,7 @@ ARM void ActorNavi::func_ov059_0219aa08(bool param1) {
this->mUnk_334.mUnk_00.x =
ROUND_Q20(uVar4) | ((this->mUnk_344 >> 0x1F) * 0x666 + (lVar2 >> 0x20) + (~0x800 < uVar4)) * 0x100000;
- Mat3p_MultiplyVec(&this->mUnk_334.mUnk_00, &this->unkBoneMatrixStruct.mUnk_28, &this->mUnk_334.mUnk_00);
+ Mat3p_MultiplyVec(&this->mUnk_334.mUnk_00, &this->unkBoneMatrixStruct.rot, &this->mUnk_334.mUnk_00);
Vec3p_RotateY(uVar3, &this->mUnk_334.mUnk_00);
Vec3p_Add(&this->mUnk_334.mUnk_00, &VStack_24, &this->mUnk_334.mUnk_00);
VStack_60.z = this->mUnk_334.mUnk_00.z;
diff --git a/src/Main/Game/Game.cpp b/src/Main/Game/Game.cpp
index d702f191..65410b8d 100644
--- a/src/Main/Game/Game.cpp
+++ b/src/Main/Game/Game.cpp
@@ -3,7 +3,7 @@
#include <nds/gfx.h>
#include <nds/irq.h>
-#include "DTCM/UnkStruct_027e037c.hpp"
+#include "DTCM/UnkStruct_027e037c.h"
#include "DTCM/UnkStruct_027e05f8.hpp"
#include "DTCM/UnkStruct_027e077c.hpp"
#include "DTCM/UnkStruct_027e080c.hpp"
generated by cgit v1.2.3 (git 2.25.1) at 2026-08-03 05:14:07 +0000