From eaf2417e89b3e1f54e60e3b12e0db85c331711f7 Mon Sep 17 00:00:00 2001 From: magn9775 Date: Fri, 12 Apr 2024 12:03:06 +0200 Subject: [PATCH] organiseret assets --- .../ML-Agents/Timers/AI training_timers.json | 2 +- Assets/Prefabs/{ => Cars}/Ford.prefab | 0 Assets/Prefabs/{ => Cars}/Ford.prefab.meta | 0 Assets/Prefabs/Smaller track pieces.meta | 8 +++++ .../Cooler_wall.prefab | 0 .../Cooler_wall.prefab.meta | 0 .../{ => Smaller track pieces}/Plane.prefab | 0 .../Plane.prefab.meta | 0 .../TrainingArea.prefab | 0 .../TrainingArea.prefab.meta | 0 .../{ => Smaller track pieces}/Wall.prefab | 0 .../Wall.prefab.meta | 0 .../racetrack1.prefab | 0 .../racetrack1.prefab.meta | 0 .../racetrack2.prefab | 0 .../racetrack2.prefab.meta | 0 .../small_wall.prefab | 0 .../small_wall.prefab.meta | 0 .../turned_track.prefab | 0 .../turned_track.prefab.meta | 0 .../turned_wall.prefab | 0 .../turned_wall.prefab.meta | 0 Assets/Prefabs/Track pieces.meta | 8 +++++ .../better_turned_track.prefab | 0 .../better_turned_track.prefab.meta | 0 .../{ => Tracks}/straight_track.prefab | 0 .../{ => Tracks}/straight_track.prefab.meta | 0 Assets/Scenes/AI Training.unity | 32 +++++++++++++++++++ 28 files changed, 49 insertions(+), 1 deletion(-) rename Assets/Prefabs/{ => Cars}/Ford.prefab (100%) rename Assets/Prefabs/{ => Cars}/Ford.prefab.meta (100%) create mode 100644 Assets/Prefabs/Smaller track pieces.meta rename Assets/Prefabs/{ => Smaller track pieces}/Cooler_wall.prefab (100%) rename Assets/Prefabs/{ => Smaller track pieces}/Cooler_wall.prefab.meta (100%) rename Assets/Prefabs/{ => Smaller track pieces}/Plane.prefab (100%) rename Assets/Prefabs/{ => Smaller track pieces}/Plane.prefab.meta (100%) rename Assets/Prefabs/{ => Smaller track pieces}/TrainingArea.prefab (100%) rename Assets/Prefabs/{ => Smaller track pieces}/TrainingArea.prefab.meta (100%) rename Assets/Prefabs/{ => Smaller track pieces}/Wall.prefab (100%) rename Assets/Prefabs/{ => Smaller track pieces}/Wall.prefab.meta (100%) rename Assets/Prefabs/{ => Smaller track pieces}/racetrack1.prefab (100%) rename Assets/Prefabs/{ => Smaller track pieces}/racetrack1.prefab.meta (100%) rename Assets/Prefabs/{ => Smaller track pieces}/racetrack2.prefab (100%) rename Assets/Prefabs/{ => Smaller track pieces}/racetrack2.prefab.meta (100%) rename Assets/Prefabs/{ => Smaller track pieces}/small_wall.prefab (100%) rename Assets/Prefabs/{ => Smaller track pieces}/small_wall.prefab.meta (100%) rename Assets/Prefabs/{ => Smaller track pieces}/turned_track.prefab (100%) rename Assets/Prefabs/{ => Smaller track pieces}/turned_track.prefab.meta (100%) rename Assets/Prefabs/{ => Smaller track pieces}/turned_wall.prefab (100%) rename Assets/Prefabs/{ => Smaller track pieces}/turned_wall.prefab.meta (100%) create mode 100644 Assets/Prefabs/Track pieces.meta rename Assets/Prefabs/{ => Track pieces}/better_turned_track.prefab (100%) rename Assets/Prefabs/{ => Track pieces}/better_turned_track.prefab.meta (100%) rename Assets/Prefabs/{ => Tracks}/straight_track.prefab (100%) rename Assets/Prefabs/{ => Tracks}/straight_track.prefab.meta (100%) diff --git a/Assets/ML-Agents/Timers/AI training_timers.json b/Assets/ML-Agents/Timers/AI training_timers.json index d54e35b..d026230 100644 --- a/Assets/ML-Agents/Timers/AI training_timers.json +++ b/Assets/ML-Agents/Timers/AI training_timers.json @@ -1 +1 @@ -{"count":1,"self":196.93605119999998,"total":222.96473799999998,"children":{"InitializeActuators":{"count":1,"self":0.0038336,"total":0.0038336,"children":null},"InitializeSensors":{"count":1,"self":0.0019949,"total":0.0019949,"children":null},"AgentSendState":{"count":10893,"self":1.2397219,"total":1.8112209,"children":{"CollectObservations":{"count":10893,"self":0.39594579999999996,"total":0.39594579999999996,"children":null},"WriteActionMask":{"count":10893,"self":0.0536644,"total":0.0536644,"children":null},"RequestDecision":{"count":10893,"self":0.12188879999999999,"total":0.12188879999999999,"children":null}}},"DecideAction":{"count":10893,"self":23.1911536,"total":23.4048522,"children":{"RayPerceptionSensor.Perceive":{"count":21786,"self":0.2136989,"total":0.2136989,"children":null}}},"AgentAct":{"count":10893,"self":0.8037961,"total":0.8037961,"children":null}},"gauges":{"BensonImitationV2.CumulativeReward":{"count":17,"max":25.32719,"min":0.00600000052,"runningAverage":3.766912,"value":11.9131,"weightedAverage":3.49163961}},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1712914965","unity_version":"2022.3.11f1","command_line_arguments":"C:\\Program Files\\Unity\\Hub\\Editor\\2022.3.11f1\\Editor\\Unity.exe -projectpath C:\\Users\\Magnus\\Desktop\\Ny unityting\\Racesm -useHub -hubIPC -cloudEnvironment production -licensingIpc LicenseClient-Magnus -hubSessionId cf11875e-7c45-4b77-a92f-dc14d8e96b41 -accessToken niNI_cX07NrigS8n9U0wVIj4PPmUMi8ELGwrz7xYRyQ005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"AI Training","end_time_seconds":"1712915188"}} \ No newline at end of file +{"count":1,"self":41.5123776,"total":46.230484999999994,"children":{"InitializeActuators":{"count":1,"self":0.0019946,"total":0.0019946,"children":null},"InitializeSensors":{"count":1,"self":0.0019959,"total":0.0019959,"children":null},"AgentSendState":{"count":2054,"self":0.2117914,"total":0.3356056,"children":{"CollectObservations":{"count":2054,"self":0.070933799999999991,"total":0.070933799999999991,"children":null},"WriteActionMask":{"count":2054,"self":0.014993999999999999,"total":0.014993999999999999,"children":null},"RequestDecision":{"count":2054,"self":0.0378864,"total":0.0378864,"children":null}}},"DecideAction":{"count":2054,"self":4.1792728,"total":4.2159086,"children":{"RayPerceptionSensor.Perceive":{"count":4108,"self":0.036635799999999996,"total":0.036635799999999996,"children":null}}},"AgentAct":{"count":2054,"self":0.1606052,"total":0.1606052,"children":null}},"gauges":{"BensonImitationV2.CumulativeReward":{"count":2,"max":15.0371494,"min":0.0100000007,"runningAverage":7.523575,"value":15.0371494,"weightedAverage":3.76678729}},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1712915962","unity_version":"2022.3.11f1","command_line_arguments":"C:\\Program Files\\Unity\\Hub\\Editor\\2022.3.11f1\\Editor\\Unity.exe -projectpath C:\\Users\\Magnus\\Desktop\\Ny unityting\\Racesm -useHub -hubIPC -cloudEnvironment production -licensingIpc LicenseClient-Magnus -hubSessionId cf11875e-7c45-4b77-a92f-dc14d8e96b41 -accessToken niNI_cX07NrigS8n9U0wVIj4PPmUMi8ELGwrz7xYRyQ005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"AI Training","end_time_seconds":"1712916008"}} \ No newline at end of file diff --git a/Assets/Prefabs/Ford.prefab b/Assets/Prefabs/Cars/Ford.prefab similarity index 100% rename from Assets/Prefabs/Ford.prefab rename to Assets/Prefabs/Cars/Ford.prefab diff --git a/Assets/Prefabs/Ford.prefab.meta b/Assets/Prefabs/Cars/Ford.prefab.meta similarity index 100% rename from Assets/Prefabs/Ford.prefab.meta rename to Assets/Prefabs/Cars/Ford.prefab.meta diff --git a/Assets/Prefabs/Smaller track pieces.meta b/Assets/Prefabs/Smaller track pieces.meta new file mode 100644 index 0000000..8801b9b --- /dev/null +++ b/Assets/Prefabs/Smaller track pieces.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: de444cb34796f514797f636ac0182b7a +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Cooler_wall.prefab b/Assets/Prefabs/Smaller track pieces/Cooler_wall.prefab similarity index 100% rename from Assets/Prefabs/Cooler_wall.prefab rename to Assets/Prefabs/Smaller track pieces/Cooler_wall.prefab diff --git a/Assets/Prefabs/Cooler_wall.prefab.meta b/Assets/Prefabs/Smaller track pieces/Cooler_wall.prefab.meta similarity index 100% rename from Assets/Prefabs/Cooler_wall.prefab.meta rename to Assets/Prefabs/Smaller track pieces/Cooler_wall.prefab.meta diff --git a/Assets/Prefabs/Plane.prefab b/Assets/Prefabs/Smaller track pieces/Plane.prefab similarity index 100% rename from Assets/Prefabs/Plane.prefab rename to Assets/Prefabs/Smaller track pieces/Plane.prefab diff --git a/Assets/Prefabs/Plane.prefab.meta b/Assets/Prefabs/Smaller track pieces/Plane.prefab.meta similarity index 100% rename from Assets/Prefabs/Plane.prefab.meta rename to Assets/Prefabs/Smaller track pieces/Plane.prefab.meta diff --git a/Assets/Prefabs/TrainingArea.prefab b/Assets/Prefabs/Smaller track pieces/TrainingArea.prefab similarity index 100% rename from Assets/Prefabs/TrainingArea.prefab rename to Assets/Prefabs/Smaller track pieces/TrainingArea.prefab diff --git a/Assets/Prefabs/TrainingArea.prefab.meta b/Assets/Prefabs/Smaller track pieces/TrainingArea.prefab.meta similarity index 100% rename from Assets/Prefabs/TrainingArea.prefab.meta rename to Assets/Prefabs/Smaller track pieces/TrainingArea.prefab.meta diff --git a/Assets/Prefabs/Wall.prefab b/Assets/Prefabs/Smaller track pieces/Wall.prefab similarity index 100% rename from Assets/Prefabs/Wall.prefab rename to Assets/Prefabs/Smaller track pieces/Wall.prefab diff --git a/Assets/Prefabs/Wall.prefab.meta b/Assets/Prefabs/Smaller track pieces/Wall.prefab.meta similarity index 100% rename from Assets/Prefabs/Wall.prefab.meta rename to Assets/Prefabs/Smaller track pieces/Wall.prefab.meta diff --git a/Assets/Prefabs/racetrack1.prefab b/Assets/Prefabs/Smaller track pieces/racetrack1.prefab similarity index 100% rename from Assets/Prefabs/racetrack1.prefab rename to Assets/Prefabs/Smaller track pieces/racetrack1.prefab diff --git a/Assets/Prefabs/racetrack1.prefab.meta b/Assets/Prefabs/Smaller track pieces/racetrack1.prefab.meta similarity index 100% rename from Assets/Prefabs/racetrack1.prefab.meta rename to Assets/Prefabs/Smaller track pieces/racetrack1.prefab.meta diff --git a/Assets/Prefabs/racetrack2.prefab b/Assets/Prefabs/Smaller track pieces/racetrack2.prefab similarity index 100% rename from Assets/Prefabs/racetrack2.prefab rename to Assets/Prefabs/Smaller track pieces/racetrack2.prefab diff --git a/Assets/Prefabs/racetrack2.prefab.meta b/Assets/Prefabs/Smaller track pieces/racetrack2.prefab.meta similarity index 100% rename from Assets/Prefabs/racetrack2.prefab.meta rename to Assets/Prefabs/Smaller track pieces/racetrack2.prefab.meta diff --git a/Assets/Prefabs/small_wall.prefab b/Assets/Prefabs/Smaller track pieces/small_wall.prefab similarity index 100% rename from Assets/Prefabs/small_wall.prefab rename to Assets/Prefabs/Smaller track pieces/small_wall.prefab diff --git a/Assets/Prefabs/small_wall.prefab.meta b/Assets/Prefabs/Smaller track pieces/small_wall.prefab.meta similarity index 100% rename from Assets/Prefabs/small_wall.prefab.meta rename to Assets/Prefabs/Smaller track pieces/small_wall.prefab.meta diff --git a/Assets/Prefabs/turned_track.prefab b/Assets/Prefabs/Smaller track pieces/turned_track.prefab similarity index 100% rename from Assets/Prefabs/turned_track.prefab rename to Assets/Prefabs/Smaller track pieces/turned_track.prefab diff --git a/Assets/Prefabs/turned_track.prefab.meta b/Assets/Prefabs/Smaller track pieces/turned_track.prefab.meta similarity index 100% rename from Assets/Prefabs/turned_track.prefab.meta rename to Assets/Prefabs/Smaller track pieces/turned_track.prefab.meta diff --git a/Assets/Prefabs/turned_wall.prefab b/Assets/Prefabs/Smaller track pieces/turned_wall.prefab similarity index 100% rename from Assets/Prefabs/turned_wall.prefab rename to Assets/Prefabs/Smaller track pieces/turned_wall.prefab diff --git a/Assets/Prefabs/turned_wall.prefab.meta b/Assets/Prefabs/Smaller track pieces/turned_wall.prefab.meta similarity index 100% rename from Assets/Prefabs/turned_wall.prefab.meta rename to Assets/Prefabs/Smaller track pieces/turned_wall.prefab.meta diff --git a/Assets/Prefabs/Track pieces.meta b/Assets/Prefabs/Track pieces.meta new file mode 100644 index 0000000..9bb93b2 --- /dev/null +++ b/Assets/Prefabs/Track pieces.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6b872f15197247f45ab132902e50153d +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/better_turned_track.prefab b/Assets/Prefabs/Track pieces/better_turned_track.prefab similarity index 100% rename from Assets/Prefabs/better_turned_track.prefab rename to Assets/Prefabs/Track pieces/better_turned_track.prefab diff --git a/Assets/Prefabs/better_turned_track.prefab.meta b/Assets/Prefabs/Track pieces/better_turned_track.prefab.meta similarity index 100% rename from Assets/Prefabs/better_turned_track.prefab.meta rename to Assets/Prefabs/Track pieces/better_turned_track.prefab.meta diff --git a/Assets/Prefabs/straight_track.prefab b/Assets/Prefabs/Tracks/straight_track.prefab similarity index 100% rename from Assets/Prefabs/straight_track.prefab rename to Assets/Prefabs/Tracks/straight_track.prefab diff --git a/Assets/Prefabs/straight_track.prefab.meta b/Assets/Prefabs/Tracks/straight_track.prefab.meta similarity index 100% rename from Assets/Prefabs/straight_track.prefab.meta rename to Assets/Prefabs/Tracks/straight_track.prefab.meta diff --git a/Assets/Scenes/AI Training.unity b/Assets/Scenes/AI Training.unity index 53b3e0f..9318a58 100644 --- a/Assets/Scenes/AI Training.unity +++ b/Assets/Scenes/AI Training.unity @@ -708,6 +708,10 @@ PrefabInstance: propertyPath: carTransform value: objectReference: {fileID: 4361687674892069559, guid: 3664a8beed80ac848a9377d9ee14cb9b, type: 3} + - target: {fileID: 1553392025741153767, guid: 5851f609a58dc884a99030da0105c6db, type: 3} + propertyPath: m_SidewaysFriction.m_ExtremumSlip + value: 0.2 + objectReference: {fileID: 0} - target: {fileID: 1708831625890644937, guid: 5851f609a58dc884a99030da0105c6db, type: 3} propertyPath: isFR value: 1 @@ -716,6 +720,18 @@ PrefabInstance: propertyPath: carTransform value: objectReference: {fileID: 4361687674892069559, guid: 3664a8beed80ac848a9377d9ee14cb9b, type: 3} + - target: {fileID: 2883785401448142367, guid: 5851f609a58dc884a99030da0105c6db, type: 3} + propertyPath: m_ForwardFriction.m_Stiffness + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2883785401448142367, guid: 5851f609a58dc884a99030da0105c6db, type: 3} + propertyPath: m_SidewaysFriction.m_Stiffness + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2883785401448142367, guid: 5851f609a58dc884a99030da0105c6db, type: 3} + propertyPath: m_SidewaysFriction.m_ExtremumSlip + value: 0.2 + objectReference: {fileID: 0} - target: {fileID: 5418785709807611868, guid: 5851f609a58dc884a99030da0105c6db, type: 3} propertyPath: maxSpeed value: 400 @@ -800,6 +816,22 @@ PrefabInstance: propertyPath: m_Name value: Player objectReference: {fileID: 0} + - target: {fileID: 6429322875164058677, guid: 5851f609a58dc884a99030da0105c6db, type: 3} + propertyPath: m_ForwardFriction.m_Stiffness + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 6429322875164058677, guid: 5851f609a58dc884a99030da0105c6db, type: 3} + propertyPath: m_SidewaysFriction.m_Stiffness + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 6429322875164058677, guid: 5851f609a58dc884a99030da0105c6db, type: 3} + propertyPath: m_SidewaysFriction.m_ExtremumSlip + value: 0.2 + objectReference: {fileID: 0} + - target: {fileID: 6619084378601959143, guid: 5851f609a58dc884a99030da0105c6db, type: 3} + propertyPath: m_SidewaysFriction.m_ExtremumSlip + value: 0.2 + objectReference: {fileID: 0} - target: {fileID: 7953198523918571078, guid: 5851f609a58dc884a99030da0105c6db, type: 3} propertyPath: m_LocalPosition.x value: 0