Fixed an issue where the objects displayed by Camera Plus were not li…

…nked to the HMD.
Snow1226 · Mar 29, 2020 · c310d30 · c310d30
1 parent a5f6a7a
commit c310d30
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 4 deletions.
diff --git a/CameraPlus/CameraPlusBehaviour.cs b/CameraPlus/CameraPlusBehaviour.cs
@@ -201,7 +201,6 @@ protected IEnumerator DelayedInit()
                 AddMovementScript();
 
             SetCullingMask();
-            _cam.cullingMask |= (1 << ParticleLayer); 
             CameraMovement.CreateExampleScript();
 
             Plugin.Instance.ActiveSceneChanged += SceneManager_activeSceneChanged;
@@ -503,6 +502,7 @@ internal virtual void SetFOV()
 
         internal virtual void SetCullingMask()
         {
+            _cam.cullingMask = Camera.main.cullingMask;
             if (Config.transparentWalls)
                 _cam.cullingMask &= ~(1 << TransparentWallsPatch.WallLayerMask);
             else

diff --git a/CameraPlus/CameraUtilities.cs b/CameraPlus/CameraUtilities.cs
@@ -137,6 +137,14 @@ string msg
             return false;
         }
 
+        public static void SetAllCamerCulling()
+        {
+            foreach (CameraPlusInstance c in Plugin.Instance.Cameras.Values.ToArray())
+            {
+                c.Instance.SetCullingMask();
+            }
+        }
+
         public static void ReloadCameras()
         {
             try

diff --git a/CameraPlus/Plugin.cs b/CameraPlus/Plugin.cs
@@ -68,6 +68,7 @@ private IEnumerator DelayedActiveSceneChanged(Scene from, Scene to)
             // If any new cameras have been added to the config folder, render them
            // if(to.name == )
             CameraUtilities.ReloadCameras();
+            CameraUtilities.SetAllCamerCulling();
 
             if (ActiveSceneChanged != null)
             {

diff --git a/CameraPlus/Properties/AssemblyInfo.cs b/CameraPlus/Properties/AssemblyInfo.cs
@@ -31,5 +31,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("4.0.1")]
-[assembly: AssemblyFileVersion("4.0.1")]
+[assembly: AssemblyVersion("4.0.2")]
+[assembly: AssemblyFileVersion("4.0.2")]
diff --git a/CameraPlus/manifest.json b/CameraPlus/manifest.json
@@ -5,7 +5,7 @@
     "gameVersion": "1.8.0",
     "id": "CameraPlus",
     "name": "CameraPlus",
-    "version": "4.0.1",
+    "version": "4.0.2",
     "features": [],
     "dependsOn": {
     }