syncing major changes from gopro branches

allenai · Aug 20, 2024 · 9853797 · 9853797
1 parent 5a75cd2
commit 9853797
Show file tree

Hide file tree

Showing 12 changed files with 1,275 additions and 91 deletions.
diff --git a/unity/Assets/Physics/SceneSetupPrefabs/PhysicsSceneManager.prefab b/unity/Assets/Physics/SceneSetupPrefabs/PhysicsSceneManager.prefab
@@ -31,7 +31,8 @@ Transform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
+  m_Children:
+  - {fileID: 3036343922174695752}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -256,3 +257,131 @@ MonoBehaviour:
   - {fileID: 2100000, guid: b7babe292cedd6644bb0e057878a58c4, type: 2}
   - {fileID: 2100000, guid: 8d07f44645275464fa8e0a0a82043dfb, type: 2}
   - {fileID: 2100000, guid: a426c8270276e6f46b8f83b927bfe225, type: 2}
+--- !u!1 &2571171791558639256
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6414754439291210063}
+  - component: {fileID: 8272309782993795336}
+  m_Layer: 19
+  m_Name: ppProfilePrimary
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &6414754439291210063
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2571171791558639256}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: -0.009, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 3036343922174695752}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &8272309782993795336
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2571171791558639256}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 8b9a305e18de0c04dbd257a21cd47087, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  sharedProfile: {fileID: 11400000, guid: a5d160b4553f5e84aaca887c9309afc9, type: 2}
+  isGlobal: 1
+  blendDistance: 0
+  weight: 1
+  priority: 0
+--- !u!1 &4145085167880843110
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3036343922174695752}
+  m_Layer: 0
+  m_Name: ppProfiles
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &3036343922174695752
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4145085167880843110}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 6414754439291210063}
+  - {fileID: 1724417223204369504}
+  m_Father: {fileID: 4523222967138746}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &8529546001303059388
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1724417223204369504}
+  - component: {fileID: 9048358252671230580}
+  m_Layer: 20
+  m_Name: ppProfileSecondary
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1724417223204369504
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8529546001303059388}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: -0.009, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 3036343922174695752}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &9048358252671230580
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8529546001303059388}
+  m_Enabled: 0
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 8b9a305e18de0c04dbd257a21cd47087, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  sharedProfile: {fileID: 11400000, guid: e502ae08dd22f49f58743d4aace40ba9, type: 2}
+  isGlobal: 1
+  blendDistance: 0
+  weight: 1
+  priority: 0
diff --git a/unity/Assets/Scenes/FloorPlan1_physics.unity b/unity/Assets/Scenes/FloorPlan1_physics.unity
@@ -38,7 +38,7 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0.71791136, g: 0.73149365, b: 0.7516093, a: 1}
+  m_IndirectSpecularColor: {r: 0.7130405, g: 0.72730166, b: 0.74681276, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:

diff --git a/unity/Assets/Scripts/DebugInputField.cs b/unity/Assets/Scripts/DebugInputField.cs
@@ -1108,6 +1108,35 @@ public void Execute(string command) {
 
                         break;
                     }
+
+                case "ldtoggle": {
+                    Dictionary<string, object> action = new Dictionary<string, object>();
+
+                    action["action"] = "ToggleLensDistortion";
+                    if (splitcommand.Length > 1) {
+                        action["state"] = bool.Parse(splitcommand[1]);
+                    }
+
+                    CurrentActiveController().ProcessControlCommand(action);
+                    break;
+                }
+
+                case "ssc": {
+                    Dictionary<string, object> action = new Dictionary<string, object>();
+
+                    action["action"] = "SetUpSecondaryCamera";
+                    CurrentActiveController().ProcessControlCommand(action);
+                    break;
+                }
+                case "dsc": {
+                    Dictionary<string, object> action = new Dictionary<string, object>();
+
+                    action["action"] = "DisableSecondaryCamera";
+                    CurrentActiveController().ProcessControlCommand(action);
+                    break;
+                }
+
+
                 case "rpanm": {
                         Dictionary<string, object> action = new Dictionary<string, object>();
 

diff --git a/unity/Assets/Scripts/DroneFPSAgentController.cs b/unity/Assets/Scripts/DroneFPSAgentController.cs
@@ -52,7 +52,9 @@ public override ActionFinished InitializeBody(ServerAction initializeAction) {
             cc.radius = m_CharacterController.radius;
             cc.height = m_CharacterController.height;
 
-            m_Camera.GetComponent<PostProcessVolume>().enabled = false;
+            // we should do this in a different way later, now that post-processing effects are meant to be
+            // disabled by turning off the referenced post-processing volume in its dedicated stack, not by toggling
+            // on and off the individual layer component
             m_Camera.GetComponent<PostProcessLayer>().enabled = false;
 
             // camera position set forward a bit for drone

diff --git a/unity/Assets/Scripts/PhysicsRemoteFPSAgentController.cs b/unity/Assets/Scripts/PhysicsRemoteFPSAgentController.cs
@@ -51,7 +51,9 @@ public override ActionFinished InitializeBody(ServerAction initializeAction) {
             cc.radius = m_CharacterController.radius;
             cc.height = m_CharacterController.height;
 
-            m_Camera.GetComponent<PostProcessVolume>().enabled = false;
+            // we should do this in a different way later, now that post-processing effects are meant to be
+            // disabled by turning off the referenced post-processing volume in its dedicated stack, not by toggling
+            // on and off the individual layer component
             m_Camera.GetComponent<PostProcessLayer>().enabled = false;
 
             // camera position