fixed actuations camera

7 months ago · 2c0252aeb9
5 changed files with 1014 additions and 189 deletions
--- a/Graphs/Swarm/Swarm.vfx
+++ b/Graphs/Swarm/Swarm.vfx
@ -60,11 +60,26 @@ MonoBehaviour:
  - {fileID: 8926484042661614933}
  - {fileID: 8926484042661614939}
  - {fileID: 8926484042661614941}
+  - {fileID: 8926484042661614995}
  m_UIPosition: {x: 0, y: 0}
  m_UICollapsed: 1
  m_UISuperCollapsed: 0
  m_UIInfos: {fileID: 114340500867371532}
-  m_ParameterInfo: []
+  m_ParameterInfo:
+  - name: Center
+    path: Center
+    tooltip: 
+    sheetType: m_Vector3f
+    realType: Vector3
+    defaultValue:
+      m_Type:
+        m_SerializableType: UnityEngine.Vector3, UnityEngine.CoreModule, Version=0.0.0.0,
+          Culture=neutral, PublicKeyToken=null
+      m_SerializableObject: '{"x":0.0,"y":0.0,"z":0.0}'
+    min: -Infinity
+    max: Infinity
+    enumValues: []
+    descendantCount: 0
  m_ImportDependencies: []
  m_GraphVersion: 12
  m_ResourceVersion: 1
@ -9015,7 +9030,8 @@ MonoBehaviour:
      m_SerializableType: UnityEngine.Vector3, UnityEngine.CoreModule, Version=0.0.0.0,
        Culture=neutral, PublicKeyToken=null
  m_Direction: 0
-  m_LinkedSlots: []
+  m_LinkedSlots:
+  - {fileID: 8926484042661614996}
 --- !u!114 &8926484042661614988
 MonoBehaviour:
  m_ObjectHideFlags: 0
@ -9250,3 +9266,185 @@ MonoBehaviour:
        PublicKeyToken=b77a5c561934e089
  m_Direction: 0
  m_LinkedSlots: []
+--- !u!114 &8926484042661614995
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 330e0fca1717dde4aaa144f48232aa64, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_UIIgnoredErrors: []
+  m_Parent: {fileID: 114350483966674976}
+  m_Children: []
+  m_UIPosition: {x: 0, y: 0}
+  m_UICollapsed: 0
+  m_UISuperCollapsed: 0
+  m_InputSlots: []
+  m_OutputSlots:
+  - {fileID: 8926484042661614996}
+  m_ExposedName: Center
+  m_Exposed: 1
+  m_Order: 0
+  m_Category: 
+  m_Min:
+    m_Type:
+      m_SerializableType: 
+    m_SerializableObject: 
+  m_Max:
+    m_Type:
+      m_SerializableType: 
+    m_SerializableObject: 
+  m_IsOutput: 0
+  m_EnumValues: []
+  m_ValueFilter: 0
+  m_Tooltip: 
+  m_Nodes:
+  - m_Id: 0
+    linkedSlots:
+    - outputSlot: {fileID: 8926484042661614996}
+      inputSlot: {fileID: 8926484042661614987}
+    position: {x: 732, y: 202}
+    expandedSlots: []
+    expanded: 0
+--- !u!114 &8926484042661614996
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ac39bd03fca81b849929b9c966f1836a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_UIIgnoredErrors: []
+  m_Parent: {fileID: 0}
+  m_Children:
+  - {fileID: 8926484042661614997}
+  - {fileID: 8926484042661614998}
+  - {fileID: 8926484042661614999}
+  m_UIPosition: {x: 0, y: 0}
+  m_UICollapsed: 1
+  m_UISuperCollapsed: 0
+  m_MasterSlot: {fileID: 8926484042661614996}
+  m_MasterData:
+    m_Owner: {fileID: 8926484042661614995}
+    m_Value:
+      m_Type:
+        m_SerializableType: UnityEngine.Vector3, UnityEngine.CoreModule, Version=0.0.0.0,
+          Culture=neutral, PublicKeyToken=null
+      m_SerializableObject: 
+    m_Space: 2147483647
+  m_Property:
+    name: o
+    m_serializedType:
+      m_SerializableType: UnityEngine.Vector3, UnityEngine.CoreModule, Version=0.0.0.0,
+        Culture=neutral, PublicKeyToken=null
+  m_Direction: 1
+  m_LinkedSlots:
+  - {fileID: 8926484042661614987}
+--- !u!114 &8926484042661614997
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f780aa281814f9842a7c076d436932e7, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_UIIgnoredErrors: []
+  m_Parent: {fileID: 8926484042661614996}
+  m_Children: []
+  m_UIPosition: {x: 0, y: 0}
+  m_UICollapsed: 1
+  m_UISuperCollapsed: 0
+  m_MasterSlot: {fileID: 8926484042661614996}
+  m_MasterData:
+    m_Owner: {fileID: 0}
+    m_Value:
+      m_Type:
+        m_SerializableType: 
+      m_SerializableObject: 
+    m_Space: 2147483647
+  m_Property:
+    name: x
+    m_serializedType:
+      m_SerializableType: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral,
+        PublicKeyToken=b77a5c561934e089
+  m_Direction: 1
+  m_LinkedSlots: []
+--- !u!114 &8926484042661614998
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f780aa281814f9842a7c076d436932e7, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_UIIgnoredErrors: []
+  m_Parent: {fileID: 8926484042661614996}
+  m_Children: []
+  m_UIPosition: {x: 0, y: 0}
+  m_UICollapsed: 1
+  m_UISuperCollapsed: 0
+  m_MasterSlot: {fileID: 8926484042661614996}
+  m_MasterData:
+    m_Owner: {fileID: 0}
+    m_Value:
+      m_Type:
+        m_SerializableType: 
+      m_SerializableObject: 
+    m_Space: 2147483647
+  m_Property:
+    name: y
+    m_serializedType:
+      m_SerializableType: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral,
+        PublicKeyToken=b77a5c561934e089
+  m_Direction: 1
+  m_LinkedSlots: []
+--- !u!114 &8926484042661614999
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f780aa281814f9842a7c076d436932e7, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_UIIgnoredErrors: []
+  m_Parent: {fileID: 8926484042661614996}
+  m_Children: []
+  m_UIPosition: {x: 0, y: 0}
+  m_UICollapsed: 1
+  m_UISuperCollapsed: 0
+  m_MasterSlot: {fileID: 8926484042661614996}
+  m_MasterData:
+    m_Owner: {fileID: 0}
+    m_Value:
+      m_Type:
+        m_SerializableType: 
+      m_SerializableObject: 
+    m_Space: 2147483647
+  m_Property:
+    name: z
+    m_serializedType:
+      m_SerializableType: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral,
+        PublicKeyToken=b77a5c561934e089
+  m_Direction: 1
+  m_LinkedSlots: []
--- a/Assets/5_Scenes/DreconDemo.unity
+++ b/Assets/5_Scenes/DreconDemo.unity
--- a/Assets/8_Scripts/1_Managers/CameraManager.cs
+++ b/Assets/8_Scripts/1_Managers/CameraManager.cs
@ -143,7 +143,7 @@ public class CameraManager : MonoBehaviour
                m_Camera.cullingMask = m_Actuations;
 				m_PoseCanvas.SetActive(false);
 				m_BrainPose.SetActive(false);
