update material and effect

master
uc-hoba 8 years ago
parent a82c15bedc
commit 258430cf3f
  1. 2
      Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa_Effect_A-Standby.asset
  2. 2
      Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa_Effect_A-Standby.asset.meta
  3. 15
      Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa_Effect_A-Trigger.asset
  4. 4
      Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa_Effect_A-Trigger.asset.meta
  5. 15
      Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa_Effect_B-Standby.asset
  6. 10
      Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa_Effect_B-Standby.asset.meta
  7. 15
      Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa_Effect_B-Trigger.asset
  8. 10
      Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa_Effect_B-Trigger.asset.meta
  9. 2
      Unity_2018_Frozen/Assets/Frozen/DSAsset/Kristoff-Trigger.asset
  10. 4
      Unity_2018_Frozen/Assets/Frozen/DSAsset/Space-Day.asset
  11. 10
      Unity_2018_Frozen/Assets/Frozen/DSAsset/Space-Day.asset.meta
  12. 15
      Unity_2018_Frozen/Assets/Frozen/DSAsset/Space-Night.asset
  13. 10
      Unity_2018_Frozen/Assets/Frozen/DSAsset/Space-Night.asset.meta
  14. 1163
      Unity_2018_Frozen/Assets/Frozen/Frozen.unity
  15. 2
      Unity_2018_Frozen/Assets/Frozen/Material/GiantSnowflake.mat
  16. 4
      Unity_2018_Frozen/Assets/Frozen/Material/Snowflake.mat
  17. 6
      Unity_2018_Frozen/Assets/Frozen/Material/Space-Ground.mat
  18. 0
      Unity_2018_Frozen/Assets/Frozen/Material/Space-Ground.mat.meta
  19. 83
      Unity_2018_Frozen/Assets/Frozen/Material/Space-Wall.mat
  20. 10
      Unity_2018_Frozen/Assets/Frozen/Material/Space-Wall.mat.meta
  21. 18
      Unity_2018_Frozen/Assets/Frozen/Script/CharacterBehaviour.cs
  22. 10
      Unity_2018_Frozen/Assets/Frozen/Script/ElsaEffectGenerator.cs
  23. 28
      Unity_2018_Frozen/Assets/Frozen/Script/FrozenScreenToWorldSpace.cs
  24. 8
      Unity_2018_Frozen/Assets/Frozen/Script/GiantSnowflake.cs
  25. 9
      Unity_2018_Frozen/Assets/Frozen/Script/SceneController.cs
  26. 200
      Unity_2018_Frozen/Assets/Frozen/Script/SpaceMeshGenerator.cs
  27. 3
      Unity_2018_Frozen/Assets/Frozen/Shader/FrozenUnlitBlendedTexture.shader
  28. 6
      Unity_2018_Frozen/Assets/Frozen/Shader/SnowflakeParticleUpdate.compute
  29. 4
      Unity_2018_Frozen/Assets/Frozen/Texture/Character/Kristoff_Sven.mat
  30. 0
      Unity_2018_Frozen/Assets/Frozen/Texture/Character/Kristoff_Sven.mat.meta
  31. 3
      Unity_2018_Frozen/Assets/Frozen/Texture/Character/Sven_and_Krostoff.png
  32. 88
      Unity_2018_Frozen/Assets/Frozen/Texture/Character/Sven_and_Krostoff.png.meta
  33. 4
      Unity_2018_Frozen/Assets/Frozen/Texture/Character/anna.png
  34. 3
      Unity_2018_Frozen/Assets/Frozen/Texture/Character/snowball_only.png
  35. 88
      Unity_2018_Frozen/Assets/Frozen/Texture/Character/snowball_only.png.meta
  36. 25
      Unity_2018_Frozen/Assets/Frozen/Texture/Effect/Cloud_Snow.mat
  37. 14
      Unity_2018_Frozen/Assets/Frozen/Texture/Effect/Cloud_Snow.png.meta
  38. 78
      Unity_2018_Frozen/Assets/Frozen/Texture/Effect/Elsa_Effect_A.mat
  39. 10
      Unity_2018_Frozen/Assets/Frozen/Texture/Effect/Elsa_Effect_A.mat.meta
  40. 3
      Unity_2018_Frozen/Assets/Frozen/Texture/Effect/Elsa_Effect_A_hap.png
  41. 88
      Unity_2018_Frozen/Assets/Frozen/Texture/Effect/Elsa_Effect_A_hap.png.meta
  42. 78
      Unity_2018_Frozen/Assets/Frozen/Texture/Effect/Elsa_Effect_B.mat
  43. 10
      Unity_2018_Frozen/Assets/Frozen/Texture/Effect/Elsa_Effect_B.mat.meta
  44. 3
      Unity_2018_Frozen/Assets/Frozen/Texture/Effect/Elsa_Effect_B_hap.png
  45. 88
      Unity_2018_Frozen/Assets/Frozen/Texture/Effect/Elsa_Effect_B_hap.png.meta
  46. BIN
      Unity_2018_Frozen/Assets/Frozen/Texture/space-dark-mountain-sq.jpg
  47. 88
      Unity_2018_Frozen/Assets/Frozen/Texture/space-dark-mountain-sq.jpg.meta
  48. BIN
      Unity_2018_Frozen/Assets/Frozen/Texture/space-ice-forest-sq.jpg
  49. 88
      Unity_2018_Frozen/Assets/Frozen/Texture/space-ice-forest-sq.jpg.meta
  50. 4
      Unity_2018_Frozen/Assets/KinectOpticalFlow/ApplyKinectFluidBufferShader.compute
  51. 2
      Unity_2018_Frozen/Assets/KinectOpticalFlow/Grpc/KinectBufferComposite.compute
  52. 16
      Unity_2018_Frozen/Assets/KinectOpticalFlow/KinectOpticalFlowMath.cs

