Browse Source

Fix issue with dragpoint mesh getting darker

I thought I wasn't destroying the dragpoints properly or something but
it was just the subcamera not getting destroyed
habeebweeb 4 years ago
parent
commit
6b06a0138a

+ 17 - 20
COM3D2.MeidoPhotoStudio.Plugin/MeidoPhotoStudio/Managers/EnvironmentManager.cs

@@ -23,26 +23,17 @@ namespace COM3D2.MeidoPhotoStudio.Plugin
 
         public void Initialize()
         {
-            if (!bgObject)
-            {
-                bgObject = GameObject.Find("__GameMain__/BG");
-                bg = bgObject.transform;
-            }
-
-            GameObject.Destroy(cameraObject);
-            GameObject.Destroy(subCamera);
-
-            if (cameraObject == null)
-            {
-                cameraObject = new GameObject("subCamera");
-                subCamera = cameraObject.AddComponent<Camera>();
-                subCamera.CopyFrom(Camera.main);
-                cameraObject.SetActive(true);
-                subCamera.clearFlags = CameraClearFlags.Depth;
-                subCamera.cullingMask = 256;
-                subCamera.depth = 1f;
-                subCamera.transform.parent = GameMain.Instance.MainCamera.transform;
-            }
+            bgObject = GameObject.Find("__GameMain__/BG");
+            bg = bgObject.transform;
+
+            cameraObject = new GameObject("subCamera");
+            subCamera = cameraObject.AddComponent<Camera>();
+            subCamera.CopyFrom(Camera.main);
+            cameraObject.SetActive(true);
+            subCamera.clearFlags = CameraClearFlags.Depth;
+            subCamera.cullingMask = 256;
+            subCamera.depth = 1f;
+            subCamera.transform.parent = GameMain.Instance.MainCamera.transform;
 
             bgObject.SetActive(true);
             GameMain.Instance.BgMgr.ChangeBg("Theater");
@@ -59,5 +50,11 @@ namespace COM3D2.MeidoPhotoStudio.Plugin
             cameraMain.SetTargetPos(new Vector3(0f, 0.9f, 0f), true);
             cameraMain.SetDistance(3f, true);
         }
+
+        public void Deactivate()
+        {
+            GameObject.Destroy(cameraObject);
+            GameObject.Destroy(subCamera);
+        }
     }
 }

+ 1 - 0
COM3D2.MeidoPhotoStudio.Plugin/MeidoPhotoStudio/MeidoPhotoStudio.cs

@@ -85,6 +85,7 @@ namespace COM3D2.MeidoPhotoStudio.Plugin
         {
             if (meidoManager.IsBusy) return;
             meidoManager.DeactivateMeidos();
+            environmentManager.Deactivate();
 
             isActive = false;
             initialized = false;