Merge pull request #637 from NextCenturyCorporation/development

0.6.3 - Dev to Master
NextCenturyCorporation · Dec 20, 2022 · 4b016bf · 4b016bf
2 parents 043d0cc + c0d975f
commit 4b016bf
Show file tree

Hide file tree

Showing 26 changed files with 12,437 additions and 51 deletions.
diff --git a/CPU_Container.dockerfile b/CPU_Container.dockerfile
@@ -9,7 +9,7 @@ ARG DEBIAN_FRONTEND=noninteractive
 ENV TZ=America/New_York
 
 # --build-arg mcsversion=x.y.z to override default in docker build command
-ARG mcsversion=0.6.2
+ARG mcsversion=0.6.3
 ARG mcs_library_version=master
 
 WORKDIR /mcs

diff --git a/Dockerfile b/Dockerfile
@@ -19,7 +19,7 @@ ENV NVIDIA_DRIVER_CAPABILITIES ${NVIDIA_DRIVER_CAPABILITIES},display
 # ENV LANG C.UTF-8
 
 # --build-arg mcsversion=x.y.z to override default in docker build command
-ARG mcsversion=0.6.2
+ARG mcsversion=0.6.3
 ARG mcs_library_version=master
 
 WORKDIR /mcs

diff --git a/README.md b/README.md
@@ -16,7 +16,7 @@ Publish to PyPI: [![Publish PyPI](https://github.com/NextCenturyCorporation/MCS/
 
 # MCS Python Package
 
-Python interface for interacting with MCS AI2Thor environment and running scenes. The latest release of the MCS Python library is `0.6.2`. You can find the latest documentation [here](https://nextcenturycorporation.github.io/MCS).
+Python interface for interacting with MCS AI2Thor environment and running scenes. The latest release of the MCS Python library is `0.6.3`. You can find the latest documentation [here](https://nextcenturycorporation.github.io/MCS).
 
 - [Quickstart Installation](#quickstart-installation)
 - [Usage](#usage)

diff --git a/docs/source/install.rst b/docs/source/install.rst
@@ -2,8 +2,8 @@
 Installation and Setup
 =======================
 
-.. _Download and unzip the Mac ZIP: https://github.com/NextCenturyCorporation/MCS/releases/download/0.6.2/MCS-AI2-THOR-Unity-App-v0.6.2-mac.zip
-.. _Download and unzip the Linux ZIP: https://github.com/NextCenturyCorporation/MCS/releases/download/0.6.2/MCS-AI2-THOR-Unity-App-v0.6.2-linux.zip
+.. _Download and unzip the Mac ZIP: https://github.com/NextCenturyCorporation/MCS/releases/download/0.6.3/MCS-AI2-THOR-Unity-App-v0.6.3-mac.zip
+.. _Download and unzip the Linux ZIP: https://github.com/NextCenturyCorporation/MCS/releases/download/0.6.3/MCS-AI2-THOR-Unity-App-v0.6.3-linux.zip
 
 Virtual Environments
 ------------------------

diff --git a/integration_tests/data/068.scripted_ghost.oracle.outputs.json b/integration_tests/data/068.scripted_ghost.oracle.outputs.json
@@ -19,7 +19,7 @@
                 "texture_color_list": [
                     "blue"
                 ],
-                "visible": false
+                "visible": true
             },
             {
                 "direction_x": 0.0,
@@ -38,7 +38,7 @@
                 "texture_color_list": [
                     "blue"
                 ],
-                "visible": true
+                "visible": false
             }
         ],
         "objects_count": 2,
@@ -69,11 +69,11 @@
                 "texture_color_list": [
                     "blue"
                 ],
-                "visible": false
+                "visible": true
             },
             {
                 "direction_x": 0.0,
-                "direction_y": -0.248,
+                "direction_y": -0.27,
                 "direction_z": 0.969,
                 "distance": 2.064,
                 "held": false,
@@ -88,7 +88,7 @@
                 "texture_color_list": [
                     "blue"
                 ],
-                "visible": true
+                "visible": false
             }
         ],
         "objects_count": 2,
@@ -119,11 +119,11 @@
                 "texture_color_list": [
                     "blue"
                 ],
-                "visible": false
+                "visible": true
             },
             {
                 "direction_x": 0.0,
-                "direction_y": -0.248,
+                "direction_y": -0.27,
                 "direction_z": 0.969,
                 "distance": 2.064,
                 "held": false,
@@ -138,7 +138,7 @@
                 "texture_color_list": [
                     "blue"
                 ],
-                "visible": true
+                "visible": false
             }
         ],
         "objects_count": 2,