@ -9,7 +9,7 @@ MonoBehaviour:
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: b7eca376a120a0e49a97afa024778843, type: 3}
m_Name: Sven-Standby
m_Name: Elsa_Effect_A-Standby
m_EditorClassIdentifier:
m_VideoLocation: 1
m_VideoPath: ../FrozenMaterial/Demo/Olaf-standby.avi

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 0aa239f497b53734eb6adca529ab6225
guid: 7b0a38d5d484cf54089379ebbe5c1d9d
timeCreated: 1524453128
licenseType: Free
NativeFormatImporter:

@ -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_Effect_A-Trigger
m_EditorClassIdentifier:
m_VideoLocation: 1
m_VideoPath: ../FrozenMaterial/effect/Elsa_Effect_A_hap.avi

@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: 0dfbbcfb9e891fe49874e63122982159
timeCreated: 1524210684
guid: 23773c4900ad46e4f9ba5cb3d1c28912
timeCreated: 1524453128
licenseType: Free
NativeFormatImporter:
externalObjects: {}

@ -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_Effect_B-Standby
m_EditorClassIdentifier:
m_VideoLocation: 1
m_VideoPath: ../FrozenMaterial/Demo/Olaf-standby.avi

@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: f2f10fb696e1a6145b55378c7c7ec9df
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_Effect_B-Trigger
m_EditorClassIdentifier:
m_VideoLocation: 1
m_VideoPath: ../FrozenMaterial/effect/Elsa_Effect_B_hap.avi

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

@ -12,4 +12,4 @@ MonoBehaviour:
m_Name: Kristoff-Trigger
m_EditorClassIdentifier:
m_VideoLocation: 1
m_VideoPath: ../FrozenMaterial/day/Kristoff_hap.avi
m_VideoPath: ../FrozenMaterial/day/Sven_and_Krostoff_hap.avi

@ -9,7 +9,7 @@ MonoBehaviour:
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: b7eca376a120a0e49a97afa024778843, type: 3}
m_Name: Sven-Trigger
m_Name: Space-Day
m_EditorClassIdentifier:
m_VideoLocation: 1
m_VideoPath: ../FrozenMaterial/day/Sven_hap.avi
m_VideoPath: ../FrozenMaterial/space-dark-mountain-sq.avi

@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: 93f0cd64ff27b384c81c546d57b38ea5
timeCreated: 1526278276
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: Space-Night
m_EditorClassIdentifier:
m_VideoLocation: 1
m_VideoPath: ../FrozenMaterial/space-dark-mountain-v1.avi

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

File diff suppressed because it is too large Load Diff

@ -72,5 +72,5 @@ Material:
- _UVSec: 0
- _ZWrite: 1
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 0.99999887}
- _Color: {r: 1, g: 1, b: 1, a: 0}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}

@ -70,7 +70,7 @@ Material:
- _DistortionEnabled: 0
- _DistortionStrength: 1
- _DistortionStrengthScaled: 0
- _DstBlend: 1
- _DstBlend: 10
- _EmissionEnabled: 0
- _FlipbookMode: 0
- _GlossMapScale: 1
@ -79,7 +79,7 @@ Material:
- _InvFade: 1
- _LightingEnabled: 1
- _Metallic: 0
- _Mode: 4
- _Mode: 2
- _OcclusionStrength: 1
- _Parallax: 0.02
- _SmoothnessTextureChannel: 0

@ -6,7 +6,7 @@ Material:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: Space
m_Name: Space-Ground
m_Shader: {fileID: 4800000, guid: 9c06d40e212c2634f84f3f27c34986d2, type: 3}
m_ShaderKeywords:
m_LightmapFlags: 4
@ -70,12 +70,14 @@ Material:
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _Rate: 1
- _Rate: 0
- _SmoothnessTextureChannel: 0
- _SpaceRate: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _UVSec: 0
- _ZWrite: 1
- _isGamma: 0
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}

@ -0,0 +1,83 @@
%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: Space-Wall
m_Shader: {fileID: 4800000, guid: 9c06d40e212c2634f84f3f27c34986d2, type: 3}
m_ShaderKeywords: _ISGAMMA_ON
m_LightmapFlags: 4
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: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 2800000, guid: 2a0d6dab08d40bc4fa8783efdc682ca7, 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}
- _SubTex:
m_Texture: {fileID: 2800000, guid: ae04e57c11d96fa4ab1c13f67394f3b6, type: 3}
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: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _Rate: 0
- _SmoothnessTextureChannel: 0
- _SpaceRate: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _UVSec: 0
- _ZWrite: 1
- _isGamma: 0
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}

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

