mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2024-11-29 12:52:18 -05:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' of github.com:Malkierian/Shipwright into dev-to-rando-5-6

Browse Source
This commit is contained in:
Malkierian 2024-05-08 22:28:29 -07:00
commit baf41161d3
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libultraship

@ -1 +1 @@
Subproject commit 878efcc26701f1779e06389a6c6ca8df7aef64da Subproject commit 0da318c0f4e431313565cad546fc469b8e850388

6
soh/soh/Enhancements/debugger/colViewer.cpp
View File

@ -445,7 +445,7 @@ void DrawBgActorCollision() {
bg.curTransform.scale.z, bg.curTransform.rot.x, bg.curTransform.rot.y, bg.curTransform.scale.z, bg.curTransform.rot.x, bg.curTransform.rot.y,
bg.curTransform.rot.z, bg.curTransform.pos.x, bg.curTransform.pos.y, bg.curTransform.rot.z, bg.curTransform.pos.x, bg.curTransform.pos.y,
bg.curTransform.pos.z); bg.curTransform.pos.z);
// guMtxF2L(mf, &m); guMtxF2L(mf.mf, &m);
mtxDl.push_back(m); mtxDl.push_back(m);
dl.push_back(gsSPMatrix(&mtxDl.back(), G_MTX_MODELVIEW | G_MTX_LOAD | G_MTX_PUSH)); dl.push_back(gsSPMatrix(&mtxDl.back(), G_MTX_MODELVIEW | G_MTX_LOAD | G_MTX_PUSH));
@ -493,7 +493,7 @@ void DrawColCheckList(std::vector<Gfx>& dl, Collider** objects, int32_t count) {
SkinMatrix_SetScale(&ms, radius / 128.0f, radius / 128.0f, radius / 128.0f); SkinMatrix_SetScale(&ms, radius / 128.0f, radius / 128.0f, radius / 128.0f);
MtxF dest; MtxF dest;
SkinMatrix_MtxFMtxFMult(&mf, &ms, &dest); SkinMatrix_MtxFMtxFMult(&mf, &ms, &dest);
// guMtxF2L(&dest, &m); guMtxF2L(dest.mf, &m);
mtxDl.push_back(m); mtxDl.push_back(m);
dl.push_back(gsSPMatrix(&mtxDl.back(), G_MTX_MODELVIEW | G_MTX_LOAD | G_MTX_PUSH)); dl.push_back(gsSPMatrix(&mtxDl.back(), G_MTX_MODELVIEW | G_MTX_LOAD | G_MTX_PUSH));
@ -512,7 +512,7 @@ void DrawColCheckList(std::vector<Gfx>& dl, Collider** objects, int32_t count) {
SkinMatrix_SetScale(&ms, radius / 128.0f, cyl->dim.height / 128.0f, radius / 128.0f); SkinMatrix_SetScale(&ms, radius / 128.0f, cyl->dim.height / 128.0f, radius / 128.0f);
MtxF dest; MtxF dest;
SkinMatrix_MtxFMtxFMult(&mt, &ms, &dest); SkinMatrix_MtxFMtxFMult(&mt, &ms, &dest);
// guMtxF2L(&dest, &m); guMtxF2L(dest.mf, &m);
mtxDl.push_back(m); mtxDl.push_back(m);
dl.push_back(gsSPMatrix(&mtxDl.back(), G_MTX_MODELVIEW | G_MTX_LOAD | G_MTX_PUSH)); dl.push_back(gsSPMatrix(&mtxDl.back(), G_MTX_MODELVIEW | G_MTX_LOAD | G_MTX_PUSH));