From a113700afcfe247be2599a22dce35077ee322ac6 Mon Sep 17 00:00:00 2001 From: Cailean Finn Date: Sun, 9 Jun 2024 11:56:57 +0100 Subject: [PATCH] everything is working!! --- Assets/5_Scenes/DreconDemo.unity | 96 +++++++++---------- Assets/8_Scripts/1_Managers/CameraManager.cs | 4 +- .../SMPLX_Texture/smplx texture human.mat | 2 +- .../ML-Agents/Timers/DreconDemo_timers.json | 2 +- 4 files changed, 52 insertions(+), 52 deletions(-) diff --git a/Assets/5_Scenes/DreconDemo.unity b/Assets/5_Scenes/DreconDemo.unity index 3fc18e1..3c7a2a1 100644 --- a/Assets/5_Scenes/DreconDemo.unity +++ b/Assets/5_Scenes/DreconDemo.unity @@ -919,22 +919,22 @@ LineRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_Positions: - - {x: -387.25262, y: -22.136444, z: -261.261} - - {x: -113.77623, y: -22.136444, z: -261.261} - - {x: -113.77623, y: -22.136444, z: -74.10927} - - {x: -387.25262, y: -22.136444, z: -74.10927} - - {x: -387.25262, y: -22.136444, z: -261.261} - - {x: -387.25262, y: 446.16705, z: -261.261} - - {x: -113.77623, y: 446.16705, z: -261.261} - - {x: -113.77623, y: -22.136444, z: -261.261} - - {x: -113.77623, y: 446.16705, z: -261.261} - - {x: -113.77623, y: 446.16705, z: -74.10927} - - {x: -113.77623, y: -22.136444, z: -74.10927} - - {x: -113.77623, y: 446.16705, z: -74.10927} - - {x: -387.25262, y: 446.16705, z: -74.10927} - - {x: -387.25262, y: -22.136444, z: -74.10927} - - {x: -387.25262, y: 446.16705, z: -74.10927} - - {x: -387.25262, y: 446.16705, z: -261.261} + - {x: -374.3868, y: -22.164154, z: -274.7059} + - {x: -121.63822, y: -22.164154, z: -274.7059} + - {x: -121.63822, y: -22.164154, z: -90.29599} + - {x: -374.3868, y: -22.164154, z: -90.29599} + - {x: -374.3868, y: -22.164154, z: -274.7059} + - {x: -374.3868, y: 470.06696, z: -274.7059} + - {x: -121.63822, y: 470.06696, z: -274.7059} + - {x: -121.63822, y: -22.164154, z: -274.7059} + - {x: -121.63822, y: 470.06696, z: -274.7059} + - {x: -121.63822, y: 470.06696, z: -90.29599} + - {x: -121.63822, y: -22.164154, z: -90.29599} + - {x: -121.63822, y: 470.06696, z: -90.29599} + - {x: -374.3868, y: 470.06696, z: -90.29599} + - {x: -374.3868, y: -22.164154, z: -90.29599} + - {x: -374.3868, y: 470.06696, z: -90.29599} + - {x: -374.3868, y: 470.06696, z: -274.7059} m_Parameters: serializedVersion: 3 widthMultiplier: 1 @@ -1268,7 +1268,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 62178361} serializedVersion: 2 - m_LocalRotation: {x: 0.12400306, y: -0.09265334, z: 0.011630276, w: 0.9878782} + m_LocalRotation: {x: 0.12400308, y: -0.092653364, z: 0.011630281, w: 0.9878782} m_LocalPosition: {x: 24.371735, y: 51, z: -83.27547} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -2053,7 +2053,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 153031623} serializedVersion: 2 - m_LocalRotation: {x: -0.000012147186, y: 0.9991337, z: 0.04161607, w: -0.000077417935} + m_LocalRotation: {x: -0.000012147184, y: 0.9991337, z: 0.041616086, w: -0.000077417935} m_LocalPosition: {x: 18.101631, y: 8.540332, z: 4.4995093} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -3872,8 +3872,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 320225263} serializedVersion: 2 - m_LocalRotation: {x: -0.109934606, y: 0.80571884, z: -0.5601098, w: -0.15814109} - m_LocalPosition: {x: 146.21146, y: 328.14352, z: -324.69604} + m_LocalRotation: {x: -0.10993796, y: 0.8057182, z: -0.56010866, w: -0.15814611} + m_LocalPosition: {x: 146.21153, y: 328.14352, z: -324.69604} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -3902,7 +3902,7 @@ MonoBehaviour: m_Follow: {fileID: 1683887270} m_Lens: FieldOfView: 0.3993083 - OrthographicSize: 0.2006525 + OrthographicSize: 0.3970231 NearClipPlane: 0.01 FarClipPlane: 5000 Dutch: 0 @@ -4194,7 +4194,7 @@ Camera: far clip plane: 5000 field of view: 0.3993083 orthographic: 1 - orthographic size: 0.2006525 + orthographic size: 0.3970231 m_Depth: -1 m_CullingMask: serializedVersion: 2 @@ -4218,8 +4218,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 330585543} serializedVersion: 2 - m_LocalRotation: {x: -0.109934606, y: 0.80571884, z: -0.5601098, w: -0.15814109} - m_LocalPosition: {x: 146.21146, y: 328.14352, z: -324.69604} + m_LocalRotation: {x: -0.10993796, y: 0.8057182, z: -0.56010866, w: -0.15814611} + m_LocalPosition: {x: 146.21153, y: 328.14352, z: -324.69604} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -4245,7 +4245,7 @@ MonoBehaviour: m_BlendUpdateMethod: 1 m_DefaultBlend: m_Style: 1 - m_Time: 11 + m_Time: 14 m_CustomCurve: serializedVersion: 2 m_Curve: [] @@ -7914,7 +7914,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 605393721} serializedVersion: 2 - m_LocalRotation: {x: -0.03109299, y: 0.0021573328, z: 0.000067110544, w: 0.99951416} + m_LocalRotation: {x: -0.03109301, y: 0.0021573673, z: 0.00006711165, w: 0.99951416} m_LocalPosition: {x: 18.109629, y: 8.274419, z: -10.463577} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -12281,7 +12281,7 @@ MonoBehaviour: FieldOfView: 19 OrthographicSize: 116.57 NearClipPlane: 0.1 - FarClipPlane: 5000 + FarClipPlane: 3269.8 Dutch: 0 ModeOverride: 2 LensShift: {x: 0, y: 0} @@ -18418,7 +18418,7 @@ MonoBehaviour: FieldOfView: 30.1 OrthographicSize: 90 NearClipPlane: 0.1 - FarClipPlane: 50000 + FarClipPlane: 5000 Dutch: 0 ModeOverride: 1 LensShift: {x: 0, y: 0} @@ -24033,22 +24033,22 @@ LineRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_Positions: - - {x: -84.76288, y: -21.918839, z: -242.2361} - - {x: 160.52072, y: -21.918839, z: -242.2361} - - {x: 160.52072, y: -21.918839, z: 8.086563} - - {x: -84.76288, y: -21.918839, z: 8.086563} - - {x: -84.76288, y: -21.918839, z: -242.2361} - - {x: -84.76288, y: 470.6853, z: -242.2361} - - {x: 160.52072, y: 470.6853, z: -242.2361} - - {x: 160.52072, y: -21.918839, z: -242.2361} - - {x: 160.52072, y: 470.6853, z: -242.2361} - - {x: 160.52072, y: 470.6853, z: 8.086563} - - {x: 160.52072, y: -21.918839, z: 8.086563} - - {x: 160.52072, y: 470.6853, z: 8.086563} - - {x: -84.76288, y: 470.6853, z: 8.086563} - - {x: -84.76288, y: -21.918839, z: 8.086563} - - {x: -84.76288, y: 470.6853, z: 8.086563} - - {x: -84.76288, y: 470.6853, z: -242.2361} + - {x: -60.66286, y: -13.629044, z: -230.3164} + - {x: 165.12428, y: -13.629044, z: -230.3164} + - {x: 165.12428, y: -13.629044, z: 6.505104} + - {x: -60.66286, y: -13.629044, z: 6.505104} + - {x: -60.66286, y: -13.629044, z: -230.3164} + - {x: -60.66286, y: 430.57385, z: -230.3164} + - {x: 165.12428, y: 430.57385, z: -230.3164} + - {x: 165.12428, y: -13.629044, z: -230.3164} + - {x: 165.12428, y: 430.57385, z: -230.3164} + - {x: 165.12428, y: 430.57385, z: 6.505104} + - {x: 165.12428, y: -13.629044, z: 6.505104} + - {x: 165.12428, y: 430.57385, z: 6.505104} + - {x: -60.66286, y: 430.57385, z: 6.505104} + - {x: -60.66286, y: -13.629044, z: 6.505104} + - {x: -60.66286, y: 430.57385, z: 6.505104} + - {x: -60.66286, y: 430.57385, z: -230.3164} m_Parameters: serializedVersion: 3 widthMultiplier: 1 @@ -25109,7 +25109,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1955078056} serializedVersion: 2 - m_LocalRotation: {x: 0.700439, y: -0.026124025, z: 0.025693517, w: 0.7127711} + m_LocalRotation: {x: 0.7004385, y: -0.026138652, z: 0.025707895, w: 0.7127705} m_LocalPosition: {x: 18.102207, y: 11.040333, z: -0.5004903} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -25738,9 +25738,9 @@ MonoBehaviour: m_Rewards: {fileID: 459103776} m_CameraBlendMin: 10 m_CameraBlendMax: 15 - m_CameraSwapMin: 30 - m_CameraSwapMax: 45 - m_CameraController: 1 + m_CameraSwapMin: 45 + m_CameraSwapMax: 60 + m_CameraController: 0 m_HumanoidMaterial: {fileID: 2100000, guid: 597337d36e2278c4db0ba474300e988f, type: 2} m_BackgroundColor: {r: 0.90196085, g: 0.2901961, b: 0.2627451, a: 0} m_PoseCanvas: {fileID: 607314882} diff --git a/Assets/8_Scripts/1_Managers/CameraManager.cs b/Assets/8_Scripts/1_Managers/CameraManager.cs index c0b4c5d..9ca91e7 100644 --- a/Assets/8_Scripts/1_Managers/CameraManager.cs +++ b/Assets/8_Scripts/1_Managers/CameraManager.cs @@ -177,14 +177,14 @@ public class CameraManager : MonoBehaviour float randomIndex = Random.Range(0f, totalWeight); - Debug.Log($"Random Number: {randomIndex}"); + Debug.Log($"Random Number: {randomIndex}, Size: {shuffledList.Count}"); GameObject selectedCamera = null; int selectedCameraIndex = 0; for (int i = 0; i < shuffledList.Count; i++){ randomIndex -= m_CameraSettings[shuffledList[i]].cameraWeight; - Debug.Log($"Adj Index: {randomIndex}, Weight: {totalWeight}, {m_CameraSettings[shuffledList[i]].cameraWeight}, Name: {m_CameraObjects[shuffledList[i]].name}"); + //Debug.Log($"Adj Index: {randomIndex}, Weight: {totalWeight}, {m_CameraSettings[shuffledList[i]].cameraWeight}, Name: {m_CameraObjects[shuffledList[i]].name}"); if(randomIndex <= 0){ // Activate Selected Camera selectedCamera = m_CameraObjects[shuffledList[i]]; diff --git a/Assets/9_Models/Humanoid/SMPLX_Texture/smplx texture human.mat b/Assets/9_Models/Humanoid/SMPLX_Texture/smplx texture human.mat index a4eb20d..97f1445 100644 --- a/Assets/9_Models/Humanoid/SMPLX_Texture/smplx texture human.mat +++ b/Assets/9_Models/Humanoid/SMPLX_Texture/smplx texture human.mat @@ -205,7 +205,7 @@ Material: - _Ior: 1.5 - _IridescenceMask: 1 - _IridescenceThickness: 1 - - _LerpTexture: 0.03875969 + - _LerpTexture: 0.031007752 - _LinkDetailsWithBase: 1 - _MaterialID: 1 - _Metallic: 0 diff --git a/Assets/ML-Agents/Timers/DreconDemo_timers.json b/Assets/ML-Agents/Timers/DreconDemo_timers.json index 9432bce..c2c711a 100644 --- a/Assets/ML-Agents/Timers/DreconDemo_timers.json +++ b/Assets/ML-Agents/Timers/DreconDemo_timers.json @@ -1 +1 @@ -{"count":1,"self":314.7872256,"total":328.3624625,"children":{"InitializeActuators":{"count":1,"self":0.0012384,"total":0.0012384,"children":null},"InitializeSensors":{"count":1,"self":0.0010118,"total":0.0010118,"children":null},"AgentSendState":{"count":18837,"self":0.13811569999999998,"total":3.9351626,"children":{"CollectObservations":{"count":9419,"self":3.2952548,"total":3.2952548999999998,"children":null},"WriteActionMask":{"count":9419,"self":0.0113926,"total":0.0113926,"children":null},"RequestDecision":{"count":9419,"self":0.4903994,"total":0.4903994,"children":null}}},"DecideAction":{"count":18837,"self":6.31065,"total":6.31065,"children":null},"AgentAct":{"count":18837,"self":3.3261751999999998,"total":3.3261751,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1717929086","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 54d62fb1-d031-4cf8-972f-61a26f9b4ce4 -accessToken nDJK2CK7Mfn8E4WwlfB4xRQLHGqrIOWOlcuQLOi8Y88005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"DreconDemo","end_time_seconds":"1717929414"}} \ No newline at end of file +{"count":1,"self":49.1053664,"total":50.8796417,"children":{"InitializeActuators":{"count":1,"self":0.0010071,"total":0.0010071,"children":null},"InitializeSensors":{"count":1,"self":0.0010517,"total":0.0010517,"children":null},"AgentSendState":{"count":2218,"self":0.027602099999999997,"total":0.651569,"children":{"CollectObservations":{"count":1109,"self":0.40842429999999996,"total":0.40842429999999996,"children":null},"WriteActionMask":{"count":1109,"self":0.0015289,"total":0.0015289,"children":null},"RequestDecision":{"count":1109,"self":0.2140137,"total":0.2140137,"children":null}}},"DecideAction":{"count":2218,"self":0.7539194,"total":0.7539194,"children":null},"AgentAct":{"count":2218,"self":0.36672659999999996,"total":0.36672659999999996,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1717930262","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 54d62fb1-d031-4cf8-972f-61a26f9b4ce4 -accessToken nDJK2CK7Mfn8E4WwlfB4xRQLHGqrIOWOlcuQLOi8Y88005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"DreconDemo","end_time_seconds":"1717930312"}} \ No newline at end of file