diff options
| author | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2024-09-11 15:01:40 -0400 |
|---|---|---|
| committer | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2024-09-11 15:01:40 -0400 |
| commit | bd39bcd7077735f7f5365dc1690b44cd062b9ee9 (patch) | |
| tree | acbd84d449b6865a9be9bbbf11d972c11b4eaaa6 | |
| parent | 9d2ea6dd39951f1295831331a9dd3737a49d4e4d (diff) | |
object-camera OK
| -rw-r--r-- | configure.py | 2 | ||||
| -rw-r--r-- | src/JSystem/JStudio/JStudio_JStage/object-camera.cpp | 14 |
2 files changed, 3 insertions, 13 deletions
diff --git a/configure.py b/configure.py index d32de9e3..c1892ff8 100644 --- a/configure.py +++ b/configure.py @@ -692,7 +692,7 @@ config.libs = [ Object(Matching, "JSystem/JStudio/JStudio_JStage/object.cpp"), Object(Matching, "JSystem/JStudio/JStudio_JStage/object-actor.cpp"), Object(Matching, "JSystem/JStudio/JStudio_JStage/object-ambientlight.cpp"), - Object(NonMatching, "JSystem/JStudio/JStudio_JStage/object-camera.cpp"), + Object(Matching, "JSystem/JStudio/JStudio_JStage/object-camera.cpp"), Object(Matching, "JSystem/JStudio/JStudio_JStage/object-fog.cpp"), Object(Matching, "JSystem/JStudio/JStudio_JStage/object-light.cpp"), ], diff --git a/src/JSystem/JStudio/JStudio_JStage/object-camera.cpp b/src/JSystem/JStudio/JStudio_JStage/object-camera.cpp index 9b967f52..9b6536b3 100644 --- a/src/JSystem/JStudio/JStudio_JStage/object-camera.cpp +++ b/src/JSystem/JStudio/JStudio_JStage/object-camera.cpp @@ -47,10 +47,6 @@ namespace { } else { pControl->transformOnGet_transform(rSrc.mCurrent, &pDst->mCurrent); pControl->transformOnGet_transform(rSrc.mTarget, &pDst->mTarget); - // Fixes codegen, but breaks regalloc: - // CMtxP temp = pControl->mTransformOnGet_Matrix; - // MTXMultVec(temp, &rSrc.mCurrent.mPosition, &pDst->mCurrent.mPosition); - // MTXMultVec(temp, &rSrc.mTarget.mPosition, &pDst->mTarget.mPosition); return pDst; } } @@ -60,10 +56,6 @@ namespace { } else { pControl->transformOnSet_transform(rSrc.mCurrent, &pDst->mCurrent); pControl->transformOnSet_transform(rSrc.mTarget, &pDst->mTarget); - // Fixes codegen, but breaks regalloc: - // CMtxP temp = pControl->mTransformOnSet_Matrix; - // MTXMultVec(temp, &rSrc.mCurrent.mPosition, &pDst->mCurrent.mPosition); - // MTXMultVec(temp, &rSrc.mTarget.mPosition, &pDst->mTarget.mPosition); return pDst; } } @@ -71,10 +63,9 @@ namespace { /* 802774A8-80277600 .text adaptor_do_begin__Q214JStudio_JStage15TAdaptor_cameraFPCQ27JStudio7TObject */ void TAdaptor_camera::adaptor_do_begin(const JStudio::TObject* object) { - /* Nonmatching */ mObject->JSGFEnableFlag(1); - const JStudio::TControl* pControl = (JStudio::TControl*)object->getControl(); + JStudio::TControl* pControl = (JStudio::TControl*)object->getControl(); TTransformed_ sp20; TTransformed_ sp08; const TTransformed_* r29; @@ -95,8 +86,7 @@ void TAdaptor_camera::adaptor_do_end(const JStudio::TObject* object) { /* 80277654-8027771C .text adaptor_do_update__Q214JStudio_JStage15TAdaptor_cameraFPCQ27JStudio7TObjectUl */ void TAdaptor_camera::adaptor_do_update(const JStudio::TObject* object, u32 p2) { - /* Nonmatching */ - const JStudio::TControl* pControl = (JStudio::TControl*)object->getControl(); + JStudio::TControl* pControl = (JStudio::TControl*)object->getControl(); TTransformed_ sp20; TTransformed_ sp08; adaptor_getVariableValue_Vec(&sp20.mCurrent.mPosition, sauVariableValue_3_POSITION_XYZ); |