From 8f3d1e7af8334ae20bf83512e9c12c54c952050e Mon Sep 17 00:00:00 2001 From: Lena Date: Mon, 25 Apr 2022 19:44:31 +0200 Subject: [PATCH 01/14] - added glitch strength depending on movement - added sending glitch strength to OSC --- .../Materials/M_DesertRingPlaneGlitch_0.mat | 8 +-- .../DesertScene/Prefabs/DesertRing.prefab | 2 +- .../DesertScene/Scripts/GlitchManager.cs | 61 +++++++++++++++++++ .../General/Scripts/BootstrapInstaller.cs | 2 + 4 files changed, 68 insertions(+), 5 deletions(-) create mode 100644 Assets/NeueRaeume/VirtualChoir/DesertScene/Scripts/GlitchManager.cs diff --git a/Assets/NeueRaeume/VirtualChoir/DesertScene/Materials/M_DesertRingPlaneGlitch_0.mat b/Assets/NeueRaeume/VirtualChoir/DesertScene/Materials/M_DesertRingPlaneGlitch_0.mat index 01f4069..8a6486d 100644 --- a/Assets/NeueRaeume/VirtualChoir/DesertScene/Materials/M_DesertRingPlaneGlitch_0.mat +++ b/Assets/NeueRaeume/VirtualChoir/DesertScene/Materials/M_DesertRingPlaneGlitch_0.mat @@ -56,17 +56,17 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Floats: - - _AdditionalNoiseA: 0.377 - - _AdditionalNoiseB: 1 + - _AdditionalNoiseA: 0 + - _AdditionalNoiseB: 0 - _BumpScale: 1 - - _Clip: 0.739 + - _Clip: 0.61 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossyReflections: 1 - - _GridSize: 300 + - _GridSize: 158 - _Metallic: 0 - _Mode: 0 - _OcclusionStrength: 1 diff --git a/Assets/NeueRaeume/VirtualChoir/DesertScene/Prefabs/DesertRing.prefab b/Assets/NeueRaeume/VirtualChoir/DesertScene/Prefabs/DesertRing.prefab index ffe77c1..ca86c47 100644 --- a/Assets/NeueRaeume/VirtualChoir/DesertScene/Prefabs/DesertRing.prefab +++ b/Assets/NeueRaeume/VirtualChoir/DesertScene/Prefabs/DesertRing.prefab @@ -14,7 +14,7 @@ GameObject: - component: {fileID: 8468264294038436545} m_Layer: 0 m_Name: DesertRing - m_TagString: Untagged + m_TagString: desertRing m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 diff --git a/Assets/NeueRaeume/VirtualChoir/DesertScene/Scripts/GlitchManager.cs b/Assets/NeueRaeume/VirtualChoir/DesertScene/Scripts/GlitchManager.cs new file mode 100644 index 0000000..87e70a8 --- /dev/null +++ b/Assets/NeueRaeume/VirtualChoir/DesertScene/Scripts/GlitchManager.cs @@ -0,0 +1,61 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using Windows.Kinect; +using Joint = Windows.Kinect.Joint; +using Zenject; +using NeueRaeume.VirtualChoir.General; + +namespace NeueRaeume.VirtualChoir.General +{ + public class GlitchManager : ITickable, IInitializable + { + + private IKinectSkeleton kinectSkeleton; + private ISonicPiMessageDispatcher oscDispatcher; + public GameObject[] rings; + private List cachedList = new List(1); + + + public GlitchManager(IKinectSkeleton kinectSkeleton, ISonicPiMessageDispatcher oscDispatcher) + { + //get Player Movement + //set Shader Variable + // Set Ring Movement + // send to SonicPi with OSC + this.kinectSkeleton = kinectSkeleton; + this.oscDispatcher = oscDispatcher; + // Debug.Log("Init glitch Manager"); + + } + // Start is called before the first frame update + public void Initialize() + { + rings = GameObject.FindGameObjectsWithTag("desertRing"); + } + + + public void Tick() + { + float leftPos = kinectSkeleton.PlayerSkeleton.JointPositions[JointType.HandLeft].Relative[0]; + float rightPos = kinectSkeleton.PlayerSkeleton.JointPositions[JointType.HandRight].Relative[0]; + + + float shaderInput = -leftPos - rightPos; + // Debug.Log($"Right Hand: {kinectSkeleton.PlayerSkeleton.JointPositions[JointType.HandRight].Relative} , Left Hand: {kinectSkeleton.PlayerSkeleton.JointPositions[JointType.HandLeft].Relative}, Shader Input: {shaderInput}"); + foreach (GameObject ring in rings) + { + ring.GetComponent().sharedMaterial.SetFloat("_RandomStrength", shaderInput); + } + float oscInput = ((shaderInput - -1) / (1 - -1)) * (1 - 0) + 0; + Debug.Log($"Shader: {shaderInput}, OSC: {oscInput}"); + cachedList.Clear(); + cachedList.Add(oscInput); + oscDispatcher.SendOscMessage("/desertglitch", cachedList); + + } + + + } +} \ No newline at end of file diff --git a/Assets/NeueRaeume/VirtualChoir/General/Scripts/BootstrapInstaller.cs b/Assets/NeueRaeume/VirtualChoir/General/Scripts/BootstrapInstaller.cs index 03286a3..2428604 100644 --- a/Assets/NeueRaeume/VirtualChoir/General/Scripts/BootstrapInstaller.cs +++ b/Assets/NeueRaeume/VirtualChoir/General/Scripts/BootstrapInstaller.cs @@ -29,6 +29,8 @@ public class BootstrapInstaller : MonoInstaller Container.BindInterfacesAndSelfTo().AsSingle().NonLazy(); Container.BindInterfacesTo().AsSingle().NonLazy(); + Container.BindInterfacesAndSelfTo().AsSingle().NonLazy(); + // --ORDER-- Container.BindInitializableExecutionOrder(-20); Container.BindInitializableExecutionOrder(-10); -- GitLab From a637ad07104766ca3c3dd7f971d8084f065f358b Mon Sep 17 00:00:00 2001 From: Lena Date: Tue, 26 Apr 2022 16:52:07 +0200 Subject: [PATCH 02/14] Changed Shader to glitch in both directions --- .../VirtualChoir/DesertScene/Shaders/PixelSorting.shader | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Assets/NeueRaeume/VirtualChoir/DesertScene/Shaders/PixelSorting.shader b/Assets/NeueRaeume/VirtualChoir/DesertScene/Shaders/PixelSorting.shader index 07ba37b..fe8f0a8 100644 --- a/Assets/NeueRaeume/VirtualChoir/DesertScene/Shaders/PixelSorting.shader +++ b/Assets/NeueRaeume/VirtualChoir/DesertScene/Shaders/PixelSorting.shader @@ -6,7 +6,7 @@ _Tint ("Tint", Color) = (0,0,0,0) _GridSize ("Grid Size", Range(10, 1000)) = 500 _Shift ("Shift", float) = 0.01 - _RandomStrength ("Random Strength", Range(0.001, 1)) = 0.01 + _RandomStrength ("Random Strength", Range(-1, 1)) = 0.01 _Clip ("Clip", Range(0.0, 1.0)) = 1.0 _AdditionalNoiseA ("Additional noise A", Range(0.0, 1.0)) = 1.0 _AdditionalNoiseB ("Additional noise B", Range(0.0, 1.0)) = 1.0 @@ -77,8 +77,10 @@ step_y += _AdditionalNoiseA * (rand(i.uv.x*i.uv.y*_Time.y)*0.025*sin(_Time.y)); // shake offset and modulate it // step_y = _AdditionalNoiseB * (lerp(step_y, step_y*rand(i.uv.x*_Time.x)*0.5, sin(_Time.x))); // more noisy spikes - i.uv.x-=step_y; - + if(_RandomStrength < 0) + i.uv.x-=step_y; + else + i.uv.x += step_y; // uncomment if you want to shift in both ways /*fixed4 col = tex2D(_MainTex, i.uv); if (dot(col, fixed4(0.299, 0.587, 0.114, 0.)) > 1.2*(_SinTime.w*0.325+0.50)){ -- GitLab From bc53497b28ad96a1499b1e7bde3de6561aededff Mon Sep 17 00:00:00 2001 From: meralium Date: Sun, 1 May 2022 12:42:54 +0200 Subject: [PATCH 03/14] - missing meta file --- .../DesertScene/Scripts/GlitchManager.cs.meta | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 Assets/NeueRaeume/VirtualChoir/DesertScene/Scripts/GlitchManager.cs.meta diff --git a/Assets/NeueRaeume/VirtualChoir/DesertScene/Scripts/GlitchManager.cs.meta b/Assets/NeueRaeume/VirtualChoir/DesertScene/Scripts/GlitchManager.cs.meta new file mode 100644 index 0000000..ae479aa --- /dev/null +++ b/Assets/NeueRaeume/VirtualChoir/DesertScene/Scripts/GlitchManager.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: fa58700d96012cc4d92d829c191f2861 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: -- GitLab From 6fe0fd30fd1a8661afadaee0468e3d3edef2f737 Mon Sep 17 00:00:00 2001 From: meralium Date: Sun, 1 May 2022 12:50:58 +0200 Subject: [PATCH 04/14] - refactored to not modify the shared material but use property block - minor refactoring --- .../DesertScene/Scripts/GlitchManager.cs | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/Assets/NeueRaeume/VirtualChoir/DesertScene/Scripts/GlitchManager.cs b/Assets/NeueRaeume/VirtualChoir/DesertScene/Scripts/GlitchManager.cs index 87e70a8..f3a49f3 100644 --- a/Assets/NeueRaeume/VirtualChoir/DesertScene/Scripts/GlitchManager.cs +++ b/Assets/NeueRaeume/VirtualChoir/DesertScene/Scripts/GlitchManager.cs @@ -3,6 +3,7 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; using Windows.Kinect; +using NeueRaeume.VirtualChoir.ConfigData; using Joint = Windows.Kinect.Joint; using Zenject; using NeueRaeume.VirtualChoir.General; @@ -11,12 +12,15 @@ namespace NeueRaeume.VirtualChoir.General { public class GlitchManager : ITickable, IInitializable { + private static readonly int _RandomStrength = Shader.PropertyToID("_RandomStrength"); private IKinectSkeleton kinectSkeleton; private ISonicPiMessageDispatcher oscDispatcher; - public GameObject[] rings; private List cachedList = new List(1); + private MaterialPropertyBlock propertyBlock = new MaterialPropertyBlock(); + private List ringRenderers = new List(); + public GameObject[] rings; public GlitchManager(IKinectSkeleton kinectSkeleton, ISonicPiMessageDispatcher oscDispatcher) { @@ -29,10 +33,14 @@ namespace NeueRaeume.VirtualChoir.General // Debug.Log("Init glitch Manager"); } - // Start is called before the first frame update + public void Initialize() { - rings = GameObject.FindGameObjectsWithTag("desertRing"); + rings = GameObject.FindGameObjectsWithTag(UnityTags.DESERTRING_TAG); + foreach (GameObject ring in rings) + { + ringRenderers.Add(ring.GetComponent()); + } } @@ -43,11 +51,13 @@ namespace NeueRaeume.VirtualChoir.General float shaderInput = -leftPos - rightPos; + propertyBlock.SetFloat(_RandomStrength, shaderInput); // Debug.Log($"Right Hand: {kinectSkeleton.PlayerSkeleton.JointPositions[JointType.HandRight].Relative} , Left Hand: {kinectSkeleton.PlayerSkeleton.JointPositions[JointType.HandLeft].Relative}, Shader Input: {shaderInput}"); - foreach (GameObject ring in rings) + foreach (MeshRenderer ringRenderer in ringRenderers) { - ring.GetComponent().sharedMaterial.SetFloat("_RandomStrength", shaderInput); + ringRenderer.SetPropertyBlock(propertyBlock); } + float oscInput = ((shaderInput - -1) / (1 - -1)) * (1 - 0) + 0; Debug.Log($"Shader: {shaderInput}, OSC: {oscInput}"); cachedList.Clear(); -- GitLab From 5987aa43a2d1f8950ddb4d0d791e4fc6d7306b7a Mon Sep 17 00:00:00 2001 From: meralium Date: Sun, 1 May 2022 13:08:29 +0200 Subject: [PATCH 05/14] - cleaned up usage of desert ring prefab in the scene (not using the automated prefab for a model anymore) --- .../DesertScene/Prefabs/P_Wueste.prefab | 953 +++++++----------- Assets/Scenes/SubScenes/02_Wueste.unity | 65 -- 2 files changed, 354 insertions(+), 664 deletions(-) diff --git a/Assets/NeueRaeume/VirtualChoir/DesertScene/Prefabs/P_Wueste.prefab b/Assets/NeueRaeume/VirtualChoir/DesertScene/Prefabs/P_Wueste.prefab index e50003b..6c1f9b7 100644 --- a/Assets/NeueRaeume/VirtualChoir/DesertScene/Prefabs/P_Wueste.prefab +++ b/Assets/NeueRaeume/VirtualChoir/DesertScene/Prefabs/P_Wueste.prefab @@ -4982,19 +4982,6 @@ MeshCollider: m_Convex: 1 m_CookingOptions: 30 m_Mesh: {fileID: 4156628262991852684, guid: 64de194c3336ce94e94f803e2e176981, type: 3} ---- !u!114 &2020616365194435154 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 761883722517896288} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e429e06aa0d028f4d862a4fea4ff07dc, type: 3} - m_Name: - m_EditorClassIdentifier: - rotationsPerMinute: 0.5 --- !u!1 &780190361595948787 GameObject: m_ObjectHideFlags: 0 @@ -10635,19 +10622,6 @@ MeshCollider: m_Convex: 1 m_CookingOptions: 30 m_Mesh: {fileID: -4384231129897880489, guid: 64de194c3336ce94e94f803e2e176981, type: 3} ---- !u!114 &6716918943289624477 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1579889464504803868} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e429e06aa0d028f4d862a4fea4ff07dc, type: 3} - m_Name: - m_EditorClassIdentifier: - rotationsPerMinute: 0.01 --- !u!1 &1581039773588445041 GameObject: m_ObjectHideFlags: 0 @@ -12904,19 +12878,6 @@ MeshCollider: m_Convex: 1 m_CookingOptions: 30 m_Mesh: {fileID: -4739357522097340182, guid: 64de194c3336ce94e94f803e2e176981, type: 3} ---- !u!114 &3990446939053003797 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1917235547069734242} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e429e06aa0d028f4d862a4fea4ff07dc, type: 3} - m_Name: - m_EditorClassIdentifier: - rotationsPerMinute: 0.5 --- !u!1 &1919325408991381214 GameObject: m_ObjectHideFlags: 0 @@ -19591,19 +19552,6 @@ MeshCollider: m_Convex: 1 m_CookingOptions: 30 m_Mesh: {fileID: -19818185944664175, guid: 64de194c3336ce94e94f803e2e176981, type: 3} ---- !u!114 &426698621701671473 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2683305112505475824} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e429e06aa0d028f4d862a4fea4ff07dc, type: 3} - m_Name: - m_EditorClassIdentifier: - rotationsPerMinute: 0.15 --- !u!1 &2690652664542138444 GameObject: m_ObjectHideFlags: 0 @@ -21607,16 +21555,16 @@ Transform: m_Children: - {fileID: 6955552781140265555} - {fileID: 3485025584599237523} - - {fileID: 6353478390686926827} - - {fileID: 133157013254604506} - - {fileID: 5350457343669799043} - - {fileID: 8856187424877548325} - - {fileID: 7572873047465278185} - - {fileID: 7428668126808774004} - - {fileID: 1283722976686475224} - - {fileID: 2208793191447050406} - - {fileID: 3895279155191732595} - - {fileID: 3348095803411445834} + - {fileID: 7018008053975177500} + - {fileID: 3466710950561934244} + - {fileID: 363998358389400726} + - {fileID: 858978334272503654} + - {fileID: 3015472890489637094} + - {fileID: 650696312950890277} + - {fileID: 9211833861711020215} + - {fileID: 8240902546564398997} + - {fileID: 21720741703735729} + - {fileID: 963095597742228916} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -32430,19 +32378,6 @@ MeshCollider: m_Convex: 1 m_CookingOptions: 30 m_Mesh: {fileID: 7974206269821272834, guid: 64de194c3336ce94e94f803e2e176981, type: 3} ---- !u!114 &7961399495927879526 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4414969560313070537} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e429e06aa0d028f4d862a4fea4ff07dc, type: 3} - m_Name: - m_EditorClassIdentifier: - rotationsPerMinute: 0.2 --- !u!1 &4420564359097014615 GameObject: m_ObjectHideFlags: 0 @@ -34699,19 +34634,6 @@ MeshCollider: m_Convex: 1 m_CookingOptions: 30 m_Mesh: {fileID: -4376361255093150698, guid: 64de194c3336ce94e94f803e2e176981, type: 3} ---- !u!114 &5034170183188985786 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4686967619765523001} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e429e06aa0d028f4d862a4fea4ff07dc, type: 3} - m_Name: - m_EditorClassIdentifier: - rotationsPerMinute: -0.15 --- !u!1 &4693638930670609987 GameObject: m_ObjectHideFlags: 0 @@ -44607,19 +44529,6 @@ MeshCollider: m_Convex: 1 m_CookingOptions: 30 m_Mesh: {fileID: -514806616783310777, guid: 64de194c3336ce94e94f803e2e176981, type: 3} ---- !u!114 &8761116867928792163 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6009990222030544209} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e429e06aa0d028f4d862a4fea4ff07dc, type: 3} - m_Name: - m_EditorClassIdentifier: - rotationsPerMinute: 0.1 --- !u!1 &6011507277418907336 GameObject: m_ObjectHideFlags: 0 @@ -51732,19 +51641,6 @@ MeshCollider: m_Convex: 1 m_CookingOptions: 30 m_Mesh: {fileID: 869135786393565223, guid: 64de194c3336ce94e94f803e2e176981, type: 3} ---- !u!114 &7536581254138030146 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7085269720193851475} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e429e06aa0d028f4d862a4fea4ff07dc, type: 3} - m_Name: - m_EditorClassIdentifier: - rotationsPerMinute: 0.15 --- !u!1 &7092781580744865026 GameObject: m_ObjectHideFlags: 0 @@ -58231,19 +58127,6 @@ MeshCollider: m_Convex: 1 m_CookingOptions: 30 m_Mesh: {fileID: -3345258730188349840, guid: 64de194c3336ce94e94f803e2e176981, type: 3} ---- !u!114 &7673945644037949225 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7808184994035421134} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e429e06aa0d028f4d862a4fea4ff07dc, type: 3} - m_Name: - m_EditorClassIdentifier: - rotationsPerMinute: 0.1 --- !u!1 &7841601598033953564 GameObject: m_ObjectHideFlags: 0 @@ -60876,19 +60759,6 @@ MeshCollider: m_Convex: 1 m_CookingOptions: 30 m_Mesh: {fileID: 1414880279149968178, guid: 64de194c3336ce94e94f803e2e176981, type: 3} ---- !u!114 &7115589498729718207 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8191114404027943327} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e429e06aa0d028f4d862a4fea4ff07dc, type: 3} - m_Name: - m_EditorClassIdentifier: - rotationsPerMinute: -0.2 --- !u!1 &8213481616180941298 GameObject: m_ObjectHideFlags: 0 @@ -69161,1063 +69031,948 @@ MeshCollider: m_Convex: 1 m_CookingOptions: 30 m_Mesh: {fileID: 4324147749882297074, guid: 64de194c3336ce94e94f803e2e176981, type: 3} ---- !u!1001 &455893686192562481 +--- !u!1001 &721110879994583062 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 5585162202189421855} m_Modifications: - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 6661590263475643900, guid: f338d0b50de06b240beff881bd243fb1, + type: 3} + propertyPath: m_Name + value: DesertRing + objectReference: {fileID: 0} + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_RootOrder - value: 3 + value: 2 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalScale.x value: 200 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalScale.y value: 200 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalScale.z value: 200 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalPosition.x - value: 9.383436e-12 + value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalPosition.y value: 64 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalPosition.z - value: -1.9758885e-11 + value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalRotation.w - value: 0.5609856 + value: 0.7071068 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalRotation.x - value: -0.5609856 + value: -0.7071068 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalRotation.y - value: -0.4304593 + value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalRotation.z - value: -0.4304592 + value: -0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: -90.00001 + value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: -75 - objectReference: {fileID: 0} - - target: {fileID: -7511558181221131132, guid: 65e9fdf7b4253354b88d8ea20fe158d2, - type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: b72feefd3d2faf54b877f6219cd9e1ac, type: 2} - - target: {fileID: 919132149155446097, guid: 65e9fdf7b4253354b88d8ea20fe158d2, - type: 3} - propertyPath: m_Name - value: DesertRingPlane (1) - objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: 65e9fdf7b4253354b88d8ea20fe158d2, - type: 3} - propertyPath: m_TagString - value: desertRing + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 65e9fdf7b4253354b88d8ea20fe158d2, type: 3} ---- !u!1 &761883722517896288 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 65e9fdf7b4253354b88d8ea20fe158d2, - type: 3} - m_PrefabInstance: {fileID: 455893686192562481} - m_PrefabAsset: {fileID: 0} ---- !u!4 &133157013254604506 stripped + m_SourcePrefab: {fileID: 100100000, guid: f338d0b50de06b240beff881bd243fb1, type: 3} +--- !u!4 &7018008053975177500 stripped Transform: - m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + m_CorrespondingSourceObject: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} - m_PrefabInstance: {fileID: 455893686192562481} + m_PrefabInstance: {fileID: 721110879994583062} m_PrefabAsset: {fileID: 0} ---- !u!1001 &1610611102064500787 +--- !u!1001 &1491287091794477501 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 5585162202189421855} m_Modifications: - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 6661590263475643900, guid: f338d0b50de06b240beff881bd243fb1, + type: 3} + propertyPath: m_Name + value: DesertRing (6) + objectReference: {fileID: 0} + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_RootOrder value: 8 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalScale.x value: 200 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalScale.y value: 200 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalScale.z value: 200 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalPosition.x value: 9.383436e-12 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalPosition.y value: 94 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalPosition.z value: -1.9758885e-11 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalRotation.w value: -0.43045866 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalRotation.x value: 0.43045843 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalRotation.y value: -0.56098616 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalRotation.z value: -0.56098616 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: -90.00001 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: -255 objectReference: {fileID: 0} - - target: {fileID: -7511558181221131132, guid: 65e9fdf7b4253354b88d8ea20fe158d2, - type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: b72feefd3d2faf54b877f6219cd9e1ac, type: 2} - - target: {fileID: 919132149155446097, guid: 65e9fdf7b4253354b88d8ea20fe158d2, - type: 3} - propertyPath: m_Name - value: DesertRingPlane (6) - objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 8468264294038436545, guid: f338d0b50de06b240beff881bd243fb1, type: 3} - propertyPath: m_TagString - value: desertRing + propertyPath: rotationsPerMinute + value: 0.5 objectReference: {fileID: 0} m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 65e9fdf7b4253354b88d8ea20fe158d2, type: 3} ---- !u!1 &1917235547069734242 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 65e9fdf7b4253354b88d8ea20fe158d2, - type: 3} - m_PrefabInstance: {fileID: 1610611102064500787} - m_PrefabAsset: {fileID: 0} ---- !u!4 &1283722976686475224 stripped + m_SourcePrefab: {fileID: 100100000, guid: f338d0b50de06b240beff881bd243fb1, type: 3} +--- !u!4 &9211833861711020215 stripped Transform: - m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + m_CorrespondingSourceObject: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} - m_PrefabInstance: {fileID: 1610611102064500787} + m_PrefabInstance: {fileID: 1491287091794477501} m_PrefabAsset: {fileID: 0} ---- !u!1001 &1814261019954765645 +--- !u!1001 &1817359224560123551 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 5585162202189421855} m_Modifications: - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 6661590263475643900, guid: f338d0b50de06b240beff881bd243fb1, + type: 3} + propertyPath: m_Name + value: DesertRing (7) + objectReference: {fileID: 0} + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_RootOrder value: 9 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalScale.x value: 200 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalScale.y value: 200 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalScale.z value: 200 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalPosition.x value: -0.000006605059 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalPosition.y value: 26 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalPosition.z value: -0.000013908402 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalRotation.w value: 0.43046007 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalRotation.x value: -0.43045992 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalRotation.y value: -0.56098515 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalRotation.z value: -0.560985 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: -90.00001 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: -105.00001 objectReference: {fileID: 0} - - target: {fileID: -7511558181221131132, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 8468264294038436545, guid: f338d0b50de06b240beff881bd243fb1, type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: 475ff57fca53461469ad20c29a5f06ba, type: 2} - - target: {fileID: 919132149155446097, guid: 65e9fdf7b4253354b88d8ea20fe158d2, - type: 3} - propertyPath: m_Name - value: DesertRingPlane (7) - objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: 65e9fdf7b4253354b88d8ea20fe158d2, - type: 3} - propertyPath: m_TagString - value: desertRing + propertyPath: rotationsPerMinute + value: 0.01 objectReference: {fileID: 0} m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 65e9fdf7b4253354b88d8ea20fe158d2, type: 3} ---- !u!1 &1579889464504803868 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 65e9fdf7b4253354b88d8ea20fe158d2, - type: 3} - m_PrefabInstance: {fileID: 1814261019954765645} - m_PrefabAsset: {fileID: 0} ---- !u!4 &2208793191447050406 stripped + m_SourcePrefab: {fileID: 100100000, guid: f338d0b50de06b240beff881bd243fb1, type: 3} +--- !u!4 &8240902546564398997 stripped Transform: - m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + m_CorrespondingSourceObject: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} - m_PrefabInstance: {fileID: 1814261019954765645} + m_PrefabInstance: {fileID: 1817359224560123551} m_PrefabAsset: {fileID: 0} ---- !u!1001 &3025409707757920161 +--- !u!1001 &4808722059277289964 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 5585162202189421855} m_Modifications: - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 6661590263475643900, guid: f338d0b50de06b240beff881bd243fb1, + type: 3} + propertyPath: m_Name + value: DesertRing (4) + objectReference: {fileID: 0} + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_RootOrder - value: 11 + value: 6 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalScale.x value: 198 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalScale.y value: 198 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalScale.z value: 198 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalPosition.x value: 0.000011724972 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalPosition.y - value: -119 + value: -149 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalPosition.z value: -0.000009979694 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalRotation.w - value: 0.707107 + value: 0.00000043213362 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalRotation.x - value: -0.70710665 + value: -0.00000033457482 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalRotation.y - value: 0.000000461936 + value: 0.7071068 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalRotation.z - value: 0.00000051409006 + value: 0.70710677 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: -90.00001 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -7511558181221131132, guid: 65e9fdf7b4253354b88d8ea20fe158d2, - type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: 475ff57fca53461469ad20c29a5f06ba, type: 2} - - target: {fileID: 919132149155446097, guid: 65e9fdf7b4253354b88d8ea20fe158d2, - type: 3} - propertyPath: m_Name - value: DesertRingPlane (9) + value: 180.00002 objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 8468264294038436545, guid: f338d0b50de06b240beff881bd243fb1, type: 3} - propertyPath: m_TagString - value: desertRing + propertyPath: rotationsPerMinute + value: 0.15 objectReference: {fileID: 0} m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 65e9fdf7b4253354b88d8ea20fe158d2, type: 3} ---- !u!1 &2683305112505475824 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 65e9fdf7b4253354b88d8ea20fe158d2, - type: 3} - m_PrefabInstance: {fileID: 3025409707757920161} - m_PrefabAsset: {fileID: 0} ---- !u!4 &3348095803411445834 stripped + m_SourcePrefab: {fileID: 100100000, guid: f338d0b50de06b240beff881bd243fb1, type: 3} +--- !u!4 &3015472890489637094 stripped Transform: - m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + m_CorrespondingSourceObject: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} - m_PrefabInstance: {fileID: 3025409707757920161} + m_PrefabInstance: {fileID: 4808722059277289964} m_PrefabAsset: {fileID: 0} ---- !u!1001 &3568107361397816984 +--- !u!1001 &6591339798416927406 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 5585162202189421855} m_Modifications: - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 6661590263475643900, guid: f338d0b50de06b240beff881bd243fb1, + type: 3} + propertyPath: m_Name + value: DesertRing (1) + objectReference: {fileID: 0} + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_RootOrder - value: 10 + value: 3 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalScale.x value: 200 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalScale.y value: 200 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalScale.z value: 200 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: 9.383436e-12 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalPosition.y - value: -56 + value: 64 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalPosition.z - value: 0 + value: -1.9758885e-11 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalRotation.w - value: 0.00000081956387 + value: 0.5609856 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalRotation.x - value: -0.00000081956387 + value: -0.5609856 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalRotation.y - value: -0.7071068 + value: -0.4304593 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalRotation.z - value: -0.7071068 + value: -0.4304592 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: -90.00001 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: -180.00002 - objectReference: {fileID: 0} - - target: {fileID: -7511558181221131132, guid: 65e9fdf7b4253354b88d8ea20fe158d2, - type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: 813b55c20f75aa94cb2852272a21ddf2, type: 2} - - target: {fileID: 919132149155446097, guid: 65e9fdf7b4253354b88d8ea20fe158d2, - type: 3} - propertyPath: m_Name - value: DesertRingPlane (8) + value: -75 objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 8468264294038436545, guid: f338d0b50de06b240beff881bd243fb1, type: 3} - propertyPath: m_TagString - value: desertRing + propertyPath: rotationsPerMinute + value: 0.5 objectReference: {fileID: 0} m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 65e9fdf7b4253354b88d8ea20fe158d2, type: 3} ---- !u!1 &4414969560313070537 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 65e9fdf7b4253354b88d8ea20fe158d2, - type: 3} - m_PrefabInstance: {fileID: 3568107361397816984} - m_PrefabAsset: {fileID: 0} ---- !u!4 &3895279155191732595 stripped + m_SourcePrefab: {fileID: 100100000, guid: f338d0b50de06b240beff881bd243fb1, type: 3} +--- !u!4 &3466710950561934244 stripped Transform: - m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + m_CorrespondingSourceObject: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} - m_PrefabInstance: {fileID: 3568107361397816984} + m_PrefabInstance: {fileID: 6591339798416927406} m_PrefabAsset: {fileID: 0} ---- !u!1001 &5605325561337278312 +--- !u!1001 &6957687161939033708 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 5585162202189421855} m_Modifications: - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 6661590263475643900, guid: f338d0b50de06b240beff881bd243fb1, + type: 3} + propertyPath: m_Name + value: DesertRing (3) + objectReference: {fileID: 0} + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_RootOrder - value: 4 + value: 5 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalScale.x value: 200 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalScale.y value: 200 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalScale.z value: 200 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalPosition.x - value: -0.000006605059 + value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalPosition.y - value: -4 + value: -86 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalPosition.z - value: -0.000013908402 + value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalRotation.w - value: 0.5609856 + value: 0.7071068 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalRotation.x - value: -0.5609856 + value: -0.7071068 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalRotation.y - value: 0.4304593 + value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalRotation.z - value: 0.4304592 + value: -0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: -90.00001 + value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: 75 - objectReference: {fileID: 0} - - target: {fileID: -7511558181221131132, guid: 65e9fdf7b4253354b88d8ea20fe158d2, - type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: 475ff57fca53461469ad20c29a5f06ba, type: 2} - - target: {fileID: 919132149155446097, guid: 65e9fdf7b4253354b88d8ea20fe158d2, - type: 3} - propertyPath: m_Name - value: DesertRingPlane (2) + value: 0 objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 8468264294038436545, guid: f338d0b50de06b240beff881bd243fb1, type: 3} - propertyPath: m_TagString - value: desertRing + propertyPath: rotationsPerMinute + value: -0.2 objectReference: {fileID: 0} m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 65e9fdf7b4253354b88d8ea20fe158d2, type: 3} ---- !u!1 &4686967619765523001 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 65e9fdf7b4253354b88d8ea20fe158d2, - type: 3} - m_PrefabInstance: {fileID: 5605325561337278312} - m_PrefabAsset: {fileID: 0} ---- !u!4 &5350457343669799043 stripped + m_SourcePrefab: {fileID: 100100000, guid: f338d0b50de06b240beff881bd243fb1, type: 3} +--- !u!4 &858978334272503654 stripped Transform: - m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + m_CorrespondingSourceObject: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} - m_PrefabInstance: {fileID: 5605325561337278312} + m_PrefabInstance: {fileID: 6957687161939033708} m_PrefabAsset: {fileID: 0} ---- !u!1001 &6892389322876428288 +--- !u!1001 &7089408513916689967 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 5585162202189421855} m_Modifications: - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 6661590263475643900, guid: f338d0b50de06b240beff881bd243fb1, + type: 3} + propertyPath: m_Name + value: DesertRing (5) + objectReference: {fileID: 0} + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_RootOrder - value: 2 + value: 7 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalScale.x value: 200 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalScale.y value: 200 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalScale.z value: 200 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalPosition.y - value: 64 + value: 94 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalRotation.w - value: 0.7071068 + value: 0.00000081956387 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalRotation.x - value: -0.7071068 + value: -0.00000081956387 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0.7071068 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalRotation.z - value: -0 + value: -0.7071068 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 0 + value: -90.00001 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -7511558181221131132, guid: 65e9fdf7b4253354b88d8ea20fe158d2, - type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: 475ff57fca53461469ad20c29a5f06ba, type: 2} - - target: {fileID: 919132149155446097, guid: 65e9fdf7b4253354b88d8ea20fe158d2, - type: 3} - propertyPath: m_Name - value: DesertRingPlane + value: -180.00002 objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 8468264294038436545, guid: f338d0b50de06b240beff881bd243fb1, type: 3} - propertyPath: m_TagString - value: desertRing + propertyPath: rotationsPerMinute + value: 0.1 objectReference: {fileID: 0} m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 65e9fdf7b4253354b88d8ea20fe158d2, type: 3} ---- !u!4 &6353478390686926827 stripped + m_SourcePrefab: {fileID: 100100000, guid: f338d0b50de06b240beff881bd243fb1, type: 3} +--- !u!4 &650696312950890277 stripped Transform: - m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + m_CorrespondingSourceObject: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} - m_PrefabInstance: {fileID: 6892389322876428288} + m_PrefabInstance: {fileID: 7089408513916689967} m_PrefabAsset: {fileID: 0} ---- !u!1 &6009990222030544209 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 65e9fdf7b4253354b88d8ea20fe158d2, - type: 3} - m_PrefabInstance: {fileID: 6892389322876428288} - m_PrefabAsset: {fileID: 0} ---- !u!1001 &6961816462823092895 +--- !u!1001 &7365784481528104126 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 5585162202189421855} m_Modifications: - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 6661590263475643900, guid: f338d0b50de06b240beff881bd243fb1, + type: 3} + propertyPath: m_Name + value: DesertRing (9) + objectReference: {fileID: 0} + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_RootOrder - value: 7 + value: 11 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalScale.x - value: 200 + value: 198 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalScale.y - value: 200 + value: 198 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalScale.z - value: 200 + value: 198 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: 0.000011724972 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalPosition.y - value: 94 + value: -119 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalPosition.z - value: 0 + value: -0.000009979694 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalRotation.w - value: 0.00000081956387 + value: 0.707107 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalRotation.x - value: -0.00000081956387 + value: -0.70710665 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalRotation.y - value: -0.7071068 + value: 0.000000461936 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalRotation.z - value: -0.7071068 + value: 0.00000051409006 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: -90.00001 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: -180.00002 - objectReference: {fileID: 0} - - target: {fileID: -7511558181221131132, guid: 65e9fdf7b4253354b88d8ea20fe158d2, - type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: 475ff57fca53461469ad20c29a5f06ba, type: 2} - - target: {fileID: 919132149155446097, guid: 65e9fdf7b4253354b88d8ea20fe158d2, - type: 3} - propertyPath: m_Name - value: DesertRingPlane (5) + value: 0 objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 8468264294038436545, guid: f338d0b50de06b240beff881bd243fb1, type: 3} - propertyPath: m_TagString - value: desertRing + propertyPath: rotationsPerMinute + value: 0.15 objectReference: {fileID: 0} m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 65e9fdf7b4253354b88d8ea20fe158d2, type: 3} ---- !u!4 &7428668126808774004 stripped + m_SourcePrefab: {fileID: 100100000, guid: f338d0b50de06b240beff881bd243fb1, type: 3} +--- !u!4 &963095597742228916 stripped Transform: - m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, - type: 3} - m_PrefabInstance: {fileID: 6961816462823092895} - m_PrefabAsset: {fileID: 0} ---- !u!1 &7808184994035421134 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + m_CorrespondingSourceObject: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} - m_PrefabInstance: {fileID: 6961816462823092895} + m_PrefabInstance: {fileID: 7365784481528104126} m_PrefabAsset: {fileID: 0} ---- !u!1001 &7967578663366515970 +--- !u!1001 &7721480129183488187 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 5585162202189421855} m_Modifications: - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 6661590263475643900, guid: f338d0b50de06b240beff881bd243fb1, + type: 3} + propertyPath: m_Name + value: DesertRing (8) + objectReference: {fileID: 0} + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_RootOrder - value: 6 + value: 10 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalScale.x - value: 198 + value: 200 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalScale.y - value: 198 + value: 200 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalScale.z - value: 198 + value: 200 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalPosition.x - value: 0.000011724972 + value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalPosition.y - value: -149 + value: -56 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalPosition.z - value: -0.000009979694 + value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalRotation.w - value: 0.00000043213362 + value: 0.00000081956387 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalRotation.x - value: -0.00000033457482 + value: -0.00000081956387 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalRotation.y - value: 0.7071068 + value: -0.7071068 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalRotation.z - value: 0.70710677 + value: -0.7071068 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: -90.00001 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: 180.00002 - objectReference: {fileID: 0} - - target: {fileID: -7511558181221131132, guid: 65e9fdf7b4253354b88d8ea20fe158d2, - type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: 475ff57fca53461469ad20c29a5f06ba, type: 2} - - target: {fileID: 919132149155446097, guid: 65e9fdf7b4253354b88d8ea20fe158d2, - type: 3} - propertyPath: m_Name - value: DesertRingPlane (4) + value: -180.00002 objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 8468264294038436545, guid: f338d0b50de06b240beff881bd243fb1, type: 3} - propertyPath: m_TagString - value: desertRing + propertyPath: rotationsPerMinute + value: 0.2 objectReference: {fileID: 0} m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 65e9fdf7b4253354b88d8ea20fe158d2, type: 3} ---- !u!1 &7085269720193851475 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 65e9fdf7b4253354b88d8ea20fe158d2, - type: 3} - m_PrefabInstance: {fileID: 7967578663366515970} - m_PrefabAsset: {fileID: 0} ---- !u!4 &7572873047465278185 stripped + m_SourcePrefab: {fileID: 100100000, guid: f338d0b50de06b240beff881bd243fb1, type: 3} +--- !u!4 &21720741703735729 stripped Transform: - m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + m_CorrespondingSourceObject: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} - m_PrefabInstance: {fileID: 7967578663366515970} + m_PrefabInstance: {fileID: 7721480129183488187} m_PrefabAsset: {fileID: 0} ---- !u!1001 &9038098791540389070 +--- !u!1001 &7955662850404017564 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 5585162202189421855} m_Modifications: - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 6661590263475643900, guid: f338d0b50de06b240beff881bd243fb1, + type: 3} + propertyPath: m_Name + value: DesertRing (2) + objectReference: {fileID: 0} + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_RootOrder - value: 5 + value: 4 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalScale.x value: 200 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalScale.y value: 200 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalScale.z value: 200 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: -0.000006605059 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalPosition.y - value: -86 + value: -4 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalPosition.z - value: 0 + value: -0.000013908402 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalRotation.w - value: 0.7071068 + value: 0.5609856 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalRotation.x - value: -0.7071068 + value: -0.5609856 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: 0.4304593 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalRotation.z - value: -0 + value: 0.4304592 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 0 + value: -90.00001 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -7511558181221131132, guid: 65e9fdf7b4253354b88d8ea20fe158d2, - type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: 813b55c20f75aa94cb2852272a21ddf2, type: 2} - - target: {fileID: 919132149155446097, guid: 65e9fdf7b4253354b88d8ea20fe158d2, - type: 3} - propertyPath: m_Name - value: DesertRingPlane (3) + value: 75 objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + - target: {fileID: 8468264294038436545, guid: f338d0b50de06b240beff881bd243fb1, type: 3} - propertyPath: m_TagString - value: desertRing + propertyPath: rotationsPerMinute + value: -0.15 objectReference: {fileID: 0} m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 65e9fdf7b4253354b88d8ea20fe158d2, type: 3} ---- !u!4 &8856187424877548325 stripped + m_SourcePrefab: {fileID: 100100000, guid: f338d0b50de06b240beff881bd243fb1, type: 3} +--- !u!4 &363998358389400726 stripped Transform: - m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 65e9fdf7b4253354b88d8ea20fe158d2, - type: 3} - m_PrefabInstance: {fileID: 9038098791540389070} - m_PrefabAsset: {fileID: 0} ---- !u!1 &8191114404027943327 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 65e9fdf7b4253354b88d8ea20fe158d2, + m_CorrespondingSourceObject: {fileID: 7738626316252627210, guid: f338d0b50de06b240beff881bd243fb1, type: 3} - m_PrefabInstance: {fileID: 9038098791540389070} + m_PrefabInstance: {fileID: 7955662850404017564} m_PrefabAsset: {fileID: 0} diff --git a/Assets/Scenes/SubScenes/02_Wueste.unity b/Assets/Scenes/SubScenes/02_Wueste.unity index a1d8092..3459a6f 100644 --- a/Assets/Scenes/SubScenes/02_Wueste.unity +++ b/Assets/Scenes/SubScenes/02_Wueste.unity @@ -191,36 +191,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 115862009571474615, guid: f35fe36acd40d2d4cbf1dec853ec4f3b, - type: 3} - propertyPath: m_Enabled - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 115862009571474615, guid: f35fe36acd40d2d4cbf1dec853ec4f3b, - type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: f3964273368c3fa4da9e9dd763c0b6e7, type: 2} - target: {fileID: 514062692051049346, guid: f35fe36acd40d2d4cbf1dec853ec4f3b, type: 3} propertyPath: m_Enabled value: 0 objectReference: {fileID: 0} - - target: {fileID: 1075262349169869769, guid: f35fe36acd40d2d4cbf1dec853ec4f3b, - type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: f3964273368c3fa4da9e9dd763c0b6e7, type: 2} - - target: {fileID: 1266141814868114869, guid: f35fe36acd40d2d4cbf1dec853ec4f3b, - type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: f3964273368c3fa4da9e9dd763c0b6e7, type: 2} - - target: {fileID: 2757860057410445852, guid: f35fe36acd40d2d4cbf1dec853ec4f3b, - type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: f3964273368c3fa4da9e9dd763c0b6e7, type: 2} - target: {fileID: 2976286381113169435, guid: f35fe36acd40d2d4cbf1dec853ec4f3b, type: 3} propertyPath: m_Name @@ -246,16 +221,6 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4485021970748883749, guid: f35fe36acd40d2d4cbf1dec853ec4f3b, - type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: f3964273368c3fa4da9e9dd763c0b6e7, type: 2} - - target: {fileID: 5217202686350081156, guid: f35fe36acd40d2d4cbf1dec853ec4f3b, - type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: f3964273368c3fa4da9e9dd763c0b6e7, type: 2} - target: {fileID: 5338931621064718242, guid: f35fe36acd40d2d4cbf1dec853ec4f3b, type: 3} propertyPath: m_IsActive @@ -341,11 +306,6 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} - - target: {fileID: 6488429528951452652, guid: f35fe36acd40d2d4cbf1dec853ec4f3b, - type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: f3964273368c3fa4da9e9dd763c0b6e7, type: 2} - target: {fileID: 6955552781140265555, guid: f35fe36acd40d2d4cbf1dec853ec4f3b, type: 3} propertyPath: m_LocalScale.x @@ -366,30 +326,5 @@ PrefabInstance: propertyPath: m_LocalPosition.y value: -42 objectReference: {fileID: 0} - - target: {fileID: 7686610296471054410, guid: f35fe36acd40d2d4cbf1dec853ec4f3b, - type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: f3964273368c3fa4da9e9dd763c0b6e7, type: 2} - - target: {fileID: 8600963320031997467, guid: f35fe36acd40d2d4cbf1dec853ec4f3b, - type: 3} - propertyPath: m_CastShadows - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8600963320031997467, guid: f35fe36acd40d2d4cbf1dec853ec4f3b, - type: 3} - propertyPath: m_ReceiveShadows - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8600963320031997467, guid: f35fe36acd40d2d4cbf1dec853ec4f3b, - type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: f3964273368c3fa4da9e9dd763c0b6e7, type: 2} - - target: {fileID: 8742352421609783686, guid: f35fe36acd40d2d4cbf1dec853ec4f3b, - type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: f3964273368c3fa4da9e9dd763c0b6e7, type: 2} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f35fe36acd40d2d4cbf1dec853ec4f3b, type: 3} -- GitLab From 21a6dc8a0f770287606ab5493503147767638a23 Mon Sep 17 00:00:00 2001 From: meralium Date: Sun, 1 May 2022 13:08:43 +0200 Subject: [PATCH 06/14] - removed unused materials --- .../Materials/M_DesertRingPlane_00.mat | 119 ------------------ .../Materials/M_DesertRingPlane_00.mat.meta | 8 -- .../Materials/M_DesertRingPlane_01.mat | 119 ------------------ .../Materials/M_DesertRingPlane_01.mat.meta | 8 -- .../Materials/M_DesertRingPlane_02.mat | 119 ------------------ .../Materials/M_DesertRingPlane_02.mat.meta | 8 -- 6 files changed, 381 deletions(-) delete mode 100644 Assets/NeueRaeume/VirtualChoir/DesertScene/Materials/M_DesertRingPlane_00.mat delete mode 100644 Assets/NeueRaeume/VirtualChoir/DesertScene/Materials/M_DesertRingPlane_00.mat.meta delete mode 100644 Assets/NeueRaeume/VirtualChoir/DesertScene/Materials/M_DesertRingPlane_01.mat delete mode 100644 Assets/NeueRaeume/VirtualChoir/DesertScene/Materials/M_DesertRingPlane_01.mat.meta delete mode 100644 Assets/NeueRaeume/VirtualChoir/DesertScene/Materials/M_DesertRingPlane_02.mat delete mode 100644 Assets/NeueRaeume/VirtualChoir/DesertScene/Materials/M_DesertRingPlane_02.mat.meta diff --git a/Assets/NeueRaeume/VirtualChoir/DesertScene/Materials/M_DesertRingPlane_00.mat b/Assets/NeueRaeume/VirtualChoir/DesertScene/Materials/M_DesertRingPlane_00.mat deleted file mode 100644 index d5e17fe..0000000 --- a/Assets/NeueRaeume/VirtualChoir/DesertScene/Materials/M_DesertRingPlane_00.mat +++ /dev/null @@ -1,119 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: M_DesertRingPlane_00 - m_Shader: {fileID: 4800000, guid: 94f20be2bc537ca40a2d1a87c19fe6d9, type: 3} - m_ShaderKeywords: _INVERTALBEDO_ON - m_LightmapFlags: 0 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _Albedo: - m_Texture: {fileID: 2800000, guid: a6df245b726b1c74a880784a5a713d12, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _BurnRamp: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DisolveGuide: - m_Texture: {fileID: 2800000, guid: e1bea94c6895342478a424f2f3f13c38, type: 3} - m_Scale: {x: 20, y: 20} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 2800000, guid: a6df245b726b1c74a880784a5a713d12, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _texcoord: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _texcoord2: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _texcoord3: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _BumpScale: 1 - - _Cutoff: 0.05 - - _DEBUG_OpacityOverride: 1 - - _DetailNormalMapScale: 1 - - _DissolveAmount: 0 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0 - - _GlossyReflections: 1 - - _GradientDissolveValue: 0 - - _GradientRotationTime: 0 - - _InvertAlbedo: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Opacity: 0.3 - - _Parallax: 0.02 - - _RotationTimeScale: 0.05 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _TimeOffset: 0.849 - - _UV0XOffset: 0.226 - - _UV0YOffset: 0 - - _UVSec: 0 - - _WireframeShaderMaskSphereRadius: 100 - - _WireframeSphereRadiusMultiplier: 3 - - _Wireframe_DynamicMask_Invert: 0 - - _ZWrite: 1 - - __dirty: 0 - - _edgeFalloff: 25 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _ColorTint: {r: 1, g: 0.9022961, b: 0.46698081, a: 0} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _WireframeShaderMaskSpherePosition: {r: -27.355556, g: -115.655396, b: 482.48846, - a: 0} diff --git a/Assets/NeueRaeume/VirtualChoir/DesertScene/Materials/M_DesertRingPlane_00.mat.meta b/Assets/NeueRaeume/VirtualChoir/DesertScene/Materials/M_DesertRingPlane_00.mat.meta deleted file mode 100644 index 426f2a6..0000000 --- a/Assets/NeueRaeume/VirtualChoir/DesertScene/Materials/M_DesertRingPlane_00.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 475ff57fca53461469ad20c29a5f06ba -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/NeueRaeume/VirtualChoir/DesertScene/Materials/M_DesertRingPlane_01.mat b/Assets/NeueRaeume/VirtualChoir/DesertScene/Materials/M_DesertRingPlane_01.mat deleted file mode 100644 index 9628ba9..0000000 --- a/Assets/NeueRaeume/VirtualChoir/DesertScene/Materials/M_DesertRingPlane_01.mat +++ /dev/null @@ -1,119 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: M_DesertRingPlane_01 - m_Shader: {fileID: 4800000, guid: 94f20be2bc537ca40a2d1a87c19fe6d9, type: 3} - m_ShaderKeywords: _INVERTALBEDO_ON - m_LightmapFlags: 0 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _Albedo: - m_Texture: {fileID: 2800000, guid: a6df245b726b1c74a880784a5a713d12, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _BurnRamp: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DisolveGuide: - m_Texture: {fileID: 2800000, guid: e1bea94c6895342478a424f2f3f13c38, type: 3} - m_Scale: {x: 20, y: 20} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 2800000, guid: a6df245b726b1c74a880784a5a713d12, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _texcoord: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _texcoord2: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _texcoord3: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _BumpScale: 1 - - _Cutoff: 0.05 - - _DEBUG_OpacityOverride: 0 - - _DetailNormalMapScale: 1 - - _DissolveAmount: 0 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0 - - _GlossyReflections: 1 - - _GradientDissolveValue: 0 - - _GradientRotationTime: 0 - - _InvertAlbedo: 1 - - _Metallic: 0 - - _Mode: 1 - - _OcclusionStrength: 1 - - _Opacity: 0.3 - - _Parallax: 0.02 - - _RotationTimeScale: 0.05 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _TimeOffset: 0.849 - - _UV0XOffset: 0.226 - - _UV0YOffset: 0 - - _UVSec: 0 - - _WireframeShaderMaskSphereRadius: 100 - - _WireframeSphereRadiusMultiplier: 3 - - _Wireframe_DynamicMask_Invert: 0 - - _ZWrite: 1 - - __dirty: 0 - - _edgeFalloff: 25 - m_Colors: - - _Color: {r: 0, g: 0, b: 0, a: 0} - - _ColorTint: {r: 1, g: 0.9022961, b: 0.46698081, a: 0} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _WireframeShaderMaskSpherePosition: {r: -27.355556, g: -115.655396, b: 482.48846, - a: 0} diff --git a/Assets/NeueRaeume/VirtualChoir/DesertScene/Materials/M_DesertRingPlane_01.mat.meta b/Assets/NeueRaeume/VirtualChoir/DesertScene/Materials/M_DesertRingPlane_01.mat.meta deleted file mode 100644 index 2c9edea..0000000 --- a/Assets/NeueRaeume/VirtualChoir/DesertScene/Materials/M_DesertRingPlane_01.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: b72feefd3d2faf54b877f6219cd9e1ac -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/NeueRaeume/VirtualChoir/DesertScene/Materials/M_DesertRingPlane_02.mat b/Assets/NeueRaeume/VirtualChoir/DesertScene/Materials/M_DesertRingPlane_02.mat deleted file mode 100644 index 639f9f3..0000000 --- a/Assets/NeueRaeume/VirtualChoir/DesertScene/Materials/M_DesertRingPlane_02.mat +++ /dev/null @@ -1,119 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: M_DesertRingPlane_02 - m_Shader: {fileID: 4800000, guid: 94f20be2bc537ca40a2d1a87c19fe6d9, type: 3} - m_ShaderKeywords: _INVERTALBEDO_ON - m_LightmapFlags: 0 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _Albedo: - m_Texture: {fileID: 2800000, guid: a6df245b726b1c74a880784a5a713d12, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _BurnRamp: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DisolveGuide: - m_Texture: {fileID: 2800000, guid: e1bea94c6895342478a424f2f3f13c38, type: 3} - m_Scale: {x: 20, y: 20} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 2800000, guid: a6df245b726b1c74a880784a5a713d12, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _texcoord: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _texcoord2: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _texcoord3: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _BumpScale: 1 - - _Cutoff: 0.05 - - _DEBUG_OpacityOverride: 0 - - _DetailNormalMapScale: 1 - - _DissolveAmount: 0 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0 - - _GlossyReflections: 1 - - _GradientDissolveValue: 0 - - _GradientRotationTime: 0 - - _InvertAlbedo: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Opacity: 0.3 - - _Parallax: 0.02 - - _RotationTimeScale: 0.05 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _TimeOffset: 0.849 - - _UV0XOffset: 0.226 - - _UV0YOffset: 0 - - _UVSec: 0 - - _WireframeShaderMaskSphereRadius: 100 - - _WireframeSphereRadiusMultiplier: 3 - - _Wireframe_DynamicMask_Invert: 0 - - _ZWrite: 1 - - __dirty: 0 - - _edgeFalloff: 25 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _ColorTint: {r: 1, g: 0.9022961, b: 0.46698081, a: 0} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _WireframeShaderMaskSpherePosition: {r: -27.355556, g: -115.655396, b: 482.48846, - a: 0} diff --git a/Assets/NeueRaeume/VirtualChoir/DesertScene/Materials/M_DesertRingPlane_02.mat.meta b/Assets/NeueRaeume/VirtualChoir/DesertScene/Materials/M_DesertRingPlane_02.mat.meta deleted file mode 100644 index e85e26b..0000000 --- a/Assets/NeueRaeume/VirtualChoir/DesertScene/Materials/M_DesertRingPlane_02.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 813b55c20f75aa94cb2852272a21ddf2 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: -- GitLab From c2494e6240c7bce91b18b6ed69e969ef81f53247 Mon Sep 17 00:00:00 2001 From: meralium Date: Sun, 1 May 2022 14:26:12 +0200 Subject: [PATCH 07/14] - extracted movement detection logic into a separate class --- .../Scripts/Movement/MovementDetectorOnly.cs | 44 +++++++++++++++++++ .../Movement/MovementDetectorOnly.cs.meta | 3 ++ 2 files changed, 47 insertions(+) create mode 100644 Assets/NeueRaeume/VirtualChoir/General/Scripts/Movement/MovementDetectorOnly.cs create mode 100644 Assets/NeueRaeume/VirtualChoir/General/Scripts/Movement/MovementDetectorOnly.cs.meta diff --git a/Assets/NeueRaeume/VirtualChoir/General/Scripts/Movement/MovementDetectorOnly.cs b/Assets/NeueRaeume/VirtualChoir/General/Scripts/Movement/MovementDetectorOnly.cs new file mode 100644 index 0000000..c03fb8d --- /dev/null +++ b/Assets/NeueRaeume/VirtualChoir/General/Scripts/Movement/MovementDetectorOnly.cs @@ -0,0 +1,44 @@ +using UnityEngine; +using Zenject; + +namespace NeueRaeume.VirtualChoir.General +{ + public interface IMovementDetector + { + bool IsStayingStill { get; } + } + + public class MovementDetectorOnly: ITickable, IMovementDetector + { + private readonly IPlayerMarker playerMarker; + + private Vector3 lastUpdatePos = Vector3.zero; + private float notMovingForSeconds = 0.0f; + + private float speedThreshold = 0.4f; + private float triggerAfterIsNotMovingForSec = 6.0f; + + public bool IsStayingStill { get; private set; } + + public MovementDetectorOnly(IPlayerMarker playerMarker) + { + this.playerMarker = playerMarker; + } + + public void Tick() + { + // Computations + Vector3 currentPosition = playerMarker.GetPlayerTransform().position; + Vector3 distance = currentPosition - lastUpdatePos; + float currentSpeed = distance.magnitude / Time.deltaTime; + lastUpdatePos = currentPosition; + + // Is currently moving + var isMoving = currentSpeed > speedThreshold; + float notMovingForSecondsPlusDeltaTime = notMovingForSeconds + Time.deltaTime; + notMovingForSeconds = isMoving ? 0.0f : notMovingForSecondsPlusDeltaTime; + + IsStayingStill = !isMoving && notMovingForSeconds > triggerAfterIsNotMovingForSec; + } + } +} \ No newline at end of file diff --git a/Assets/NeueRaeume/VirtualChoir/General/Scripts/Movement/MovementDetectorOnly.cs.meta b/Assets/NeueRaeume/VirtualChoir/General/Scripts/Movement/MovementDetectorOnly.cs.meta new file mode 100644 index 0000000..b3f786b --- /dev/null +++ b/Assets/NeueRaeume/VirtualChoir/General/Scripts/Movement/MovementDetectorOnly.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: bca0201111aa4e58b849a2e11a5dd9b2 +timeCreated: 1651407841 \ No newline at end of file -- GitLab From 947d5ef925f168636028beb2a3c2f3270a3fbd45 Mon Sep 17 00:00:00 2001 From: meralium Date: Sun, 1 May 2022 15:03:57 +0200 Subject: [PATCH 08/14] - big refactoring of movement detector and progress bar for forest scene --- .../SoundSculpture/MovementDetector.cs | 76 +++++++------------ .../SoundSculpture/ProgressAnimation.cs | 13 +++- .../General/Scripts/BootstrapInstaller.cs | 1 + .../Scripts/Movement/MovementDetectorOnly.cs | 6 +- 4 files changed, 42 insertions(+), 54 deletions(-) diff --git a/Assets/NeueRaeume/VirtualChoir/ForestScene/Scripts/SoundSculpture/MovementDetector.cs b/Assets/NeueRaeume/VirtualChoir/ForestScene/Scripts/SoundSculpture/MovementDetector.cs index 64cd683..cfa687e 100644 --- a/Assets/NeueRaeume/VirtualChoir/ForestScene/Scripts/SoundSculpture/MovementDetector.cs +++ b/Assets/NeueRaeume/VirtualChoir/ForestScene/Scripts/SoundSculpture/MovementDetector.cs @@ -12,87 +12,54 @@ namespace NeueRaeume.VirtualChoir.SoundSculpture private readonly IPlayerMarker playerMarker; private readonly IProgressBarFactory progressBarFactory; private readonly IZoneService zoneService; + private readonly IMovementDetector movementDetector; public Action notMoving; - - private Vector3 lastUpdatePos = Vector3.zero; - private Vector3 distance; - private float notMovingForSeconds = 0.0f; - private bool isMoving = false; + private Vector3? hitGroundPos = null; private Transform hitTransform; - private float currentSpeed; - private float speedThreshold = 0.4f; - - public float triggerAfterIsNotMovingForSec = 6.0f; - public float beforeTriggerAnimationDelay = 3.0f; - private ProgressAnimation progressAnimation; private LineRendererProgressIndicator progressIndicatorBeh; - public MovementDetector(IPlayerMarker playerMarker, IProgressBarFactory progressBarFactory, IZoneService zoneService) + public MovementDetector(IPlayerMarker playerMarker, IProgressBarFactory progressBarFactory, + IZoneService zoneService, IMovementDetector movementDetector) { this.playerMarker = playerMarker; this.progressBarFactory = progressBarFactory; this.zoneService = zoneService; + this.movementDetector = movementDetector; progressAnimation = new ProgressAnimation(); progressAnimation.onStarted += OnAnimTweenStarted; progressAnimation.onStopped += OnAnimTweenStopped; + progressAnimation.onFinished += OnAnimTweenFinished; notMoving += (atPos, t) => progressAnimation.Stop(); } public void Tick() { - if (zoneService.CurrentZone != Zones.Forest) - { - return; - } - - // Computations - var currentPosition = playerMarker.GetPlayerTransform().position; - distance = currentPosition - lastUpdatePos; - currentSpeed = distance.magnitude / Time.deltaTime; - lastUpdatePos = currentPosition; - - // Is moving - isMoving = currentSpeed > speedThreshold; - - float notMovingForSecondsPlusDeltaTime = notMovingForSeconds + Time.deltaTime; - if (!isMoving && - notMovingForSeconds <= triggerAfterIsNotMovingForSec && - notMovingForSecondsPlusDeltaTime > triggerAfterIsNotMovingForSec) + if (zoneService.CurrentZone != Zones.Forest) return; + if (!movementDetector.IsStayingStill) { - if (hitGroundPos.HasValue) + if (progressAnimation.isStarted) { - notMoving?.Invoke(hitGroundPos.Value, hitTransform); + progressAnimation.Stop(); } - } - UpdateProgressAnimation(notMovingForSecondsPlusDeltaTime); - - notMovingForSeconds = isMoving ? 0.0f : notMovingForSecondsPlusDeltaTime; - } + return; + } - private void UpdateProgressAnimation(float notMovingForSecondsPlusDeltaTime) - { - if (!progressAnimation.isStarted && - notMovingForSeconds <= beforeTriggerAnimationDelay && - notMovingForSecondsPlusDeltaTime > beforeTriggerAnimationDelay) + if (!progressAnimation.isStarted) { if (SoundSculptureDetector.IsNearSoundSculpture) { progressAnimation.Stop(); return; } - progressAnimation.Start(); - } - if (isMoving) - { - progressAnimation.Stop(); + progressAnimation.Start(); } progressAnimation.Update(); @@ -100,7 +67,7 @@ namespace NeueRaeume.VirtualChoir.SoundSculpture // Line renderer as progress indicator if (progressIndicatorBeh) { - progressIndicatorBeh.SetProgress((int) progressAnimation.progressInPercent); + progressIndicatorBeh.SetProgress((int)progressAnimation.progressInPercent); } } @@ -116,7 +83,7 @@ namespace NeueRaeume.VirtualChoir.SoundSculpture progressIndicatorBeh = progressBarFactory.InstantiateAt(hitGroundPos.Value, playerTransform.rotation); } } - + private void OnAnimTweenStopped() { if (progressIndicatorBeh) @@ -128,5 +95,14 @@ namespace NeueRaeume.VirtualChoir.SoundSculpture hitGroundPos = null; } } + + private void OnAnimTweenFinished() + { + if (hitGroundPos.HasValue) + { + notMoving?.Invoke(hitGroundPos.Value, hitTransform); + } + progressAnimation.Stop(); + } } -} +} \ No newline at end of file diff --git a/Assets/NeueRaeume/VirtualChoir/ForestScene/Scripts/SoundSculpture/ProgressAnimation.cs b/Assets/NeueRaeume/VirtualChoir/ForestScene/Scripts/SoundSculpture/ProgressAnimation.cs index c884487..c380861 100644 --- a/Assets/NeueRaeume/VirtualChoir/ForestScene/Scripts/SoundSculpture/ProgressAnimation.cs +++ b/Assets/NeueRaeume/VirtualChoir/ForestScene/Scripts/SoundSculpture/ProgressAnimation.cs @@ -7,6 +7,7 @@ namespace NeueRaeume.VirtualChoir.SoundSculpture { public Action onStarted; public Action onStopped; + public Action onFinished; public float progressInPercent = 0.0f; public float progress = 0.0f; @@ -16,7 +17,7 @@ namespace NeueRaeume.VirtualChoir.SoundSculpture private bool _isReversed = false; - private bool _stopOn100Percent = false; + private bool _stopOn100Percent = true; private bool _isStarted = false; @@ -47,7 +48,13 @@ namespace NeueRaeume.VirtualChoir.SoundSculpture ResetValues(); onStopped?.Invoke(); } - + + private void Finish() + { + Pause(); + onFinished?.Invoke(); + } + public void Update() { if (!_isStarted) return; @@ -59,7 +66,7 @@ namespace NeueRaeume.VirtualChoir.SoundSculpture if (_stopOn100Percent && progressInPercent >= 100) { - Pause(); + Finish(); } } diff --git a/Assets/NeueRaeume/VirtualChoir/General/Scripts/BootstrapInstaller.cs b/Assets/NeueRaeume/VirtualChoir/General/Scripts/BootstrapInstaller.cs index 8161d21..457cd14 100644 --- a/Assets/NeueRaeume/VirtualChoir/General/Scripts/BootstrapInstaller.cs +++ b/Assets/NeueRaeume/VirtualChoir/General/Scripts/BootstrapInstaller.cs @@ -23,6 +23,7 @@ namespace NeueRaeume.VirtualChoir.General Container.BindInterfacesAndSelfTo().AsSingle().NonLazy(); Container.BindInterfacesTo().AsSingle().NonLazy(); + Container.BindInterfacesTo().AsSingle().NonLazy(); Container.Bind().FromComponentInNewPrefab(playerMarkerPrefab).AsSingle(); diff --git a/Assets/NeueRaeume/VirtualChoir/General/Scripts/Movement/MovementDetectorOnly.cs b/Assets/NeueRaeume/VirtualChoir/General/Scripts/Movement/MovementDetectorOnly.cs index c03fb8d..6639b2b 100644 --- a/Assets/NeueRaeume/VirtualChoir/General/Scripts/Movement/MovementDetectorOnly.cs +++ b/Assets/NeueRaeume/VirtualChoir/General/Scripts/Movement/MovementDetectorOnly.cs @@ -6,6 +6,7 @@ namespace NeueRaeume.VirtualChoir.General public interface IMovementDetector { bool IsStayingStill { get; } + float StayingStillForSeconds { get; } } public class MovementDetectorOnly: ITickable, IMovementDetector @@ -19,7 +20,8 @@ namespace NeueRaeume.VirtualChoir.General private float triggerAfterIsNotMovingForSec = 6.0f; public bool IsStayingStill { get; private set; } - + public float StayingStillForSeconds { get; private set; } + public MovementDetectorOnly(IPlayerMarker playerMarker) { this.playerMarker = playerMarker; @@ -39,6 +41,8 @@ namespace NeueRaeume.VirtualChoir.General notMovingForSeconds = isMoving ? 0.0f : notMovingForSecondsPlusDeltaTime; IsStayingStill = !isMoving && notMovingForSeconds > triggerAfterIsNotMovingForSec; + + StayingStillForSeconds = notMovingForSecondsPlusDeltaTime; } } } \ No newline at end of file -- GitLab From 233ddc2c011d45e741c439fdcde215aaa42c704b Mon Sep 17 00:00:00 2001 From: meralium Date: Sun, 1 May 2022 15:12:23 +0200 Subject: [PATCH 09/14] - more refactoring/renaming --- .../ForestScene/Scripts/ForestLevelMonoInstaller.cs | 2 +- .../SoundSculpture/AudioClipPlayback/MicRecorder.cs | 12 ++++++------ .../Scripts/SoundSculpture/ProgressAnimation.cs | 1 + ...{MovementDetector.cs => ProgressBarController.cs} | 11 ++++------- ...etector.cs.meta => ProgressBarController.cs.meta} | 0 5 files changed, 12 insertions(+), 14 deletions(-) rename Assets/NeueRaeume/VirtualChoir/ForestScene/Scripts/SoundSculpture/{MovementDetector.cs => ProgressBarController.cs} (89%) rename Assets/NeueRaeume/VirtualChoir/ForestScene/Scripts/SoundSculpture/{MovementDetector.cs.meta => ProgressBarController.cs.meta} (100%) diff --git a/Assets/NeueRaeume/VirtualChoir/ForestScene/Scripts/ForestLevelMonoInstaller.cs b/Assets/NeueRaeume/VirtualChoir/ForestScene/Scripts/ForestLevelMonoInstaller.cs index 02fc0d9..02cfa6e 100644 --- a/Assets/NeueRaeume/VirtualChoir/ForestScene/Scripts/ForestLevelMonoInstaller.cs +++ b/Assets/NeueRaeume/VirtualChoir/ForestScene/Scripts/ForestLevelMonoInstaller.cs @@ -16,7 +16,7 @@ public class ForestLevelMonoInstaller : MonoInstaller Container.BindInterfacesAndSelfTo().AsSingle().NonLazy(); Container.BindInterfacesTo().AsSingle().NonLazy(); - Container.BindInterfacesAndSelfTo().AsSingle().NonLazy(); + Container.BindInterfacesAndSelfTo().AsSingle().NonLazy(); var micRecorder = Container.InstantiatePrefabResourceForComponent(MIC_REC_PREFAB_PATH); } diff --git a/Assets/NeueRaeume/VirtualChoir/ForestScene/Scripts/SoundSculpture/AudioClipPlayback/MicRecorder.cs b/Assets/NeueRaeume/VirtualChoir/ForestScene/Scripts/SoundSculpture/AudioClipPlayback/MicRecorder.cs index d037fa7..6501d7b 100644 --- a/Assets/NeueRaeume/VirtualChoir/ForestScene/Scripts/SoundSculpture/AudioClipPlayback/MicRecorder.cs +++ b/Assets/NeueRaeume/VirtualChoir/ForestScene/Scripts/SoundSculpture/AudioClipPlayback/MicRecorder.cs @@ -20,7 +20,7 @@ namespace NeueRaeume.VirtualChoir.SoundSculpture.AudioClipPlayback private AudioSource audioSrc; private ISoundSculptureGenerator soundSculptureGenerator; - private MovementDetector movementDetector; + private ProgressBarController progressBarController; private IPlayerMarker playerMarker; private string microphoneName; @@ -31,16 +31,16 @@ namespace NeueRaeume.VirtualChoir.SoundSculpture.AudioClipPlayback public AudioConfig audioConfig; [Inject] - public void Construct(MovementDetector movementDetector, IPlayerMarker playerMarker) + public void Construct(ProgressBarController progressBarController, IPlayerMarker playerMarker) { - this.movementDetector = movementDetector; + this.progressBarController = progressBarController; this.playerMarker = playerMarker; } // Use this for initialization void Awake() { - movementDetector.notMoving += OnPlayerStayingStill; + progressBarController.ProgressFinished += OnProgressFinished; audioSrc = GetComponent(); soundSculptureGenerator = GetComponent(); @@ -54,10 +54,10 @@ namespace NeueRaeume.VirtualChoir.SoundSculpture.AudioClipPlayback private void OnDestroy() { - movementDetector.notMoving -= OnPlayerStayingStill; + progressBarController.ProgressFinished -= OnProgressFinished; } - private void OnPlayerStayingStill(Vector3 atPos, Transform hitTransform) + private void OnProgressFinished(Vector3 atPos, Transform hitTransform) { if (SoundSculptureDetector.IsNearSoundSculpture) { diff --git a/Assets/NeueRaeume/VirtualChoir/ForestScene/Scripts/SoundSculpture/ProgressAnimation.cs b/Assets/NeueRaeume/VirtualChoir/ForestScene/Scripts/SoundSculpture/ProgressAnimation.cs index c380861..ecb29eb 100644 --- a/Assets/NeueRaeume/VirtualChoir/ForestScene/Scripts/SoundSculpture/ProgressAnimation.cs +++ b/Assets/NeueRaeume/VirtualChoir/ForestScene/Scripts/SoundSculpture/ProgressAnimation.cs @@ -67,6 +67,7 @@ namespace NeueRaeume.VirtualChoir.SoundSculpture if (_stopOn100Percent && progressInPercent >= 100) { Finish(); + Stop(); } } diff --git a/Assets/NeueRaeume/VirtualChoir/ForestScene/Scripts/SoundSculpture/MovementDetector.cs b/Assets/NeueRaeume/VirtualChoir/ForestScene/Scripts/SoundSculpture/ProgressBarController.cs similarity index 89% rename from Assets/NeueRaeume/VirtualChoir/ForestScene/Scripts/SoundSculpture/MovementDetector.cs rename to Assets/NeueRaeume/VirtualChoir/ForestScene/Scripts/SoundSculpture/ProgressBarController.cs index cfa687e..fea8df7 100644 --- a/Assets/NeueRaeume/VirtualChoir/ForestScene/Scripts/SoundSculpture/MovementDetector.cs +++ b/Assets/NeueRaeume/VirtualChoir/ForestScene/Scripts/SoundSculpture/ProgressBarController.cs @@ -7,14 +7,14 @@ using Object = UnityEngine.Object; namespace NeueRaeume.VirtualChoir.SoundSculpture { - public class MovementDetector : ITickable + public class ProgressBarController : ITickable { private readonly IPlayerMarker playerMarker; private readonly IProgressBarFactory progressBarFactory; private readonly IZoneService zoneService; private readonly IMovementDetector movementDetector; - public Action notMoving; + public Action ProgressFinished; private Vector3? hitGroundPos = null; private Transform hitTransform; @@ -22,7 +22,7 @@ namespace NeueRaeume.VirtualChoir.SoundSculpture private ProgressAnimation progressAnimation; private LineRendererProgressIndicator progressIndicatorBeh; - public MovementDetector(IPlayerMarker playerMarker, IProgressBarFactory progressBarFactory, + public ProgressBarController(IPlayerMarker playerMarker, IProgressBarFactory progressBarFactory, IZoneService zoneService, IMovementDetector movementDetector) { this.playerMarker = playerMarker; @@ -34,8 +34,6 @@ namespace NeueRaeume.VirtualChoir.SoundSculpture progressAnimation.onStarted += OnAnimTweenStarted; progressAnimation.onStopped += OnAnimTweenStopped; progressAnimation.onFinished += OnAnimTweenFinished; - - notMoving += (atPos, t) => progressAnimation.Stop(); } public void Tick() @@ -100,9 +98,8 @@ namespace NeueRaeume.VirtualChoir.SoundSculpture { if (hitGroundPos.HasValue) { - notMoving?.Invoke(hitGroundPos.Value, hitTransform); + ProgressFinished?.Invoke(hitGroundPos.Value, hitTransform); } - progressAnimation.Stop(); } } } \ No newline at end of file diff --git a/Assets/NeueRaeume/VirtualChoir/ForestScene/Scripts/SoundSculpture/MovementDetector.cs.meta b/Assets/NeueRaeume/VirtualChoir/ForestScene/Scripts/SoundSculpture/ProgressBarController.cs.meta similarity index 100% rename from Assets/NeueRaeume/VirtualChoir/ForestScene/Scripts/SoundSculpture/MovementDetector.cs.meta rename to Assets/NeueRaeume/VirtualChoir/ForestScene/Scripts/SoundSculpture/ProgressBarController.cs.meta -- GitLab From f7894a85fa499e0577e26c4d72a8430c5fae1762 Mon Sep 17 00:00:00 2001 From: meralium Date: Sun, 1 May 2022 15:31:51 +0200 Subject: [PATCH 10/14] - removed binding if GlitchManager in bootstrapinstaller - added mono installer for desert scene - added injection of MovementDetector in GlitchManager --- .../Scripts/DesertSceneMonoInstaller.cs | 13 +++++++++++++ .../Scripts/DesertSceneMonoInstaller.cs.meta | 11 +++++++++++ .../DesertScene/Scripts/GlitchManager.cs | 12 ++++++++---- .../General/Scripts/BootstrapInstaller.cs | 4 +--- Assets/Scenes/SubScenes/02_Wueste.unity | 16 +++++++++++++++- 5 files changed, 48 insertions(+), 8 deletions(-) create mode 100644 Assets/NeueRaeume/VirtualChoir/DesertScene/Scripts/DesertSceneMonoInstaller.cs create mode 100644 Assets/NeueRaeume/VirtualChoir/DesertScene/Scripts/DesertSceneMonoInstaller.cs.meta diff --git a/Assets/NeueRaeume/VirtualChoir/DesertScene/Scripts/DesertSceneMonoInstaller.cs b/Assets/NeueRaeume/VirtualChoir/DesertScene/Scripts/DesertSceneMonoInstaller.cs new file mode 100644 index 0000000..31d1c72 --- /dev/null +++ b/Assets/NeueRaeume/VirtualChoir/DesertScene/Scripts/DesertSceneMonoInstaller.cs @@ -0,0 +1,13 @@ +using NeueRaeume.VirtualChoir.General; +using Zenject; + +namespace NeueRaeume.VirtualChoir.DesertScene +{ + public class DesertSceneMonoInstaller : MonoInstaller + { + public override void InstallBindings() + { + Container.BindInterfacesAndSelfTo().AsSingle().NonLazy(); + } + } +} \ No newline at end of file diff --git a/Assets/NeueRaeume/VirtualChoir/DesertScene/Scripts/DesertSceneMonoInstaller.cs.meta b/Assets/NeueRaeume/VirtualChoir/DesertScene/Scripts/DesertSceneMonoInstaller.cs.meta new file mode 100644 index 0000000..47935cc --- /dev/null +++ b/Assets/NeueRaeume/VirtualChoir/DesertScene/Scripts/DesertSceneMonoInstaller.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: f0d7491ae615dd24fb344e9f31530dfa +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/NeueRaeume/VirtualChoir/DesertScene/Scripts/GlitchManager.cs b/Assets/NeueRaeume/VirtualChoir/DesertScene/Scripts/GlitchManager.cs index f3a49f3..9f0122d 100644 --- a/Assets/NeueRaeume/VirtualChoir/DesertScene/Scripts/GlitchManager.cs +++ b/Assets/NeueRaeume/VirtualChoir/DesertScene/Scripts/GlitchManager.cs @@ -14,15 +14,17 @@ namespace NeueRaeume.VirtualChoir.General { private static readonly int _RandomStrength = Shader.PropertyToID("_RandomStrength"); - private IKinectSkeleton kinectSkeleton; - private ISonicPiMessageDispatcher oscDispatcher; + private readonly IKinectSkeleton kinectSkeleton; + private readonly ISonicPiMessageDispatcher oscDispatcher; + private readonly IMovementDetector movementDetector; + private List cachedList = new List(1); private MaterialPropertyBlock propertyBlock = new MaterialPropertyBlock(); private List ringRenderers = new List(); public GameObject[] rings; - public GlitchManager(IKinectSkeleton kinectSkeleton, ISonicPiMessageDispatcher oscDispatcher) + public GlitchManager(IKinectSkeleton kinectSkeleton, ISonicPiMessageDispatcher oscDispatcher, IMovementDetector movementDetector) { //get Player Movement //set Shader Variable @@ -30,6 +32,7 @@ namespace NeueRaeume.VirtualChoir.General // send to SonicPi with OSC this.kinectSkeleton = kinectSkeleton; this.oscDispatcher = oscDispatcher; + this.movementDetector = movementDetector; // Debug.Log("Init glitch Manager"); } @@ -46,6 +49,7 @@ namespace NeueRaeume.VirtualChoir.General public void Tick() { + // Debug.Log("Is still: " + movementDetector.IsStayingStill); float leftPos = kinectSkeleton.PlayerSkeleton.JointPositions[JointType.HandLeft].Relative[0]; float rightPos = kinectSkeleton.PlayerSkeleton.JointPositions[JointType.HandRight].Relative[0]; @@ -59,7 +63,7 @@ namespace NeueRaeume.VirtualChoir.General } float oscInput = ((shaderInput - -1) / (1 - -1)) * (1 - 0) + 0; - Debug.Log($"Shader: {shaderInput}, OSC: {oscInput}"); + //Debug.Log($"Shader: {shaderInput}, OSC: {oscInput}"); cachedList.Clear(); cachedList.Add(oscInput); oscDispatcher.SendOscMessage("/desertglitch", cachedList); diff --git a/Assets/NeueRaeume/VirtualChoir/General/Scripts/BootstrapInstaller.cs b/Assets/NeueRaeume/VirtualChoir/General/Scripts/BootstrapInstaller.cs index 457cd14..1cdbcdc 100644 --- a/Assets/NeueRaeume/VirtualChoir/General/Scripts/BootstrapInstaller.cs +++ b/Assets/NeueRaeume/VirtualChoir/General/Scripts/BootstrapInstaller.cs @@ -26,9 +26,7 @@ namespace NeueRaeume.VirtualChoir.General Container.BindInterfacesTo().AsSingle().NonLazy(); Container.Bind().FromComponentInNewPrefab(playerMarkerPrefab).AsSingle(); - - Container.BindInterfacesAndSelfTo().AsSingle().NonLazy(); - + // --ORDER-- Container.BindInitializableExecutionOrder(-20); Container.BindInitializableExecutionOrder(-10); diff --git a/Assets/Scenes/SubScenes/02_Wueste.unity b/Assets/Scenes/SubScenes/02_Wueste.unity index 3459a6f..350078a 100644 --- a/Assets/Scenes/SubScenes/02_Wueste.unity +++ b/Assets/Scenes/SubScenes/02_Wueste.unity @@ -131,6 +131,7 @@ GameObject: m_Component: - component: {fileID: 1409222671} - component: {fileID: 1409222670} + - component: {fileID: 1409222672} m_Layer: 0 m_Name: SceneContext m_TagString: Untagged @@ -151,7 +152,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _scriptableObjectInstallers: [] - _monoInstallers: [] + _monoInstallers: + - {fileID: 1409222672} _installerPrefabs: [] _autoRun: 1 OnPreInstall: @@ -184,6 +186,18 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1409222672 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1409222669} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f0d7491ae615dd24fb344e9f31530dfa, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &8379469544831326262 PrefabInstance: m_ObjectHideFlags: 0 -- GitLab From c89998d9e24e5124f44b040577c8fb947864ac3b Mon Sep 17 00:00:00 2001 From: meralium Date: Sun, 1 May 2022 15:39:14 +0200 Subject: [PATCH 11/14] - extended interface --- .../VirtualChoir/DesertScene/Scripts/GlitchManager.cs | 9 ++------- .../Scripts/SoundSculpture/ProgressBarController.cs | 2 +- .../General/Scripts/Movement/MovementDetectorOnly.cs | 11 +++++------ 3 files changed, 8 insertions(+), 14 deletions(-) diff --git a/Assets/NeueRaeume/VirtualChoir/DesertScene/Scripts/GlitchManager.cs b/Assets/NeueRaeume/VirtualChoir/DesertScene/Scripts/GlitchManager.cs index 9f0122d..57f3d70 100644 --- a/Assets/NeueRaeume/VirtualChoir/DesertScene/Scripts/GlitchManager.cs +++ b/Assets/NeueRaeume/VirtualChoir/DesertScene/Scripts/GlitchManager.cs @@ -1,12 +1,8 @@ -using System; -using System.Collections; -using System.Collections.Generic; -using UnityEngine; +using System.Collections.Generic; using Windows.Kinect; using NeueRaeume.VirtualChoir.ConfigData; -using Joint = Windows.Kinect.Joint; +using UnityEngine; using Zenject; -using NeueRaeume.VirtualChoir.General; namespace NeueRaeume.VirtualChoir.General { @@ -46,7 +42,6 @@ namespace NeueRaeume.VirtualChoir.General } } - public void Tick() { // Debug.Log("Is still: " + movementDetector.IsStayingStill); diff --git a/Assets/NeueRaeume/VirtualChoir/ForestScene/Scripts/SoundSculpture/ProgressBarController.cs b/Assets/NeueRaeume/VirtualChoir/ForestScene/Scripts/SoundSculpture/ProgressBarController.cs index fea8df7..a4de568 100644 --- a/Assets/NeueRaeume/VirtualChoir/ForestScene/Scripts/SoundSculpture/ProgressBarController.cs +++ b/Assets/NeueRaeume/VirtualChoir/ForestScene/Scripts/SoundSculpture/ProgressBarController.cs @@ -39,7 +39,7 @@ namespace NeueRaeume.VirtualChoir.SoundSculpture public void Tick() { if (zoneService.CurrentZone != Zones.Forest) return; - if (!movementDetector.IsStayingStill) + if (!movementDetector.IsStayingStillForLong) { if (progressAnimation.isStarted) { diff --git a/Assets/NeueRaeume/VirtualChoir/General/Scripts/Movement/MovementDetectorOnly.cs b/Assets/NeueRaeume/VirtualChoir/General/Scripts/Movement/MovementDetectorOnly.cs index 6639b2b..775097b 100644 --- a/Assets/NeueRaeume/VirtualChoir/General/Scripts/Movement/MovementDetectorOnly.cs +++ b/Assets/NeueRaeume/VirtualChoir/General/Scripts/Movement/MovementDetectorOnly.cs @@ -5,8 +5,8 @@ namespace NeueRaeume.VirtualChoir.General { public interface IMovementDetector { + bool IsStayingStillForLong { get; } bool IsStayingStill { get; } - float StayingStillForSeconds { get; } } public class MovementDetectorOnly: ITickable, IMovementDetector @@ -18,9 +18,9 @@ namespace NeueRaeume.VirtualChoir.General private float speedThreshold = 0.4f; private float triggerAfterIsNotMovingForSec = 6.0f; - + + public bool IsStayingStillForLong { get; private set; } public bool IsStayingStill { get; private set; } - public float StayingStillForSeconds { get; private set; } public MovementDetectorOnly(IPlayerMarker playerMarker) { @@ -40,9 +40,8 @@ namespace NeueRaeume.VirtualChoir.General float notMovingForSecondsPlusDeltaTime = notMovingForSeconds + Time.deltaTime; notMovingForSeconds = isMoving ? 0.0f : notMovingForSecondsPlusDeltaTime; - IsStayingStill = !isMoving && notMovingForSeconds > triggerAfterIsNotMovingForSec; - - StayingStillForSeconds = notMovingForSecondsPlusDeltaTime; + IsStayingStillForLong = !isMoving && notMovingForSeconds > triggerAfterIsNotMovingForSec; + IsStayingStill = !isMoving; } } } \ No newline at end of file -- GitLab From fe32a83d924d30a51da933ff725b2e3c64ea0ebc Mon Sep 17 00:00:00 2001 From: meralium Date: Sun, 1 May 2022 15:45:42 +0200 Subject: [PATCH 12/14] - corrected namespace --- .../DesertScene/Scripts/DesertSceneMonoInstaller.cs | 1 - .../VirtualChoir/DesertScene/Scripts/GlitchManager.cs | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Assets/NeueRaeume/VirtualChoir/DesertScene/Scripts/DesertSceneMonoInstaller.cs b/Assets/NeueRaeume/VirtualChoir/DesertScene/Scripts/DesertSceneMonoInstaller.cs index 31d1c72..627a6b5 100644 --- a/Assets/NeueRaeume/VirtualChoir/DesertScene/Scripts/DesertSceneMonoInstaller.cs +++ b/Assets/NeueRaeume/VirtualChoir/DesertScene/Scripts/DesertSceneMonoInstaller.cs @@ -1,4 +1,3 @@ -using NeueRaeume.VirtualChoir.General; using Zenject; namespace NeueRaeume.VirtualChoir.DesertScene diff --git a/Assets/NeueRaeume/VirtualChoir/DesertScene/Scripts/GlitchManager.cs b/Assets/NeueRaeume/VirtualChoir/DesertScene/Scripts/GlitchManager.cs index 57f3d70..b2ae933 100644 --- a/Assets/NeueRaeume/VirtualChoir/DesertScene/Scripts/GlitchManager.cs +++ b/Assets/NeueRaeume/VirtualChoir/DesertScene/Scripts/GlitchManager.cs @@ -1,10 +1,11 @@ using System.Collections.Generic; using Windows.Kinect; using NeueRaeume.VirtualChoir.ConfigData; +using NeueRaeume.VirtualChoir.General; using UnityEngine; using Zenject; -namespace NeueRaeume.VirtualChoir.General +namespace NeueRaeume.VirtualChoir.DesertScene { public class GlitchManager : ITickable, IInitializable { -- GitLab From 6af56abe92b81f994d2100033377b35ec40220f2 Mon Sep 17 00:00:00 2001 From: Lena Date: Mon, 2 May 2022 15:33:28 +0200 Subject: [PATCH 13/14] Ring Rotation stops when player is not Moving --- .../DesertScene/Scripts/GlitchManager.cs | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/Assets/NeueRaeume/VirtualChoir/DesertScene/Scripts/GlitchManager.cs b/Assets/NeueRaeume/VirtualChoir/DesertScene/Scripts/GlitchManager.cs index b2ae933..f85d27b 100644 --- a/Assets/NeueRaeume/VirtualChoir/DesertScene/Scripts/GlitchManager.cs +++ b/Assets/NeueRaeume/VirtualChoir/DesertScene/Scripts/GlitchManager.cs @@ -49,7 +49,20 @@ namespace NeueRaeume.VirtualChoir.DesertScene float leftPos = kinectSkeleton.PlayerSkeleton.JointPositions[JointType.HandLeft].Relative[0]; float rightPos = kinectSkeleton.PlayerSkeleton.JointPositions[JointType.HandRight].Relative[0]; - + if (movementDetector.IsStayingStill) + { + foreach (GameObject ring in rings) + { + ring.GetComponent().rotationsPerMinute = 0.0f; + } + } + else + { + foreach (GameObject ring in rings) + { + ring.GetComponent().rotationsPerMinute = 0.15f; + } + } float shaderInput = -leftPos - rightPos; propertyBlock.SetFloat(_RandomStrength, shaderInput); // Debug.Log($"Right Hand: {kinectSkeleton.PlayerSkeleton.JointPositions[JointType.HandRight].Relative} , Left Hand: {kinectSkeleton.PlayerSkeleton.JointPositions[JointType.HandLeft].Relative}, Shader Input: {shaderInput}"); @@ -58,7 +71,8 @@ namespace NeueRaeume.VirtualChoir.DesertScene ringRenderer.SetPropertyBlock(propertyBlock); } - float oscInput = ((shaderInput - -1) / (1 - -1)) * (1 - 0) + 0; + float oscInput = ((shaderInput - -1) / (1 - -1)) ; + //float oscInput = ((shaderInput - -1) / (1 - -1)) * (1 - 0) + 0; //Debug.Log($"Shader: {shaderInput}, OSC: {oscInput}"); cachedList.Clear(); cachedList.Add(oscInput); -- GitLab From fb408553d74c4bb51978bddad30a82eea647f733 Mon Sep 17 00:00:00 2001 From: Katharina Date: Fri, 6 May 2022 21:12:26 +0200 Subject: [PATCH 14/14] - refactoring --- .../DesertScene/Scripts/GlitchManager.cs | 34 ++++--------------- 1 file changed, 7 insertions(+), 27 deletions(-) diff --git a/Assets/NeueRaeume/VirtualChoir/DesertScene/Scripts/GlitchManager.cs b/Assets/NeueRaeume/VirtualChoir/DesertScene/Scripts/GlitchManager.cs index f85d27b..047605e 100644 --- a/Assets/NeueRaeume/VirtualChoir/DesertScene/Scripts/GlitchManager.cs +++ b/Assets/NeueRaeume/VirtualChoir/DesertScene/Scripts/GlitchManager.cs @@ -18,54 +18,38 @@ namespace NeueRaeume.VirtualChoir.DesertScene private List cachedList = new List(1); private MaterialPropertyBlock propertyBlock = new MaterialPropertyBlock(); private List ringRenderers = new List(); - - public GameObject[] rings; + private List rotators = new List(); public GlitchManager(IKinectSkeleton kinectSkeleton, ISonicPiMessageDispatcher oscDispatcher, IMovementDetector movementDetector) { - //get Player Movement - //set Shader Variable - // Set Ring Movement - // send to SonicPi with OSC this.kinectSkeleton = kinectSkeleton; this.oscDispatcher = oscDispatcher; this.movementDetector = movementDetector; - // Debug.Log("Init glitch Manager"); - } public void Initialize() { - rings = GameObject.FindGameObjectsWithTag(UnityTags.DESERTRING_TAG); + var rings = GameObject.FindGameObjectsWithTag(UnityTags.DESERTRING_TAG); foreach (GameObject ring in rings) { ringRenderers.Add(ring.GetComponent()); + rotators.Add(ring.GetComponent()); } } public void Tick() { - // Debug.Log("Is still: " + movementDetector.IsStayingStill); float leftPos = kinectSkeleton.PlayerSkeleton.JointPositions[JointType.HandLeft].Relative[0]; float rightPos = kinectSkeleton.PlayerSkeleton.JointPositions[JointType.HandRight].Relative[0]; - if (movementDetector.IsStayingStill) - { - foreach (GameObject ring in rings) - { - ring.GetComponent().rotationsPerMinute = 0.0f; - } - } - else + var rpm = movementDetector.IsStayingStill ? 0f : 0.15f; + foreach (ConstantRotator rotator in rotators) { - foreach (GameObject ring in rings) - { - ring.GetComponent().rotationsPerMinute = 0.15f; - } + rotator.rotationsPerMinute = rpm; } + float shaderInput = -leftPos - rightPos; propertyBlock.SetFloat(_RandomStrength, shaderInput); - // Debug.Log($"Right Hand: {kinectSkeleton.PlayerSkeleton.JointPositions[JointType.HandRight].Relative} , Left Hand: {kinectSkeleton.PlayerSkeleton.JointPositions[JointType.HandLeft].Relative}, Shader Input: {shaderInput}"); foreach (MeshRenderer ringRenderer in ringRenderers) { ringRenderer.SetPropertyBlock(propertyBlock); @@ -73,13 +57,9 @@ namespace NeueRaeume.VirtualChoir.DesertScene float oscInput = ((shaderInput - -1) / (1 - -1)) ; //float oscInput = ((shaderInput - -1) / (1 - -1)) * (1 - 0) + 0; - //Debug.Log($"Shader: {shaderInput}, OSC: {oscInput}"); cachedList.Clear(); cachedList.Add(oscInput); oscDispatcher.SendOscMessage("/desertglitch", cachedList); - } - - } } \ No newline at end of file -- GitLab