From 1efc176061db1a0ec2d7fa78eb72c82333e28961 Mon Sep 17 00:00:00 2001 From: Cailean Finn Date: Tue, 7 May 2024 15:58:46 +0100 Subject: [PATCH] camera updates --- Assets/5_Scenes/DreconDemo.unity | 94 +++++++++---------- Assets/6_Splat/vfx graph/Wow.vfx | 43 +++++++-- Assets/8_Scripts/2_General/ActuationsSine.cs | 2 +- .../smplx texture human actuations.mat | 2 +- .../Objects/Materials/Ground Grey.mat | 2 +- .../ML-Agents/Timers/DreconDemo_timers.json | 2 +- 6 files changed, 84 insertions(+), 61 deletions(-) diff --git a/Assets/5_Scenes/DreconDemo.unity b/Assets/5_Scenes/DreconDemo.unity index da7f92f..3881ae3 100644 --- a/Assets/5_Scenes/DreconDemo.unity +++ b/Assets/5_Scenes/DreconDemo.unity @@ -432,22 +432,22 @@ LineRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_Positions: - - {x: -352.5766, y: -9.5408325, z: -248.83424} - - {x: -159.67682, y: -9.5408325, z: -248.83424} - - {x: -159.67682, y: -9.5408325, z: -126.13109} - - {x: -352.5766, y: -9.5408325, z: -126.13109} - - {x: -352.5766, y: -9.5408325, z: -248.83424} - - {x: -352.5766, y: 400.5359, z: -248.83424} - - {x: -159.67682, y: 400.5359, z: -248.83424} - - {x: -159.67682, y: -9.5408325, z: -248.83424} - - {x: -159.67682, y: 400.5359, z: -248.83424} - - {x: -159.67682, y: 400.5359, z: -126.13109} - - {x: -159.67682, y: -9.5408325, z: -126.13109} - - {x: -159.67682, y: 400.5359, z: -126.13109} - - {x: -352.5766, y: 400.5359, z: -126.13109} - - {x: -352.5766, y: -9.5408325, z: -126.13109} - - {x: -352.5766, y: 400.5359, z: -126.13109} - - {x: -352.5766, y: 400.5359, z: -248.83424} + - {x: -362.373, y: -9.734314, z: -269.58728} + - {x: -162.64754, y: -9.734314, z: -269.58728} + - {x: -162.64754, y: -9.734314, z: -105.91316} + - {x: -362.373, y: -9.734314, z: -105.91316} + - {x: -362.373, y: -9.734314, z: -269.58728} + - {x: -362.373, y: 494.6581, z: -269.58728} + - {x: -162.64754, y: 494.6581, z: -269.58728} + - {x: -162.64754, y: -9.734314, z: -269.58728} + - {x: -162.64754, y: 494.6581, z: -269.58728} + - {x: -162.64754, y: 494.6581, z: -105.91316} + - {x: -162.64754, y: -9.734314, z: -105.91316} + - {x: -162.64754, y: 494.6581, z: -105.91316} + - {x: -362.373, y: 494.6581, z: -105.91316} + - {x: -362.373, y: -9.734314, z: -105.91316} + - {x: -362.373, y: 494.6581, z: -105.91316} + - {x: -362.373, y: 494.6581, z: -269.58728} m_Parameters: serializedVersion: 3 widthMultiplier: 1 @@ -1147,7 +1147,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 153031623} serializedVersion: 2 - m_LocalRotation: {x: -0.000010763138, y: 0.9982297, z: 0.059476644, w: -0.000077583616} + m_LocalRotation: {x: -0.000010763137, y: 0.9982297, z: 0.059476644, w: -0.00007758362} m_LocalPosition: {x: 18.101631, y: 8.540332, z: 4.4995093} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -1633,14 +1633,14 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 298844361} serializedVersion: 2 - m_LocalRotation: {x: -0.5177001, y: 0.3509316, z: -0.24526884, w: -0.7407273} - m_LocalPosition: {x: 172.3, y: 404.2, z: -89.4} + m_LocalRotation: {x: -0.12804751, y: 0.3442018, z: -0.035006724, w: 0.9294641} + m_LocalPosition: {x: -252, y: 170, z: -471} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1531711172} m_Father: {fileID: 1346050330} - m_LocalEulerAnglesHint: {x: 69.9, y: 309.3, z: 0} + m_LocalEulerAnglesHint: {x: -12.353, y: 41.62, z: -9.024} --- !u!114 &298844363 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1662,11 +1662,11 @@ MonoBehaviour: m_LookAt: {fileID: 0} m_Follow: {fileID: 0} m_Lens: - FieldOfView: 20 + FieldOfView: 17.5 OrthographicSize: 10 NearClipPlane: 0.1 FarClipPlane: 5000 - Dutch: 0 + Dutch: -122 ModeOverride: 2 LensShift: {x: 0, y: 0} GateFit: 2 @@ -1759,7 +1759,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 320225263} serializedVersion: 2 - m_LocalRotation: {x: 0.42968023, y: 0.5493335, z: -0.39451057, w: 0.59830517} + m_LocalRotation: {x: 0.42968017, y: 0.5493336, z: -0.39451066, w: 0.5983051} m_LocalPosition: {x: 69.4, y: 315, z: -332.1} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -1788,7 +1788,7 @@ MonoBehaviour: m_LookAt: {fileID: 489043706} m_Follow: {fileID: 0} m_Lens: - FieldOfView: 6.765776 + FieldOfView: 7.536252 OrthographicSize: 30.38 NearClipPlane: 0.1 FarClipPlane: 5000 @@ -1938,7 +1938,7 @@ MonoBehaviour: m_Lens: FieldOfView: 20 OrthographicSize: 10 - NearClipPlane: 0.5 + NearClipPlane: 0.01 FarClipPlane: 5000 Dutch: 0 ModeOverride: 2 @@ -2064,7 +2064,7 @@ Camera: height: 1 near clip plane: 0.1 far clip plane: 5000 - field of view: 6.765776 + field of view: 7.536252 orthographic: 0 orthographic size: 30.38 m_Depth: -1 @@ -2090,7 +2090,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 330585543} serializedVersion: 2 - m_LocalRotation: {x: 0.42968023, y: 0.5493335, z: -0.39451057, w: 0.59830517} + m_LocalRotation: {x: 0.42968017, y: 0.5493336, z: -0.39451066, w: 0.5983051} m_LocalPosition: {x: 69.4, y: 315, z: -332.1} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -2117,7 +2117,7 @@ MonoBehaviour: m_BlendUpdateMethod: 1 m_DefaultBlend: m_Style: 1 - m_Time: 3 + m_Time: 0 m_CustomCurve: serializedVersion: 2 m_Curve: [] @@ -8306,7 +8306,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1446210418} serializedVersion: 2 - m_LocalRotation: {x: -0.00018797578, y: 0.99926, z: -0.0049240883, w: -0.038146485} + m_LocalRotation: {x: -0.0001879747, y: 0.99926, z: -0.004924065, w: -0.03814645} m_LocalPosition: {x: 18.109627, y: 8.274419, z: 9.536423} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -10219,7 +10219,7 @@ Transform: m_GameObject: {fileID: 1837387739} serializedVersion: 2 m_LocalRotation: {x: -0.04636615, y: 0.9349433, z: 0.13314544, w: 0.32558176} - m_LocalPosition: {x: -84.9, y: 9.7, z: 87.8} + m_LocalPosition: {x: -79.7, y: 21.6, z: 87.8} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -10621,22 +10621,22 @@ LineRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_Positions: - - {x: -80.557, y: -13.5368805, z: -226.11227} - - {x: 147.50385, y: -13.5368805, z: -226.11227} - - {x: 147.50385, y: -13.5368805, z: -31.74102} - - {x: -80.557, y: -13.5368805, z: -31.74102} - - {x: -80.557, y: -13.5368805, z: -226.11227} - - {x: -80.557, y: 436.80365, z: -226.11227} - - {x: 147.50385, y: 436.80365, z: -226.11227} - - {x: 147.50385, y: -13.5368805, z: -226.11227} - - {x: 147.50385, y: 436.80365, z: -226.11227} - - {x: 147.50385, y: 436.80365, z: -31.74102} - - {x: 147.50385, y: -13.5368805, z: -31.74102} - - {x: 147.50385, y: 436.80365, z: -31.74102} - - {x: -80.557, y: 436.80365, z: -31.74102} - - {x: -80.557, y: -13.5368805, z: -31.74102} - - {x: -80.557, y: 436.80365, z: -31.74102} - - {x: -80.557, y: 436.80365, z: -226.11227} + - {x: -91.87857, y: -13.535568, z: -240.22662} + - {x: 159.82822, y: -13.535568, z: -240.22662} + - {x: 159.82822, y: -13.535568, z: -23.694542} + - {x: -91.87857, y: -13.535568, z: -23.694542} + - {x: -91.87857, y: -13.535568, z: -240.22662} + - {x: -91.87857, y: 489.51746, z: -240.22662} + - {x: 159.82822, y: 489.51746, z: -240.22662} + - {x: 159.82822, y: -13.535568, z: -240.22662} + - {x: 159.82822, y: 489.51746, z: -240.22662} + - {x: 159.82822, y: 489.51746, z: -23.694542} + - {x: 159.82822, y: -13.535568, z: -23.694542} + - {x: 159.82822, y: 489.51746, z: -23.694542} + - {x: -91.87857, y: 489.51746, z: -23.694542} + - {x: -91.87857, y: -13.535568, z: -23.694542} + - {x: -91.87857, y: 489.51746, z: -23.694542} + - {x: -91.87857, y: 489.51746, z: -240.22662} m_Parameters: serializedVersion: 3 widthMultiplier: 1 @@ -11125,7 +11125,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1955078056} serializedVersion: 2 - m_LocalRotation: {x: 0.70043874, y: -0.026131282, z: 0.025700655, w: 0.7127708} + m_LocalRotation: {x: 0.7004391, y: -0.026122667, z: 0.02569219, w: 0.7127711} m_LocalPosition: {x: 18.102207, y: 11.040333, z: -0.5004903} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 diff --git a/Assets/6_Splat/vfx graph/Wow.vfx b/Assets/6_Splat/vfx graph/Wow.vfx index 27949e5..6b9fc85 100644 --- a/Assets/6_Splat/vfx graph/Wow.vfx +++ b/Assets/6_Splat/vfx graph/Wow.vfx @@ -19,8 +19,8 @@ MonoBehaviour: serializedVersion: 2 x: -1910 y: -283 - width: 3771 - height: 2420 + width: 3770 + height: 2421 --- !u!114 &114350483966674976 MonoBehaviour: m_ObjectHideFlags: 1 @@ -6390,9 +6390,7 @@ MonoBehaviour: - context: {fileID: 8926484042661615832} slotIndex: 0 m_OutputFlowSlot: - - link: - - context: {fileID: 8926484042661615792} - slotIndex: 0 + - link: [] integration: 0 angularIntegration: 0 ageParticles: 1 @@ -7132,11 +7130,9 @@ MonoBehaviour: - {fileID: 8926484042661615793} m_OutputSlots: [] m_Label: - m_Data: {fileID: 8926484042661615846} + m_Data: {fileID: 8926484042661616278} m_InputFlowSlot: - - link: - - context: {fileID: 8926484042661615769} - slotIndex: 0 + - link: [] m_OutputFlowSlot: - link: [] blendMode: 1 @@ -8847,7 +8843,6 @@ MonoBehaviour: m_Owners: - {fileID: 8926484042661615832} - {fileID: 8926484042661615769} - - {fileID: 8926484042661615792} dataType: 0 capacity: 10000 stripCapacity: 16 @@ -12072,3 +12067,31 @@ MonoBehaviour: m_Direction: 1 m_LinkedSlots: - {fileID: 8926484042661615956} +--- !u!114 &8926484042661616278 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d78581a96eae8bf4398c282eb0b098bd, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UIIgnoredErrors: [] + m_Parent: {fileID: 0} + m_Children: [] + m_UIPosition: {x: 0, y: 0} + m_UICollapsed: 1 + m_UISuperCollapsed: 0 + title: + m_Owners: + - {fileID: 8926484042661615792} + dataType: 0 + capacity: 128 + stripCapacity: 1 + particlePerStripCount: 128 + needsComputeBounds: 0 + boundsMode: 0 + m_Space: 0 diff --git a/Assets/8_Scripts/2_General/ActuationsSine.cs b/Assets/8_Scripts/2_General/ActuationsSine.cs index 7541a1c..b6ff41b 100644 --- a/Assets/8_Scripts/2_General/ActuationsSine.cs +++ b/Assets/8_Scripts/2_General/ActuationsSine.cs @@ -30,7 +30,7 @@ public class ActuationsSine : MonoBehaviour m_Camera.m_Lens.FieldOfView = mappedFOV; - float mappedVertex = Map(50f, 10f, -1, 1, sin); + float mappedVertex = Map(50f, 20f, -1, 1, sin); m_ActuationsMaterial.SetFloat("Vector1_B2CC132F", mappedVertex); } diff --git a/Assets/9_Models/Humanoid/SMPLX_Texture/smplx texture human actuations.mat b/Assets/9_Models/Humanoid/SMPLX_Texture/smplx texture human actuations.mat index 6077364..77c10fa 100644 --- a/Assets/9_Models/Humanoid/SMPLX_Texture/smplx texture human actuations.mat +++ b/Assets/9_Models/Humanoid/SMPLX_Texture/smplx texture human actuations.mat @@ -136,7 +136,7 @@ Material: m_Floats: - Boolean_43476D73: 1 - Boolean_D258FF8E: 0 - - Vector1_B2CC132F: 19.875519 + - Vector1_B2CC132F: 13.7111435 - _AORemapMax: 1 - _AORemapMin: 0 - _ATDistance: 1 diff --git a/Assets/9_Models/Objects/Materials/Ground Grey.mat b/Assets/9_Models/Objects/Materials/Ground Grey.mat index ace3bc5..c890bb1 100644 --- a/Assets/9_Models/Objects/Materials/Ground Grey.mat +++ b/Assets/9_Models/Objects/Materials/Ground Grey.mat @@ -255,7 +255,7 @@ Material: - _RefractionModel: 0 - _RenderQueueType: 1 - _RequireSplitLighting: 0 - - _Smooth: 0.5 + - _Smooth: 0 - _Smoothness: 0 - _SmoothnessRemapMax: 1 - _SmoothnessRemapMin: 0 diff --git a/Assets/ML-Agents/Timers/DreconDemo_timers.json b/Assets/ML-Agents/Timers/DreconDemo_timers.json index 6751081..318e800 100644 --- a/Assets/ML-Agents/Timers/DreconDemo_timers.json +++ b/Assets/ML-Agents/Timers/DreconDemo_timers.json @@ -1 +1 @@ -{"count":1,"self":257.307392,"total":269.3657014,"children":{"InitializeActuators":{"count":1,"self":0.0010061999999999998,"total":0.0010061999999999998,"children":null},"InitializeSensors":{"count":1,"self":0.0010004,"total":0.0010004,"children":null},"AgentSendState":{"count":15681,"self":0.1363008,"total":3.7899838999999997,"children":{"CollectObservations":{"count":7841,"self":3.5841048,"total":3.5841049,"children":null},"WriteActionMask":{"count":7841,"self":0.0195534,"total":0.0195534,"children":null},"RequestDecision":{"count":7841,"self":0.050024799999999994,"total":0.050024799999999994,"children":null}}},"DecideAction":{"count":15681,"self":4.9619604,"total":4.9619605,"children":null},"AgentAct":{"count":15681,"self":3.303861,"total":3.303861,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1715091790","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 93a68a07-80c3-45f4-9064-a08c685fba09 -accessToken EOhCjdSX5p6195YgTtACX8tQfMnVVnUoav-8Uk-6v30005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"DreconDemo","end_time_seconds":"1715092059"}} \ No newline at end of file +{"count":1,"self":383.3984512,"total":400.0722356,"children":{"InitializeActuators":{"count":1,"self":0.0005072,"total":0.0005072,"children":null},"InitializeSensors":{"count":1,"self":0.0015230999999999999,"total":0.0015230999999999999,"children":null},"AgentSendState":{"count":23267,"self":0.4940269,"total":5.6692053,"children":{"CollectObservations":{"count":11634,"self":5.0868788,"total":5.0868788,"children":null},"WriteActionMask":{"count":11634,"self":0.0229597,"total":0.0229597,"children":null},"RequestDecision":{"count":11634,"self":0.065339899999999992,"total":0.065339899999999992,"children":null}}},"DecideAction":{"count":23267,"self":6.4704647999999994,"total":6.470465,"children":null},"AgentAct":{"count":23267,"self":4.5320864,"total":4.5320865999999995,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1715092668","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 93a68a07-80c3-45f4-9064-a08c685fba09 -accessToken EOhCjdSX5p6195YgTtACX8tQfMnVVnUoav-8Uk-6v30005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"DreconDemo","end_time_seconds":"1715093068"}} \ No newline at end of file