Supports Player Track for new Noodle Extensions

Snow1226 · Jun 21, 2021 · 3552274 · 3552274
1 parent b075b89
commit 3552274
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 12 deletions.
diff --git a/CameraPlus/Behaviours/CameraPlusBehaviour.cs b/CameraPlus/Behaviours/CameraPlusBehaviour.cs
@@ -232,9 +232,6 @@ protected IEnumerator DelayedInit()
 
             if (Config.VMCProtocolMode == "sender")
                 InitExternalSender();
-
-            if (CameraUtilities.seekBar == null)
-                CameraUtilities.CreatSeekbarTexture();
         }
 
         public void InitExternalSender()
@@ -414,12 +411,12 @@ public virtual void SceneManager_activeSceneChanged(Scene from, Scene to)
 
             StartCoroutine(GetMainCamera());
             StartCoroutine(Get360Managers());
-
+            /*
             var pointer = VRPointerPatch.Instance;
             if (_moverPointer) Destroy(_moverPointer);
             _moverPointer = pointer.gameObject.AddComponent<CameraMoverPointer>();
             _moverPointer.Init(this, _cameraCube);
-
+            */
             if (to.name == "GameCore")
                 SharedCoroutineStarter.instance.StartCoroutine(Delayed_activeSceneChanged(from, to));
             else
@@ -476,15 +473,18 @@ protected virtual void LateUpdate()
                 {
                     if (FPFCPatch.isInstanceFPFC)
                     {
-                        if (isFPFC != FPFCPatch.instance.isActiveAndEnabled)
+                        if (isFPFC != FPFCPatch.isInstanceFPFC)
                         {
-                            isFPFC = FPFCPatch.instance.enabled;
+                            isFPFC = FPFCPatch.isInstanceFPFC;
                             turnToHead = false;
                             replaceFPFC = true;
                             CreateScreenRenderTexture();
                         }
                         else
+                        {
+                            isFPFC = FPFCPatch.isInstanceFPFC;
                             turnToHead = Config.turnToHead;
+                        }
                     }
 #if WithVMCAvatar
                     if (Plugin.cameraController.existsVMCAvatar)
@@ -512,7 +512,7 @@ protected virtual void LateUpdate()
                             Plugin.cameraController.origin = new GameObject("OriginParent").transform;
                         }
                         adjustParent.transform.position = Plugin.cameraController.origin.position - RoomAdjustPatch.position;
-                        adjustParent.transform.localRotation = Plugin.cameraController.origin.localRotation * Quaternion.Inverse(RoomAdjustPatch.rotation);
+                        adjustParent.transform.rotation = Plugin.cameraController.origin.rotation * Quaternion.Inverse(RoomAdjustPatch.rotation);
 
                         adjustOffset.transform.localPosition = ThirdPersonPos;
                         adjustOffset.transform.localEulerAngles = ThirdPersonRot;
@@ -536,7 +536,7 @@ protected virtual void LateUpdate()
                         transform.position += OffsetPosition;
 
                     }
-                    if (turnToHead)
+                    if (turnToHead && !isFPFC)
                     {
                         turnToTarget = Camera.main.transform;
                         turnToTarget.transform.position += turnToHeadOffset;

diff --git a/CameraPlus/CHANGELOG.md b/CameraPlus/CHANGELOG.md
@@ -1,3 +1,6 @@
+# v5.2.2 Changes
+- Supports Player Track for new Noodle Extensions.  
+
 # v5.2.1 Changes
 - buf fix (It failed to destroy VRPointer internally and was mass-produced every time the profile was loaded.)  
 - Re-register code for 1.15.0 and below.  

diff --git a/CameraPlus/Properties/AssemblyInfo.cs b/CameraPlus/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("5.2.1")]
-[assembly: AssemblyFileVersion("5.2.1")]
+[assembly: AssemblyVersion("5.2.2")]
+[assembly: AssemblyFileVersion("5.2.2")]
diff --git a/CameraPlus/manifest.json b/CameraPlus/manifest.json
@@ -3,7 +3,7 @@
   "id": "CameraPlus",
   "name": "CameraPlus",
   "author": "Various Modders",
-  "version": "5.2.1",
+  "version": "5.2.2",
   "description": "CameraPlus is a Beat Saber mod that allows for multiple wide FOV cameras with smoothed movement.",
   "gameVersion": "1.16.2",
   "dependsOn": {