@@ -169,11 +169,11 @@
                 "texture_color_list": [
                     "blue"
                 ],
-                "visible": false
+                "visible": true
             },
             {
                 "direction_x": 0.0,
-                "direction_y": -0.248,
+                "direction_y": -0.27,
                 "direction_z": 0.969,
                 "distance": 2.064,
                 "held": false,
@@ -188,7 +188,7 @@
                 "texture_color_list": [
                     "blue"
                 ],
-                "visible": true
+                "visible": false
             }
         ],
         "objects_count": 2,
@@ -219,11 +219,11 @@
                 "texture_color_list": [
                     "blue"
                 ],
-                "visible": false
+                "visible": true
             },
             {
                 "direction_x": 0.0,
-                "direction_y": -0.248,
+                "direction_y": -0.27,
                 "direction_z": 0.969,
                 "distance": 2.064,
                 "held": false,
@@ -238,7 +238,7 @@
                 "texture_color_list": [
                     "blue"
                 ],
-                "visible": true
+                "visible": false
             }
         ],
         "objects_count": 2,

diff --git a/integration_tests/data/068.scripted_ghost.scene.json b/integration_tests/data/068.scripted_ghost.scene.json
@@ -53,10 +53,11 @@
                 "z": 2
             },
             "scale": {
-                "x": 0.5,
-                "y": 0.5,
-                "z": 0.5
+                "x": 0.4,
+                "y": 0.4,
+                "z": 0.4
             }
         }]
     }]
-}
+  }
+
diff --git a/integration_tests/data/125.agents_interaction_advanced_action.level1.outputs.json b/integration_tests/data/125.agents_interaction_advanced_action.level1.outputs.json
@@ -94,7 +94,7 @@
         "objects_count": 0,
         "position_x": null,
         "position_z": null,
-        "return_status": "AGENT_CURRENTLY_INTERACTING_WTIH_PERFORMER",
+        "return_status": "AGENT_CURRENTLY_INTERACTING_WITH_PERFORMER",
         "rotation_y": null,
         "step_number": 9,
         "structural_objects_count": 0
@@ -194,7 +194,7 @@
         "objects_count": 0,
         "position_x": null,
         "position_z": null,
-        "return_status": "AGENT_CURRENTLY_INTERACTING_WTIH_PERFORMER",
+        "return_status": "AGENT_CURRENTLY_INTERACTING_WITH_PERFORMER",
         "rotation_y": null,
         "step_number": 19,
         "structural_objects_count": 0
@@ -204,7 +204,7 @@
         "objects_count": 0,
         "position_x": null,
         "position_z": null,
-        "return_status": "AGENT_CURRENTLY_INTERACTING_WTIH_PERFORMER",
+        "return_status": "AGENT_CURRENTLY_INTERACTING_WITH_PERFORMER",
         "rotation_y": null,
         "step_number": 20,
         "structural_objects_count": 0

diff --git a/integration_tests/data/125.agents_interaction_advanced_action.level2.outputs.json b/integration_tests/data/125.agents_interaction_advanced_action.level2.outputs.json
@@ -94,7 +94,7 @@
         "objects_count": 0,
         "position_x": null,
         "position_z": null,
-        "return_status": "AGENT_CURRENTLY_INTERACTING_WTIH_PERFORMER",
+        "return_status": "AGENT_CURRENTLY_INTERACTING_WITH_PERFORMER",
         "rotation_y": null,
         "step_number": 9,
         "structural_objects_count": 0
@@ -194,7 +194,7 @@
         "objects_count": 0,
         "position_x": null,
         "position_z": null,
-        "return_status": "AGENT_CURRENTLY_INTERACTING_WTIH_PERFORMER",
+        "return_status": "AGENT_CURRENTLY_INTERACTING_WITH_PERFORMER",
         "rotation_y": null,
         "step_number": 19,
         "structural_objects_count": 0
@@ -204,7 +204,7 @@
         "objects_count": 0,
         "position_x": null,
         "position_z": null,
-        "return_status": "AGENT_CURRENTLY_INTERACTING_WTIH_PERFORMER",
+        "return_status": "AGENT_CURRENTLY_INTERACTING_WITH_PERFORMER",
         "rotation_y": null,
         "step_number": 20,
         "structural_objects_count": 0

