Revert "Added second camera to Stretch Robot"

This reverts commit 26d2fc2.
allenai · Dec 2, 2021 · 128a072 · 128a072
1 parent 26d2fc2
commit 128a072
Show file tree

Hide file tree

Showing 3 changed files with 83 additions and 320 deletions.
diff --git a/unity/Assets/Scripts/BaseFPSAgentController.cs b/unity/Assets/Scripts/BaseFPSAgentController.cs
@@ -177,7 +177,7 @@ public BaseFPSAgentController(BaseAgentComponent baseAgentComponent, AgentManage
             this.m_WalkSpeed = 2;
             this.m_RunSpeed = 10;
             this.m_GravityMultiplier = 2;
-            this.m_Camera = this.transform.Find("FirstPersonCharacter").GetComponent<Camera>();
+            this.m_Camera = this.gameObject.GetComponentInChildren<Camera>();
             this.m_CharacterController = GetComponent<CharacterController>();
             collidedObjects = new string[0];
             collisionsInAction = new List<string>();

diff --git a/unity/Assets/Scripts/StretchAgentController.cs b/unity/Assets/Scripts/StretchAgentController.cs
@@ -37,15 +37,6 @@ public override void InitializeBody() {
             standingLocalCameraPosition = m_Camera.transform.localPosition;
             crouchingLocalCameraPosition = m_Camera.transform.localPosition;
 
-            // set secondary arm-camera
-            Camera fp_camera_2 = m_CharacterController.transform.Find("FirstPersonCharacter").Find("SecondCamera").GetComponent<Camera>();
-            fp_camera_2.gameObject.SetActive(true);
-            Debug.Log(fp_camera_2 + " should be enabled, so is it? Answer: " + fp_camera_2.enabled);
-            fp_camera_2.transform.localPosition = new Vector3(-0.01760002f, 0.1291f, -0.1512001f);
-            fp_camera_2.transform.localEulerAngles = new Vector3(45f, 90f, 0f);
-            fp_camera_2.fieldOfView = 60f;
-            this.agentManager.thirdPartyCameras.Add(fp_camera_2);
-
             // limit camera from looking too far down
             this.maxDownwardLookAngle = 90f;
             this.maxUpwardLookAngle = 25f;