mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-08-19 21:33:07 -04:00
Code Issues Packages Projects Releases Wiki Activity

More inlines

Browse Source 
Also update dtk-template
This commit is contained in:
LagoLunatic
2025-04-19 13:55:59 -04:00
parent f74a03109f
commit 58ab930817
32 changed files with 145 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/d_wood.cpp
+15 -26
View File
@@ -378,11 +378,11 @@ void dWood::Anm_c::mode_cut(dWood::Packet_c *) {
mPosOffsetZ = mPosOffsetZ + L_attr.kCutZVel;
mPhaseX[0] = mPhaseX[0] - L_attr.kCutPitchVel;
mDoMtx_YrotS(mDoMtx_stack_c::now, mForceDir);
mDoMtx_stack_c::YrotS(mForceDir);
mDoMtx_stack_c::transM(0.0f, mPosOffsetY, mPosOffsetZ);
mDoMtx_XrotM(mDoMtx_stack_c::now, mPhaseX[0]);
mDoMtx_YrotM(mDoMtx_stack_c::now, -mForceDir);
mDoMtx_copy(mDoMtx_stack_c::now, mModelMtx);
mDoMtx_stack_c::XrotM(mPhaseX[0]);
mDoMtx_stack_c::YrotM(-mForceDir);
cMtx_copy(mDoMtx_stack_c::get(), mModelMtx);
// Fade out the bush as it falls
if (mCountdown < attr().kCutFadeStart) {
@@ -638,7 +638,7 @@ bool dWood::Unit_c::set_ground() {
mtx[2][3] = mPos.z;
mDoMtx_stack_c::scaleM(L_attr.kUncutShadowScale, kGroundHeightBias,
L_attr.kUncutShadowScale);
mDoMtx_copy(mDoMtx_stack_c::now, mShadowModelMtx);
cMtx_copy(mDoMtx_stack_c::get(), mShadowModelMtx);
return true;
} else {
return false;
@@ -649,16 +649,17 @@ bool dWood::Unit_c::set_ground() {
void dWood::Unit_c::set_mtx(dWood::Anm_c *anim) {
int anmIdx = mAnmIdx;
mDoMtx_copy(anim[anmIdx].mModelMtx, mDoMtx_stack_c::get());
mDoMtx_stack_c::now[0][3] = mDoMtx_stack_c::now[0][3] + mPos.x;
mDoMtx_stack_c::now[1][3] = mDoMtx_stack_c::now[1][3] + mPos.y;
mDoMtx_stack_c::now[2][3] = mDoMtx_stack_c::now[2][3] + mPos.z;
mDoMtx_concat(j3dSys.getViewMtx(), mDoMtx_stack_c::now, mModelViewMtx);
mDoMtx_stack_c::copy(anim[anmIdx].mModelMtx);
MtxP mtx = mDoMtx_stack_c::get();
mtx[0][3] += mPos.x;
mtx[1][3] += mPos.y;
mtx[2][3] += mPos.z;
mDoMtx_concat(j3dSys.getViewMtx(), mDoMtx_stack_c::get(), mModelViewMtx);
mDoMtx_copy(anim[anmIdx].mTrunkModelMtx, mDoMtx_stack_c::get());
mDoMtx_stack_c::now[0][3] = mPos.x;
mDoMtx_stack_c::now[1][3] = mPos.y;
mDoMtx_stack_c::now[2][3] = mPos.z;
mDoMtx_stack_c::copy(anim[anmIdx].mTrunkModelMtx);
mtx[0][3] = mPos.x;
mtx[1][3] = mPos.y;
mtx[2][3] = mPos.z;
mDoMtx_concat(j3dSys.getViewMtx(), mDoMtx_stack_c::get(), mTrunkModelViewMtx);
mDoMtx_concat(j3dSys.getViewMtx(), mShadowModelMtx, mShadowModelViewMtx);
@@ -952,18 +953,6 @@ void dWood::Packet_c::update() {
/* 800BF614-800BF900 .text draw__Q25dWood8Packet_cFv */
void dWood::Packet_c::draw() {
u8 bVar1;
int iVar2;
int iVar3;
uint uVar4;
int iVar6;
int iVar7;
GXColor local_48;
GXColor local_44;
GXColor local_40;
GXColor local_38;
GXColorS10 local_30;
static GXVtxDescList l_shadowVtxDescList[] = {
{GX_VA_POS, GX_INDEX8},
{GX_VA_TEX0, GX_INDEX8},