From c59b5f2f0e77c10df39c3b13942948082961609c Mon Sep 17 00:00:00 2001 From: Cailean Finn Date: Mon, 8 Apr 2024 13:51:46 +0100 Subject: [PATCH] last update to treadmill --- .../Shaders/Shader Graphs_Treadmill Belt.mat | 2 +- Assets/6_Scenes/Beep.unity | 22 +++++++++---------- Assets/7_Scripts/Waypoint/WaypointManager.cs | 2 ++ Assets/ML-Agents/Timers/Beep_timers.json | 2 +- 4 files changed, 15 insertions(+), 13 deletions(-) diff --git a/Assets/3_Materials/Shaders/Shader Graphs_Treadmill Belt.mat b/Assets/3_Materials/Shaders/Shader Graphs_Treadmill Belt.mat index 12b90f9..3fd104d 100644 --- a/Assets/3_Materials/Shaders/Shader Graphs_Treadmill Belt.mat +++ b/Assets/3_Materials/Shaders/Shader Graphs_Treadmill Belt.mat @@ -92,7 +92,7 @@ Material: - _RefractionModel: 0 - _RenderQueueType: 1 - _RequireSplitLighting: 0 - - _Speed: -4.4523954 + - _Speed: -12.736127 - _SrcBlend: 1 - _StencilRef: 0 - _StencilRefDepth: 8 diff --git a/Assets/6_Scenes/Beep.unity b/Assets/6_Scenes/Beep.unity index 42dac44..21ba0dd 100644 --- a/Assets/6_Scenes/Beep.unity +++ b/Assets/6_Scenes/Beep.unity @@ -1245,7 +1245,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 155411616} serializedVersion: 2 - m_LocalRotation: {x: 0.024549965, y: -0.8590012, z: 0.49051577, w: -0.14459783} + m_LocalRotation: {x: 0.024549956, y: -0.8590012, z: 0.49051577, w: -0.1445978} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -3222,7 +3222,7 @@ PrefabInstance: - target: {fileID: 3364236482078802793, guid: 263d8cea838224448bdfd0e71bc2dce4, type: 3} propertyPath: m_LocalPosition.x - value: -271.94 + value: -272.15 objectReference: {fileID: 0} - target: {fileID: 3364236482078802793, guid: 263d8cea838224448bdfd0e71bc2dce4, type: 3} @@ -3232,12 +3232,12 @@ PrefabInstance: - target: {fileID: 3364236482078802793, guid: 263d8cea838224448bdfd0e71bc2dce4, type: 3} propertyPath: m_LocalPosition.z - value: 560.77 + value: 561.73 objectReference: {fileID: 0} - target: {fileID: 3364236482078802793, guid: 263d8cea838224448bdfd0e71bc2dce4, type: 3} propertyPath: m_LocalRotation.w - value: 1 + value: 0.98429346 objectReference: {fileID: 0} - target: {fileID: 3364236482078802793, guid: 263d8cea838224448bdfd0e71bc2dce4, type: 3} @@ -3247,7 +3247,7 @@ PrefabInstance: - target: {fileID: 3364236482078802793, guid: 263d8cea838224448bdfd0e71bc2dce4, type: 3} propertyPath: m_LocalRotation.y - value: -0 + value: -0.17654012 objectReference: {fileID: 0} - target: {fileID: 3364236482078802793, guid: 263d8cea838224448bdfd0e71bc2dce4, type: 3} @@ -4682,7 +4682,7 @@ MonoBehaviour: LensShift: {x: 0, y: 0} GateFit: 1 FocusDistance: 10 - m_SensorSize: {x: 70.41, y: 52.63} + m_SensorSize: {x: 1, y: 1} Iso: 50 ShutterSpeed: 0.0005 Aperture: 2.2 @@ -5318,7 +5318,7 @@ MonoBehaviour: LensShift: {x: 0, y: 0} GateFit: 1 FocusDistance: 10 - m_SensorSize: {x: 70.41, y: 52.63} + m_SensorSize: {x: 1, y: 1} Iso: 200 ShutterSpeed: 0.005 Aperture: 16 @@ -16678,12 +16678,12 @@ PrefabInstance: - target: {fileID: 1170441306195283109, guid: 796c0c7bfd2e89547bd866eedcc6d386, type: 3} propertyPath: m_LocalPosition.x - value: -39.04 + value: -39.25 objectReference: {fileID: 0} - target: {fileID: 1170441306195283109, guid: 796c0c7bfd2e89547bd866eedcc6d386, type: 3} propertyPath: m_LocalPosition.z - value: 137.31 + value: 138.27 objectReference: {fileID: 0} - target: {fileID: 1433528410791844214, guid: 796c0c7bfd2e89547bd866eedcc6d386, type: 3} @@ -16838,12 +16838,12 @@ PrefabInstance: - target: {fileID: 7419875685076643595, guid: 796c0c7bfd2e89547bd866eedcc6d386, type: 3} propertyPath: m_LocalPosition.x - value: -37.43 + value: -37.3 objectReference: {fileID: 0} - target: {fileID: 7419875685076643595, guid: 796c0c7bfd2e89547bd866eedcc6d386, type: 3} propertyPath: m_LocalPosition.z - value: 133.36 + value: 132.88 objectReference: {fileID: 0} - target: {fileID: 7773461343564336651, guid: 796c0c7bfd2e89547bd866eedcc6d386, type: 3} diff --git a/Assets/7_Scripts/Waypoint/WaypointManager.cs b/Assets/7_Scripts/Waypoint/WaypointManager.cs index 508d0c9..f3b96a4 100644 --- a/Assets/7_Scripts/Waypoint/WaypointManager.cs +++ b/Assets/7_Scripts/Waypoint/WaypointManager.cs @@ -68,7 +68,9 @@ public class WaypointManager : MonoBehaviour private void MoveTargetToWaypoint() { Vector3 wpPosition = m_CurrentWaypoint.m_WaypointPosition.position; + Quaternion wpRotation = m_CurrentWaypoint.m_WaypointPosition.rotation; m_Target.position = wpPosition; + //m_Target.rotation = wpRotation; } private bool SetNextWaypoint(float index, string modelName) diff --git a/Assets/ML-Agents/Timers/Beep_timers.json b/Assets/ML-Agents/Timers/Beep_timers.json index df8cbbb..3e193e1 100644 --- a/Assets/ML-Agents/Timers/Beep_timers.json +++ b/Assets/ML-Agents/Timers/Beep_timers.json @@ -1 +1 @@ -{"count":1,"self":26.9375552,"total":27.2160692,"children":{"InitializeActuators":{"count":1,"self":0.0010069,"total":0.0010069,"children":null},"InitializeSensors":{"count":1,"self":0.0030293,"total":0.0030293,"children":null},"AgentSendState":{"count":1022,"self":0.0127094,"total":0.0316756,"children":{"CollectObservations":{"count":205,"self":0.0080762,"total":0.0080762,"children":null},"WriteActionMask":{"count":205,"self":0,"total":0,"children":null},"RequestDecision":{"count":205,"self":0.01089,"total":0.01089,"children":null}}},"DecideAction":{"count":1022,"self":0.2316887,"total":0.23319979999999998,"children":{"RayPerceptionSensor.Perceive":{"count":205,"self":0.0015111,"total":0.0015111,"children":null}}},"AgentAct":{"count":1022,"self":0.0086032,"total":0.0086032,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1712580257","unity_version":"2023.2.8f1","command_line_arguments":"C:\\Program Files\\Unity\\Hub\\Editor\\2023.2.8f1\\Editor\\Unity.exe -projectpath C:\\Users\\caile\\Desktop\\Projects\\24_03-Beep\\beep-final -useHub -hubIPC -cloudEnvironment production","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.3.0-exp.3","scene_name":"Beep","end_time_seconds":"1712580284"}} \ No newline at end of file +{"count":1,"self":43.0674688,"total":43.5100562,"children":{"InitializeActuators":{"count":1,"self":0.0015049,"total":0.0015049,"children":null},"InitializeSensors":{"count":1,"self":0.0025298,"total":0.0025298,"children":null},"AgentSendState":{"count":1838,"self":0.028665,"total":0.0567212,"children":{"CollectObservations":{"count":368,"self":0.014420899999999999,"total":0.014420899999999999,"children":null},"WriteActionMask":{"count":368,"self":0.0015057999999999998,"total":0.0015057999999999998,"children":null},"RequestDecision":{"count":368,"self":0.0121295,"total":0.0121295,"children":null}}},"DecideAction":{"count":1838,"self":0.36071739999999997,"total":0.3647547,"children":{"RayPerceptionSensor.Perceive":{"count":368,"self":0.0040373,"total":0.0040373,"children":null}}},"AgentAct":{"count":1838,"self":0.017076499999999998,"total":0.017076499999999998,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1712580654","unity_version":"2023.2.8f1","command_line_arguments":"C:\\Program Files\\Unity\\Hub\\Editor\\2023.2.8f1\\Editor\\Unity.exe -projectpath C:\\Users\\caile\\Desktop\\Projects\\24_03-Beep\\beep-final -useHub -hubIPC -cloudEnvironment production","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.3.0-exp.3","scene_name":"Beep","end_time_seconds":"1712580698"}} \ No newline at end of file