object-camera OK

zeldaret · Sep 11, 2024 · bd39bcd · bd39bcd
1 parent 9d2ea6d
commit bd39bcd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 13 deletions.
diff --git a/configure.py b/configure.py
@@ -692,7 +692,7 @@ def JSystemLib(lib_name, objects, progress_category="core"):
             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
@@ -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,21 +56,16 @@ 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;
         }
     }
 };
 
 /* 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);