From ae17d6d966658bf00780c317c00f7d6530c00dbd Mon Sep 17 00:00:00 2001 From: uc-hoba Date: Thu, 3 May 2018 17:15:55 +0800 Subject: [PATCH] add Characters clean code --- .../Assets/Frozen/DSAsset/Anna-Standby.asset | 15 + .../Frozen/DSAsset/Anna-Standby.asset.meta | 10 + .../Assets/Frozen/DSAsset/Anna-Trigger.asset | 15 + .../Frozen/DSAsset/Anna-Trigger.asset.meta | 10 + .../Assets/Frozen/DSAsset/Elsa-Standby.asset | 15 + .../Frozen/DSAsset/Elsa-Standby.asset.meta | 10 + .../Assets/Frozen/DSAsset/Elsa-Trigger.asset | 15 + .../Frozen/DSAsset/Elsa-Trigger.asset.meta | 10 + .../Frozen/DSAsset/Kristoff-Standby.asset | 15 + .../DSAsset/Kristoff-Standby.asset.meta | 10 + .../Frozen/DSAsset/Kristoff-Trigger.asset | 15 + .../DSAsset/Kristoff-Trigger.asset.meta | 10 + .../DSAsset/Olaf_CC065053-Trigger.asset | 2 +- .../DSAsset/Olaf_CC065056-Trigger.asset | 2 +- .../Assets/Frozen/DSAsset/Sven-Standby.asset | 15 + .../Frozen/DSAsset/Sven-Standby.asset.meta | 10 + .../Assets/Frozen/DSAsset/Sven-Trigger.asset | 15 + .../Frozen/DSAsset/Sven-Trigger.asset.meta | 10 + Unity_2018_Frozen/Assets/Frozen/Frozen.unity | 1685 +++++++---------- .../Assets/Frozen/Material/Point.mat | 2 +- .../Assets/Frozen/Material/Space.mat | 2 +- .../Frozen/Script/DFVolumeParticleUpdater.cs | 120 -- .../Script/DFVolumeParticleUpdater.cs.meta | 13 - .../Frozen/Script/SnowflakeParticleUpdater.cs | 6 +- .../Assets/Frozen/Texture/Character/Anna.mat | 76 + .../Frozen/Texture/Character/Anna.mat.meta | 10 + .../Assets/Frozen/Texture/Character/Elsa.mat | 76 + .../Frozen/Texture/Character/Elsa.mat.meta | 10 + .../Assets/Frozen/Texture/Character/Elsa.png | 3 + .../Frozen/Texture/Character/Elsa.png.meta | 88 + .../Frozen/Texture/Character/Kristoff.mat | 76 + .../Texture/Character/Kristoff.mat.meta | 10 + .../Frozen/Texture/Character/Kristoff.png | 3 + .../Texture/Character/Kristoff.png.meta | 88 + .../Texture/Character/Olaf_CC065053.png | 4 +- .../Texture/Character/Olaf_CC065056.png | 4 +- .../Assets/Frozen/Texture/Character/Sven.mat | 76 + .../Frozen/Texture/Character/Sven.mat.meta | 10 + .../Assets/Frozen/Texture/Character/Sven.png | 3 + .../Frozen/Texture/Character/Sven.png.meta | 88 + .../Assets/Frozen/Texture/Character/anna.png | 3 + .../Frozen/Texture/Character/anna.png.meta | 88 + .../Grpc/KinectBufferComposite.compute | 5 +- .../Grpc/KinectGrpcServer.cs | 9 +- .../KinectOpticalFlow/KinectOpticalFlow.cs | 8 +- .../KinectUpdateShader.compute | 4 +- .../ParticleWorks/Script/ParticleUpdater.cs | 2 - Unity_2018_Frozen/Assets/UnityUtils | 2 +- .../ProjectSettings/ProjectVersion.txt | 2 +- of_v0.9.8/apps/myApps/Kinect2Motion | 2 +- of_v0.9.8/uc_libs/lib_libfreenect2 | 2 +- 51 files changed, 1649 insertions(+), 1135 deletions(-) create mode 100644 Unity_2018_Frozen/Assets/Frozen/DSAsset/Anna-Standby.asset create mode 100644 Unity_2018_Frozen/Assets/Frozen/DSAsset/Anna-Standby.asset.meta create mode 100644 Unity_2018_Frozen/Assets/Frozen/DSAsset/Anna-Trigger.asset create mode 100644 Unity_2018_Frozen/Assets/Frozen/DSAsset/Anna-Trigger.asset.meta create mode 100644 Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa-Standby.asset create mode 100644 Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa-Standby.asset.meta create mode 100644 Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa-Trigger.asset create mode 100644 Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa-Trigger.asset.meta create mode 100644 Unity_2018_Frozen/Assets/Frozen/DSAsset/Kristoff-Standby.asset create mode 100644 Unity_2018_Frozen/Assets/Frozen/DSAsset/Kristoff-Standby.asset.meta create mode 100644 Unity_2018_Frozen/Assets/Frozen/DSAsset/Kristoff-Trigger.asset create mode 100644 Unity_2018_Frozen/Assets/Frozen/DSAsset/Kristoff-Trigger.asset.meta create mode 100644 Unity_2018_Frozen/Assets/Frozen/DSAsset/Sven-Standby.asset create mode 100644 Unity_2018_Frozen/Assets/Frozen/DSAsset/Sven-Standby.asset.meta create mode 100644 Unity_2018_Frozen/Assets/Frozen/DSAsset/Sven-Trigger.asset create mode 100644 Unity_2018_Frozen/Assets/Frozen/DSAsset/Sven-Trigger.asset.meta delete mode 100644 Unity_2018_Frozen/Assets/Frozen/Script/DFVolumeParticleUpdater.cs delete mode 100644 Unity_2018_Frozen/Assets/Frozen/Script/DFVolumeParticleUpdater.cs.meta create mode 100644 Unity_2018_Frozen/Assets/Frozen/Texture/Character/Anna.mat create mode 100644 Unity_2018_Frozen/Assets/Frozen/Texture/Character/Anna.mat.meta create mode 100644 Unity_2018_Frozen/Assets/Frozen/Texture/Character/Elsa.mat create mode 100644 Unity_2018_Frozen/Assets/Frozen/Texture/Character/Elsa.mat.meta create mode 100644 Unity_2018_Frozen/Assets/Frozen/Texture/Character/Elsa.png create mode 100644 Unity_2018_Frozen/Assets/Frozen/Texture/Character/Elsa.png.meta create mode 100644 Unity_2018_Frozen/Assets/Frozen/Texture/Character/Kristoff.mat create mode 100644 Unity_2018_Frozen/Assets/Frozen/Texture/Character/Kristoff.mat.meta create mode 100644 Unity_2018_Frozen/Assets/Frozen/Texture/Character/Kristoff.png create mode 100644 Unity_2018_Frozen/Assets/Frozen/Texture/Character/Kristoff.png.meta create mode 100644 Unity_2018_Frozen/Assets/Frozen/Texture/Character/Sven.mat create mode 100644 Unity_2018_Frozen/Assets/Frozen/Texture/Character/Sven.mat.meta create mode 100644 Unity_2018_Frozen/Assets/Frozen/Texture/Character/Sven.png create mode 100644 Unity_2018_Frozen/Assets/Frozen/Texture/Character/Sven.png.meta create mode 100644 Unity_2018_Frozen/Assets/Frozen/Texture/Character/anna.png create mode 100644 Unity_2018_Frozen/Assets/Frozen/Texture/Character/anna.png.meta diff --git a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Anna-Standby.asset b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Anna-Standby.asset new file mode 100644 index 0000000..48159b6 --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Anna-Standby.asset @@ -0,0 +1,15 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b7eca376a120a0e49a97afa024778843, type: 3} + m_Name: Anna-Standby + m_EditorClassIdentifier: + m_VideoLocation: 1 + m_VideoPath: ../FrozenMaterial/Demo/Olaf-standby.avi diff --git a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Anna-Standby.asset.meta b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Anna-Standby.asset.meta new file mode 100644 index 0000000..d6c8917 --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Anna-Standby.asset.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 6d7b66e288bf3924fbd7a716ae3ac255 +timeCreated: 1524210684 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Anna-Trigger.asset b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Anna-Trigger.asset new file mode 100644 index 0000000..632bc87 --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Anna-Trigger.asset @@ -0,0 +1,15 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b7eca376a120a0e49a97afa024778843, type: 3} + m_Name: Anna-Trigger + m_EditorClassIdentifier: + m_VideoLocation: 1 + m_VideoPath: ../FrozenMaterial/day/anna_hap.avi diff --git a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Anna-Trigger.asset.meta b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Anna-Trigger.asset.meta new file mode 100644 index 0000000..fa0bcd3 --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Anna-Trigger.asset.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 2845fcd21d061464f8f97219a167ba7a +timeCreated: 1524453128 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa-Standby.asset b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa-Standby.asset new file mode 100644 index 0000000..bc6e225 --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa-Standby.asset @@ -0,0 +1,15 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b7eca376a120a0e49a97afa024778843, type: 3} + m_Name: Elsa-Standby + m_EditorClassIdentifier: + m_VideoLocation: 1 + m_VideoPath: ../FrozenMaterial/Demo/Olaf-standby.avi diff --git a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa-Standby.asset.meta b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa-Standby.asset.meta new file mode 100644 index 0000000..beee477 --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa-Standby.asset.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: aa1bbb3d5a802fb47880c1cf0237dc60 +timeCreated: 1524210684 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa-Trigger.asset b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa-Trigger.asset new file mode 100644 index 0000000..82b8946 --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa-Trigger.asset @@ -0,0 +1,15 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b7eca376a120a0e49a97afa024778843, type: 3} + m_Name: Elsa-Trigger + m_EditorClassIdentifier: + m_VideoLocation: 1 + m_VideoPath: ../FrozenMaterial/night/Elsa_Hap.avi diff --git a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa-Trigger.asset.meta b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa-Trigger.asset.meta new file mode 100644 index 0000000..be96956 --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa-Trigger.asset.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 2ea2925de6b8a934fa0ea7a7020103b1 +timeCreated: 1524453128 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Kristoff-Standby.asset b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Kristoff-Standby.asset new file mode 100644 index 0000000..f507836 --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Kristoff-Standby.asset @@ -0,0 +1,15 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b7eca376a120a0e49a97afa024778843, type: 3} + m_Name: Kristoff-Standby + m_EditorClassIdentifier: + m_VideoLocation: 1 + m_VideoPath: ../FrozenMaterial/Demo/Olaf-standby.avi diff --git a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Kristoff-Standby.asset.meta b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Kristoff-Standby.asset.meta new file mode 100644 index 0000000..baa4375 --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Kristoff-Standby.asset.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: dfdc3af2e37491840b05776ce71e1ca8 +timeCreated: 1524210684 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Kristoff-Trigger.asset b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Kristoff-Trigger.asset new file mode 100644 index 0000000..abc937e --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Kristoff-Trigger.asset @@ -0,0 +1,15 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b7eca376a120a0e49a97afa024778843, type: 3} + m_Name: Kristoff-Trigger + m_EditorClassIdentifier: + m_VideoLocation: 1 + m_VideoPath: ../FrozenMaterial/day/Kristoff.avi diff --git a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Kristoff-Trigger.asset.meta b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Kristoff-Trigger.asset.meta new file mode 100644 index 0000000..abc383a --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Kristoff-Trigger.asset.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: a6af2089baf7ed8489a4e941dae4e928 +timeCreated: 1524453128 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Olaf_CC065053-Trigger.asset b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Olaf_CC065053-Trigger.asset index 7b94835..7b5fadd 100644 --- a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Olaf_CC065053-Trigger.asset +++ b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Olaf_CC065053-Trigger.asset @@ -12,4 +12,4 @@ MonoBehaviour: m_Name: Olaf_CC065053-Trigger m_EditorClassIdentifier: m_VideoLocation: 1 - m_VideoPath: ../FrozenMaterial/Demo/Olaf_CC065053_Hap.avi + m_VideoPath: ../FrozenMaterial/day/Olaf_CC065053_Hap.avi diff --git a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Olaf_CC065056-Trigger.asset b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Olaf_CC065056-Trigger.asset index a9a94b3..ed0657f 100644 --- a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Olaf_CC065056-Trigger.asset +++ b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Olaf_CC065056-Trigger.asset @@ -12,4 +12,4 @@ MonoBehaviour: m_Name: Olaf_CC065056-Trigger m_EditorClassIdentifier: m_VideoLocation: 1 - m_VideoPath: ../FrozenMaterial/Demo/Olaf_CC065056_Hap.avi + m_VideoPath: ../FrozenMaterial/night/Olaf_CC065056_Hap.avi diff --git a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Sven-Standby.asset b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Sven-Standby.asset new file mode 100644 index 0000000..f78db50 --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Sven-Standby.asset @@ -0,0 +1,15 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b7eca376a120a0e49a97afa024778843, type: 3} + m_Name: Sven-Standby + m_EditorClassIdentifier: + m_VideoLocation: 1 + m_VideoPath: ../FrozenMaterial/Demo/Olaf-standby.avi diff --git a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Sven-Standby.asset.meta b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Sven-Standby.asset.meta new file mode 100644 index 0000000..d2aad7e --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Sven-Standby.asset.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 0dfbbcfb9e891fe49874e63122982159 +timeCreated: 1524210684 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Sven-Trigger.asset b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Sven-Trigger.asset new file mode 100644 index 0000000..10fd15c --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Sven-Trigger.asset @@ -0,0 +1,15 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b7eca376a120a0e49a97afa024778843, type: 3} + m_Name: Sven-Trigger + m_EditorClassIdentifier: + m_VideoLocation: 1 + m_VideoPath: ../FrozenMaterial/day/Sven.avi diff --git a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Sven-Trigger.asset.meta b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Sven-Trigger.asset.meta new file mode 100644 index 0000000..43ec21c --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Sven-Trigger.asset.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 0aa239f497b53734eb6adca529ab6225 +timeCreated: 1524453128 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity_2018_Frozen/Assets/Frozen/Frozen.unity b/Unity_2018_Frozen/Assets/Frozen/Frozen.unity index 758c8d3..0479915 100644 --- a/Unity_2018_Frozen/Assets/Frozen/Frozen.unity +++ b/Unity_2018_Frozen/Assets/Frozen/Frozen.unity @@ -113,72 +113,6 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!1 &67279955 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 - m_Component: - - component: {fileID: 67279956} - - component: {fileID: 67279957} - m_Layer: 5 - m_Name: Kinect Camera V2 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &67279956 -Transform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 67279955} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -2.28, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 2122473687} - m_Father: {fileID: 401185751} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!20 &67279957 -Camera: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 67279955} - m_Enabled: 1 - serializedVersion: 2 - m_ClearFlags: 1 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} - m_NormalizedViewPortRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - near clip plane: 0.3 - far clip plane: 1000 - field of view: 60 - orthographic: 0 - orthographic size: 5 - m_Depth: 0 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingPath: 1 - m_TargetTexture: {fileID: 8400000, guid: f9c2cef894c9cc54f807a92207bf6eda, type: 2} - m_TargetDisplay: 1 - m_TargetEye: 3 - m_HDR: 1 - m_AllowMSAA: 0 - m_AllowDynamicResolution: 0 - m_ForceIntoRT: 0 - m_OcclusionCulling: 1 - m_StereoConvergence: 10 - m_StereoSeparation: 0.022 --- !u!1 &102745337 GameObject: m_ObjectHideFlags: 0 @@ -233,7 +167,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 10 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &147055504 GameObject: @@ -262,11 +196,11 @@ Transform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 147055504} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.496, y: 0.483, z: 2.49} + m_LocalPosition: {x: 1.306, y: 0.483, z: 2.49} m_LocalScale: {x: 1.0630362, y: 1.0630376, z: 1.0630376} m_Children: [] m_Father: {fileID: 917676528} - m_RootOrder: 3 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!54 &147055506 Rigidbody: @@ -298,6 +232,7 @@ MonoBehaviour: disappearTime: 5 mat: {fileID: 0} area: 0 + AppearArea: 0000000001000000 wallRoi: {x: 0, y: 0} heightRange: {x: 0, y: 0.1} fakeButton: {fileID: 0} @@ -443,6 +378,92 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &165270300 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 165270301} + - component: {fileID: 165270304} + - component: {fileID: 165270303} + - component: {fileID: 165270302} + m_Layer: 9 + m_Name: Quad + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &165270301 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 165270300} + m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0, y: 0, z: 1.5} + m_LocalScale: {x: 8, y: 5, z: 1} + m_Children: [] + m_Father: {fileID: 732632615} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} +--- !u!23 &165270302 +MeshRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 165270300} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_Materials: + - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 1 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!64 &165270303 +MeshCollider: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 165270300} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Convex: 0 + m_CookingOptions: 14 + m_SkinWidth: 0.01 + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!33 &165270304 +MeshFilter: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 165270300} + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &182553293 GameObject: m_ObjectHideFlags: 0 @@ -595,7 +616,7 @@ Transform: m_Children: - {fileID: 917676528} m_Father: {fileID: 0} - m_RootOrder: 16 + m_RootOrder: 15 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &350883107 GameObject: @@ -686,7 +707,7 @@ Camera: far clip plane: 1000 field of view: 60 orthographic: 1 - orthographic size: 5 + orthographic size: 7 m_Depth: 0 m_CullingMask: serializedVersion: 2 @@ -713,7 +734,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 11 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} --- !u!1 &386695295 GameObject: @@ -745,37 +766,6 @@ Transform: - {fileID: 1848145250} - {fileID: 887356093} m_Father: {fileID: 0} - m_RootOrder: 9 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &401185750 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 - m_Component: - - component: {fileID: 401185751} - m_Layer: 5 - m_Name: Kinect Spout - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &401185751 -Transform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 401185750} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: -10, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 67279956} - - {fileID: 694714222} - - {fileID: 1553193321} - m_Father: {fileID: 0} m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &411383572 @@ -832,7 +822,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 20 + m_RootOrder: 19 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &438615021 GameObject: @@ -924,7 +914,7 @@ RectTransform: - {fileID: 770059767} - {fileID: 1774693142} m_Father: {fileID: 0} - m_RootOrder: 19 + m_RootOrder: 18 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -975,113 +965,241 @@ MonoBehaviour: uniform: {fileID: 11400000, guid: 43473f0506b1ba64c86ae17dd11d902a, type: 2} subUniform: {fileID: 11400000, guid: 54b82be1afe58664c8daeb575db89094, type: 2} rate: 0 ---- !u!1 &520040865 +--- !u!1 &461690048 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} serializedVersion: 5 m_Component: - - component: {fileID: 520040869} - - component: {fileID: 520040868} - m_Layer: 0 - m_Name: Final Camera + - component: {fileID: 461690049} + - component: {fileID: 461690054} + - component: {fileID: 461690053} + - component: {fileID: 461690052} + - component: {fileID: 461690051} + - component: {fileID: 461690050} + m_Layer: 8 + m_Name: Sven m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!20 &520040868 -Camera: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 520040865} - m_Enabled: 1 - serializedVersion: 2 - m_ClearFlags: 2 - m_BackGroundColor: {r: 0, g: 0, b: 0, a: 1} - m_NormalizedViewPortRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - near clip plane: 0.3 - far clip plane: 1000 - field of view: 60 - orthographic: 0 - orthographic size: 5 - m_Depth: 0 - m_CullingMask: - serializedVersion: 2 - m_Bits: 32 - m_RenderingPath: 1 - m_TargetTexture: {fileID: 0} - m_TargetDisplay: 0 - m_TargetEye: 3 - m_HDR: 0 - m_AllowMSAA: 0 - m_AllowDynamicResolution: 0 - m_ForceIntoRT: 1 - m_OcclusionCulling: 1 - m_StereoConvergence: 10 - m_StereoSeparation: 0.022 ---- !u!4 &520040869 +--- !u!4 &461690049 Transform: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 520040865} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 40, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_GameObject: {fileID: 461690048} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.556, y: 1.117, z: 2.49} + m_LocalScale: {x: 1.8937764, y: 1.8937769, z: 1.8937769} m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 24 + m_Father: {fileID: 917676528} + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &528715328 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 - m_Component: - - component: {fileID: 528715329} - - component: {fileID: 528715333} - - component: {fileID: 528715332} - - component: {fileID: 528715331} - m_Layer: 0 - m_Name: Sphere - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &528715329 -Transform: +--- !u!54 &461690050 +Rigidbody: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 528715328} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0.5, z: 0} - m_LocalScale: {x: 0.2, y: 0.2, z: 0.2} - m_Children: [] - m_Father: {fileID: 850228141} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!23 &528715331 -MeshRenderer: + m_GameObject: {fileID: 461690048} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 0 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!114 &461690051 +MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 528715328} - m_Enabled: 0 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_MotionVectors: 1 + m_GameObject: {fileID: 461690048} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 12ea4d85cdda0aa4981a82e5e18fed52, type: 3} + m_Name: + m_EditorClassIdentifier: + standby: 1 + disappearTime: 5 + mat: {fileID: 0} + area: 0 + AppearArea: 02000000 + wallRoi: {x: 0, y: 0} + heightRange: {x: 0, y: 0.1} + fakeButton: {fileID: 0} + standbyClip: {fileID: 11400000, guid: 0dfbbcfb9e891fe49874e63122982159, type: 2} + triggerClip: {fileID: 11400000, guid: 0aa239f497b53734eb6adca529ab6225, type: 2} + players: [] + color: {r: 1, g: 1, b: 1, a: 1} + videoStopTime: 1.5 + isTriggerCollider: 0 +--- !u!23 &461690052 +MeshRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 461690048} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_Materials: + - {fileID: 2100000, guid: 839c0e58e555dab48be2d0d4b169e1ca, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 1 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!64 &461690053 +MeshCollider: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 461690048} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 3 + m_Convex: 1 + m_CookingOptions: 14 + m_SkinWidth: 0.01 + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!33 &461690054 +MeshFilter: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 461690048} + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &520040865 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 520040869} + - component: {fileID: 520040868} + m_Layer: 0 + m_Name: Final Camera + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!20 &520040868 +Camera: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 520040865} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 2 + m_BackGroundColor: {r: 0, g: 0, b: 0, a: 1} + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 0 + orthographic size: 5 + m_Depth: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 32 + m_RenderingPath: 1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 0 + m_AllowMSAA: 0 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 1 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!4 &520040869 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 520040865} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 40, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 23 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &528715328 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 528715329} + - component: {fileID: 528715333} + - component: {fileID: 528715332} + - component: {fileID: 528715331} + m_Layer: 0 + m_Name: Sphere + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &528715329 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 528715328} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0.5, z: 0} + m_LocalScale: {x: 0.2, y: 0.2, z: 0.2} + m_Children: [] + m_Father: {fileID: 850228141} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &528715331 +MeshRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 528715328} + m_Enabled: 0 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_Materials: @@ -1191,252 +1309,60 @@ Prefab: - target: {fileID: 4472652550524646, guid: 1f68bf7cec2600e49a46d2f0554453c8, type: 2} propertyPath: m_LocalRotation.y value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4472652550524646, guid: 1f68bf7cec2600e49a46d2f0554453c8, type: 2} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4472652550524646, guid: 1f68bf7cec2600e49a46d2f0554453c8, type: 2} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4472652550524646, guid: 1f68bf7cec2600e49a46d2f0554453c8, type: 2} - propertyPath: m_RootOrder - value: 4 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: 1f68bf7cec2600e49a46d2f0554453c8, type: 2} - m_IsPrefabParent: 0 ---- !u!1 &658720283 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 - m_Component: - - component: {fileID: 658720284} - m_Layer: 0 - m_Name: '-------------------------------------' - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &658720284 -Transform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 658720283} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 13 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &671544960 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 - m_Component: - - component: {fileID: 671544961} - - component: {fileID: 671544962} - m_Layer: 5 - m_Name: Canvas - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &671544961 -RectTransform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 671544960} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0, y: 0, z: 0} - m_Children: - - {fileID: 1028300135} - - {fileID: 718864549} - m_Father: {fileID: 1553193321} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0, y: 0} ---- !u!223 &671544962 -Canvas: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 671544960} - m_Enabled: 1 - serializedVersion: 3 - m_RenderMode: 1 - m_Camera: {fileID: 1553193322} - m_PlaneDistance: 1 - m_PixelPerfect: 0 - m_ReceivesEvents: 1 - m_OverrideSorting: 0 - m_OverridePixelPerfect: 0 - m_SortingBucketNormalizedSize: 0 - m_AdditionalShaderChannelsFlag: 0 - m_SortingLayerID: 0 - m_SortingOrder: 0 - m_TargetDisplay: 0 ---- !u!1 &694714221 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 - m_Component: - - component: {fileID: 694714222} - - component: {fileID: 694714223} - m_Layer: 5 - m_Name: Kinect Camera - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &694714222 -Transform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 694714221} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -2.28, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 806122350} - m_Father: {fileID: 401185751} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!20 &694714223 -Camera: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 694714221} - m_Enabled: 1 - serializedVersion: 2 - m_ClearFlags: 1 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} - m_NormalizedViewPortRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - near clip plane: 0.3 - far clip plane: 1000 - field of view: 60 - orthographic: 0 - orthographic size: 5 - m_Depth: 0 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingPath: 1 - m_TargetTexture: {fileID: 8400000, guid: f9c2cef894c9cc54f807a92207bf6eda, type: 2} - m_TargetDisplay: 1 - m_TargetEye: 3 - m_HDR: 1 - m_AllowMSAA: 0 - m_AllowDynamicResolution: 0 - m_ForceIntoRT: 0 - m_OcclusionCulling: 1 - m_StereoConvergence: 10 - m_StereoSeparation: 0.022 ---- !u!1 &718864548 + objectReference: {fileID: 0} + - target: {fileID: 4472652550524646, guid: 1f68bf7cec2600e49a46d2f0554453c8, type: 2} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4472652550524646, guid: 1f68bf7cec2600e49a46d2f0554453c8, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4472652550524646, guid: 1f68bf7cec2600e49a46d2f0554453c8, type: 2} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 114080462365263002, guid: 1f68bf7cec2600e49a46d2f0554453c8, + type: 2} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114569137293014918, guid: 1f68bf7cec2600e49a46d2f0554453c8, + type: 2} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 1f68bf7cec2600e49a46d2f0554453c8, type: 2} + m_IsPrefabParent: 0 +--- !u!1 &658720283 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} serializedVersion: 5 m_Component: - - component: {fileID: 718864549} - - component: {fileID: 718864552} - - component: {fileID: 718864551} - - component: {fileID: 718864550} - m_Layer: 5 - m_Name: Velocity + - component: {fileID: 658720284} + m_Layer: 0 + m_Name: '-------------------------------------' m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &718864549 -RectTransform: +--- !u!4 &658720284 +Transform: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 718864548} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_GameObject: {fileID: 658720283} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 671544961} - m_RootOrder: 1 + m_Father: {fileID: 0} + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 512, y: 0} - m_SizeDelta: {x: 512, y: 424} - m_Pivot: {x: 0, y: 1} ---- !u!114 &718864550 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 718864548} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 846b026f9a6af4049ae8cbc3b560f976, type: 3} - m_Name: - m_EditorClassIdentifier: - _sharingName: 020945164847-Velocity ---- !u!114 &718864551 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 718864548} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -98529514, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Texture: {fileID: 0} - m_UVRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 ---- !u!222 &718864552 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 718864548} --- !u!43 &725363233 Mesh: m_ObjectHideFlags: 0 @@ -1598,8 +1524,9 @@ Transform: - {fileID: 1035960134} - {fileID: 441718964} - {fileID: 1167120023} + - {fileID: 165270301} m_Father: {fileID: 0} - m_RootOrder: 12 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &750667758 GameObject: @@ -1649,7 +1576,7 @@ RectTransform: m_Children: - {fileID: 1000268179} m_Father: {fileID: 0} - m_RootOrder: 22 + m_RootOrder: 21 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -1682,7 +1609,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 17 + m_RootOrder: 16 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &770059766 GameObject: @@ -1990,62 +1917,6 @@ MonoBehaviour: material: {fileID: 2100000, guid: 0858735f439783448b9cc855a56a9e94, type: 2} shader: {fileID: 7200000, guid: 12722f65bf7d89d448b703b34b9e4dcb, type: 3} references: [] ---- !u!1 &806122349 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 - m_Component: - - component: {fileID: 806122350} - - component: {fileID: 806122351} - m_Layer: 5 - m_Name: Canvas - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &806122350 -RectTransform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 806122349} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0, y: 0, z: 0} - m_Children: - - {fileID: 1974547831} - - {fileID: 1842692481} - m_Father: {fileID: 694714222} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0, y: 0} ---- !u!223 &806122351 -Canvas: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 806122349} - m_Enabled: 1 - serializedVersion: 3 - m_RenderMode: 1 - m_Camera: {fileID: 694714223} - m_PlaneDistance: 1 - m_PixelPerfect: 0 - m_ReceivesEvents: 1 - m_OverrideSorting: 0 - m_OverridePixelPerfect: 0 - m_SortingBucketNormalizedSize: 0 - m_AdditionalShaderChannelsFlag: 0 - m_SortingLayerID: 0 - m_SortingOrder: 0 - m_TargetDisplay: 0 --- !u!1 &810572921 GameObject: m_ObjectHideFlags: 0 @@ -2175,6 +2046,7 @@ MonoBehaviour: port: 50051 shader: {fileID: 7200000, guid: bd9793649dc30c046875df07338824bb, type: 3} collectShader: {fileID: 7200000, guid: 7a8ac615a5434b24d83dbec67effb820, type: 3} + clip: 1 connectedDevices: [] debug: debugDraw: 1 @@ -2209,8 +2081,12 @@ Transform: m_Children: - {fileID: 411383573} - {fileID: 1906326617} + - {fileID: 1933714481} + - {fileID: 1690794385} + - {fileID: 461690049} - {fileID: 1878556046} - {fileID: 147055505} + - {fileID: 1973785472} m_Father: {fileID: 338663765} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2264,219 +2140,59 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 16e57166815b2534daf1be5fd19595f2, type: 3} - m_Name: - m_EditorClassIdentifier: - update: 0 - width: 8 - depth: 5 - height: 3 ---- !u!1 &927263596 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 - m_Component: - - component: {fileID: 927263597} - - component: {fileID: 927263600} - - component: {fileID: 927263599} - - component: {fileID: 927263598} - m_Layer: 5 - m_Name: Velocity - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &927263597 -RectTransform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 927263596} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 2122473687} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 512, y: 0} - m_SizeDelta: {x: 512, y: 424} - m_Pivot: {x: 0, y: 1} ---- !u!114 &927263598 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 927263596} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 846b026f9a6af4049ae8cbc3b560f976, type: 3} - m_Name: - m_EditorClassIdentifier: - _sharingName: KinectV2-Velocity ---- !u!114 &927263599 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 927263596} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -98529514, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Texture: {fileID: 0} - m_UVRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 ---- !u!222 &927263600 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 927263596} ---- !u!1 &1000268178 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 - m_Component: - - component: {fileID: 1000268179} - - component: {fileID: 1000268182} - - component: {fileID: 1000268181} - m_Layer: 5 - m_Name: RawImage - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1000268179 -RectTransform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1000268178} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 750667763} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 5040, y: 3200} - m_Pivot: {x: 0, y: 1} ---- !u!114 &1000268181 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1000268178} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -98529514, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: f05d2e0d0f372ae48998e59e3d376a63, type: 2} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Texture: {fileID: 8400000, guid: e222b09ab4f80eb4eae6760ed0503d87, type: 2} - m_UVRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 ---- !u!222 &1000268182 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1000268178} ---- !u!1 &1028300134 + m_Name: + m_EditorClassIdentifier: + update: 0 + width: 8 + depth: 5 + height: 3 +--- !u!1 &1000268178 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} serializedVersion: 5 m_Component: - - component: {fileID: 1028300135} - - component: {fileID: 1028300138} - - component: {fileID: 1028300137} - - component: {fileID: 1028300136} + - component: {fileID: 1000268179} + - component: {fileID: 1000268182} + - component: {fileID: 1000268181} m_Layer: 5 - m_Name: Position + m_Name: RawImage m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &1028300135 +--- !u!224 &1000268179 RectTransform: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1028300134} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_GameObject: {fileID: 1000268178} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 671544961} + m_Father: {fileID: 750667763} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 512, y: 424} + m_SizeDelta: {x: 5040, y: 3200} m_Pivot: {x: 0, y: 1} ---- !u!114 &1028300136 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1028300134} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 846b026f9a6af4049ae8cbc3b560f976, type: 3} - m_Name: - m_EditorClassIdentifier: - _sharingName: 020945164847-Position ---- !u!114 &1028300137 +--- !u!114 &1000268181 MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1028300134} + m_GameObject: {fileID: 1000268178} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -98529514, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} + m_Material: {fileID: 2100000, guid: f05d2e0d0f372ae48998e59e3d376a63, type: 2} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: @@ -2484,19 +2200,19 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Texture: {fileID: 0} + m_Texture: {fileID: 8400000, guid: e222b09ab4f80eb4eae6760ed0503d87, type: 2} m_UVRect: serializedVersion: 2 x: 0 y: 0 width: 1 height: 1 ---- !u!222 &1028300138 +--- !u!222 &1000268182 CanvasRenderer: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1028300134} + m_GameObject: {fileID: 1000268178} --- !u!1 &1035960133 GameObject: m_ObjectHideFlags: 0 @@ -2791,7 +2507,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 18 + m_RootOrder: 17 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1390635887 GameObject: @@ -2900,154 +2616,136 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 14 + m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} ---- !u!1 &1553193320 +--- !u!1 &1690794384 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} serializedVersion: 5 m_Component: - - component: {fileID: 1553193321} - - component: {fileID: 1553193322} - m_Layer: 5 - m_Name: Kinect Camera (1) + - component: {fileID: 1690794385} + - component: {fileID: 1690794390} + - component: {fileID: 1690794389} + - component: {fileID: 1690794388} + - component: {fileID: 1690794387} + - component: {fileID: 1690794386} + m_Layer: 8 + m_Name: Kristoff m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &1553193321 + m_IsActive: 1 +--- !u!4 &1690794385 Transform: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1553193320} + m_GameObject: {fileID: 1690794384} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -2.28, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 671544961} - m_Father: {fileID: 401185751} - m_RootOrder: 2 + m_LocalPosition: {x: -1.757, y: 1.035, z: 2.49} + m_LocalScale: {x: 1.4554749, y: 1.4554745, z: 1.4554745} + m_Children: [] + m_Father: {fileID: 917676528} + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!20 &1553193322 -Camera: +--- !u!54 &1690794386 +Rigidbody: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1553193320} - m_Enabled: 1 + m_GameObject: {fileID: 1690794384} serializedVersion: 2 - m_ClearFlags: 1 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} - m_NormalizedViewPortRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - near clip plane: 0.3 - far clip plane: 1000 - field of view: 60 - orthographic: 0 - orthographic size: 5 - m_Depth: 0 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingPath: 1 - m_TargetTexture: {fileID: 8400000, guid: 1276428e64b9c6444aaa6e9b476ebb1c, type: 2} - m_TargetDisplay: 1 - m_TargetEye: 3 - m_HDR: 1 - m_AllowMSAA: 0 - m_AllowDynamicResolution: 0 - m_ForceIntoRT: 0 - m_OcclusionCulling: 1 - m_StereoConvergence: 10 - m_StereoSeparation: 0.022 ---- !u!1 &1621860758 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 - m_Component: - - component: {fileID: 1621860759} - - component: {fileID: 1621860762} - - component: {fileID: 1621860761} - - component: {fileID: 1621860760} - m_Layer: 5 - m_Name: Position - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1621860759 -RectTransform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1621860758} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 2122473687} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 512, y: 424} - m_Pivot: {x: 0, y: 1} ---- !u!114 &1621860760 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 0 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!114 &1690794387 MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1621860758} + m_GameObject: {fileID: 1690794384} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 846b026f9a6af4049ae8cbc3b560f976, type: 3} + m_Script: {fileID: 11500000, guid: 12ea4d85cdda0aa4981a82e5e18fed52, type: 3} m_Name: m_EditorClassIdentifier: - _sharingName: KinectV2-Position ---- !u!114 &1621860761 -MonoBehaviour: + standby: 1 + disappearTime: 5 + mat: {fileID: 0} + area: 0 + AppearArea: 02000000 + wallRoi: {x: 0, y: 0} + heightRange: {x: 0, y: 0.1} + fakeButton: {fileID: 0} + standbyClip: {fileID: 11400000, guid: dfdc3af2e37491840b05776ce71e1ca8, type: 2} + triggerClip: {fileID: 11400000, guid: a6af2089baf7ed8489a4e941dae4e928, type: 2} + players: [] + color: {r: 1, g: 1, b: 1, a: 1} + videoStopTime: 1.5 + isTriggerCollider: 0 +--- !u!23 &1690794388 +MeshRenderer: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1621860758} + m_GameObject: {fileID: 1690794384} m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -98529514, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_Materials: + - {fileID: 2100000, guid: ab048f026549e9e4896e951efd521c70, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 1 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!64 &1690794389 +MeshCollider: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1690794384} m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Texture: {fileID: 0} - m_UVRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 ---- !u!222 &1621860762 -CanvasRenderer: + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 3 + m_Convex: 1 + m_CookingOptions: 14 + m_SkinWidth: 0.01 + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!33 &1690794390 +MeshFilter: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1621860758} + m_GameObject: {fileID: 1690794384} + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &1761700811 GameObject: m_ObjectHideFlags: 0 @@ -3192,7 +2890,7 @@ RectTransform: - {fileID: 1227078085} - {fileID: 2084135710} m_Father: {fileID: 0} - m_RootOrder: 25 + m_RootOrder: 24 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -3307,7 +3005,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 542c4b2aee71a0142928f8b82f70141f, type: 3} m_Name: m_EditorClassIdentifier: - sharingName: UnitySender + sharingName: FrozenSpout textureFormat: 28 yFlip: 1 output: {fileID: 0} @@ -3359,7 +3057,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 21 + m_RootOrder: 20 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1817143150 MonoBehaviour: @@ -3444,100 +3142,20 @@ SphereCollider: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1820320968} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Radius: 0.5 - m_Center: {x: 0, y: 0, z: 0} ---- !u!33 &1820320972 -MeshFilter: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1820320968} - m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} ---- !u!1 &1842692480 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 - m_Component: - - component: {fileID: 1842692481} - - component: {fileID: 1842692484} - - component: {fileID: 1842692483} - - component: {fileID: 1842692482} - m_Layer: 5 - m_Name: Velocity - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1842692481 -RectTransform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1842692480} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 806122350} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 512, y: 0} - m_SizeDelta: {x: 512, y: 424} - m_Pivot: {x: 0, y: 1} ---- !u!114 &1842692482 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1842692480} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 846b026f9a6af4049ae8cbc3b560f976, type: 3} - m_Name: - m_EditorClassIdentifier: - _sharingName: 020929664847-Velocity ---- !u!114 &1842692483 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1842692480} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -98529514, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Texture: {fileID: 0} - m_UVRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 ---- !u!222 &1842692484 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1842692480} + m_GameObject: {fileID: 1820320968} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Radius: 0.5 + m_Center: {x: 0, y: 0, z: 0} +--- !u!33 &1820320972 +MeshFilter: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1820320968} + m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &1848145249 GameObject: m_ObjectHideFlags: 0 @@ -3620,7 +3238,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 917676528} - m_RootOrder: 2 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1906326616 GameObject: @@ -3649,7 +3267,7 @@ Transform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1906326616} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 1.369, y: 0.932, z: 2.49} + m_LocalPosition: {x: -3.153, y: 0.932, z: 2.49} m_LocalScale: {x: 1.06304, y: 1.06304, z: 1.06304} m_Children: [] m_Father: {fileID: 917676528} @@ -3685,6 +3303,7 @@ MonoBehaviour: disappearTime: 5 mat: {fileID: 0} area: 0 + AppearArea: 000000000100000002000000 wallRoi: {x: 0, y: 0} heightRange: {x: 0, y: 0.1} fakeButton: {fileID: 0} @@ -3813,88 +3432,264 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 15 + m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1974547830 +--- !u!1 &1933714480 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} serializedVersion: 5 m_Component: - - component: {fileID: 1974547831} - - component: {fileID: 1974547834} - - component: {fileID: 1974547833} - - component: {fileID: 1974547832} - m_Layer: 5 - m_Name: Position + - component: {fileID: 1933714481} + - component: {fileID: 1933714486} + - component: {fileID: 1933714485} + - component: {fileID: 1933714484} + - component: {fileID: 1933714483} + - component: {fileID: 1933714482} + m_Layer: 8 + m_Name: Anna m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &1974547831 -RectTransform: +--- !u!4 &1933714481 +Transform: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1974547830} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_GameObject: {fileID: 1933714480} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -2.598, y: 1.023, z: 2.49} + m_LocalScale: {x: 1.3311108, y: 1.3311105, z: 1.3311105} m_Children: [] - m_Father: {fileID: 806122350} - m_RootOrder: 0 + m_Father: {fileID: 917676528} + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 512, y: 424} - m_Pivot: {x: 0, y: 1} ---- !u!114 &1974547832 +--- !u!54 &1933714482 +Rigidbody: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1933714480} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 0 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!114 &1933714483 MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1974547830} + m_GameObject: {fileID: 1933714480} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 846b026f9a6af4049ae8cbc3b560f976, type: 3} + m_Script: {fileID: 11500000, guid: 12ea4d85cdda0aa4981a82e5e18fed52, type: 3} m_Name: m_EditorClassIdentifier: - _sharingName: 020929664847-Position ---- !u!114 &1974547833 + standby: 1 + disappearTime: 5 + mat: {fileID: 0} + area: 0 + AppearArea: 02000000 + wallRoi: {x: 0, y: 0} + heightRange: {x: 0, y: 0.1} + fakeButton: {fileID: 0} + standbyClip: {fileID: 11400000, guid: 6d7b66e288bf3924fbd7a716ae3ac255, type: 2} + triggerClip: {fileID: 11400000, guid: 2845fcd21d061464f8f97219a167ba7a, type: 2} + players: [] + color: {r: 1, g: 1, b: 1, a: 1} + videoStopTime: 1.5 + isTriggerCollider: 0 +--- !u!23 &1933714484 +MeshRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1933714480} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_Materials: + - {fileID: 2100000, guid: 2969b78c14f1c6f4e941656f8f9cb902, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 1 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!64 &1933714485 +MeshCollider: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1933714480} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 3 + m_Convex: 1 + m_CookingOptions: 14 + m_SkinWidth: 0.01 + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!33 &1933714486 +MeshFilter: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1933714480} + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &1973785471 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1973785472} + - component: {fileID: 1973785477} + - component: {fileID: 1973785476} + - component: {fileID: 1973785475} + - component: {fileID: 1973785474} + - component: {fileID: 1973785473} + m_Layer: 8 + m_Name: Elsa + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1973785472 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1973785471} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 2.329, y: 0.809, z: 2.49} + m_LocalScale: {x: 1.7848748, y: 1.7848743, z: 1.7848743} + m_Children: [] + m_Father: {fileID: 917676528} + m_RootOrder: 7 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!54 &1973785473 +Rigidbody: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1973785471} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 0 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!114 &1973785474 MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1974547830} + m_GameObject: {fileID: 1973785471} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -98529514, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: 12ea4d85cdda0aa4981a82e5e18fed52, type: 3} m_Name: m_EditorClassIdentifier: + standby: 1 + disappearTime: 5 + mat: {fileID: 0} + area: 0 + AppearArea: 02000000 + wallRoi: {x: 0, y: 0} + heightRange: {x: 0, y: 0.1} + fakeButton: {fileID: 0} + standbyClip: {fileID: 11400000, guid: aa1bbb3d5a802fb47880c1cf0237dc60, type: 2} + triggerClip: {fileID: 11400000, guid: 2ea2925de6b8a934fa0ea7a7020103b1, type: 2} + players: [] + color: {r: 1, g: 1, b: 1, a: 1} + videoStopTime: 1.5 + isTriggerCollider: 0 +--- !u!23 &1973785475 +MeshRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1973785471} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_Materials: + - {fileID: 2100000, guid: d441d7339e3f6914fb9a8658c10b54bd, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 1 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!64 &1973785476 +MeshCollider: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1973785471} m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Texture: {fileID: 0} - m_UVRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 ---- !u!222 &1974547834 -CanvasRenderer: + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 3 + m_Convex: 1 + m_CookingOptions: 14 + m_SkinWidth: 0.01 + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!33 &1973785477 +MeshFilter: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1974547830} + m_GameObject: {fileID: 1973785471} + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &2024329733 GameObject: m_ObjectHideFlags: 0 @@ -3921,7 +3716,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 23 + m_RootOrder: 22 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2084135709 GameObject: @@ -4034,8 +3829,12 @@ MonoBehaviour: cosineGradient: {fileID: 1167120024} dayCharacters: - {fileID: 1906326619} + - {fileID: 1933714483} + - {fileID: 1690794387} + - {fileID: 461690051} nightCharacters: - {fileID: 147055507} + - {fileID: 1973785474} debug: 0 --- !u!4 &2084936104 Transform: @@ -4050,59 +3849,3 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &2122473686 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 - m_Component: - - component: {fileID: 2122473687} - - component: {fileID: 2122473688} - m_Layer: 5 - m_Name: Canvas - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2122473687 -RectTransform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 2122473686} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0, y: 0, z: 0} - m_Children: - - {fileID: 1621860759} - - {fileID: 927263597} - m_Father: {fileID: 67279956} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0, y: 0} ---- !u!223 &2122473688 -Canvas: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 2122473686} - m_Enabled: 1 - serializedVersion: 3 - m_RenderMode: 1 - m_Camera: {fileID: 67279957} - m_PlaneDistance: 1 - m_PixelPerfect: 0 - m_ReceivesEvents: 1 - m_OverrideSorting: 0 - m_OverridePixelPerfect: 0 - m_SortingBucketNormalizedSize: 0 - m_AdditionalShaderChannelsFlag: 0 - m_SortingLayerID: 0 - m_SortingOrder: 0 - m_TargetDisplay: 0 diff --git a/Unity_2018_Frozen/Assets/Frozen/Material/Point.mat b/Unity_2018_Frozen/Assets/Frozen/Material/Point.mat index f618567..2716760 100644 --- a/Unity_2018_Frozen/Assets/Frozen/Material/Point.mat +++ b/Unity_2018_Frozen/Assets/Frozen/Material/Point.mat @@ -81,7 +81,7 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 - - _Size: 0.0051771435 + - _Size: 0 - _SmoothnessTextureChannel: 0 - _SoftParticlesEnabled: 0 - _SoftParticlesFarFadeDistance: 1 diff --git a/Unity_2018_Frozen/Assets/Frozen/Material/Space.mat b/Unity_2018_Frozen/Assets/Frozen/Material/Space.mat index 5090d4d..2fcd2ca 100644 --- a/Unity_2018_Frozen/Assets/Frozen/Material/Space.mat +++ b/Unity_2018_Frozen/Assets/Frozen/Material/Space.mat @@ -70,7 +70,7 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 - - _Rate: 0.3156795 + - _Rate: 0 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 diff --git a/Unity_2018_Frozen/Assets/Frozen/Script/DFVolumeParticleUpdater.cs b/Unity_2018_Frozen/Assets/Frozen/Script/DFVolumeParticleUpdater.cs deleted file mode 100644 index 4e5108f..0000000 --- a/Unity_2018_Frozen/Assets/Frozen/Script/DFVolumeParticleUpdater.cs +++ /dev/null @@ -1,120 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -namespace UltraCombos.Frozen -{ - public class DFVolumeParticleUpdater : MonoBehaviour - { - public bool reset = false; - [Range(1, 1 << 20)] - public int maxParticles = 1 << 15; - public StructuredBuffer particleBuffer = null; - List buffer_data = null; - - public ComputeShader shader = null; - ComputeBuffer args_buffer = null; - - public UniformStructuredBuffer uniformBuffer; - ParticleUniforms uniforms = null; - - public Klak.Chromatics.CosineGradient cosineGradient = null; - - bool is_initialized = false; - - [SerializeField] - KinectOpticalFlow kinectOpticalFlow; - [SerializeField] - FluidSim3DProject.SmokeFluidSim smokeFluidSim; - [SerializeField] - ParticleViewerMesh particleViewerMesh; - [SerializeField] - [Range(0, 1)] - public float rate = 1.0f; - - [SerializeField] DFVolume.VolumeData volumeData; - - [SerializeField, Range(0, 1)] - float value = 0; - [SerializeField] - string debug; - - private void Start() - { - uniforms = uniformBuffer.uniform as ParticleUniforms; - particleViewerMesh.BufferCount = (int)(maxParticles * rate); - StartCoroutine(Initialize()); - } - - private void FixedUpdate() - { - if (is_initialized == false) - return; - - if (reset) - { - reset = false; - OnReset(); - } - - UpdateParticle(Time.fixedDeltaTime); - } - - private void OnDestroy() - { - Utilities.Release(ref args_buffer); - } - - private void OnReset() - { - particleBuffer.SetData(buffer_data); - } - - private IEnumerator Initialize() - { - { - args_buffer = shader.CreateIndirectComputeArgsBuffer(maxParticles, 1, 1); - } - - { - buffer_data = new List(); - yield return Utilities.GetRandomParticleData(maxParticles, buffer_data); - } - - is_initialized = true; - OnReset(); - } - - private void UpdateParticle(float time_step) - { - { - shader.SetFloat("timeStep", time_step); - shader.SetFloat("timeValue", Utilities.GetTimeValue()); - shader.SetInt("home_count", 0); - shader.SetFloat("bufferCount", particleBuffer.count); - - if (cosineGradient != null) - { - shader.SetVector("coeffsA", cosineGradient.coeffsA); - shader.SetVector("coeffsB", cosineGradient.coeffsB); - shader.SetVector("coeffsC", cosineGradient.coeffsC2); - shader.SetVector("coeffsD", cosineGradient.coeffsD2); - } - - shader.SetVector("FluidGridDim", smokeFluidSim.GridDim); - shader.SetVector("FluidGridRoot", smokeFluidSim.GridRoot); - shader.SetVector("FluidGridSize", smokeFluidSim.GridSize); - - shader.SetBuffer(0, particleBuffer.bufferName, particleBuffer.obj); - shader.SetBuffer(0, uniformBuffer.bufferName, uniformBuffer.obj); - shader.SetBuffer(0, "home_position_buffer", kinectOpticalFlow.HomePositionBuffer); - shader.SetBuffer(0, "home_velocity_buffer", kinectOpticalFlow.HomeVelocityBuffer); - shader.SetBuffer(0, "fluid_velocity_buffer", smokeFluidSim.VelocityBuffer); - - shader.SetTexture(0, "DFVolume", volumeData.texture); - - shader.DispatchIndirect(0, args_buffer); - } - } - } -} \ No newline at end of file diff --git a/Unity_2018_Frozen/Assets/Frozen/Script/DFVolumeParticleUpdater.cs.meta b/Unity_2018_Frozen/Assets/Frozen/Script/DFVolumeParticleUpdater.cs.meta deleted file mode 100644 index 40c40b2..0000000 --- a/Unity_2018_Frozen/Assets/Frozen/Script/DFVolumeParticleUpdater.cs.meta +++ /dev/null @@ -1,13 +0,0 @@ -fileFormatVersion: 2 -guid: 73561edc8add6a84082d5ef8c1bb6b71 -timeCreated: 1519889674 -licenseType: Free -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Unity_2018_Frozen/Assets/Frozen/Script/SnowflakeParticleUpdater.cs b/Unity_2018_Frozen/Assets/Frozen/Script/SnowflakeParticleUpdater.cs index 02db143..fdf0ac1 100644 --- a/Unity_2018_Frozen/Assets/Frozen/Script/SnowflakeParticleUpdater.cs +++ b/Unity_2018_Frozen/Assets/Frozen/Script/SnowflakeParticleUpdater.cs @@ -18,7 +18,6 @@ namespace UltraCombos.Frozen ComputeBuffer args_buffer = null; public UniformStructuredBuffer uniformBuffer; - ParticleUniforms uniforms = null; //public Klak.Chromatics.CosineGradient cosineGradient = null; public BlendedCosineGradient cosineGradient = null; @@ -34,15 +33,12 @@ namespace UltraCombos.Frozen [SerializeField] [Range(0, 1)] public float rate = 1.0f; - - [SerializeField, Range(0, 1)] - float value = 0; + [SerializeField] string debug; private void Start() { - uniforms = uniformBuffer.uniform as ParticleUniforms; particleViewerMesh.BufferCount = (int)(maxParticles * rate); StartCoroutine(Initialize()); } diff --git a/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Anna.mat b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Anna.mat new file mode 100644 index 0000000..1eac9a8 --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Anna.mat @@ -0,0 +1,76 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: Anna + m_Shader: {fileID: 4800000, guid: a76fe72ab9c198948a9233662c9407f3, type: 3} + m_ShaderKeywords: _ALPHATEST_ON _EMISSION + m_LightmapFlags: 1 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + 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} + - _EmissionMap: + m_Texture: {fileID: 2800000, guid: 0a8eed7dd69bbac43ab277a7cc6074e1, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 6e92be5ab67533c4b8681d9ec0a2ebb8, 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} + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 1 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Anna.mat.meta b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Anna.mat.meta new file mode 100644 index 0000000..0dd7e54 --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Anna.mat.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 2969b78c14f1c6f4e941656f8f9cb902 +timeCreated: 1525245333 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Elsa.mat b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Elsa.mat new file mode 100644 index 0000000..6cb7a96 --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Elsa.mat @@ -0,0 +1,76 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: Elsa + m_Shader: {fileID: 4800000, guid: a76fe72ab9c198948a9233662c9407f3, type: 3} + m_ShaderKeywords: _ALPHATEST_ON _EMISSION + m_LightmapFlags: 1 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + 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} + - _EmissionMap: + m_Texture: {fileID: 2800000, guid: 0a8eed7dd69bbac43ab277a7cc6074e1, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: ba331c7bdfb44ae45a69e9068a0fb6eb, 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} + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 1 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Elsa.mat.meta b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Elsa.mat.meta new file mode 100644 index 0000000..75a8822 --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Elsa.mat.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: d441d7339e3f6914fb9a8658c10b54bd +timeCreated: 1525245333 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Elsa.png b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Elsa.png new file mode 100644 index 0000000..2054a3b --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Elsa.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:20c4bfb110e86a39e713631fa5e1743427f68071e138b9787acbf22c4aa68d77 +size 2459045 diff --git a/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Elsa.png.meta b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Elsa.png.meta new file mode 100644 index 0000000..e03c0b1 --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Elsa.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: ba331c7bdfb44ae45a69e9068a0fb6eb +timeCreated: 1525321800 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Kristoff.mat b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Kristoff.mat new file mode 100644 index 0000000..3ffcf54 --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Kristoff.mat @@ -0,0 +1,76 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: Kristoff + m_Shader: {fileID: 4800000, guid: a76fe72ab9c198948a9233662c9407f3, type: 3} + m_ShaderKeywords: _ALPHATEST_ON _EMISSION + m_LightmapFlags: 1 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + 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} + - _EmissionMap: + m_Texture: {fileID: 2800000, guid: 0a8eed7dd69bbac43ab277a7cc6074e1, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 8a3849f71f810db4094f196d78e406ea, 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} + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 1 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Kristoff.mat.meta b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Kristoff.mat.meta new file mode 100644 index 0000000..8237028 --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Kristoff.mat.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: ab048f026549e9e4896e951efd521c70 +timeCreated: 1525245333 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Kristoff.png b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Kristoff.png new file mode 100644 index 0000000..a209155 --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Kristoff.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:33276ef7c6e2c08775cfc7f76e58f70f382d1007e1abe3b7a0e5a306f6c92264 +size 1342645 diff --git a/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Kristoff.png.meta b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Kristoff.png.meta new file mode 100644 index 0000000..fdfcee0 --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Kristoff.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 8a3849f71f810db4094f196d78e406ea +timeCreated: 1525321799 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 0 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Olaf_CC065053.png b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Olaf_CC065053.png index c801752..7005c24 100644 --- a/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Olaf_CC065053.png +++ b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Olaf_CC065053.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ea2a1abb08b7025e5c6fe28dec6128b9dd637a05587b73bded23391cfbce8b09 -size 1396447 +oid sha256:cc30b571b0a3b792a969403d61dc7481db57c77f185a68bbde281e25a82e501e +size 1326760 diff --git a/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Olaf_CC065056.png b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Olaf_CC065056.png index f295d76..0a89747 100644 --- a/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Olaf_CC065056.png +++ b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Olaf_CC065056.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9dbff66109fd831cb3838e1eedf1c9b2db179faa53a4833f583c4487453511ea -size 2219569 +oid sha256:968e932b0aca3755bd816432b2fc5fe1c56c841991449f3d67904e1bae7e6caa +size 1976079 diff --git a/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Sven.mat b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Sven.mat new file mode 100644 index 0000000..3eaaf68 --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Sven.mat @@ -0,0 +1,76 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: Sven + m_Shader: {fileID: 4800000, guid: a76fe72ab9c198948a9233662c9407f3, type: 3} + m_ShaderKeywords: _ALPHATEST_ON _EMISSION + m_LightmapFlags: 1 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + 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} + - _EmissionMap: + m_Texture: {fileID: 2800000, guid: 0a8eed7dd69bbac43ab277a7cc6074e1, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 110fcbd4884145b40a9b0d51024aaecf, 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} + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 1 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Sven.mat.meta b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Sven.mat.meta new file mode 100644 index 0000000..b1eb94d --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Sven.mat.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 839c0e58e555dab48be2d0d4b169e1ca +timeCreated: 1525245333 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Sven.png b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Sven.png new file mode 100644 index 0000000..43983a9 --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Sven.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3eb120df72a001632ae978e722ad506c3b1b17345aae5234591ac9950dc66f72 +size 1659188 diff --git a/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Sven.png.meta b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Sven.png.meta new file mode 100644 index 0000000..62c2397 --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Sven.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 110fcbd4884145b40a9b0d51024aaecf +timeCreated: 1525321797 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 0 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity_2018_Frozen/Assets/Frozen/Texture/Character/anna.png b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/anna.png new file mode 100644 index 0000000..3e09c58 --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/anna.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:72b035a931b5164f7a6d6231faefb249771435ff155980abbbfcbd6c9022b4f2 +size 2654649 diff --git a/Unity_2018_Frozen/Assets/Frozen/Texture/Character/anna.png.meta b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/anna.png.meta new file mode 100644 index 0000000..6a0253d --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/anna.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 6e92be5ab67533c4b8681d9ec0a2ebb8 +timeCreated: 1525321799 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity_2018_Frozen/Assets/KinectOpticalFlow/Grpc/KinectBufferComposite.compute b/Unity_2018_Frozen/Assets/KinectOpticalFlow/Grpc/KinectBufferComposite.compute index 3b7cc4a..44a9ead 100644 --- a/Unity_2018_Frozen/Assets/KinectOpticalFlow/Grpc/KinectBufferComposite.compute +++ b/Unity_2018_Frozen/Assets/KinectOpticalFlow/Grpc/KinectBufferComposite.compute @@ -14,6 +14,7 @@ Texture2D depth_low_texture; Texture2D velocity_texture; float4x4 kinect_matrix; +float clip; float3 clip_box; @@ -70,9 +71,9 @@ void CSMain(uint3 id : SV_DispatchThreadID) float3 kpos = mul(kinect_matrix, float4(t_p3d, 1.0)).xyz; float3 kvel = mul(kinect_matrix, float4(vel3d, 0.0)).xyz; - if (kpos.x < -clip_box.x * 0.5 || kpos.x > clip_box.x * 0.5 || + if ((kpos.x < -clip_box.x * 0.5 || kpos.x > clip_box.x * 0.5 || kpos.z < -clip_box.z * 0.5 || kpos.z > clip_box.z * 0.5 || - kpos.y < 0.0 || kpos.y > clip_box.y) + kpos.y < 0.0 || kpos.y > clip_box.y) && clip > 0.5) { kpos = float3(0, 0, 0); kvel = float3(0, 0, 0); diff --git a/Unity_2018_Frozen/Assets/KinectOpticalFlow/Grpc/KinectGrpcServer.cs b/Unity_2018_Frozen/Assets/KinectOpticalFlow/Grpc/KinectGrpcServer.cs index 997247b..bd76ec5 100644 --- a/Unity_2018_Frozen/Assets/KinectOpticalFlow/Grpc/KinectGrpcServer.cs +++ b/Unity_2018_Frozen/Assets/KinectOpticalFlow/Grpc/KinectGrpcServer.cs @@ -18,6 +18,9 @@ namespace UltraCombos.Kinect2MotionTransmit [SerializeField] ComputeShader collectShader; + [SerializeField] + bool clip = true; + class KinectBuffer { ~KinectBuffer() @@ -168,6 +171,7 @@ namespace UltraCombos.Kinect2MotionTransmit shader.SetBuffer(0, "velocity_buffer", kinect.velocity); shader.SetMatrix("kinect_matrix", kinect.matrix); shader.SetVector("clip_box", kinect.ClipBox); + shader.SetFloat("clip", clip ? 1.0f : 0.0f); shader.Dispatch(0, args[0], args[1], args[2]); kinect.fps = Mathf.Lerp(kinect.fps, 1.0f / (Time.time - kinect.stamp), 0.02f); @@ -301,7 +305,8 @@ namespace UltraCombos.Kinect2MotionTransmit private void OnDrawGizmosSelected() { var col = Gizmos.color; - + float fov = 60.0f; + float aspect = 512.0f / 424.0f; int count = 0; foreach (var buf in kinect_buffers) { @@ -312,7 +317,7 @@ namespace UltraCombos.Kinect2MotionTransmit Gizmos.matrix = Matrix4x4.identity; Gizmos.DrawWireCube(new Vector3(0, kinect.ClipBox.y * 0.5f, 0), kinect.ClipBox); Gizmos.matrix *= kinect.matrix; - Gizmos.DrawFrustum(Vector3.zero, 60.0f, 20.0f, 0.6f, 512.0f / 424.0f); + Gizmos.DrawFrustum(Vector3.zero, fov, 10.0f, 0.0f, aspect); Gizmos.matrix = mat; } diff --git a/Unity_2018_Frozen/Assets/KinectOpticalFlow/KinectOpticalFlow.cs b/Unity_2018_Frozen/Assets/KinectOpticalFlow/KinectOpticalFlow.cs index 48230e2..9a3dc3e 100644 --- a/Unity_2018_Frozen/Assets/KinectOpticalFlow/KinectOpticalFlow.cs +++ b/Unity_2018_Frozen/Assets/KinectOpticalFlow/KinectOpticalFlow.cs @@ -44,8 +44,6 @@ namespace UltraCombos bool colorize = false; [SerializeField] Material debugMaterial; - [SerializeField] - string debugInfo; ComputeBuffer home_position_buffer; public ComputeBuffer HomePositionBuffer { get { return home_position_buffer; } } @@ -155,15 +153,13 @@ namespace UltraCombos { ComputeBuffer.CopyCount(home_position_buffer, home_count_buffer, 0); - int home_count; #if false + int home_count; var data = new int[home_count_buffer.count]; home_count_buffer.GetData(data); home_count = data[0]; -#else - home_count = 0; + Debug.LogFormat("home_count: {0}", home_count); #endif - debugInfo = string.Format("{0}", home_count); home_position_buffer.SetCounterValue(0); home_velocity_buffer.SetCounterValue(0); } diff --git a/Unity_2018_Frozen/Assets/KinectOpticalFlow/KinectUpdateShader.compute b/Unity_2018_Frozen/Assets/KinectOpticalFlow/KinectUpdateShader.compute index d4207c2..acf202f 100644 --- a/Unity_2018_Frozen/Assets/KinectOpticalFlow/KinectUpdateShader.compute +++ b/Unity_2018_Frozen/Assets/KinectOpticalFlow/KinectUpdateShader.compute @@ -36,7 +36,7 @@ void CSMain (uint3 id : SV_DispatchThreadID) float4 pos = FinalPositionBuffer[id.x]; //pos.y *= -1; - //pos.z *= -1; + pos.z *= -1; pos.x = lerp(pos.x, -pos.x, flipX); float pos_mag = length(pos.xyz); @@ -47,7 +47,7 @@ void CSMain (uint3 id : SV_DispatchThreadID) float4 vel = FinalVelocityBuffer[id.x]; //vel = float4(0, 0, 0.01, 0); //vel.y *= -1; - //vel.z *= -1; + vel.z *= -1; vel.x = lerp(vel.x, -vel.x, flipX); float3 grid_pos = (pos.xyz - FluidRoot.xyz) / FluidSize.xyz; diff --git a/Unity_2018_Frozen/Assets/ParticleWorks/Script/ParticleUpdater.cs b/Unity_2018_Frozen/Assets/ParticleWorks/Script/ParticleUpdater.cs index e826850..48b8843 100644 --- a/Unity_2018_Frozen/Assets/ParticleWorks/Script/ParticleUpdater.cs +++ b/Unity_2018_Frozen/Assets/ParticleWorks/Script/ParticleUpdater.cs @@ -18,7 +18,6 @@ namespace UltraCombos ComputeBuffer args_buffer = null; public UniformStructuredBuffer uniformBuffer; - ParticleUniforms uniforms = null; public Klak.Chromatics.CosineGradient cosineGradient = null; @@ -29,7 +28,6 @@ namespace UltraCombos private void Start() { - uniforms = uniformBuffer.uniform as ParticleUniforms; StartCoroutine(Initialize()); } diff --git a/Unity_2018_Frozen/Assets/UnityUtils b/Unity_2018_Frozen/Assets/UnityUtils index 14d7e35..21f528b 160000 --- a/Unity_2018_Frozen/Assets/UnityUtils +++ b/Unity_2018_Frozen/Assets/UnityUtils @@ -1 +1 @@ -Subproject commit 14d7e35c8053e94dcfc79b7181585fa022c70829 +Subproject commit 21f528b6c6e9746ba82259065ea299672602a1de diff --git a/Unity_2018_Frozen/ProjectSettings/ProjectVersion.txt b/Unity_2018_Frozen/ProjectSettings/ProjectVersion.txt index e3618f1..3c36492 100644 --- a/Unity_2018_Frozen/ProjectSettings/ProjectVersion.txt +++ b/Unity_2018_Frozen/ProjectSettings/ProjectVersion.txt @@ -1 +1 @@ -m_EditorVersion: 2017.4.1f1 +m_EditorVersion: 2017.4.2f2 diff --git a/of_v0.9.8/apps/myApps/Kinect2Motion b/of_v0.9.8/apps/myApps/Kinect2Motion index ce18a28..3591d3f 160000 --- a/of_v0.9.8/apps/myApps/Kinect2Motion +++ b/of_v0.9.8/apps/myApps/Kinect2Motion @@ -1 +1 @@ -Subproject commit ce18a28cbe76d2ceff2856d1a9f875e158539ff2 +Subproject commit 3591d3f9c01ea3d940aab307dfff5fe0ab385c95 diff --git a/of_v0.9.8/uc_libs/lib_libfreenect2 b/of_v0.9.8/uc_libs/lib_libfreenect2 index 92fc577..f37b31f 160000 --- a/of_v0.9.8/uc_libs/lib_libfreenect2 +++ b/of_v0.9.8/uc_libs/lib_libfreenect2 @@ -1 +1 @@ -Subproject commit 92fc577c35a08661d6b2b1628e8f21b3d581b6a4 +Subproject commit f37b31f49fa074687fbfbe7fc0eddc17259c02db