Merge pull request #786 from allenai/RemoveFromScene_Update

Fix to RemoveFromScene objectId assignment
allenai · Jun 17, 2021 · 16d3007 · 16d3007
2 parents 53ff17a + 25f6a5d
commit 16d3007
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 16 deletions.
diff --git a/unity/Assets/Scripts/BaseFPSAgentController.cs b/unity/Assets/Scripts/BaseFPSAgentController.cs
@@ -1226,6 +1226,8 @@ public bool CheckIfAgentCanMove(
             return true;
         }
 
+        //TODO: May need to track enabled/disabled objecst separately since some
+        //actions loop through the ObjectIdTOSimObjPhysics dict and this may have adverse effects
         public void DisableObject(string objectId) {
             if (physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(objectId)) {
                 physicsSceneManager.ObjectIdToSimObjPhysics[objectId].gameObject.SetActive(false);
@@ -1235,6 +1237,24 @@ public void DisableObject(string objectId) {
             }
         }
 
+        //TODO: May need to track enabled/disabled objecst separately since some
+        //actions loop through the ObjectIdTOSimObjPhysics dict and this may have adverse effects
+        public void DisableAllObjectsOfType(ServerAction action) {
+            string type = action.objectType;
+            if (type == "") {
+                type = action.objectId;
+            }
+
+            foreach (SimObjPhysics so in GameObject.FindObjectsOfType<SimObjPhysics>()) {
+                if (Enum.GetName(typeof(SimObjType), so.Type) == type) {
+                    so.gameObject.SetActive(false);
+                }
+            }
+            actionFinished(true);
+        }
+
+        //TODO: May need to track enabled/disabled objecst separately since some
+        //actions loop through the ObjectIdTOSimObjPhysics dict and this may have adverse effects
         public void EnableObject(string objectId) {
             if (physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(objectId)) {
                 physicsSceneManager.ObjectIdToSimObjPhysics[objectId].gameObject.SetActive(true);
@@ -1256,7 +1276,9 @@ public void RemoveFromScene(string objectId) {
             // see if the object exists in this scene
             if (physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(objectId)) {
                 physicsSceneManager.ObjectIdToSimObjPhysics[objectId].transform.gameObject.SetActive(false);
-                physicsSceneManager.SetupScene();
+                //don't do a full scene setup to prevent overwriting already assigned objectIds
+                //TODO: More robust objectId system
+                physicsSceneManager.RemoveFromObjectsInScene(physicsSceneManager.ObjectIdToSimObjPhysics[objectId]);
                 actionFinished(true);
                 return;
             }

diff --git a/unity/Assets/Scripts/PhysicsRemoteFPSAgentController.cs b/unity/Assets/Scripts/PhysicsRemoteFPSAgentController.cs
@@ -1,4 +1,4 @@
-// Copyright Allen Institute for Artificial Intelligence 2017
+// Copyright Allen Institute for Artificial Intelligence 2017
 
 using System;
 using System.Collections;
@@ -7277,20 +7277,6 @@ public void ObjectsVisibleFromPositions(ServerAction action) {
             actionFinished(true, objectIdToVisiblePositions);
         }
 
-        public void DisableAllObjectsOfType(ServerAction action) {
-            string type = action.objectType;
-            if (type == "") {
-                type = action.objectId;
-            }
-
-            foreach (SimObjPhysics so in GameObject.FindObjectsOfType<SimObjPhysics>()) {
-                if (Enum.GetName(typeof(SimObjType), so.Type) == type) {
-                    so.gameObject.SetActive(false);
-                }
-            }
-            actionFinished(true);
-        }
-
         public void StackBooks() {
             GameObject topLevelObject = GameObject.Find("HideAndSeek");
             SimObjPhysics[] hideSeekObjects = topLevelObject.GetComponentsInChildren<SimObjPhysics>();