@ -194,7 +194,7 @@ public class CharacterBehaviour : MonoBehaviour
{
case Area.TopWall:
{
float minmax = Mathf.Abs(padding - FrozenScreenToWorldSpace.Instance.length * 0.5f);
float minmax = Mathf.Abs(padding - FrozenScreenToWorldSpace.Instance.width * 0.5f);
float x = Mathf.Clamp(pos.x + noise, -minmax, minmax);
transform.localPosition = new Vector3(x, pos.y, pos.z);
}
@ -202,7 +202,7 @@ public class CharacterBehaviour : MonoBehaviour
case Area.LeftWall:
case Area.RightWall:
{
float minmax = Mathf.Abs(padding - FrozenScreenToWorldSpace.Instance.width * 0.5f);
float minmax = Mathf.Abs(padding - FrozenScreenToWorldSpace.Instance.length * 0.5f);
float z = Mathf.Clamp(pos.z + noise, -minmax, minmax);
transform.localPosition = new Vector3(pos.x, pos.y, z);
}
@ -231,17 +231,17 @@ public class CharacterBehaviour : MonoBehaviour
Quaternion q = new Quaternion();
if (area == Area.LeftWall)
{
newPos.x = -FrozenScreenToWorldSpace.Instance.length / 2;
newPos.x = -FrozenScreenToWorldSpace.Instance.width / 2;
q.SetLookRotation(Vector3.left);
}
if (area == Area.RightWall)
{
newPos.x = FrozenScreenToWorldSpace.Instance.length / 2;
newPos.x = FrozenScreenToWorldSpace.Instance.width / 2;
q.SetLookRotation(Vector3.right);
}
if (area == Area.TopWall)
{
newPos.z = FrozenScreenToWorldSpace.Instance.width / 2;
newPos.z = FrozenScreenToWorldSpace.Instance.length / 2;
q.SetLookRotation(Vector3.forward);
}
transform.rotation = q;
@ -255,9 +255,9 @@ public class CharacterBehaviour : MonoBehaviour
float minX = transform.localScale.x / 2;
if (randomPos.x == 0)
wallRoi.x = Random.Range(minX, FrozenScreenToWorldSpace.Instance.length - minX) / FrozenScreenToWorldSpace.Instance.length;
else
wallRoi.x = Random.Range(minX, FrozenScreenToWorldSpace.Instance.width - minX) / FrozenScreenToWorldSpace.Instance.width;
else
wallRoi.x = Random.Range(minX, FrozenScreenToWorldSpace.Instance.length - minX) / FrozenScreenToWorldSpace.Instance.length;
wallRoi.y = origin_height / FrozenScreenToWorldSpace.Instance.height;
UpdatePos();
@ -268,9 +268,9 @@ public class CharacterBehaviour : MonoBehaviour
{
Vector3 n_pos = transform.localPosition;
if (area == Area.TopWall)
n_pos.x = Mathf.Lerp(-FrozenScreenToWorldSpace.Instance.length / 2, FrozenScreenToWorldSpace.Instance.length / 2, wallRoi.x);
n_pos.x = Mathf.Lerp(-FrozenScreenToWorldSpace.Instance.width / 2, FrozenScreenToWorldSpace.Instance.width / 2, wallRoi.x);
else
n_pos.z = Mathf.Lerp(-FrozenScreenToWorldSpace.Instance.width / 2, FrozenScreenToWorldSpace.Instance.width / 2, wallRoi.x);
n_pos.z = Mathf.Lerp(-FrozenScreenToWorldSpace.Instance.length / 2, FrozenScreenToWorldSpace.Instance.length / 2, wallRoi.x);
n_pos.y = Mathf.Lerp(0, (float)FrozenScreenToWorldSpace.Instance.height, wallRoi.y);
transform.localPosition = n_pos;
//SetButtonPos();

@ -19,6 +19,7 @@ namespace UltraCombos.Frozen
private void Update()
{
/*
float padding = 0.5f;
Ray ray = new Ray(Vector3.zero, -new Vector3(kinectMath.averageVelocity.x, 0, kinectMath.averageVelocity.z));
@ -30,7 +31,7 @@ namespace UltraCombos.Frozen
if (FrozenScreenToWorldSpace.Instance.GetWallPlane(Area.LeftWall).Raycast(ray, out enter))
{
hit_point = ray.GetPoint(enter);
if (Mathf.Abs(hit_point.z) < FrozenScreenToWorldSpace.Instance.width * 0.5f - padding)
if (Mathf.Abs(hit_point.z) < FrozenScreenToWorldSpace.Instance.length * 0.5f - padding)
{
isHit = true;
}
@ -42,7 +43,7 @@ namespace UltraCombos.Frozen
if (FrozenScreenToWorldSpace.Instance.GetWallPlane(Area.RightWall).Raycast(ray, out enter))
{
hit_point = ray.GetPoint(enter);
if (Mathf.Abs(hit_point.z) < FrozenScreenToWorldSpace.Instance.width * 0.5f - padding)
if (Mathf.Abs(hit_point.z) < FrozenScreenToWorldSpace.Instance.length * 0.5f - padding)
{
isHit = true;
}
@ -54,7 +55,7 @@ namespace UltraCombos.Frozen
if (FrozenScreenToWorldSpace.Instance.GetWallPlane(Area.TopWall).Raycast(ray, out enter))
{
hit_point = ray.GetPoint(enter);
if (Mathf.Abs(hit_point.x) < FrozenScreenToWorldSpace.Instance.length * 0.5f - padding)
if (Mathf.Abs(hit_point.x) < FrozenScreenToWorldSpace.Instance.width * 0.5f - padding)
{
isHit = true;
}
@ -66,14 +67,17 @@ namespace UltraCombos.Frozen
{
hitPoint = hit_point + transform.position;
}
*/
}
private void OnDrawGizmosSelected()
{
/*
Gizmos.DrawLine(transform.position, transform.position - new Vector3(kinectMath.averageVelocity.x, 0, kinectMath.averageVelocity.z) * 50.0f);
if (isHit == false)
return;
Gizmos.DrawWireCube(hitPoint, Vector3.one);
*/
}
}

@ -25,8 +25,8 @@ public class FrozenScreenToWorldSpace : MonoBehaviour {
}
private static FrozenScreenToWorldSpace instacnce;
public float width = 5;
public float length = 8;
public float width = 8;
public float length = 5;
public float height = 3;
public float blackLength = 0.89f;
public float PixelsByMeter = 360;
@ -72,19 +72,19 @@ public class FrozenScreenToWorldSpace : MonoBehaviour {
void InitailROISetting()
{
totalLength = height * 2 + length;
totalWidth = height + width + blackLength;
LeftWall = new RenderTextureROI(0, height / totalWidth, height / totalLength, width / totalWidth);
RightWall = new RenderTextureROI((height + length) / totalLength, height / totalWidth, height / totalLength, width / totalWidth);
TopWall = new RenderTextureROI((height) / totalLength, 0, length / totalLength, height / totalWidth);
Floor = new RenderTextureROI(height / totalLength, height / totalWidth, length / totalLength, width / totalWidth);
totalLength = height * 2 + width;
totalWidth = height + length + blackLength;
LeftWall = new RenderTextureROI(0, height / totalWidth, height / totalLength, length / totalWidth);
RightWall = new RenderTextureROI((height + width) / totalLength, height / totalWidth, height / totalLength, length / totalWidth);
TopWall = new RenderTextureROI((height) / totalLength, 0, width / totalLength, height / totalWidth);
Floor = new RenderTextureROI(height / totalLength, height / totalWidth, width / totalLength, length / totalWidth);
RenderTextureROIList.Add(Area.LeftWall, LeftWall);
RenderTextureROIList.Add(Area.RightWall, RightWall);
RenderTextureROIList.Add(Area.TopWall, TopWall);
RenderTextureROIList.Add(Area.Floor, Floor);
wallPlaneList.Add(Area.LeftWall, new Plane(Vector3.right, new Vector3(-length * 0.5f, 0, 0)));
wallPlaneList.Add(Area.RightWall, new Plane(Vector3.left, new Vector3(length * 0.5f, 0, 0)));
wallPlaneList.Add(Area.TopWall, new Plane(Vector3.back, new Vector3(0, 0, width * 0.5f)));
wallPlaneList.Add(Area.LeftWall, new Plane(Vector3.right, new Vector3(-width * 0.5f, 0, 0)));
wallPlaneList.Add(Area.RightWall, new Plane(Vector3.left, new Vector3(width * 0.5f, 0, 0)));
wallPlaneList.Add(Area.TopWall, new Plane(Vector3.back, new Vector3(0, 0, length * 0.5f)));
}
public RenderTextureROI GetROI(Area area)
@ -136,19 +136,19 @@ public class FrozenScreenToWorldSpace : MonoBehaviour {
{
case Area.TopWall:
{
roi.x = (position.x + length * 0.5f) / length;
roi.x = (position.x + width * 0.5f) / width;
roi.y = position.y / height;
}
break;
case Area.LeftWall:
{
roi.x = (position.z + width * 0.5f) / width;
roi.x = (position.z + length * 0.5f) / length;
roi.y = position.y / height;
}
break;
case Area.RightWall:
{
roi.x = (position.z + width * 0.5f) / width;
roi.x = (position.z + length * 0.5f) / length;
roi.y = position.y / height;
}
break;

@ -21,10 +21,15 @@ namespace UltraCombos.Frozen
[SerializeField]
float cooldown = 2.0f;
[SerializeField]
float offset = 1.5f;
Vector3 root;
private void Start()
{
material = GetComponent<MeshRenderer>().sharedMaterial;
player = GetComponent<DShowMoviePlayer>();
root = transform.position;
StartCoroutine(Flow());
}
@ -98,6 +103,9 @@ namespace UltraCombos.Frozen
}
yield return new WaitForSeconds(cooldown);
transform.position = root + new Vector3(Random.Range(-offset, offset), 0, 0);
yield return null;
//Debug.Log("Flow done");
}
}

@ -13,7 +13,7 @@ namespace UltraCombos.Frozen
UniformBlendedStructuredBuffer uniform;
[SerializeField]
Material spaceMaterial;
List<Material> spaceMaterials = new List<Material>();
[SerializeField, Range(0.0f, 0.1f)]
float snowSize = 0.01f;
@ -25,6 +25,8 @@ namespace UltraCombos.Frozen
[SerializeField]
KinectOpticalFlow kinect;
[SerializeField]
float nightKinectAmount = 30.0f;
[SerializeField]
ParticleViewerProcedural particleViewer;
@ -53,11 +55,12 @@ namespace UltraCombos.Frozen
}
uniform.rate = rate;
spaceMaterial.SetFloat("_Rate", rate);
foreach (var mat in spaceMaterials)
mat.SetFloat("_Rate", rate);
//snowMaterial.SetFloat("_Size", Mathf.Lerp(0.0f, snowSize, rate));
snowMaterial.SetFloat("_Size", snowSize);
cosineGradient.rate = rate;
kinect.kinectAmount = rate < 0.5 ? 1.0f : 30.0f;
kinect.kinectAmount = Mathf.Lerp(1.0f, nightKinectAmount, rate);
particleViewer.VertexCount = (int)(Mathf.Lerp(dayParticleRate, 1.0f, rate) * particleViewer.buffer.count);
foreach (var chr in dayCharacters)

