diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..e232cd6 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,55 @@ +{ + "files.exclude": + { + "**/.DS_Store":true, + "**/.git":true, + "**/.gitmodules":true, + "**/*.booproj":true, + "**/*.pidb":true, + "**/*.suo":true, + "**/*.user":true, + "**/*.userprefs":true, + "**/*.unityproj":true, + "**/*.dll":true, + "**/*.exe":true, + "**/*.pdf":true, + "**/*.mid":true, + "**/*.midi":true, + "**/*.wav":true, + "**/*.gif":true, + "**/*.ico":true, + "**/*.jpg":true, + "**/*.jpeg":true, + "**/*.png":true, + "**/*.psd":true, + "**/*.tga":true, + "**/*.tif":true, + "**/*.tiff":true, + "**/*.3ds":true, + "**/*.3DS":true, + "**/*.fbx":true, + "**/*.FBX":true, + "**/*.lxo":true, + "**/*.LXO":true, + "**/*.ma":true, + "**/*.MA":true, + "**/*.obj":true, + "**/*.OBJ":true, + "**/*.asset":true, + "**/*.cubemap":true, + "**/*.flare":true, + "**/*.mat":true, + "**/*.meta":true, + "**/*.prefab":true, + "**/*.unity":true, + "build/":true, + "Build/":true, + "Library/":true, + "library/":true, + "obj/":true, + "Obj/":true, + "ProjectSettings/":true, + "temp/":true, + "Temp/":true + } +} \ No newline at end of file diff --git a/Assets/5_Scenes/DreconDemo.unity b/Assets/5_Scenes/DreconDemo.unity index 293d6c4..b510ebc 100644 --- a/Assets/5_Scenes/DreconDemo.unity +++ b/Assets/5_Scenes/DreconDemo.unity @@ -719,7 +719,7 @@ MonoBehaviour: m_LookAt: {fileID: 0} m_Follow: {fileID: 0} m_Lens: - FieldOfView: 55 + FieldOfView: 20 OrthographicSize: 10 NearClipPlane: 0.1 FarClipPlane: 5000 @@ -834,7 +834,7 @@ Camera: m_Depth: -1 m_CullingMask: serializedVersion: 2 - m_Bits: 1407 + m_Bits: 4294967295 m_RenderingPath: -1 m_TargetTexture: {fileID: 0} m_TargetDisplay: 0 @@ -881,7 +881,7 @@ MonoBehaviour: m_BlendUpdateMethod: 1 m_DefaultBlend: m_Style: 1 - m_Time: 0 + m_Time: 3 m_CustomCurve: serializedVersion: 2 m_Curve: [] @@ -1761,7 +1761,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 882491594} serializedVersion: 2 - m_LocalRotation: {x: 0.52918464, y: 0.000000026320036, z: -0.000000016414909, w: 0.8485067} + m_LocalRotation: {x: 0.52918464, y: 0.00000002632004, z: -0.00000001641491, w: 0.8485067} m_LocalPosition: {x: 18.113062, y: 9.285504, z: -0.5535152} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -2160,7 +2160,7 @@ MonoBehaviour: m_Path: {fileID: 792989025} m_UpdateMethod: 0 m_PositionUnits: 1 - m_Speed: 10 + m_Speed: 2 m_Position: 0 --- !u!1 &1080375954 GameObject: @@ -3816,7 +3816,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1955078056} serializedVersion: 2 - m_LocalRotation: {x: -0.0000005639385, y: 0.7132504, z: -0.7009093, w: -0.0000005738679} + m_LocalRotation: {x: 0.000000563939, y: 0.7132504, z: -0.7009093, w: 0.0000005738685} m_LocalPosition: {x: 18.113062, y: 10.981609, z: -0.6314695} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -3840,7 +3840,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &2024068565 Transform: m_ObjectHideFlags: 0 @@ -5140,7 +5140,7 @@ GameObject: m_Component: - component: {fileID: 543450651852864845} m_Layer: 0 - m_Name: CameraMapping + m_Name: Objects m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -7380,6 +7380,7 @@ GameObject: - component: {fileID: 4931218027702484626} - component: {fileID: 4876933051977942161} - component: {fileID: 1305037035509676156} + - component: {fileID: 4931218027702484627} m_Layer: 11 m_Name: Plane m_TagString: Untagged @@ -9924,6 +9925,18 @@ Transform: m_Children: [] m_Father: {fileID: 543450651852864845} m_LocalEulerAnglesHint: {x: -92.5, y: 0, z: 0} +--- !u!114 &4931218027702484627 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2193423312754886620} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 519cf89ae36670048bb519d29044f45e, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!4 &4945909789592020759 Transform: m_ObjectHideFlags: 0 diff --git a/Assets/8_Scripts/2_General/Rotate.cs b/Assets/8_Scripts/2_General/Rotate.cs new file mode 100644 index 0000000..e73e1d8 --- /dev/null +++ b/Assets/8_Scripts/2_General/Rotate.cs @@ -0,0 +1,12 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class Rotate : MonoBehaviour +{ + // Update is called once per frame + void Update() + { + this.transform.Rotate(0, -Time.fixedDeltaTime / 4, 0, Space.World); + } +} diff --git a/Assets/8_Scripts/2_General/Rotate.cs.meta b/Assets/8_Scripts/2_General/Rotate.cs.meta new file mode 100644 index 0000000..fd3ec70 --- /dev/null +++ b/Assets/8_Scripts/2_General/Rotate.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 519cf89ae36670048bb519d29044f45e +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/9_Models/Objects/Materials/Ground.mat b/Assets/9_Models/Objects/Materials/Ground.mat index 487de67..afca891 100644 --- a/Assets/9_Models/Objects/Materials/Ground.mat +++ b/Assets/9_Models/Objects/Materials/Ground.mat @@ -152,7 +152,7 @@ Material: - Boolean_D258FF8E: 0 - Vector1_21C41D02: 1024 - Vector1_6F288C5B: 0.5 - - Vector1_B2CC132F: 50 + - Vector1_B2CC132F: 100 - Vector1_B9994903: 11 - Vector1_E8746023: 4 - _AORemapMax: 1 diff --git a/Assets/ML-Agents/Timers/DreconDemo_timers.json b/Assets/ML-Agents/Timers/DreconDemo_timers.json index fa7fe54..ea1ae4e 100644 --- a/Assets/ML-Agents/Timers/DreconDemo_timers.json +++ b/Assets/ML-Agents/Timers/DreconDemo_timers.json @@ -1 +1 @@ -{"count":1,"self":115.11014399999999,"total":119.23069219999999,"children":{"InitializeActuators":{"count":1,"self":0.0010000999999999999,"total":0.0010000999999999999,"children":null},"InitializeSensors":{"count":1,"self":0.0015045,"total":0.0015045,"children":null},"AgentSendState":{"count":6770,"self":0.0378832,"total":1.2663053,"children":{"CollectObservations":{"count":3385,"self":1.1996301999999999,"total":1.1996301999999999,"children":null},"WriteActionMask":{"count":3385,"self":0.0073364,"total":0.0073364,"children":null},"RequestDecision":{"count":3385,"self":0.0214555,"total":0.0214555,"children":null}}},"DecideAction":{"count":6770,"self":2.0352091999999997,"total":2.0352093,"children":null},"AgentAct":{"count":6770,"self":0.81652419999999992,"total":0.81652419999999992,"children":null}},"gauges":{"DReCon-v0.CumulativeReward":{"count":1,"max":80.9361649,"min":80.9361649,"runningAverage":80.9361649,"value":80.9361649,"weightedAverage":80.9361649}},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1712917967","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 3fbdf177-9b94-4cc1-adfd-c08277a8eede -accessToken odeT9cSeLBQY3FrA1yA0599oEegUBhCWJkhIJG2gUmk005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"DreconDemo","end_time_seconds":"1712918086"}} \ No newline at end of file +{"count":1,"self":278.7324416,"total":290.1625018,"children":{"InitializeActuators":{"count":1,"self":0.0010063,"total":0.0010063,"children":null},"InitializeSensors":{"count":1,"self":0.0020066999999999997,"total":0.0020066999999999997,"children":null},"AgentSendState":{"count":17024,"self":0.1063322,"total":3.8834497,"children":{"CollectObservations":{"count":8512,"self":3.7236124,"total":3.7236124999999998,"children":null},"WriteActionMask":{"count":8512,"self":0.014856099999999999,"total":0.014856099999999999,"children":null},"RequestDecision":{"count":8512,"self":0.0386489,"total":0.0386489,"children":null}}},"DecideAction":{"count":17024,"self":5.3217696,"total":5.3217694999999994,"children":null},"AgentAct":{"count":17024,"self":2.2203206,"total":2.2203206,"children":null}},"gauges":{"DReCon-v0.CumulativeReward":{"count":4,"max":5042.318,"min":81.69729,"runningAverage":1773.96167,"value":5042.318,"weightedAverage":1632.94543}},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1712919693","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 3fbdf177-9b94-4cc1-adfd-c08277a8eede -accessToken odeT9cSeLBQY3FrA1yA0599oEegUBhCWJkhIJG2gUmk005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"DreconDemo","end_time_seconds":"1712919983"}} \ No newline at end of file diff --git a/ProjectSettings/HDRPProjectSettings.asset b/ProjectSettings/HDRPProjectSettings.asset index 826dc3e..6fb2e80 100644 --- a/ProjectSettings/HDRPProjectSettings.asset +++ b/ProjectSettings/HDRPProjectSettings.asset @@ -13,7 +13,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_ProjectSettingFolderPath: HDRPDefaultResources - m_WizardPopupAtStart: 1 + m_WizardPopupAtStart: 0 m_LastMaterialVersion: 13 m_HDShaderGraphLastSeenVersion: 0 m_PluginMaterialVersions: