From e7e63927d4a1e845244b8a0d9e28547adf29d689 Mon Sep 17 00:00:00 2001 From: Cailean Finn Date: Wed, 1 May 2024 15:26:24 +0100 Subject: [PATCH] background color added --- Assets/5_Scenes/DreconDemo.unity | 26 ++++++++++--------- Assets/8_Scripts/1_Managers/CameraManager.cs | 8 ++++++ .../SMPLX_Texture/smplx texture human.mat | 2 +- .../ML-Agents/Timers/DreconDemo_timers.json | 2 +- 4 files changed, 24 insertions(+), 14 deletions(-) diff --git a/Assets/5_Scenes/DreconDemo.unity b/Assets/5_Scenes/DreconDemo.unity index 63383c7..c761b5e 100644 --- a/Assets/5_Scenes/DreconDemo.unity +++ b/Assets/5_Scenes/DreconDemo.unity @@ -609,7 +609,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 @@ -961,7 +961,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 320225263} serializedVersion: 2 - m_LocalRotation: {x: 0.38916692, y: 0.5932075, z: -0.5829433, w: 0.3960191} + m_LocalRotation: {x: 0.3891643, y: 0.5932092, z: -0.58294517, w: 0.39601645} m_LocalPosition: {x: 17.78, y: 21.78, z: 3.06} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -1057,7 +1057,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 326736459} serializedVersion: 2 - m_LocalRotation: {x: -0.073961094, y: 0.9066138, z: 0.17882526, w: 0.3749702} + m_LocalRotation: {x: -0.07396109, y: 0.9066138, z: 0.17882524, w: 0.37497023} m_LocalPosition: {x: 17.7008, y: 8.655965, z: -0.081218004} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -1258,11 +1258,11 @@ Camera: y: 0 width: 1 height: 1 - near clip plane: 0.01 + near clip plane: 0.1 far clip plane: 5000 - field of view: 31.1 - orthographic: 0 - orthographic size: 0.53 + field of view: 40 + orthographic: 1 + orthographic size: -0.34 m_Depth: -1 m_CullingMask: serializedVersion: 2 @@ -1286,8 +1286,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 330585543} serializedVersion: 2 - m_LocalRotation: {x: -0.254152, y: 0.69070727, z: -0.6135771, w: -0.28610036} - m_LocalPosition: {x: 22.891924, y: 9.244215, z: 4.6990404} + m_LocalRotation: {x: 0.3891643, y: 0.5932092, z: -0.58294517, w: 0.39601645} + m_LocalPosition: {x: 17.78, y: 21.78, z: 3.06} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -1340,7 +1340,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: clearColorMode: 1 - backgroundColorHDR: {r: 1, g: 0, b: 0, a: 0} + backgroundColorHDR: {r: 0, g: 0, b: 1, a: 1} clearDepth: 1 volumeLayerMask: serializedVersion: 2 @@ -3464,7 +3464,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 882491594} serializedVersion: 2 - m_LocalRotation: {x: 0.49182287, y: 0.0021121176, z: -0.0011930601, w: 0.8706919} + m_LocalRotation: {x: 0.49182287, y: 0.0021121476, z: -0.0011930771, w: 0.8706919} m_LocalPosition: {x: 18.100853, y: 10.155965, z: -0.48116565} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -6352,7 +6352,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1955078056} serializedVersion: 2 - m_LocalRotation: {x: 0.7004388, y: -0.026130881, z: 0.025700254, w: 0.7127709} + m_LocalRotation: {x: 0.7004385, y: -0.026140159, z: 0.025709378, w: 0.71277046} m_LocalPosition: {x: 18.102207, y: 11.040333, z: -0.5004903} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -6438,6 +6438,8 @@ MonoBehaviour: m_CameraSwapMin: 5 m_CameraSwapMax: 10 m_CameraController: 1 + m_HumanoidMaterial: {fileID: 2100000, guid: 597337d36e2278c4db0ba474300e988f, type: 2} + m_BackgroundColor: {r: 0, g: 0, b: 0, a: 0} --- !u!1 &2031268866 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/8_Scripts/1_Managers/CameraManager.cs b/Assets/8_Scripts/1_Managers/CameraManager.cs index a9cc80f..3174644 100644 --- a/Assets/8_Scripts/1_Managers/CameraManager.cs +++ b/Assets/8_Scripts/1_Managers/CameraManager.cs @@ -45,6 +45,10 @@ public class CameraManager : MonoBehaviour public bool m_CameraController; private int m_CameraIndex = 0; + [Header("Shader")] + public Material m_HumanoidMaterial; + public Color m_BackgroundColor; + private void Awake() { if(_instance != null) @@ -241,6 +245,10 @@ public class CameraManager : MonoBehaviour try { m_Brain = GameObject.Find("CM Brain"); + // Set dissapear color same as sky color + m_Brain.GetComponent().backgroundColor = m_BackgroundColor; + Debug.Log(m_BackgroundColor); + m_HumanoidMaterial.SetColor("_DissapearColor", m_BackgroundColor); } catch { 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 f86ea56..7db2d5e 100644 --- a/Assets/9_Models/Humanoid/SMPLX_Texture/smplx texture human.mat +++ b/Assets/9_Models/Humanoid/SMPLX_Texture/smplx texture human.mat @@ -260,7 +260,7 @@ Material: - _BaseColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0} - _Color: {r: 1, g: 1, b: 1, a: 1} - _DiffusionProfileAsset: {r: 0, g: 0, b: 0, a: 0} - - _DissapearColor: {r: 1, g: 0, b: 0, a: 0} + - _DissapearColor: {r: 0, g: 0, b: 1, a: 0} - _DoubleSidedConstants: {r: 1, g: 1, b: -1, a: 0} - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/Assets/ML-Agents/Timers/DreconDemo_timers.json b/Assets/ML-Agents/Timers/DreconDemo_timers.json index f2d9028..3b3c0ff 100644 --- a/Assets/ML-Agents/Timers/DreconDemo_timers.json +++ b/Assets/ML-Agents/Timers/DreconDemo_timers.json @@ -1 +1 @@ -{"count":1,"self":42.5045504,"total":43.736457699999995,"children":{"InitializeActuators":{"count":1,"self":0.0010061999999999998,"total":0.0010061999999999998,"children":null},"InitializeSensors":{"count":1,"self":0.0020107,"total":0.0020107,"children":null},"AgentSendState":{"count":2225,"self":0.014499399999999999,"total":0.2675146,"children":{"CollectObservations":{"count":1113,"self":0.24629659999999998,"total":0.24629659999999998,"children":null},"WriteActionMask":{"count":1113,"self":0,"total":0,"children":null},"RequestDecision":{"count":1113,"self":0.0067186,"total":0.0067186,"children":null}}},"DecideAction":{"count":2225,"self":0.6279739,"total":0.6279739,"children":null},"AgentAct":{"count":2225,"self":0.3334003,"total":0.3334003,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1714572461","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 0be5c510-ebd5-47f5-9010-cd09a6e700dc -accessToken 7fsngBwFvv1hN99q_SqTtiFuqujVT4oOqRZLlJCg1lw005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"DreconDemo","end_time_seconds":"1714572505"}} \ No newline at end of file +{"count":1,"self":24.587398399999998,"total":25.3596012,"children":{"InitializeActuators":{"count":1,"self":0.0015061,"total":0.0015061,"children":null},"InitializeSensors":{"count":1,"self":0.0019998999999999998,"total":0.0019998999999999998,"children":null},"AgentSendState":{"count":1107,"self":0.010487999999999999,"total":0.1712752,"children":{"CollectObservations":{"count":554,"self":0.1537112,"total":0.1537112,"children":null},"WriteActionMask":{"count":554,"self":0,"total":0,"children":null},"RequestDecision":{"count":554,"self":0.007076,"total":0.007076,"children":null}}},"DecideAction":{"count":1107,"self":0.4541248,"total":0.4541248,"children":null},"AgentAct":{"count":1107,"self":0.14229719999999998,"total":0.14229719999999998,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1714573495","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 0be5c510-ebd5-47f5-9010-cd09a6e700dc -accessToken 7fsngBwFvv1hN99q_SqTtiFuqujVT4oOqRZLlJCg1lw005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"DreconDemo","end_time_seconds":"1714573521"}} \ No newline at end of file