@ -11,38 +11,72 @@ namespace UltraCombos.Frozen
bool update = false;
[SerializeField]
int width = 1;
int width = 8;
[SerializeField]
int depth = 1;
int length = 5;
[SerializeField]
int height = 1;
int height = 3;
[SerializeField]
bool isAnimated = false;
Vector3 size = Vector3.zero;
private void Start()
{
update = true;
if (Application.isPlaying)
{
if (isAnimated)
{
var players = GetComponentsInChildren<DShowMoviePlayer>();
foreach (var mp in players)
{
mp.gameObject.SetActive(true);
}
}
var renderers = GetComponentsInChildren<MeshRenderer>();
if (renderers.Length > 1)
{
renderers[1].sharedMaterial.SetFloat("_isGamma", isAnimated ? 1.0f : 0.0f);
}
}
}
private void Update()
{
var mesh_filter = GetComponent<MeshFilter>();
size.Set(width, height, length);
if (update)
{
update = false;
if (Application.isPlaying)
Destroy(mesh_filter.sharedMesh);
else
DestroyImmediate(mesh_filter.sharedMesh);
mesh_filter.sharedMesh = null;
ClearFilterMesh();
}
if (mesh_filter.sharedMesh == null)
var mesh_filters = GetComponentsInChildren<MeshFilter>();
for (int i = 0; i < mesh_filters.Length; i++)
{
mesh_filter.sharedMesh = CreateMesh();
var filter = mesh_filters[i];
if (filter.sharedMesh == null)
{
if (Application.isPlaying)
{
filter.sharedMesh = (i == 0) ? CreateGroundMesh() : CreateWallMesh();
}
else if (i == 0)
{
filter.sharedMesh = CreateGroundMesh();
}
}
}
}
private void OnDrawGizmosSelected()
{
var size = new Vector3(width, height, depth);
var center = transform.position;
center.y += size.y * 0.5f;
var c = Gizmos.color;
@ -51,11 +85,23 @@ namespace UltraCombos.Frozen
Gizmos.color = c;
}
private Mesh CreateMesh()
private void ClearFilterMesh()
{
var mesh_filters = GetComponentsInChildren<MeshFilter>();
foreach (var filter in mesh_filters)
{
if (Application.isPlaying)
Destroy(filter.sharedMesh);
else
DestroyImmediate(filter.sharedMesh);
filter.sharedMesh = null;
}
}
private Mesh CreateWallMesh()
{
var size = new Vector3(width, height, depth);
var half_size = size * 0.5f;
var tex_size = new Vector2(depth * 2.0f + width, depth + height);
var tex_size = new Vector2(width, height * 3.0f);
var points = new List<Vector3>();
points.Add(new Vector3(-half_size.x, 0.0f, -half_size.z));
@ -72,27 +118,16 @@ namespace UltraCombos.Frozen
var indices = new List<int>();
var normals = new List<Vector3>();
// Ground
AddIndexAndNormal(indices, vertices.Count, normals, new Vector3(0, 1, 0));
vertices.Add(points[0]);
vertices.Add(points[1]);
vertices.Add(points[2]);
vertices.Add(points[3]);
uvs.Add(new Vector2(depth / tex_size.x, 0.0f));
uvs.Add(new Vector2(depth / tex_size.x, depth / tex_size.y));
uvs.Add(new Vector2((depth + width) / tex_size.x, 0.0f));
uvs.Add(new Vector2((depth + width) / tex_size.x, depth / tex_size.y));
// Front
AddIndexAndNormal(indices, vertices.Count, normals, new Vector3(0, 0, -1));
vertices.Add(points[1]);
vertices.Add(points[5]);
vertices.Add(points[3]);
vertices.Add(points[7]);
uvs.Add(new Vector2(depth / tex_size.x, depth / tex_size.y));
uvs.Add(new Vector2(depth / tex_size.x, (depth + height) / tex_size.y));
uvs.Add(new Vector2((depth + width) / tex_size.x, depth / tex_size.y));
uvs.Add(new Vector2((depth + width) / tex_size.x, (depth + height) / tex_size.y));
uvs.Add(new Vector2(0.0f, height * 1.0f / tex_size.y));
uvs.Add(new Vector2(0.0f, height * 0.0f / tex_size.y));
uvs.Add(new Vector2(width / tex_size.x, height * 1.0f / tex_size.y));
uvs.Add(new Vector2(width / tex_size.x, height * 0.0f / tex_size.y));
// Left
AddIndexAndNormal(indices, vertices.Count, normals, new Vector3(1, 0, 0));
@ -100,10 +135,10 @@ namespace UltraCombos.Frozen
vertices.Add(points[4]);
vertices.Add(points[1]);
vertices.Add(points[5]);
uvs.Add(new Vector2(0.0f, depth / tex_size.y));
uvs.Add(new Vector2(0.0f, (depth + height) / tex_size.y));
uvs.Add(new Vector2(depth / tex_size.x, depth / tex_size.y));
uvs.Add(new Vector2(depth / tex_size.x, (depth + height) / tex_size.y));
uvs.Add(new Vector2(0.0f, height * 2.0f / tex_size.y));
uvs.Add(new Vector2(0.0f, height * 1.0f / tex_size.y));
uvs.Add(new Vector2(length / tex_size.x, height * 2.0f / tex_size.y));
uvs.Add(new Vector2(length / tex_size.x, height * 1.0f / tex_size.y));
// Right
AddIndexAndNormal(indices, vertices.Count, normals, new Vector3(-1, 0, 0));
@ -111,14 +146,97 @@ namespace UltraCombos.Frozen
vertices.Add(points[7]);
vertices.Add(points[2]);
vertices.Add(points[6]);
uvs.Add(new Vector2((depth + width) / tex_size.x, depth / tex_size.y));
uvs.Add(new Vector2((depth + width) / tex_size.x, (depth + height) / tex_size.y));
uvs.Add(new Vector2((depth * 2.0f + width) / tex_size.x, depth / tex_size.y));
uvs.Add(new Vector2((depth * 2.0f + width) / tex_size.x, (depth + height) / tex_size.y));
uvs.Add(new Vector2(0.0f, height * 3.0f / tex_size.y));
uvs.Add(new Vector2(0.0f, height * 2.0f / tex_size.y));
uvs.Add(new Vector2(length / tex_size.x, height * 3.0f / tex_size.y));
uvs.Add(new Vector2(length / tex_size.x, height * 2.0f / tex_size.y));
if (isAnimated == false)
{
for (int i = 0; i < uvs.Count; i++)
uvs[i] = new Vector2(uvs[i].x, 1.0f - uvs[i].y);
}
var mesh = new Mesh();
mesh.name = string.Format("Space Wall Mesh: ({0}x{1}x{2})", width, length, height);
mesh.SetVertices(vertices);
mesh.SetUVs(0, uvs);
mesh.SetNormals(normals);
mesh.SetIndices(indices.ToArray(), MeshTopology.Triangles, 0);
mesh.UploadMeshData(true);
return mesh;
}
private Mesh CreateGroundMesh()
{
var half_size = size * 0.5f;
var tex_size = new Vector2(this.length * 2.0f + width, this.length + height);
var points = new List<Vector3>();
points.Add(new Vector3(-half_size.x, 0.0f, -half_size.z));
points.Add(new Vector3(-half_size.x, 0.0f, +half_size.z));
points.Add(new Vector3(+half_size.x, 0.0f, -half_size.z));
points.Add(new Vector3(+half_size.x, 0.0f, +half_size.z));
points.Add(new Vector3(-half_size.x, size.y, -half_size.z));
points.Add(new Vector3(-half_size.x, size.y, +half_size.z));
points.Add(new Vector3(+half_size.x, size.y, -half_size.z));
points.Add(new Vector3(+half_size.x, size.y, +half_size.z));
var vertices = new List<Vector3>();
var uvs = new List<Vector2>();
var indices = new List<int>();
var normals = new List<Vector3>();
// Ground
AddIndexAndNormal(indices, vertices.Count, normals, new Vector3(0, 1, 0));
vertices.Add(points[0]);
vertices.Add(points[1]);
vertices.Add(points[2]);
vertices.Add(points[3]);
uvs.Add(new Vector2(this.length / tex_size.x, 0.0f));
uvs.Add(new Vector2(this.length / tex_size.x, this.length / tex_size.y));
uvs.Add(new Vector2((this.length + width) / tex_size.x, 0.0f));
uvs.Add(new Vector2((this.length + width) / tex_size.x, this.length / tex_size.y));
if (Application.isPlaying == false)
{
// Front
AddIndexAndNormal(indices, vertices.Count, normals, new Vector3(0, 0, -1));
vertices.Add(points[1]);
vertices.Add(points[5]);
vertices.Add(points[3]);
vertices.Add(points[7]);
uvs.Add(new Vector2(length / tex_size.x, length / tex_size.y));
uvs.Add(new Vector2(length / tex_size.x, (length + height) / tex_size.y));
uvs.Add(new Vector2((length + width) / tex_size.x, length / tex_size.y));
uvs.Add(new Vector2((length + width) / tex_size.x, (length + height) / tex_size.y));
// Left
AddIndexAndNormal(indices, vertices.Count, normals, new Vector3(1, 0, 0));
vertices.Add(points[0]);
vertices.Add(points[4]);
vertices.Add(points[1]);
vertices.Add(points[5]);
uvs.Add(new Vector2(0.0f, length / tex_size.y));
uvs.Add(new Vector2(0.0f, (length + height) / tex_size.y));
uvs.Add(new Vector2(length / tex_size.x, length / tex_size.y));
uvs.Add(new Vector2(length / tex_size.x, (length + height) / tex_size.y));
// Right
AddIndexAndNormal(indices, vertices.Count, normals, new Vector3(-1, 0, 0));
vertices.Add(points[3]);
vertices.Add(points[7]);
vertices.Add(points[2]);
vertices.Add(points[6]);
uvs.Add(new Vector2((length + width) / tex_size.x, length / tex_size.y));
uvs.Add(new Vector2((length + width) / tex_size.x, (length + height) / tex_size.y));
uvs.Add(new Vector2((length * 2.0f + width) / tex_size.x, length / tex_size.y));
uvs.Add(new Vector2((length * 2.0f + width) / tex_size.x, (length + height) / tex_size.y));
}
var mesh = new Mesh();
mesh.name = string.Format("Space Mesh: ({0}x{1}x{2})", width, depth, height);
mesh.name = string.Format("Space Ground Mesh: ({0}x{1}x{2})", width, this.length, height);
mesh.SetVertices(vertices);
mesh.SetUVs(0, uvs);
mesh.SetNormals(normals);

@ -5,6 +5,7 @@
_MainTex ("Texture", 2D) = "white" {}
_SubTex ("Texture", 2D) = "white" {}
_Rate ("Rate", Range(0, 1)) = 0
[Toggle] _isGamma("is Gamma", Float) = 0
}
SubShader
{
@ -35,6 +36,7 @@
float4 _MainTex_ST;
sampler2D _SubTex;
float _Rate;
float _isGamma;
v2f vert (appdata v)
{
@ -49,6 +51,7 @@
fixed4 col = tex2D(_MainTex, i.uv);
fixed4 sub_col = tex2D(_SubTex, i.uv);
fixed3 frag_color = lerp(col.xyz, sub_col.xyz, _Rate);
frag_color = lerp(frag_color, GammaToLinearSpace(frag_color), _isGamma);
return fixed4(frag_color, 1.0);
}
ENDCG

@ -58,7 +58,8 @@ void CSMain(uint3 id : SV_DispatchThreadID)
//if (isEmit == 0 && current_life > 0.0) current_life -= duration;
p.position = home_position.xyz;
p.color.rgb = float3(1, 1, 1);
p.velocity = home_velocity.xyz * 20.0f * pow(length(home_velocity.xyz), 2.0f);
//p.velocity = home_velocity.xyz * 20.0f * pow(length(home_velocity.xyz), 2.0f);
p.velocity = home_velocity.xyz * 100.0f * uni.homeStrength;
//p.velocity = forceDirection * 3.0f;
}
p.life = current_life / duration;
@ -83,13 +84,14 @@ void CSMain(uint3 id : SV_DispatchThreadID)
}
// home as tangential
/*
{
F = cross(p.position, float3(0, 1, 0));
float d = clamp(abs(p.position.y), 1, 100);
F = normalize(F) * 10.0f / pow(d, 2 * 2);
acc += F * uni.homeStrength;
}
*/
// force
{
F = float3(0, 0, 0);

@ -6,7 +6,7 @@ Material:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: Kristoff
m_Name: Kristoff_Sven
m_Shader: {fileID: 4800000, guid: a76fe72ab9c198948a9233662c9407f3, type: 3}
m_ShaderKeywords: _ALPHATEST_ON _EMISSION
m_LightmapFlags: 1
@ -39,7 +39,7 @@ Material:
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 2800000, guid: 8a3849f71f810db4094f196d78e406ea, type: 3}
m_Texture: {fileID: 2800000, guid: d8e00fc77117d3c4d9db386a3981feb8, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:

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

@ -0,0 +1,88 @@
fileFormatVersion: 2
guid: d8e00fc77117d3c4d9db386a3981feb8
timeCreated: 1526286554
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: 0
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:

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:40b107230b06ddd8ea2f317a961c19b436e6edce5e8a270092ca4c8db701fe7e
size 488374
oid sha256:ef44675520992d7f79105d3abad601a9807205bb9a07337c9ef4c5299e72fe7f
size 817464

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

@ -0,0 +1,88 @@
fileFormatVersion: 2
guid: d2326e93b3259884bb63ae615548d026
timeCreated: 1526286554
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: 0
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:

@ -8,8 +8,8 @@ Material:
m_PrefabInternal: {fileID: 0}
m_Name: Cloud_Snow
m_Shader: {fileID: 4800000, guid: a76fe72ab9c198948a9233662c9407f3, type: 3}
m_ShaderKeywords: _ALPHATEST_ON _EMISSION
m_LightmapFlags: 1
m_ShaderKeywords: _ALPHATEST_ON
m_LightmapFlags: 0
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
@ -55,22 +55,43 @@ Material:
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _BlendOp: 0
- _BumpScale: 1
- _CameraFadingEnabled: 0
- _CameraFarFadeDistance: 2
- _CameraNearFadeDistance: 1
- _ColorMode: 0
- _Cull: 2
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DistortionBlend: 0.5
- _DistortionEnabled: 0
- _DistortionStrength: 1
- _DistortionStrengthScaled: 0
- _DstBlend: 0
- _EmissionEnabled: 0
- _FlipbookMode: 0
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- _InvFade: 1
- _LightingEnabled: 0
- _Metallic: 0
- _Mode: 1
- _OcclusionStrength: 1
- _Parallax: 0.02
- _SmoothnessTextureChannel: 0
- _SoftParticlesEnabled: 0
- _SoftParticlesFarFadeDistance: 1
- _SoftParticlesNearFadeDistance: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _UVSec: 0
- _ZWrite: 1
m_Colors:
- _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _ColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0}
- _EmissionColor: {r: 1, g: 1, b: 1, a: 1}
- _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0}
- _TintColor: {r: 1, g: 1, b: 1, a: 0.5}