diff --git a/integration_tests/data/125.agents_interaction_advanced_action.oracle.outputs.json b/integration_tests/data/125.agents_interaction_advanced_action.oracle.outputs.json
@@ -734,7 +734,7 @@
         "objects_count": 3,
         "position_x": 0.0,
         "position_z": -0.6,
-        "return_status": "AGENT_CURRENTLY_INTERACTING_WTIH_PERFORMER",
+        "return_status": "AGENT_CURRENTLY_INTERACTING_WITH_PERFORMER",
         "rotation_y": 0.0,
         "step_number": 9,
         "structural_objects_count": 5
@@ -1447,7 +1447,7 @@
         "objects_count": 3,
         "position_x": 0.4,
         "position_z": -0.6,
-        "return_status": "AGENT_CURRENTLY_INTERACTING_WTIH_PERFORMER",
+        "return_status": "AGENT_CURRENTLY_INTERACTING_WITH_PERFORMER",
         "rotation_y": 0.0,
         "step_number": 19,
         "structural_objects_count": 5
@@ -1518,7 +1518,7 @@
         "objects_count": 3,
         "position_x": 0.4,
         "position_z": -0.6,
-        "return_status": "AGENT_CURRENTLY_INTERACTING_WTIH_PERFORMER",
+        "return_status": "AGENT_CURRENTLY_INTERACTING_WITH_PERFORMER",
         "rotation_y": 0.0,
         "step_number": 20,
         "structural_objects_count": 5

diff --git a/integration_tests/data/156.all_actions_on_agent_order_of_return_status.level1.outputs.json b/integration_tests/data/156.all_actions_on_agent_order_of_return_status.level1.outputs.json
@@ -426,7 +426,7 @@
         "position_z": null,
         "resolved_object": null,
         "resolved_receptacle": null,
-        "return_status": "AGENT_CURRENTLY_INTERACTING_WTIH_PERFORMER",
+        "return_status": "AGENT_CURRENTLY_INTERACTING_WITH_PERFORMER",
         "rotation_y": null,
         "step_number": 35,
         "structural_objects_count": 0

diff --git a/integration_tests/data/156.all_actions_on_agent_order_of_return_status.level2.outputs.json b/integration_tests/data/156.all_actions_on_agent_order_of_return_status.level2.outputs.json
@@ -426,7 +426,7 @@
         "position_z": null,
         "resolved_object": null,
         "resolved_receptacle": null,
-        "return_status": "AGENT_CURRENTLY_INTERACTING_WTIH_PERFORMER",
+        "return_status": "AGENT_CURRENTLY_INTERACTING_WITH_PERFORMER",
         "rotation_y": null,
         "step_number": 35,
         "structural_objects_count": 0

diff --git a/integration_tests/data/156.all_actions_on_agent_order_of_return_status.oracle.outputs.json b/integration_tests/data/156.all_actions_on_agent_order_of_return_status.oracle.outputs.json
@@ -1146,7 +1146,7 @@
         "position_z": 0.0,
         "resolved_object": "agent",
         "resolved_receptacle": "",
-        "return_status": "AGENT_CURRENTLY_INTERACTING_WTIH_PERFORMER",
+        "return_status": "AGENT_CURRENTLY_INTERACTING_WITH_PERFORMER",
         "rotation_y": 0,
         "step_number": 35,
         "structural_objects_count": 5

diff --git a/integration_tests/data/180.visible_ghosted_objects.actions.txt b/integration_tests/data/180.visible_ghosted_objects.actions.txt
@@ -0,0 +1,27 @@
+Pass
+Pass
+Pass
+Pass
+Pass
+Pass
+Pass
+Pass
+Pass
+Pass
+Pass
+Pass
+Pass
+Pass
+Pass
+Pass
+Pass
+Pass
+Pass
+Pass
+Pass
+Pass
+Pass
+Pass
+Pass
+Pass
+Pass
-Original file line number
+Diff line change
@@ -0,0 +1,27 @@
+    Pass
+    Pass
+    Pass
+    Pass
+    Pass
+    Pass
+    Pass
+    Pass
+    Pass
+    Pass
+    Pass
+    Pass
+    Pass
+    Pass
+    Pass
+    Pass
+    Pass
+    Pass
+    Pass
+    Pass
+    Pass
+    Pass
+    Pass
+    Pass
+    Pass
+    Pass
+    Pass