update on demo

master
uc deploy 8 years ago
parent bf66086646
commit 0f14165e38
  1. 9
      Frozen_5_demo.avc
  2. 4
      Unity_2018_Frozen/Assets/Frozen/DSAsset.meta
  3. 4
      Unity_2018_Frozen/Assets/Frozen/Frozen.unity
  4. 2
      Unity_2018_Frozen/Assets/Frozen/FrozenNightParticleUniforms.asset
  5. 3
      Unity_2018_Frozen/Assets/KinectOpticalFlow/ApplyKinectFluidBufferShader.compute

@ -40,12 +40,12 @@
<mixer value="1984087" index="2" selected="0"/>
</mixers>
<parameters>
<parameter orgDuration="25000000" duration="5000">
<parameter>
<name value="Position"/>
<nameGiven value="Position"/>
<textValue value=""/>
<extended value="0"/>
<values curValue="4661.51973" defaultValue="0" startValue="0" stopValue="5000"/>
<values curValue="4415.61462" defaultValue="0" startValue="0" stopValue="5000"/>
<pointsOfInterest value="0"/>
<jumpToPointsOfInterest value="-1"/>
<speedFactor curValue="1" defaultValue="1" startValue="0.0001" stopValue="10"/>
@ -167,11 +167,12 @@
<parameter paramType="110">
<name value="Server"/>
<nameGiven value="Server"/>
<choices value="1"/>
</parameter>
<parameter paramType="110">
<name value="Alpha Type"/>
<nameGiven value="Alpha Type"/>
<choices value="2"/>
<choices value="1"/>
</parameter>
<parameter paramControlType="2">
<name value="Duration"/>
@ -192,7 +193,7 @@
<nameGiven value="Position"/>
<textValue value=""/>
<extended value="0"/>
<values curValue="3046.26894" defaultValue="0" startValue="0" stopValue="5000"/>
<values curValue="3228.84454" defaultValue="0" startValue="0" stopValue="5000"/>
<pointsOfInterest value="0"/>
<jumpToPointsOfInterest value="-1"/>
<speedFactor curValue="1" defaultValue="1" startValue="0.0001" stopValue="10"/>

@ -1,7 +1,7 @@
fileFormatVersion: 2
guid: a00c6450d99200d4f8938cb09f31039c
guid: 38bc639ed9df8014ea31cbb863868880
folderAsset: yes
timeCreated: 1524205618
timeCreated: 1524815826
licenseType: Free
DefaultImporter:
externalObjects: {}

@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 1071731254}
m_IndirectSpecularColor: {r: 0.021216419, g: 0.053037524, b: 0.08577964, a: 1}
m_IndirectSpecularColor: {r: 0.021216419, g: 0.053037528, b: 0.08577964, a: 1}
--- !u!157 &3
LightmapSettings:
m_ObjectHideFlags: 0
@ -3536,7 +3536,7 @@ Transform:
m_GameObject: {fileID: 1848145249}
m_LocalRotation: {x: 0, y: -1, z: 0, w: 0}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_LocalScale: {x: 1.5, y: 1.5, z: 1.5}
m_Children:
- {fileID: 810572922}
- {fileID: 563719737}

@ -14,7 +14,7 @@ MonoBehaviour:
numRate: 1
movement: 1
geomSize: 0.094
velocityDamping: 0.95
velocityDamping: 1
lifeDuration: 10
lifeVariation: 0
convergence: 0

@ -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,6 +25,7 @@ void CSMain(uint3 id : SV_DispatchThreadID)
KinectGridBuffer[idx] = float4(vel, obs);
//KinectGridBuffer[idx] = float4(1, 0, 0, 1);
float kinectAmount = 30.0;
float obstacle = 0;

Loading…
Cancel
Save