Revert "Add a Third-Person Drone cam"

Author: brian91292

CameraPlus/CameraPlus.csproj

@@ -86,21 +86,12 @@
       <HintPath>..\..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\Beat Saber\Beat Saber_Data\Managed\UnityEngine.VRModule.dll</HintPath>
     </Reference>
     <Reference Include="WindowsBase" />
-    <Reference Include="XInputDotNetPure">
-      <HintPath>lib\XInputDotNetPure.dll</HintPath>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="CameraMoverPointer.cs" />
     <Compile Include="CameraPlusInstance.cs" />
     <Compile Include="CameraUtilities.cs" />
     <Compile Include="Config.cs" />
-    <Compile Include="DroneCam\DroneMovement.cs" />
-    <Compile Include="DroneCam\Input\InputConfig.cs" />
-    <Compile Include="DroneCam\Input\XInput.cs" />
-    <Compile Include="DroneCam\Input\DJIInput.cs" />
-    <Compile Include="DroneCam\Input\CustomInput.cs" />
-    <Compile Include="DroneCam\DroneCam.cs" />
     <Compile Include="Plugin.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="CameraPlusBehaviour.cs" />
@@ -138,7 +129,6 @@
     <PostBuildEvent>copy /Y "$(TargetDir)$(TargetFileName)" "C:\Program Files (x86)\Steam\steamapps\common\Beat Saber\Plugins"</PostBuildEvent>
   </PropertyGroup>
   <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
+    <PreBuildEvent>"$(ProjectDir)..\..\PluginVersionSetter.exe" "$(ProjectDir)Properties\AssemblyInfo.cs" "$(ProjectDir)Plugin.cs"</PreBuildEvent>
   </PropertyGroup>
 </Project>

CameraPlus/CameraPlusBehaviour.cs

@@ -25,7 +25,7 @@ public enum CursorType
             DiagonalLeft,
             DiagonalRight
         }
-
+        
         protected readonly WaitUntil _waitForMainCamera = new WaitUntil(() => Camera.main);
         private readonly WaitForSecondsRealtime _waitForSecondsRealtime = new WaitForSecondsRealtime(1f);
         protected const int OnlyInThirdPerson = 3;
@@ -54,7 +54,6 @@ public bool ThirdPerson
         }
 
         protected bool _thirdPerson;
-        public DroneCam.DroneCam droneCam;
         public Vector3 ThirdPersonPos;
         public Vector3 ThirdPersonRot;
         public Vector3 FirstPersonOffset;
@@ -98,12 +97,12 @@ public bool ThirdPerson
         protected bool _isBottom = false, _isLeft = false;
         protected ContextMenuStrip _menuStrip = new ContextMenuStrip();
         protected List<ToolStripItem> _controlTracker = new List<ToolStripItem>();
-
+        
         public static CursorType currentCursor = CursorType.None;
         public static bool wasWithinBorder = false;
         public static bool anyInstanceBusy = false;
         private static bool _contextMenuEnabled = true;
-
+        
         public virtual void Init(Config config)
         {
             DontDestroyOnLoad(gameObject);
@@ -115,7 +114,7 @@ public virtual void Init(Config config)
 
             StartCoroutine(DelayedInit());
         }
-
+     
         protected IEnumerator DelayedInit()
         {
             yield return _waitForMainCamera;
@@ -128,15 +127,15 @@ protected IEnumerator DelayedInit()
             Config.ConfigChangedEvent += PluginOnConfigChangedEvent;
 
             var gameObj = Instantiate(_mainCamera.gameObject);
-
+            
             gameObj.SetActive(false);
             gameObj.name = "Camera Plus";
             gameObj.tag = "Untagged";
             while (gameObj.transform.childCount > 0) DestroyImmediate(gameObj.transform.GetChild(0).gameObject);
             DestroyImmediate(gameObj.GetComponent("CameraRenderCallbacksManager"));
             DestroyImmediate(gameObj.GetComponent("AudioListener"));
             DestroyImmediate(gameObj.GetComponent("MeshCollider"));
-
+            
             _cam = gameObj.GetComponent<Camera>();
             _cam.stereoTargetEye = StereoTargetEyeMask.None;
             _cam.enabled = true;
@@ -178,7 +177,7 @@ protected IEnumerator DelayedInit()
             _quad.transform.localEulerAngles = new Vector3(0, 180, 0);
             _quad.transform.localScale = new Vector3(_cam.aspect, 1, 1);
             _cameraPreviewQuad = _quad;
-
+            
             ReadConfig();
 
             if (ThirdPerson)
@@ -191,19 +190,6 @@ protected IEnumerator DelayedInit()
 
                 _cameraCube.position = ThirdPersonPos;
                 _cameraCube.eulerAngles = ThirdPersonRot;
-
-                if (Config.droneCam && droneCam == null)
-                {
-                    try
-                    {
-                        droneCam = gameObject.AddComponent<DroneCam.DroneCam>();
-                        droneCam.SetupCam(Path.GetFileName(Config.FilePath));
-                    }
-                    catch (Exception e)
-                    {
-                        Console.WriteLine("CamPlusDroneErr:\n{0} {1} {2}", e.GetType().ToString(), e.Message, e.StackTrace);
-                    }
-                }
             }
 
             // Add our camera movement script if the movement script path is set