@ -37,7 +37,7 @@ TextureImporter:
wrapU: -1
wrapV: -1
wrapW: -1
nPOTScale: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 0
@ -49,7 +49,7 @@ TextureImporter:
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 0
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 0
textureShape: 1
@ -67,6 +67,16 @@ TextureImporter:
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: []

@ -0,0 +1,78 @@
%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_Effect_A
m_Shader: {fileID: 200, guid: 0000000000000000f000000000000000, type: 0}
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: 9276cdc01befe754ebf3086fdf0c880c, 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
- _InvFade: 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}
- _TintColor: {r: 1, g: 1, b: 1, a: 0.5}

@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: d399e769f1f82344b9f305269a536595
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:212eaf74b0c2332067a073d2ac02dfa2a6ba9a5aee6ee88d20eee7f23474af27
size 1807137

@ -0,0 +1,88 @@
fileFormatVersion: 2
guid: 9276cdc01befe754ebf3086fdf0c880c
timeCreated: 1526287584
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: 0
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,78 @@
%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_Effect_B
m_Shader: {fileID: 200, guid: 0000000000000000f000000000000000, type: 0}
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: 8e5a3a327c02f7c498513f78872fd584, 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
- _InvFade: 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}
- _TintColor: {r: 1, g: 1, b: 1, a: 0.5}

