From fbe7b1474219ee0fec4d42cb69102dfac4ba9fd8 Mon Sep 17 00:00:00 2001 From: cailean Date: Mon, 4 Mar 2024 14:29:34 +0000 Subject: [PATCH 1/3] scaling fixed --- Assets/2_Chair/Chair.prefab | 2 +- Assets/6_Scenes/Beep.unity | 28 +++++++++---------- Assets/ML-Agents/Timers/Beep_timers.json | 2 +- .../DefaultSettingsVolumeProfile.asset | 12 ++++++++ 4 files changed, 28 insertions(+), 16 deletions(-) diff --git a/Assets/2_Chair/Chair.prefab b/Assets/2_Chair/Chair.prefab index cd83aaf..9dab288 100644 --- a/Assets/2_Chair/Chair.prefab +++ b/Assets/2_Chair/Chair.prefab @@ -2132,7 +2132,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4d4f1f9b90b1b3949a25ccabbf8429d4, type: 3} m_Name: m_EditorClassIdentifier: - m_InitialModel: {fileID: 5022602860645237092, guid: 1dc2dd8bd62c1ce47b13f1740b15e522, + m_InitialModel: {fileID: 5022602860645237092, guid: 00d0acaeb52a3894a9b8ca8c664b12db, type: 3} nnModelList: - {fileID: 5022602860645237092, guid: 1dc2dd8bd62c1ce47b13f1740b15e522, type: 3} diff --git a/Assets/6_Scenes/Beep.unity b/Assets/6_Scenes/Beep.unity index 92bf09f..b7b5200 100644 --- a/Assets/6_Scenes/Beep.unity +++ b/Assets/6_Scenes/Beep.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 11562.574, g: 10846.728, b: 10158.274, a: 1} + m_IndirectSpecularColor: {r: 11554.347, g: 10838.552, b: 10149.165, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -144,7 +144,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 83944016} serializedVersion: 2 - m_LocalRotation: {x: 0.12893897, y: 0.84063554, z: -0.4736417, w: 0.22884531} + m_LocalRotation: {x: 0.12893897, y: 0.8406356, z: -0.4736417, w: 0.22884533} m_LocalPosition: {x: -210.12523, y: 15.466, z: 510.0548} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -265,7 +265,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 479999559} + m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 2459669275579641455, guid: 263d8cea838224448bdfd0e71bc2dce4, type: 3} @@ -597,7 +597,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 470663197} serializedVersion: 2 - m_LocalRotation: {x: 0.12893897, y: 0.84063554, z: -0.4736417, w: 0.22884531} + m_LocalRotation: {x: 0.12893897, y: 0.8406356, z: -0.4736417, w: 0.22884533} m_LocalPosition: {x: -210.12523, y: 15.466, z: 510.0548} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -724,10 +724,9 @@ Transform: serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 1.1, y: 1.1, z: 1.1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 387060610} - {fileID: 4679177718800847518} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1306,7 +1305,7 @@ Transform: m_GameObject: {fileID: 707081198} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: -44.41, y: 0, z: 95.57} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -1712,7 +1711,7 @@ Transform: m_GameObject: {fileID: 1201075075} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 36.07, y: -32.35, z: 65.54} + m_LocalPosition: {x: -19.49, y: -17.83, z: 122.54} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -1834,22 +1833,22 @@ PrefabInstance: - target: {fileID: 2722580235232797026, guid: f03606b436da1d94e977c8ffa2825bd9, type: 3} propertyPath: m_LocalPosition.x - value: -206.8 + value: -207.98 objectReference: {fileID: 0} - target: {fileID: 2722580235232797026, guid: f03606b436da1d94e977c8ffa2825bd9, type: 3} propertyPath: m_LocalPosition.y - value: 6.4659996 + value: 6.25 objectReference: {fileID: 0} - target: {fileID: 2722580235232797026, guid: f03606b436da1d94e977c8ffa2825bd9, type: 3} propertyPath: m_LocalPosition.z - value: 504.40002 + value: 426.84 objectReference: {fileID: 0} - target: {fileID: 2722580235232797026, guid: f03606b436da1d94e977c8ffa2825bd9, type: 3} propertyPath: m_LocalRotation.w - value: -0.18946251 + value: 0.8981383 objectReference: {fileID: 0} - target: {fileID: 2722580235232797026, guid: f03606b436da1d94e977c8ffa2825bd9, type: 3} @@ -1859,7 +1858,7 @@ PrefabInstance: - target: {fileID: 2722580235232797026, guid: f03606b436da1d94e977c8ffa2825bd9, type: 3} propertyPath: m_LocalRotation.y - value: 0.981888 + value: 0.43971312 objectReference: {fileID: 0} - target: {fileID: 2722580235232797026, guid: f03606b436da1d94e977c8ffa2825bd9, type: 3} @@ -1874,7 +1873,7 @@ PrefabInstance: - target: {fileID: 2722580235232797026, guid: f03606b436da1d94e977c8ffa2825bd9, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 201.843 + value: 52.171 objectReference: {fileID: 0} - target: {fileID: 2722580235232797026, guid: f03606b436da1d94e977c8ffa2825bd9, type: 3} @@ -16834,6 +16833,7 @@ SceneRoots: - {fileID: 799276790} - {fileID: 2024103101} - {fileID: 707081199} + - {fileID: 387060609} - {fileID: 479999559} - {fileID: 1956142037} - {fileID: 1518800082} diff --git a/Assets/ML-Agents/Timers/Beep_timers.json b/Assets/ML-Agents/Timers/Beep_timers.json index 5a5bcb1..5ff2c7a 100644 --- a/Assets/ML-Agents/Timers/Beep_timers.json +++ b/Assets/ML-Agents/Timers/Beep_timers.json @@ -1 +1 @@ -{"count":1,"self":22.1533968,"total":22.364477299999997,"children":{"InitializeActuators":{"count":1,"self":0.0010178,"total":0.0010178,"children":null},"InitializeSensors":{"count":1,"self":0.0020058999999999997,"total":0.0020058999999999997,"children":null},"AgentSendState":{"count":786,"self":0.0070199,"total":0.024118399999999998,"children":{"CollectObservations":{"count":158,"self":0.0035277999999999998,"total":0.0035277999999999998,"children":null},"WriteActionMask":{"count":158,"self":0.0005032,"total":0.0005032,"children":null},"RequestDecision":{"count":158,"self":0.0130675,"total":0.0130675,"children":null}}},"DecideAction":{"count":786,"self":0.170895,"total":0.1729041,"children":{"RayPerceptionSensor.Perceive":{"count":158,"self":0.0020090999999999998,"total":0.0020090999999999998,"children":null}}},"AgentAct":{"count":786,"self":0.0100348,"total":0.0100348,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1709301810","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_02-Beep\\4_Unity\\Beep Final Git\\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":"1709301832"}} \ No newline at end of file +{"count":1,"self":61.5674624,"total":62.319560499999994,"children":{"InitializeActuators":{"count":1,"self":0.0010039,"total":0.0010039,"children":null},"InitializeSensors":{"count":1,"self":0.0025069,"total":0.0025069,"children":null},"AgentSendState":{"count":2817,"self":0.0258379,"total":0.27432419999999996,"children":{"CollectObservations":{"count":564,"self":0.0080419999999999988,"total":0.0080419999999999988,"children":null},"WriteActionMask":{"count":564,"self":0.0010042999999999999,"total":0.0010042999999999999,"children":null},"RequestDecision":{"count":564,"self":0.23944,"total":0.23944,"children":null}}},"DecideAction":{"count":2817,"self":0.4480381,"total":0.45263519999999996,"children":{"RayPerceptionSensor.Perceive":{"count":564,"self":0.0045971,"total":0.0045971,"children":null}}},"AgentAct":{"count":2817,"self":0.021629799999999998,"total":0.021629799999999998,"children":null}},"gauges":{"c_Walker.CumulativeReward":{"count":1,"max":-1,"min":-1,"runningAverage":-1,"value":-1,"weightedAverage":-1}},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1709562442","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_02-Beep\\4_Unity\\Beep Final Git\\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":"1709562504"}} \ No newline at end of file diff --git a/Assets/Settings/HDRPDefaultResources/DefaultSettingsVolumeProfile.asset b/Assets/Settings/HDRPDefaultResources/DefaultSettingsVolumeProfile.asset index feab083..a338bd8 100644 --- a/Assets/Settings/HDRPDefaultResources/DefaultSettingsVolumeProfile.asset +++ b/Assets/Settings/HDRPDefaultResources/DefaultSettingsVolumeProfile.asset @@ -33,6 +33,18 @@ MonoBehaviour: maximumIntensity: m_OverrideState: 1 m_Value: 10 + denoising: + m_OverrideState: 0 + m_Value: 0 + useAOVs: + m_OverrideState: 0 + m_Value: 1 + temporal: + m_OverrideState: 0 + m_Value: 0 + asyncDenoising: + m_OverrideState: 0 + m_Value: 1 skyImportanceSampling: m_OverrideState: 1 m_Value: 0 From b45ff1da807a3e24dda492c5c00fb72bb0abc1fa Mon Sep 17 00:00:00 2001 From: cailean Date: Mon, 4 Mar 2024 14:37:30 +0000 Subject: [PATCH 2/3] scaling fixed pt.2 --- .../Physics Materials/Actor.physicMaterial | 4 ++-- .../Physics Materials/Ground.physicMaterial | 4 ++-- Assets/6_Scenes/Beep.unity | 16 ++++++++-------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Assets/3_Materials/Physics Materials/Actor.physicMaterial b/Assets/3_Materials/Physics Materials/Actor.physicMaterial index c642c87..383f4d6 100644 --- a/Assets/3_Materials/Physics Materials/Actor.physicMaterial +++ b/Assets/3_Materials/Physics Materials/Actor.physicMaterial @@ -7,8 +7,8 @@ PhysicMaterial: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Actor - dynamicFriction: 0 - staticFriction: 0 + dynamicFriction: 2 + staticFriction: 2 bounciness: 0 frictionCombine: 2 bounceCombine: 0 diff --git a/Assets/3_Materials/Physics Materials/Ground.physicMaterial b/Assets/3_Materials/Physics Materials/Ground.physicMaterial index 2ad8e74..4e13ab4 100644 --- a/Assets/3_Materials/Physics Materials/Ground.physicMaterial +++ b/Assets/3_Materials/Physics Materials/Ground.physicMaterial @@ -7,8 +7,8 @@ PhysicMaterial: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Ground - dynamicFriction: 0 - staticFriction: 0 + dynamicFriction: 1000 + staticFriction: 1000 bounciness: 0 frictionCombine: 0 bounceCombine: 2 diff --git a/Assets/6_Scenes/Beep.unity b/Assets/6_Scenes/Beep.unity index b7b5200..9e5b0e3 100644 --- a/Assets/6_Scenes/Beep.unity +++ b/Assets/6_Scenes/Beep.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 11554.347, g: 10838.552, b: 10149.165, a: 1} + m_IndirectSpecularColor: {r: 11563.5205, g: 10847.634, b: 10159.743, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -144,8 +144,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 83944016} serializedVersion: 2 - m_LocalRotation: {x: 0.12893897, y: 0.8406356, z: -0.4736417, w: 0.22884533} - m_LocalPosition: {x: -210.12523, y: 15.466, z: 510.0548} + m_LocalRotation: {x: 0.4908762, y: -0.0009795057, z: 0.0005518827, w: 0.87122864} + m_LocalPosition: {x: -252.37524, y: 15.25, z: 515.85} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -275,17 +275,17 @@ PrefabInstance: - target: {fileID: 3364236482078802793, guid: 263d8cea838224448bdfd0e71bc2dce4, type: 3} propertyPath: m_LocalPosition.x - value: -196.82999 + value: -252.39 objectReference: {fileID: 0} - target: {fileID: 3364236482078802793, guid: 263d8cea838224448bdfd0e71bc2dce4, type: 3} propertyPath: m_LocalPosition.y - value: 6.1500015 + value: 20.67 objectReference: {fileID: 0} - target: {fileID: 3364236482078802793, guid: 263d8cea838224448bdfd0e71bc2dce4, type: 3} propertyPath: m_LocalPosition.z - value: 489 + value: 546 objectReference: {fileID: 0} - target: {fileID: 3364236482078802793, guid: 263d8cea838224448bdfd0e71bc2dce4, type: 3} @@ -597,8 +597,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 470663197} serializedVersion: 2 - m_LocalRotation: {x: 0.12893897, y: 0.8406356, z: -0.4736417, w: 0.22884533} - m_LocalPosition: {x: -210.12523, y: 15.466, z: 510.0548} + m_LocalRotation: {x: 0.4908762, y: -0.0009795057, z: 0.0005518827, w: 0.87122864} + m_LocalPosition: {x: -252.37524, y: 15.25, z: 515.85} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] From 27c59681812ecfa636f2a3f1f3a59c2807f21e59 Mon Sep 17 00:00:00 2001 From: cailean Date: Mon, 4 Mar 2024 21:23:23 +0000 Subject: [PATCH 3/3] added .gitattributes file --- .gitattributes | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..28a06d8 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,72 @@ +# For line ending normalization between Unix and Windows +* text=auto + +# Unity +*.cs diff=csharp text +*.cginc text +*.shader text + +*.mat -text merge=unityyamlmerge diff +*.anim -text merge=unityyamlmerge diff +*.unity -text merge=unityyamlmerge diff +*.prefab -text merge=unityyamlmerge diff +*.physicsMaterial2D -text merge=unityyamlmerge diff +*.physicMaterial -text merge=unityyamlmerge diff +*.asset -text merge=unityyamlmerge diff +*.meta -text merge=unityyamlmerge diff +*.controller -text merge=unityyamlmerge diff + +# 3D models +*.3dm filter=lfs diff=lfs merge=lfs -text +*.3ds filter=lfs diff=lfs merge=lfs -text +*.blend filter=lfs diff=lfs merge=lfs -text +*.c4d filter=lfs diff=lfs merge=lfs -text +*.collada filter=lfs diff=lfs merge=lfs -text +*.dae filter=lfs diff=lfs merge=lfs -text +*.dxf filter=lfs diff=lfs merge=lfs -text +*.fbx filter=lfs diff=lfs merge=lfs -text +*.jas filter=lfs diff=lfs merge=lfs -text +*.lws filter=lfs diff=lfs merge=lfs -text +*.lxo filter=lfs diff=lfs merge=lfs -text +*.ma filter=lfs diff=lfs merge=lfs -text +*.max filter=lfs diff=lfs merge=lfs -text +*.mb filter=lfs diff=lfs merge=lfs -text +*.obj filter=lfs diff=lfs merge=lfs -text +*.ply filter=lfs diff=lfs merge=lfs -text +*.skp filter=lfs diff=lfs merge=lfs -text +*.stl filter=lfs diff=lfs merge=lfs -text +*.ztl filter=lfs diff=lfs merge=lfs -text +# Audio +*.aif filter=lfs diff=lfs merge=lfs -text +*.aiff filter=lfs diff=lfs merge=lfs -text +*.it filter=lfs diff=lfs merge=lfs -text +*.mod filter=lfs diff=lfs merge=lfs -text +*.mp3 filter=lfs diff=lfs merge=lfs -text +*.ogg filter=lfs diff=lfs merge=lfs -text +*.s3m filter=lfs diff=lfs merge=lfs -text +*.wav filter=lfs diff=lfs merge=lfs -text +*.xm filter=lfs diff=lfs merge=lfs -text +# Fonts +*.otf filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +# Images +*.bmp filter=lfs diff=lfs merge=lfs -text +*.exr filter=lfs diff=lfs merge=lfs -text +*.gif filter=lfs diff=lfs merge=lfs -text +*.hdr filter=lfs diff=lfs merge=lfs -text +*.iff filter=lfs diff=lfs merge=lfs -text +*.jpeg filter=lfs diff=lfs merge=lfs -text +*.jpg filter=lfs diff=lfs merge=lfs -text +*.pict filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.psd filter=lfs diff=lfs merge=lfs -text +*.tga filter=lfs diff=lfs merge=lfs -text +*.tif filter=lfs diff=lfs merge=lfs -text +*.tiff filter=lfs diff=lfs merge=lfs -text + +# Collapse Unity-generated files on GitHub +*.asset linguist-generated +*.mat linguist-generated +*.meta linguist-generated +*.prefab linguist-generated +*.unity linguist-generated \ No newline at end of file