@@ -221,7 +207,7 @@ protected IEnumerator DelayedInit()
             SceneManager_activeSceneChanged(new Scene(), new Scene());
             Plugin.Log($"Camera \"{Path.GetFileName(Config.FilePath)}\" successfully initialized!\"");
         }
-
+        
         protected virtual void OnDestroy()
         {
             Config.ConfigChangedEvent -= PluginOnConfigChangedEvent;
@@ -257,7 +243,7 @@ protected virtual void ReadConfig()
                 transform.rotation = _mainCamera.transform.rotation;
 
             }
-            else if (!Config.droneCam)
+            else
             {
                 ThirdPersonPos = Config.Position;
                 ThirdPersonRot = Config.Rotation;
@@ -299,7 +285,7 @@ protected virtual void CreateScreenRenderTexture()
                     return;
                 }
 
-                if (Config.fitToCanvas)
+                if(Config.fitToCanvas)
                 {
                     Config.screenPosX = 0;
                     Config.screenPosY = 0;
@@ -331,12 +317,12 @@ protected virtual void CreateScreenRenderTexture()
                 _prevScreenPosY = Config.screenPosY;
             });
         }
-
+        
         public virtual void SceneManager_activeSceneChanged(Scene from, Scene to)
         {
             StartCoroutine(GetMainCamera());
             var vrPointers = to.name == "GameCore" ? Resources.FindObjectsOfTypeAll<VRPointer>() : Resources.FindObjectsOfTypeAll<VRPointer>();
-            if (vrPointers.Count() == 0)
+            if(vrPointers.Count() == 0)
             {
                 Plugin.Log("Failed to get VRPointer!");
                 return;
@@ -353,7 +339,7 @@ public virtual void SceneManager_activeSceneChanged(Scene from, Scene to)
 
         protected void OnApplicationFocus(bool hasFocus)
         {
-            if (!hasFocus && GetActiveWindow() == IntPtr.Zero)
+            if(!hasFocus && GetActiveWindow() == IntPtr.Zero)
                 CloseContextMenu();
         }
 
@@ -365,26 +351,22 @@ protected virtual void Update()
                 if (Input.GetKeyDown(KeyCode.F1))
                 {
                     ThirdPerson = !ThirdPerson;
-                    if (ThirdPerson)
+                    if (!ThirdPerson)
                     {
                         transform.position = _mainCamera.transform.position;
                         transform.rotation = _mainCamera.transform.rotation;
                         FirstPersonOffset = Config.FirstPersonPositionOffset;
                     }
+                    else
+                    {
+                        ThirdPersonPos = Config.Position;
+                        ThirdPersonRot = Config.Rotation;
+                    }
 
                     Config.thirdPerson = ThirdPerson;
                     Config.Save();
                 }
             }
-
-            if (droneCam != null)
-            {
-                droneCam.Update();
-            }
-            else
-            {
-
-            }
             HandleMouseEvents();
         }
 
@@ -394,30 +376,20 @@ protected virtual void LateUpdate()
             {
                 var camera = _mainCamera.transform;
 
-                if (Config.droneCam && ThirdPerson)
-                {
-                    transform.position = Vector3.Lerp(transform.position, droneCam.smoothingTarget.position,
-                        Config.positionSmooth * Time.unscaledDeltaTime);
-
-                    transform.rotation = Quaternion.Slerp(transform.rotation, droneCam.smoothingTarget.rotation,
-                        Config.rotationSmooth * Time.unscaledDeltaTime);
-                }
-                else if (!Config.droneCam && ThirdPerson)
+                if (ThirdPerson)
                 {
                     transform.position = ThirdPersonPos;
                     transform.eulerAngles = ThirdPersonRot;
                     _cameraCube.position = ThirdPersonPos;
                     _cameraCube.eulerAngles = ThirdPersonRot;
                     return;
                 }
-                else
-                {
-                    transform.position = Vector3.Lerp(transform.position, camera.position + FirstPersonOffset,
-                        Config.positionSmooth * Time.unscaledDeltaTime);
 
-                    transform.rotation = Quaternion.Slerp(transform.rotation, camera.rotation,
-                        Config.rotationSmooth * Time.unscaledDeltaTime);
-                }
+                transform.position = Vector3.Lerp(transform.position, camera.position + FirstPersonOffset,
+                    Config.positionSmooth * Time.unscaledDeltaTime);
+
+                transform.rotation = Quaternion.Slerp(transform.rotation, camera.rotation,
+                    Config.rotationSmooth * Time.unscaledDeltaTime);
             }
             catch { }
         }
@@ -461,17 +433,12 @@ protected virtual void SetFOV()
 
         protected virtual void SetCullingMask()
         {
-            if (Config.transparentWalls)
+            if(Config.transparentWalls)
                 _cam.cullingMask &= ~(1 << TransparentWallsPatch.WallLayerMask);
             else
                 _cam.cullingMask |= (1 << TransparentWallsPatch.WallLayerMask);
         }
 
-        public void LookAt(Transform target)
-        {
-            transform.LookAt(target);
-        }
-
         public bool IsWithinRenderArea(Vector2 mousePos, Config c)
         {
             if (mousePos.x < c.screenPosX) return false;
@@ -493,13 +460,13 @@ public bool IsTopmostRenderAreaAtPos(Vector2 mousePos)
                     return false;
                 }
 
-                if (c.Config.layer == Config.layer &&
+                if (c.Config.layer == Config.layer && 
                     c.Instance._lastRenderUpdate > _lastRenderUpdate)
                 {
                     return false;
                 }
 
-                if (c.Instance._mouseHeld && (c.Instance._isMoving ||
+                if (c.Instance._mouseHeld && (c.Instance._isMoving || 
                     c.Instance._isResizing || c.Instance._contextMenuOpen))
                 {
                     return false;
@@ -535,7 +502,7 @@ protected void CloseContextMenu()
             }
             _contextMenuOpen = false;
         }
-
+        
         public static void SetCursor(CursorType type)
         {
             if (type != currentCursor)
@@ -556,7 +523,7 @@ public static void SetCursor(CursorType type)
                         texture = Utils.LoadTextureFromResources("CameraPlus.Resources.Resize_DiagLeft.png");
                         break;
                 }
-                UnityEngine.Cursor.SetCursor(texture, texture ? new Vector2(texture.width / 2, texture.height / 2) : new Vector2(0, 0), CursorMode.Auto);
+                UnityEngine.Cursor.SetCursor(texture, texture ? new Vector2(texture.width / 2, texture.height / 2) : new Vector2(0,0), CursorMode.Auto);
                 currentCursor = type;
             }
         }
@@ -629,7 +596,7 @@ protected void HandleMouseEvents()
                 {
                     _initialOffset.x = currentMouseOffsetX;
                     _initialOffset.y = currentMouseOffsetY;
-
+                    
                     _lastScreenPos = Config.ScreenPosition;
                     _lastGrabPos = new Vector2(mousePos.x, mousePos.y);
 
@@ -667,7 +634,7 @@ protected void HandleMouseEvents()
                 Config.screenHeight = Mathf.Clamp(Config.screenHeight, 100, Screen.height);
                 Config.screenPosX = Mathf.Clamp(Config.screenPosX, 0, Screen.width - Config.screenWidth);
                 Config.screenPosY = Mathf.Clamp(Config.screenPosY, 0, Screen.height - Config.screenHeight);
-
+                
                 CreateScreenRenderTexture();
             }
             else if (holdingRightClick && _contextMenuEnabled)
@@ -758,7 +725,6 @@ void DisplayContextMenu()
                 CloseContextMenu();
                 Config.Save();
             });
-
             if (Config.thirdPerson)
             {
                 // Hides/unhides the third person camera that appears when a camera is in third person mode
@@ -782,23 +748,6 @@ void DisplayContextMenu()
                     Config.Save();
                     CloseContextMenu();
                 });
-
-                _menuStrip.Items.Add(Config.droneCam ? "Disable DroneCam" : "Ënable Drone Cam", null, (p1, p2) =>
-                {
-                    if (Config.droneCam && droneCam != null)
-                    {
-                        Config.droneCam = false;
-                        droneCam.CleanUp();
-                        Destroy(droneCam);
-                    } else
-                    {
-                        Config.droneCam = true;
-                        droneCam = gameObject.AddComponent<DroneCam.DroneCam>();
-                        droneCam.SetupCam(Path.GetFileName(Config.FilePath));
-                    }
-                        Config.droneCam = false;
-                    Config.Save();
-                });
             }
             _menuStrip.Items.Add(new ToolStripSeparator());
 
@@ -865,7 +814,7 @@ void DisplayContextMenu()
                 Config.Save();
             };
             _layoutMenu.DropDownItems.Add(_renderScale);
-
+            
 
             // Sets the size of the current cameras pixelrect
             _layoutMenu.DropDownItems.Add(new ToolStripLabel("Size"));
@@ -923,7 +872,7 @@ void DisplayContextMenu()
             };
             _layoutMenu.DropDownItems.Add(_yBox);
 
-
+            
             // Fit to canvas checkbox
             var _fitToCanvasBox = new ToolStripCheckBox("Fit to Canvas");
             _controlTracker.Add(_fitToCanvasBox);
@@ -965,8 +914,7 @@ void DisplayContextMenu()
                 CameraMovement.CreateExampleScript();
                 ofd.InitialDirectory = path;
                 ofd.Title = "Select a script";
-                ofd.FileOk += (sender, e) =>
-                {
+                ofd.FileOk += (sender, e) => {
                     string file = ((OpenFileDialog)sender).FileName;
                     if (File.Exists(file))
                     {
@@ -990,7 +938,7 @@ void DisplayContextMenu()
             });
             _addSongMovement.Enabled = Config.movementScriptPath != "SongMovementScript";
             _scriptsMenu.DropDownItems.Add(_addMenu);
-
+            
             // Remove menu
             var _removeMenu = new ToolStripMenuItem("Remove");
             _controlTracker.Add(_removeMenu);