-                m_Rewards.SetActive(true);
+                m_Rewards.SetActive(false);
                break;
 			case "vc_Compare":
 				m_BrainPose.SetActive(false);
--- a/Assets/9_Models/Humanoid/SMPLX
+++ b/Assets/9_Models/Humanoid/SMPLX
@ -2287,7 +2287,7 @@ SkinnedMeshRenderer:
  m_RenderingLayerMask: 257
  m_RendererPriority: 0
  m_Materials:
-  - {fileID: 2100000, guid: 5c128b24ab321c147a2309eb60bcad62, type: 2}
+  - {fileID: 2100000, guid: 3292cafae042f4d4da78ffbee10cff04, type: 2}
  m_StaticBatchInfo:
    firstSubMesh: 0
    subMeshCount: 0
--- a/Assets/ML-Agents/Timers/DreconDemo_timers.json
+++ b/Assets/ML-Agents/Timers/DreconDemo_timers.json
@ -1 +1 @@
-{"count":1,"self":106.9990784,"total":111.6277465,"children":{"InitializeActuators":{"count":1,"self":0.0015103999999999999,"total":0.0015103999999999999,"children":null},"InitializeSensors":{"count":1,"self":0.001504,"total":0.001504,"children":null},"AgentSendState":{"count":6260,"self":0.0705701,"total":1.4536989,"children":{"CollectObservations":{"count":3130,"self":1.3518491,"total":1.3518491,"children":null},"WriteActionMask":{"count":3130,"self":0.0090594,"total":0.0090594,"children":null},"RequestDecision":{"count":3130,"self":0.0222203,"total":0.0222203,"children":null}}},"DecideAction":{"count":6260,"self":2.0805523999999997,"total":2.0805523,"children":null},"AgentAct":{"count":6260,"self":1.0903937,"total":1.0903937,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1716563152","unity_version":"2022.3.5f1","command_line_arguments":"C:\\Program Files\\Unity\\Hub\\Editor\\2022.3.5f1\\Editor\\Unity.exe -projectpath C:\\Users\\caile\\Desktop\\drecon-unity -useHub -hubIPC -cloudEnvironment production -licensingIpc LicenseClient-cail -hubSessionId a69371f4-0960-4729-b332-479a1ce08ab9 -accessToken uBPxxTOwOoFohWcnNcaFeSEyb3Y6A6Ae3NiYS44vXDY005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"DreconDemo","end_time_seconds":"1716563263"}}
+{"count":1,"self":198.45788159999998,"total":206.24364169999998,"children":{"InitializeActuators":{"count":1,"self":0.002,"total":0.002,"children":null},"InitializeSensors":{"count":1,"self":0.0015317,"total":0.0015317,"children":null},"AgentSendState":{"count":11903,"self":0.0730306,"total":2.5116527,"children":{"CollectObservations":{"count":5952,"self":2.3460091999999997,"total":2.3460093,"children":null},"WriteActionMask":{"count":5952,"self":0.0175926,"total":0.0175926,"children":null},"RequestDecision":{"count":5952,"self":0.0750202,"total":0.0750202,"children":null}}},"DecideAction":{"count":11903,"self":3.6477752,"total":3.6477752,"children":null},"AgentAct":{"count":11903,"self":1.6228004,"total":1.6228004,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1716743959","unity_version":"2022.3.5f1","command_line_arguments":"C:\\Program Files\\Unity\\Hub\\Editor\\2022.3.5f1\\Editor\\Unity.exe -projectpath C:\\Users\\caile\\Desktop\\drecon-unity -useHub -hubIPC -cloudEnvironment production -licensingIpc LicenseClient-cail -hubSessionId 6c818376-ae95-4024-a0ac-3f3ac93afdd0 -accessToken rlJAvKnw-O35WL0QWWy2PzoejhvNuee0FReRn1Dmju8005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"DreconDemo","end_time_seconds":"1716744165"}}