mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-07-07 13:23:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_material

Browse Source
This commit is contained in:
Jasper St. Pierre
2024-02-25 13:48:17 -08:00
parent c1dff9cb1c
commit 661c820d69
4 changed files with 101 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.py
+1 -1
View File
@@ -365,7 +365,7 @@ config.libs = [
Object(NonMatching, "d/d_demo.cpp"),
Object(NonMatching, "d/d_door.cpp"),
Object(Matching, "d/d_resorce.cpp", extra_cflags=['-pragma "nosyminline on"']),
Object(NonMatching, "d/d_material.cpp"),
Object(Matching, "d/d_material.cpp"),
Object(Matching, "d/d_event.cpp"),
Object(Matching, "d/d_event_data.cpp"),
Object(Matching, "d/d_event_manager.cpp"),
include/d/d_demo.h
+1
View File
@@ -59,6 +59,7 @@ public:
int JSGGetNodeTransformation(u32 no, Mtx dst) const {
JUT_ASSERT(0x52, mModel != 0);
cMtx_copy(mModel->getAnmMtx((u16)no), dst);
return 1;
}
f32 JSGGetAnimationFrameMax() const { return mAnimationFrameMax; }
f32 JSGGetTextureAnimationFrameMax() const { return mTexAnimationFrameMax; }
include/d/d_material.h
+4 -5
View File
@@ -31,8 +31,8 @@ public:
void entryDL(J3DModel*, s8, mDoExt_invisibleModel*);
void entryDL(mDoExt_McaMorf*, s8, mDoExt_invisibleModel*);
/* 0x00 */ J3DMaterialTable* field_0x0;
/* 0x04 */ mDoExt_btkAnm field_0x4;
/* 0x00 */ J3DMaterialTable* mMaterialTable;
/* 0x04 */ mDoExt_btkAnm mBtkAnm;
};
class dMat_control_c {
@@ -55,9 +55,8 @@ public:
mIce->updateDL(morf, param_2, invisModel);
}
// TODO:
static void pop(J3DModelData*) {}
static void push(J3DModelData*) {}
static void push(J3DModelData* modelData) { mTempBackup.create(modelData); }
static void pop(J3DModelData* modelData) { mTempBackup.restore(modelData); }
static mDoExt_backupMaterial_c mTempBackup;
static JKRSolidHeap* mHeap;
src/d/d_material.cpp
+95 -19
View File
@@ -4,6 +4,7 @@
//
#include "d/d_material.h"
#include "d/d_com_inf_game.h"
#include "JSystem/JKernel/JKRSolidHeap.h"
#include "JSystem/JUtility/JUTAssert.h"
#include "dolphin/types.h"
@@ -21,48 +22,124 @@ void dMat_backup_c::restore() {
/* 8006F69C-8006F740 .text create__10dMat_ice_cFP16J3DMaterialTableP19J3DAnmTextureSRTKey */
void dMat_ice_c::create(J3DMaterialTable* param_1, J3DAnmTextureSRTKey* param_2) {
/* Nonmatching */
field_0x0 = param_1;
int rt = field_0x4.init(field_0x0, param_2, 1, 2, 1.0f, 0, -1, false, 0);
mMaterialTable = param_1;
int rt = mBtkAnm.init(mMaterialTable, param_2, 1, 2, 1.0f, 0, -1, false, 0);
JUT_ASSERT(98, rt != 0);
field_0x4.entry(field_0x0, field_0x4.getFrameCtrl()->getFrame());
mBtkAnm.entry(mMaterialTable, mBtkAnm.getFrameCtrl()->getFrame());
}
/* 8006F740-8006F780 .text play__10dMat_ice_cFv */
void dMat_ice_c::play() {
/* Nonmatching */
field_0x4.play();
field_0x4.entryFrame();
mBtkAnm.play();
mBtkAnm.entryFrame();
}
/* 8006F780-8006F83C .text copy__10dMat_ice_cFP12J3DModelData */
void dMat_ice_c::copy(J3DModelData*) {
/* Nonmatching */
void dMat_ice_c::copy(J3DModelData* modelData) {
J3DMaterial* srcMat = mMaterialTable->getMaterialNodePointer(0);
for (u16 i = 0; i < modelData->getMaterialNum(); i++) {
J3DMaterial* mat = modelData->getMaterialNodePointer(i);
mat->copy(srcMat);
mat->setMaterialAnm(srcMat->getMaterialAnm());
mat->setMaterialMode(srcMat->getMaterialMode());
}
J3DTexture* srcTex = mMaterialTable->getTexture();
if (srcTex->getNum() != 0) {
modelData->setTexture(srcTex);
modelData->setTextureName(mMaterialTable->getTextureName());
}
}
/* 8006F83C-8006F90C .text updateDL__10dMat_ice_cFP8J3DModelScP21mDoExt_invisibleModel */
void dMat_ice_c::updateDL(J3DModel*, signed char, mDoExt_invisibleModel*) {
/* Nonmatching */
void dMat_ice_c::updateDL(J3DModel* model, s8 backupNo, mDoExt_invisibleModel* inv) {
J3DDrawBuffer* buffer0 = j3dSys.getDrawBuffer(0);
J3DDrawBuffer* buffer1 = j3dSys.getDrawBuffer(1);
J3DModelData* modelData = model->getModelData();
if (backupNo < 0)
dMat_control_c::push(modelData);
dComIfGd_setList();
copy(modelData);
mDoExt_modelUpdateDL(model);
if (backupNo < 0)
dMat_control_c::pop(modelData);
else
dMat_control_c::restore(backupNo);
if (inv != NULL)
inv->entry();
j3dSys.setDrawBuffer(buffer0, 0);
j3dSys.setDrawBuffer(buffer1, 1);
}
/* 8006F90C-8006F9E0 .text updateDL__10dMat_ice_cFP14mDoExt_McaMorfScP21mDoExt_invisibleModel */
void dMat_ice_c::updateDL(mDoExt_McaMorf*, signed char, mDoExt_invisibleModel*) {
/* Nonmatching */
void dMat_ice_c::updateDL(mDoExt_McaMorf* morf, s8 backupNo, mDoExt_invisibleModel* inv) {
J3DDrawBuffer* buffer0 = j3dSys.getDrawBuffer(0);
J3DDrawBuffer* buffer1 = j3dSys.getDrawBuffer(1);
J3DModelData* modelData = morf->getModel()->getModelData();
if (backupNo < 0)
dMat_control_c::push(modelData);
dComIfGd_setList();
copy(modelData);
morf->updateDL();
if (backupNo < 0)
dMat_control_c::pop(modelData);
else
dMat_control_c::restore(backupNo);
if (inv != NULL)
inv->entry();
j3dSys.setDrawBuffer(buffer0, 0);
j3dSys.setDrawBuffer(buffer1, 1);
}
/* 8006F9E0-8006FAB0 .text entryDL__10dMat_ice_cFP8J3DModelScP21mDoExt_invisibleModel */
void dMat_ice_c::entryDL(J3DModel*, signed char, mDoExt_invisibleModel*) {
/* Nonmatching */
void dMat_ice_c::entryDL(J3DModel* model, s8 backupNo, mDoExt_invisibleModel* inv) {
J3DDrawBuffer* buffer0 = j3dSys.getDrawBuffer(0);
J3DDrawBuffer* buffer1 = j3dSys.getDrawBuffer(1);
J3DModelData* modelData = model->getModelData();
if (backupNo < 0)
dMat_control_c::push(modelData);
dComIfGd_setList();
copy(modelData);
mDoExt_modelEntryDL(model);
if (backupNo < 0)
dMat_control_c::pop(modelData);
else
dMat_control_c::restore(backupNo);
if (inv != NULL)
inv->entry();
j3dSys.setDrawBuffer(buffer0, 0);
j3dSys.setDrawBuffer(buffer1, 1);
}
/* 8006FAB0-8006FB84 .text entryDL__10dMat_ice_cFP14mDoExt_McaMorfScP21mDoExt_invisibleModel */
void dMat_ice_c::entryDL(mDoExt_McaMorf*, signed char, mDoExt_invisibleModel*) {
/* Nonmatching */
void dMat_ice_c::entryDL(mDoExt_McaMorf* morf, s8 backupNo, mDoExt_invisibleModel* inv) {
J3DDrawBuffer* buffer0 = j3dSys.getDrawBuffer(0);
J3DDrawBuffer* buffer1 = j3dSys.getDrawBuffer(1);
J3DModelData* modelData = morf->getModel()->getModelData();
if (backupNo < 0)
dMat_control_c::push(modelData);
dComIfGd_setList();
copy(modelData);
morf->entryDL();
if (backupNo < 0)
dMat_control_c::pop(modelData);
else
dMat_control_c::restore(backupNo);
if (inv != NULL)
inv->entry();
j3dSys.setDrawBuffer(buffer0, 0);
j3dSys.setDrawBuffer(buffer1, 1);
}
/* 8006FB84-8006FCF0 .text create__14dMat_control_cFP16J3DMaterialTableP19J3DAnmTextureSRTKey */
void dMat_control_c::create(J3DMaterialTable* param_1, J3DAnmTextureSRTKey* param_2) {
/* Nonmatching */
mHeap = mDoExt_createSolidHeapFromSystem(0, 0);
JUT_ASSERT(308, mHeap != 0);
JKRHeap* heap = mDoExt_setCurrentHeap(mHeap);
@@ -90,7 +167,6 @@ void dMat_control_c::remove() {
/* 8006FDBC-8006FDF4 .text restore__14dMat_control_cFSc */
void dMat_control_c::restore(s8 param_1) {
/* Nonmatching */
if (param_1 < 0) {
return;
}