add Characters

clean code
master
uc-hoba 8 years ago
parent 1ac0eeab40
commit ae17d6d966
  1. 15
      Unity_2018_Frozen/Assets/Frozen/DSAsset/Anna-Standby.asset
  2. 10
      Unity_2018_Frozen/Assets/Frozen/DSAsset/Anna-Standby.asset.meta
  3. 15
      Unity_2018_Frozen/Assets/Frozen/DSAsset/Anna-Trigger.asset
  4. 10
      Unity_2018_Frozen/Assets/Frozen/DSAsset/Anna-Trigger.asset.meta
  5. 15
      Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa-Standby.asset
  6. 10
      Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa-Standby.asset.meta
  7. 15
      Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa-Trigger.asset
  8. 10
      Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa-Trigger.asset.meta
  9. 15
      Unity_2018_Frozen/Assets/Frozen/DSAsset/Kristoff-Standby.asset
  10. 10
      Unity_2018_Frozen/Assets/Frozen/DSAsset/Kristoff-Standby.asset.meta
  11. 15
      Unity_2018_Frozen/Assets/Frozen/DSAsset/Kristoff-Trigger.asset
  12. 10
      Unity_2018_Frozen/Assets/Frozen/DSAsset/Kristoff-Trigger.asset.meta
  13. 2
      Unity_2018_Frozen/Assets/Frozen/DSAsset/Olaf_CC065053-Trigger.asset
  14. 2
      Unity_2018_Frozen/Assets/Frozen/DSAsset/Olaf_CC065056-Trigger.asset
  15. 15
      Unity_2018_Frozen/Assets/Frozen/DSAsset/Sven-Standby.asset
  16. 10
      Unity_2018_Frozen/Assets/Frozen/DSAsset/Sven-Standby.asset.meta
  17. 15
      Unity_2018_Frozen/Assets/Frozen/DSAsset/Sven-Trigger.asset
  18. 10
      Unity_2018_Frozen/Assets/Frozen/DSAsset/Sven-Trigger.asset.meta
  19. 1685
      Unity_2018_Frozen/Assets/Frozen/Frozen.unity
  20. 2
      Unity_2018_Frozen/Assets/Frozen/Material/Point.mat
  21. 2
      Unity_2018_Frozen/Assets/Frozen/Material/Space.mat
  22. 120
      Unity_2018_Frozen/Assets/Frozen/Script/DFVolumeParticleUpdater.cs
  23. 13
      Unity_2018_Frozen/Assets/Frozen/Script/DFVolumeParticleUpdater.cs.meta
  24. 6
      Unity_2018_Frozen/Assets/Frozen/Script/SnowflakeParticleUpdater.cs
  25. 76
      Unity_2018_Frozen/Assets/Frozen/Texture/Character/Anna.mat
  26. 10
      Unity_2018_Frozen/Assets/Frozen/Texture/Character/Anna.mat.meta
  27. 76
      Unity_2018_Frozen/Assets/Frozen/Texture/Character/Elsa.mat
  28. 10
      Unity_2018_Frozen/Assets/Frozen/Texture/Character/Elsa.mat.meta
  29. 3
      Unity_2018_Frozen/Assets/Frozen/Texture/Character/Elsa.png
  30. 88
      Unity_2018_Frozen/Assets/Frozen/Texture/Character/Elsa.png.meta
  31. 76
      Unity_2018_Frozen/Assets/Frozen/Texture/Character/Kristoff.mat
  32. 10
      Unity_2018_Frozen/Assets/Frozen/Texture/Character/Kristoff.mat.meta
  33. 3
      Unity_2018_Frozen/Assets/Frozen/Texture/Character/Kristoff.png
  34. 88
      Unity_2018_Frozen/Assets/Frozen/Texture/Character/Kristoff.png.meta
  35. 4
      Unity_2018_Frozen/Assets/Frozen/Texture/Character/Olaf_CC065053.png
  36. 4
      Unity_2018_Frozen/Assets/Frozen/Texture/Character/Olaf_CC065056.png
  37. 76
      Unity_2018_Frozen/Assets/Frozen/Texture/Character/Sven.mat
  38. 10
      Unity_2018_Frozen/Assets/Frozen/Texture/Character/Sven.mat.meta
  39. 3
      Unity_2018_Frozen/Assets/Frozen/Texture/Character/Sven.png
  40. 88
      Unity_2018_Frozen/Assets/Frozen/Texture/Character/Sven.png.meta
  41. 3
      Unity_2018_Frozen/Assets/Frozen/Texture/Character/anna.png
  42. 88
      Unity_2018_Frozen/Assets/Frozen/Texture/Character/anna.png.meta
  43. 5
      Unity_2018_Frozen/Assets/KinectOpticalFlow/Grpc/KinectBufferComposite.compute
  44. 9
      Unity_2018_Frozen/Assets/KinectOpticalFlow/Grpc/KinectGrpcServer.cs
  45. 8
      Unity_2018_Frozen/Assets/KinectOpticalFlow/KinectOpticalFlow.cs
  46. 4
      Unity_2018_Frozen/Assets/KinectOpticalFlow/KinectUpdateShader.compute
  47. 2
      Unity_2018_Frozen/Assets/ParticleWorks/Script/ParticleUpdater.cs
  48. 2
      Unity_2018_Frozen/Assets/UnityUtils
  49. 2
      Unity_2018_Frozen/ProjectSettings/ProjectVersion.txt
  50. 2
      of_v0.9.8/apps/myApps/Kinect2Motion
  51. 2
      of_v0.9.8/uc_libs/lib_libfreenect2