@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: 5f6b94c6b2a653d439fba4373746dade
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:70b8d42fb2339b877b586812b9cfd255e7ce8a17b9dc951c52ff2554c0d996e7
size 3308008

@ -0,0 +1,88 @@
fileFormatVersion: 2
guid: 8e5a3a327c02f7c498513f78872fd584
timeCreated: 1526287583
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: 0
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:

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.0 MiB

@ -0,0 +1,88 @@
fileFormatVersion: 2
guid: ae04e57c11d96fa4ab1c13f67394f3b6
timeCreated: 1526285199
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: 0
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: 0
spriteTessellationDetail: -1
textureType: 0
textureShape: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- buildTarget: DefaultTexturePlatform
maxTextureSize: 4096
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- buildTarget: Standalone
maxTextureSize: 4096
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
spritePackingTag:
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.4 MiB

@ -0,0 +1,88 @@
fileFormatVersion: 2
guid: 2a0d6dab08d40bc4fa8783efdc682ca7
timeCreated: 1526289300
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: 0
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: 0
spriteTessellationDetail: -1
textureType: 0
textureShape: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- buildTarget: DefaultTexturePlatform
maxTextureSize: 4096
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- buildTarget: Standalone
maxTextureSize: 4096
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:

@ -11,7 +11,7 @@ float4 FluidDim;
float timeStep;
float temperatureAmount;
float densityAmount;
//float kinectAmount;
float kinectAmount;
[numthreads(NUM_THREADS, NUM_THREADS, NUM_THREADS)]
void CSMain(uint3 id : SV_DispatchThreadID)
@ -25,8 +25,6 @@ void CSMain(uint3 id : SV_DispatchThreadID)
KinectGridBuffer[idx] = float4(vel, obs);
//KinectGridBuffer[idx] = float4(1, 0, 0, 1);
float kinectAmount = 1.0;
float obstacle = 0;
// boundary

