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

Various inline cleanup

Browse Source
This commit is contained in:
LagoLunatic
2025-06-19 19:03:11 -04:00
parent b295d48d1d
commit efc33c5fc4
24 changed files with 341 additions and 278 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/JSystem/J3DGraphAnimator/J3DMaterialAttach.cpp
+10 -8
View File
@@ -83,10 +83,11 @@ s32 J3DMaterialTable::entryTexMtxAnimator(J3DAnmTextureSRTKey* btk) {
J3DTexMtx *tmtx = pMaterial->getTexMtx(texMtxID);
J3DTexMtxAnm* tmtxanm = new J3DTexMtxAnm(btk, no);
tmtx->getTexMtxInfo().mInfo = ((tmtx->getTexMtxInfo().mInfo) & 0x7F) | (btk->getTexMtxCalcType() << 7);
tmtx->getTexMtxInfo().mCenter.x = btk->getSRTCenter(no).x;
tmtx->getTexMtxInfo().mCenter.y = btk->getSRTCenter(no).y;
tmtx->getTexMtxInfo().mCenter.z = btk->getSRTCenter(no).z;
J3DTexMtxInfo& tmtxinfo = tmtx->getTexMtxInfo();
tmtxinfo.mInfo = (tmtxinfo.mInfo & 0x7F) | btk->getTexMtxCalcType() << 7;
tmtxinfo.mCenter.x = btk->getSRTCenter(no).x;
tmtxinfo.mCenter.y = btk->getSRTCenter(no).y;
tmtxinfo.mCenter.z = btk->getSRTCenter(no).z;
pMatAnm->setTexMtxAnm(texMtxID, tmtxanm);
}
@@ -291,10 +292,11 @@ s32 J3DMaterialTable::setTexMtxAnimator(J3DAnmTextureSRTKey* btk, J3DTexMtxAnm*
pMaterial->getTexCoord(texMtxID)->setTexGenMtx(GX_TEXMTX0 + (texMtxID & 0xFF) * 3);
J3DTexMtx *tmtx = pMaterial->getTexMtx(texMtxID);
tmtx->getTexMtxInfo().mInfo = ((tmtx->getTexMtxInfo().mInfo) & 0x7F) | (btk->getTexMtxCalcType() << 7);
tmtx->getTexMtxInfo().mCenter.x = btk->getSRTCenter(no).x;
tmtx->getTexMtxInfo().mCenter.y = btk->getSRTCenter(no).y;
tmtx->getTexMtxInfo().mCenter.z = btk->getSRTCenter(no).z;
J3DTexMtxInfo& tmtxinfo = tmtx->getTexMtxInfo();
tmtxinfo.mInfo = (tmtxinfo.mInfo & 0x7F) | btk->getTexMtxCalcType() << 7;
tmtxinfo.mCenter.x = btk->getSRTCenter(no).x;
tmtxinfo.mCenter.y = btk->getSRTCenter(no).y;
tmtxinfo.mCenter.z = btk->getSRTCenter(no).z;
pMatAnm->setTexMtxAnm(texMtxID, &pTexAnm[no]);
}