@ -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

@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: 6d7b66e288bf3924fbd7a716ae3ac255
timeCreated: 1524210684
licenseType: Free
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

@ -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

@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: 2845fcd21d061464f8f97219a167ba7a
timeCreated: 1524453128
licenseType: Free
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

@ -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

@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: aa1bbb3d5a802fb47880c1cf0237dc60
timeCreated: 1524210684
licenseType: Free
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

@ -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

@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: 2ea2925de6b8a934fa0ea7a7020103b1
timeCreated: 1524453128
licenseType: Free
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

@ -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

@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: dfdc3af2e37491840b05776ce71e1ca8
timeCreated: 1524210684
licenseType: Free
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

@ -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

@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: a6af2089baf7ed8489a4e941dae4e928
timeCreated: 1524453128
licenseType: Free
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

@ -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

@ -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

@ -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

@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: 0dfbbcfb9e891fe49874e63122982159
timeCreated: 1524210684
licenseType: Free
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

@ -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

@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: 0aa239f497b53734eb6adca529ab6225
timeCreated: 1524453128
licenseType: Free
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

File diff suppressed because it is too large Load Diff

@ -81,7 +81,7 @@ Material:
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _Size: 0.0051771435
- _Size: 0
- _SmoothnessTextureChannel: 0
- _SoftParticlesEnabled: 0
- _SoftParticlesFarFadeDistance: 1

@ -70,7 +70,7 @@ Material:
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _Rate: 0.3156795
- _Rate: 0
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1

@ -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<Particle> 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<Particle>();
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);
}
}
}
}

@ -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:

@ -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());
}

@ -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}

@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: 2969b78c14f1c6f4e941656f8f9cb902
timeCreated: 1525245333
licenseType: Free
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:

@ -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}

@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: d441d7339e3f6914fb9a8658c10b54bd
timeCreated: 1525245333
licenseType: Free
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:20c4bfb110e86a39e713631fa5e1743427f68071e138b9787acbf22c4aa68d77
size 2459045

@ -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:

@ -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}

@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: ab048f026549e9e4896e951efd521c70
timeCreated: 1525245333
licenseType: Free
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:33276ef7c6e2c08775cfc7f76e58f70f382d1007e1abe3b7a0e5a306f6c92264
size 1342645

@ -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:

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ea2a1abb08b7025e5c6fe28dec6128b9dd637a05587b73bded23391cfbce8b09
size 1396447
oid sha256:cc30b571b0a3b792a969403d61dc7481db57c77f185a68bbde281e25a82e501e
size 1326760

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9dbff66109fd831cb3838e1eedf1c9b2db179faa53a4833f583c4487453511ea
size 2219569
oid sha256:968e932b0aca3755bd816432b2fc5fe1c56c841991449f3d67904e1bae7e6caa
size 1976079

@ -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}

@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: 839c0e58e555dab48be2d0d4b169e1ca
timeCreated: 1525245333
licenseType: Free
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3eb120df72a001632ae978e722ad506c3b1b17345aae5234591ac9950dc66f72
size 1659188

@ -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:

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:72b035a931b5164f7a6d6231faefb249771435ff155980abbbfcbd6c9022b4f2
size 2654649

@ -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:

@ -14,6 +14,7 @@ Texture2D<float> depth_low_texture;
Texture2D<float2> 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);

@ -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;
}

@ -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);
}

@ -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;

@ -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());
}

@ -1 +1 @@
Subproject commit 14d7e35c8053e94dcfc79b7181585fa022c70829
Subproject commit 21f528b6c6e9746ba82259065ea299672602a1de

@ -1 +1 @@
m_EditorVersion: 2017.4.1f1
m_EditorVersion: 2017.4.2f2

@ -1 +1 @@
Subproject commit ce18a28cbe76d2ceff2856d1a9f875e158539ff2
Subproject commit 3591d3f9c01ea3d940aab307dfff5fe0ab385c95

@ -1 +1 @@
Subproject commit 92fc577c35a08661d6b2b1628e8f21b3d581b6a4
Subproject commit f37b31f49fa074687fbfbe7fc0eddc17259c02db
Loading…
Cancel
Save