diff --git a/Unity_2018_Frozen/Assets/Frozen/Frozen.unity b/Unity_2018_Frozen/Assets/Frozen/Frozen.unity index b97fed4..44de69f 100644 --- a/Unity_2018_Frozen/Assets/Frozen/Frozen.unity +++ b/Unity_2018_Frozen/Assets/Frozen/Frozen.unity @@ -113,6 +113,136 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!43 &34050355 +Mesh: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: 'Space Ground Mesh: (8x5x3)' + serializedVersion: 8 + m_SubMeshes: + - serializedVersion: 2 + firstByte: 0 + indexCount: 24 + topology: 0 + baseVertex: 0 + firstVertex: 0 + vertexCount: 16 + localAABB: + m_Center: {x: 0, y: 1.5, z: 0} + m_Extent: {x: 4, y: 1.5, z: 2.5} + m_Shapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + m_BindPose: [] + m_BoneNameHashes: + m_RootBoneNameHash: 0 + m_MeshCompression: 0 + m_IsReadable: 0 + m_KeepVertices: 1 + m_KeepIndices: 1 + m_IndexFormat: 0 + m_IndexBuffer: 000001000200010003000200040005000600050007000600080009000a0009000b000a000c000d000e000d000f000e00 + m_Skin: [] + m_VertexData: + m_CurrentChannels: 11 + m_VertexCount: 16 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 3 + - stream: 0 + offset: 12 + format: 0 + dimension: 3 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 24 + format: 0 + dimension: 2 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + m_DataSize: 512 + _typelessdata: 000080c000000000000020c0000000000000803f00000000e4388e3e00000000000080c00000000000002040000000000000803f00000000e4388e3e0000203f0000804000000000000020c0000000000000803f000000008ee3383f00000000000080400000000000002040000000000000803f000000008ee3383f0000203f000080c000000000000020400000000000000000000080bfe4388e3e0000203f000080c000004040000020400000000000000000000080bfe4388e3e0000803f0000804000000000000020400000000000000000000080bf8ee3383f0000203f0000804000004040000020400000000000000000000080bf8ee3383f0000803f000080c000000000000020c00000803f0000000000000000000000000000203f000080c000004040000020c00000803f0000000000000000000000000000803f000080c000000000000020400000803f0000000000000000e4388e3e0000203f000080c000004040000020400000803f0000000000000000e4388e3e0000803f000080400000000000002040000080bf00000000000000008ee3383f0000203f000080400000404000002040000080bf00000000000000008ee3383f0000803f0000804000000000000020c0000080bf00000000000000000000803f0000203f0000804000004040000020c0000080bf00000000000000000000803f0000803f + m_CompressedMesh: + m_Vertices: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_UV: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Normals: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Tangents: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Weights: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_NormalSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_TangentSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_FloatColors: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_BoneIndices: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_Triangles: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_UVInfo: 0 + m_LocalAABB: + m_Center: {x: 0, y: 1.5, z: 0} + m_Extent: {x: 4, y: 1.5, z: 2.5} + m_MeshUsageFlags: 0 + m_BakedConvexCollisionMesh: + m_BakedTriangleCollisionMesh: + m_MeshOptimized: 0 --- !u!1 &40068778 GameObject: m_ObjectHideFlags: 0 @@ -810,136 +940,6 @@ MonoBehaviour: PlayOnStart: 1 Looping: 1 AudioVolume: 1 ---- !u!43 &265528380 -Mesh: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_Name: 'Space Ground Mesh: (8x5x3)' - serializedVersion: 8 - m_SubMeshes: - - serializedVersion: 2 - firstByte: 0 - indexCount: 24 - topology: 0 - baseVertex: 0 - firstVertex: 0 - vertexCount: 16 - localAABB: - m_Center: {x: 0, y: 1.5, z: 0} - m_Extent: {x: 4, y: 1.5, z: 2.5} - m_Shapes: - vertices: [] - shapes: [] - channels: [] - fullWeights: [] - m_BindPose: [] - m_BoneNameHashes: - m_RootBoneNameHash: 0 - m_MeshCompression: 0 - m_IsReadable: 0 - m_KeepVertices: 1 - m_KeepIndices: 1 - m_IndexFormat: 0 - m_IndexBuffer: 000001000200010003000200040005000600050007000600080009000a0009000b000a000c000d000e000d000f000e00 - m_Skin: [] - m_VertexData: - m_CurrentChannels: 11 - m_VertexCount: 16 - m_Channels: - - stream: 0 - offset: 0 - format: 0 - dimension: 3 - - stream: 0 - offset: 12 - format: 0 - dimension: 3 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 24 - format: 0 - dimension: 2 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - m_DataSize: 512 - _typelessdata: 000080c000000000000020c0000000000000803f00000000e4388e3e00000000000080c00000000000002040000000000000803f00000000e4388e3e0000203f0000804000000000000020c0000000000000803f000000008ee3383f00000000000080400000000000002040000000000000803f000000008ee3383f0000203f000080c000000000000020400000000000000000000080bfe4388e3e0000203f000080c000004040000020400000000000000000000080bfe4388e3e0000803f0000804000000000000020400000000000000000000080bf8ee3383f0000203f0000804000004040000020400000000000000000000080bf8ee3383f0000803f000080c000000000000020c00000803f0000000000000000000000000000203f000080c000004040000020c00000803f0000000000000000000000000000803f000080c000000000000020400000803f0000000000000000e4388e3e0000203f000080c000004040000020400000803f0000000000000000e4388e3e0000803f000080400000000000002040000080bf00000000000000008ee3383f0000203f000080400000404000002040000080bf00000000000000008ee3383f0000803f0000804000000000000020c0000080bf00000000000000000000803f0000203f0000804000004040000020c0000080bf00000000000000000000803f0000803f - m_CompressedMesh: - m_Vertices: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_UV: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Normals: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Tangents: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Weights: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_NormalSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_TangentSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_FloatColors: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_BoneIndices: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_Triangles: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_UVInfo: 0 - m_LocalAABB: - m_Center: {x: 0, y: 1.5, z: 0} - m_Extent: {x: 4, y: 1.5, z: 2.5} - m_MeshUsageFlags: 0 - m_BakedConvexCollisionMesh: - m_BakedTriangleCollisionMesh: - m_MeshOptimized: 0 --- !u!1 &282141325 GameObject: m_ObjectHideFlags: 0 @@ -1223,6 +1223,22 @@ MonoBehaviour: triggerRadius: 1.6 cooldown: 30 offset: 1.5 + onPlay: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1346694745} + m_MethodName: PlayOneShot + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null breakProgress: 0.1 --- !u!1 &368967883 GameObject: @@ -1364,7 +1380,6 @@ MonoBehaviour: m_EditorClassIdentifier: folder: FrozenMaterial\sound\sfx\20180514_Frozen_SFX_Character_Stem filenames: [] - loop: 0 --- !u!1 &411383572 GameObject: m_ObjectHideFlags: 0 @@ -2886,7 +2901,7 @@ MonoBehaviour: width: 8 length: 5 height: 3 - isAnimated: 0 + isAnimated: 1 --- !u!1 &952607033 GameObject: m_ObjectHideFlags: 0 @@ -3370,7 +3385,6 @@ MonoBehaviour: - 20180514_Frozen_SE_MovingEFX_4.aif - 20180514_Frozen_SE_MovingEFX_5.aif - 20180514_Frozen_SE_MovingEFX_6.aif - loop: 0 --- !u!1 &1212194686 GameObject: m_ObjectHideFlags: 0 @@ -3413,7 +3427,6 @@ MonoBehaviour: m_EditorClassIdentifier: folder: FrozenMaterial\sound\sfx filenames: [] - loop: 0 --- !u!1 &1216863871 GameObject: m_ObjectHideFlags: 0 @@ -3919,7 +3932,6 @@ MonoBehaviour: m_EditorClassIdentifier: folder: FrozenMaterial\sound\sfx filenames: [] - loop: 0 --- !u!1 &1355871871 GameObject: m_ObjectHideFlags: 0 @@ -4020,7 +4032,6 @@ MonoBehaviour: m_EditorClassIdentifier: folder: FrozenMaterial\sound\sfx filenames: [] - loop: 0 --- !u!4 &1373766508 Transform: m_ObjectHideFlags: 0 @@ -4104,7 +4115,7 @@ MeshFilter: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1379541361} - m_Mesh: {fileID: 265528380} + m_Mesh: {fileID: 34050355} --- !u!1 &1390635887 GameObject: m_ObjectHideFlags: 0 @@ -4191,7 +4202,6 @@ MonoBehaviour: m_EditorClassIdentifier: folder: FrozenMaterial\sound\sfx\20180514_Frozen_SFX_Character_Stem filenames: [] - loop: 0 --- !u!1 &1447401797 GameObject: m_ObjectHideFlags: 0 @@ -4234,7 +4244,6 @@ MonoBehaviour: m_EditorClassIdentifier: folder: FrozenMaterial\sound\sfx\20180514_Frozen_SFX_Character_Stem filenames: [] - loop: 0 --- !u!1 &1451842896 GameObject: m_ObjectHideFlags: 0 @@ -4515,7 +4524,6 @@ MonoBehaviour: m_EditorClassIdentifier: folder: FrozenMaterial\sound\bgm filenames: [] - loop: 1 --- !u!1 &1690794384 GameObject: m_ObjectHideFlags: 0 @@ -5464,7 +5472,6 @@ MonoBehaviour: m_EditorClassIdentifier: folder: FrozenMaterial\sound\bgm filenames: [] - loop: 1 --- !u!1 &1930102124 GameObject: m_ObjectHideFlags: 0 @@ -5938,11 +5945,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d657b4acfe92b2949ba98770de6f12ad, type: 3} m_Name: m_EditorClassIdentifier: + state: 0 rate: 0 uniform: {fileID: 441718965} - spaceMaterials: - - {fileID: 2100000, guid: c1451959794f55e4e90241e1720a9e08, type: 2} - - {fileID: 2100000, guid: 63732a6f5c28edd4e87389f4158094bd, type: 2} + spaceMaterials: [] snowSize: 0.0164 snowMaterial: {fileID: 2100000, guid: 56457e5f2df74a44c933b2791da81324, type: 2} cosineGradient: {fileID: 1167120024} @@ -5960,6 +5966,87 @@ MonoBehaviour: - {fileID: 1973785474} - {fileID: 1984882819} - {fileID: 1225287935} + onSceneStandby: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1925824387} + m_MethodName: FadeOut + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 1679617817} + m_MethodName: FadeOut + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + onSceneDay: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1925824387} + m_MethodName: FadeIn + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 1679617817} + m_MethodName: FadeOut + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + onSceneNight: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1925824387} + m_MethodName: FadeOut + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 1679617817} + m_MethodName: FadeIn + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null mode: 0 --- !u!4 &2084936104 Transform: diff --git a/Unity_2018_Frozen/Assets/Frozen/Material/Space-Wall.mat b/Unity_2018_Frozen/Assets/Frozen/Material/Space-Wall.mat index 4e966b9..b3cb840 100644 --- a/Unity_2018_Frozen/Assets/Frozen/Material/Space-Wall.mat +++ b/Unity_2018_Frozen/Assets/Frozen/Material/Space-Wall.mat @@ -39,7 +39,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: 2a0d6dab08d40bc4fa8783efdc682ca7, type: 3} + m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: @@ -55,7 +55,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _SubTex: - m_Texture: {fileID: 2800000, guid: ae04e57c11d96fa4ab1c13f67394f3b6, type: 3} + m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Floats: diff --git a/Unity_2018_Frozen/Assets/Frozen/Script/GiantSnowflake.cs b/Unity_2018_Frozen/Assets/Frozen/Script/GiantSnowflake.cs index cf51e65..a9a7864 100644 --- a/Unity_2018_Frozen/Assets/Frozen/Script/GiantSnowflake.cs +++ b/Unity_2018_Frozen/Assets/Frozen/Script/GiantSnowflake.cs @@ -1,6 +1,7 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; +using UnityEngine.Events; namespace UltraCombos.Frozen { @@ -29,6 +30,8 @@ namespace UltraCombos.Frozen Coroutine flow = null; + public UnityEvent onPlay = new UnityEvent(); + private void Start() { root = transform.position; @@ -120,6 +123,7 @@ namespace UltraCombos.Frozen } //Debug.Log("Play the rest"); player.Play(); + onPlay.Invoke(); while (player.IsFinished == false) { yield return null; diff --git a/Unity_2018_Frozen/Assets/Frozen/Script/SceneController.cs b/Unity_2018_Frozen/Assets/Frozen/Script/SceneController.cs index a293e0c..8e6a999 100644 --- a/Unity_2018_Frozen/Assets/Frozen/Script/SceneController.cs +++ b/Unity_2018_Frozen/Assets/Frozen/Script/SceneController.cs @@ -1,19 +1,28 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; +using UnityEngine.Events; namespace UltraCombos.Frozen { public class SceneController : Singleton { + public enum State + { + Standby, + Day, + Night, + } + public State state; + [Range(0, 1)] public float rate = 0.0f; [SerializeField] UniformBlendedStructuredBuffer uniform; - [SerializeField] - List spaceMaterials = new List(); + //[SerializeField] + public List spaceMaterials = new List(); [SerializeField, Range(0.0f, 0.1f)] float snowSize = 0.01f; @@ -42,7 +51,12 @@ namespace UltraCombos.Frozen float target_rate = 0.0f; - [SerializeField] + + public UnityEvent onSceneStandby = new UnityEvent(); + public UnityEvent onSceneDay = new UnityEvent(); + public UnityEvent onSceneNight = new UnityEvent(); + + [SerializeField, Header("Debug")] bool mode = false; float stamp = 0.0f; @@ -62,14 +76,46 @@ namespace UltraCombos.Frozen } } + if (state == State.Standby) { - //rate = Mathf.Sin(Time.time * 0.2f) * 0.5f + 0.5f; - if (Input.GetKeyDown(KeyCode.PageDown) || Input.GetKeyDown(KeyCode.PageUp)) + target_rate = 0.0f; + if (Input.GetKeyDown(KeyCode.PageDown)) { - target_rate = 1.0f - target_rate; + state = State.Day; + onSceneDay.Invoke(); + } + } + else if (state == State.Day) + { + target_rate = 0.0f; + if (Input.GetKeyDown(KeyCode.PageUp)) + { + state = State.Standby; + onSceneStandby.Invoke(); + } + else if (Input.GetKeyDown(KeyCode.PageDown)) + { + state = State.Night; + onSceneNight.Invoke(); } - rate = Mathf.Lerp(rate, target_rate, 0.02f); } + else if (state == State.Night) + { + target_rate = 1.0f; + if (Input.GetKeyDown(KeyCode.PageUp)) + { + state = State.Standby; + onSceneStandby.Invoke(); + } + else if (Input.GetKeyDown(KeyCode.PageDown)) + { + state = State.Day; + onSceneDay.Invoke(); + } + } + + rate = Mathf.Lerp(rate, target_rate, 0.02f); + uniform.rate = rate; foreach (var mat in spaceMaterials) diff --git a/Unity_2018_Frozen/Assets/Frozen/Script/SoundLoader.cs b/Unity_2018_Frozen/Assets/Frozen/Script/SoundLoader.cs index c9c4742..876d4b4 100644 --- a/Unity_2018_Frozen/Assets/Frozen/Script/SoundLoader.cs +++ b/Unity_2018_Frozen/Assets/Frozen/Script/SoundLoader.cs @@ -12,14 +12,13 @@ namespace UltraCombos [SerializeField] List filenames = new List(); - - [SerializeField] - bool loop = false; - + List clips = new List(); AudioSource source = null; + float target_volume = 1.0f; + private void Start() { if (filenames.Count == 0) @@ -36,7 +35,6 @@ namespace UltraCombos } source = gameObject.AddComponent(); - source.loop = loop; } void LoadFile(string filename) @@ -68,7 +66,7 @@ namespace UltraCombos private void Update() { - + source.volume = Mathf.Lerp(source.volume, target_volume, Time.deltaTime); } public void PlayOneShot() @@ -77,14 +75,21 @@ namespace UltraCombos source.PlayOneShot(clips[Random.Range(0, clips.Count)]); } - private void FadeIn() + public void FadeIn() { - + if (clips.Count == 0) + return; + source.clip = clips[0]; + source.Play(); + source.volume = 0.0f; + target_volume = 1.0f; } - private void FadeOut() + public void FadeOut() { - + if (clips.Count == 0) + return; + target_volume = 0.0f; } IEnumerator LoadAudioFile(string uri, AudioType type) diff --git a/Unity_2018_Frozen/Assets/Frozen/Script/SpaceMeshGenerator.cs b/Unity_2018_Frozen/Assets/Frozen/Script/SpaceMeshGenerator.cs index 4d1fa97..0694ded 100644 --- a/Unity_2018_Frozen/Assets/Frozen/Script/SpaceMeshGenerator.cs +++ b/Unity_2018_Frozen/Assets/Frozen/Script/SpaceMeshGenerator.cs @@ -30,6 +30,18 @@ namespace UltraCombos.Frozen if (Application.isPlaying) { + var renderers = GetComponentsInChildren(); + if (renderers.Length > 1) + { + renderers[1].material.SetFloat("_isGamma", isAnimated ? 1.0f : 0.0f); + } + + SceneController.Instance.spaceMaterials.Clear(); + foreach (var rdr in renderers) + { + SceneController.Instance.spaceMaterials.Add(rdr.material); + } + if (isAnimated) { var players = GetComponentsInChildren(true); @@ -37,12 +49,15 @@ namespace UltraCombos.Frozen { mp.gameObject.SetActive(true); } - } + + var texture_applys = GetComponentsInChildren(true); + foreach (var ta in texture_applys) + { + ta.materials.Clear(); + ta.materials.Add(renderers[1].material); + } - var renderers = GetComponentsInChildren(); - if (renderers.Length > 1) - { - renderers[1].material.SetFloat("_isGamma", isAnimated ? 1.0f : 0.0f); + } } } diff --git a/Unity_2018_Frozen/Assets/KinectOpticalFlow/Grpc/KinectBufferComposite.compute b/Unity_2018_Frozen/Assets/KinectOpticalFlow/Grpc/KinectBufferComposite.compute index 8fe34e1..d616ea3 100644 --- a/Unity_2018_Frozen/Assets/KinectOpticalFlow/Grpc/KinectBufferComposite.compute +++ b/Unity_2018_Frozen/Assets/KinectOpticalFlow/Grpc/KinectBufferComposite.compute @@ -10,7 +10,6 @@ RWStructuredBuffer position_buffer; RWStructuredBuffer velocity_buffer; Texture2D depth_texture; -//Texture2D depth_low_texture; Texture2D velocity_texture; float4x4 kinect_matrix; @@ -80,5 +79,5 @@ void CSMain(uint3 id : SV_DispatchThreadID) } position_buffer[index] = float4(kpos, 1.0); - velocity_buffer[index] = float4(kvel, 0.0); + velocity_buffer[index] = float4(-kvel, 0.0); } diff --git a/Unity_2018_Frozen/Assets/KinectOpticalFlow/KinectUpdateShader.compute b/Unity_2018_Frozen/Assets/KinectOpticalFlow/KinectUpdateShader.compute index acf202f..7053062 100644 --- a/Unity_2018_Frozen/Assets/KinectOpticalFlow/KinectUpdateShader.compute +++ b/Unity_2018_Frozen/Assets/KinectOpticalFlow/KinectUpdateShader.compute @@ -8,18 +8,12 @@ RWStructuredBuffer KinectPositionBuffer; RWStructuredBuffer KinectVelocityBuffer; RWStructuredBuffer KinectGridBuffer; -//RWStructuredBuffer KinectOpticalBuffer; RWStructuredBuffer FinalPositionBuffer; RWStructuredBuffer FinalVelocityBuffer; AppendStructuredBuffer HomePositionBuffer; AppendStructuredBuffer HomeVelocityBuffer; -//Texture2D PositionTexture; -//Texture2D VelocityTexture; -//Texture2D MotionTexture; -//Texture2DArray MotionTextureArray; - float4 ClipMin; float4 ClipMax; float4x4 ModelMatrix;