@ -69,7 +69,7 @@ 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;
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 ||
kpos.z < -clip_box.z * 0.5 || kpos.z > clip_box.z * 0.5 ||

@ -19,12 +19,12 @@ namespace UltraCombos
int home_count;
Vector4[] position_samples = new Vector4[512 * 424 * 2];
Vector4[] velocity_samples = new Vector4[512 * 424 * 2];
//Vector4[] velocity_samples = new Vector4[512 * 424 * 2];
public Vector3 averagePositinon = Vector3.zero;
public float standardDeviation = -1.0f;
public Vector3 averageVelocity = Vector3.zero;
//public Vector3 averageVelocity = Vector3.zero;
[SerializeField]
string debug;
@ -45,10 +45,10 @@ namespace UltraCombos
kinect.HomeCountBuffer.GetData(data);
home_count = data[0];
kinect.HomePositionBuffer.GetData(position_samples, 0, 0, home_count);
kinect.HomeVelocityBuffer.GetData(velocity_samples, 0, 0, home_count);
//kinect.HomeVelocityBuffer.GetData(velocity_samples, 0, 0, home_count);
averagePositinon = Vector3.zero;
averageVelocity = Vector3.zero;
//averageVelocity = Vector3.zero;
if (home_count > countThreshold)
{
float div = 1.0f / home_count;
@ -63,17 +63,17 @@ namespace UltraCombos
avg_dist += dist;
standardDeviation += Mathf.Pow(dist, 2.0f);
var vel_smp = new Vector3(velocity_samples[i].x, velocity_samples[i].y, velocity_samples[i].z);
averageVelocity += vel_smp;
//var vel_smp = new Vector3(velocity_samples[i].x, velocity_samples[i].y, velocity_samples[i].z);
//averageVelocity += vel_smp;
}
averagePositinon.Scale(Vector4.one * div);
avg_dist *= div;
standardDeviation = Mathf.Sqrt(standardDeviation * div - avg_dist * avg_dist);
averageVelocity.Scale(Vector4.one * div);
//averageVelocity.Scale(Vector4.one * div);
debug = string.Format("{0}({1}): {2}", averagePositinon, avg_dist, standardDeviation);
debug = string.Format("{0}, {1}({2}): {3}", home_count, averagePositinon, avg_dist, standardDeviation);
}
else
{

Loading…
Cancel
Save