aboutsummaryrefslogtreecommitdiff
path: root/demo/scenes/rigidfluidcoupling.h
diff options
context:
space:
mode:
authorMiles Macklin <[email protected]>2017-06-09 13:41:15 +1200
committerMiles Macklin <[email protected]>2017-06-09 13:41:15 +1200
commit688b5f42e9bfe498d7af7075d4d8f4429867f3a3 (patch)
tree7e0d0e7c95298f0418723abd92f61ac6e16b055e /demo/scenes/rigidfluidcoupling.h
parentUpdate README.md (diff)
downloadflex-1.2.0.beta.1.tar.xz
flex-1.2.0.beta.1.zip
1.2.0.beta.11.2.0.beta.1
Diffstat (limited to 'demo/scenes/rigidfluidcoupling.h')
-rw-r--r--demo/scenes/rigidfluidcoupling.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/demo/scenes/rigidfluidcoupling.h b/demo/scenes/rigidfluidcoupling.h
index b978eb8..0bde7d9 100644
--- a/demo/scenes/rigidfluidcoupling.h
+++ b/demo/scenes/rigidfluidcoupling.h
@@ -43,13 +43,12 @@ public:
g_params.radius = radius;
g_params.dynamicFriction = 0.5f;
- g_params.fluid = true;
g_params.viscosity = 0.1f;
g_params.numIterations = 3;
g_params.vorticityConfinement = 0.0f;
g_params.anisotropyScale = 25.0f;
- g_params.fluidRestDistance = g_params.radius*0.55f;
-
+ g_params.fluidRestDistance = g_params.radius*0.55f;
+ g_params.solidRestDistance = g_params.radius*0.5f;
g_emitters[0].mEnabled = true;
g_emitters[0].mSpeed = 2.0f*(g_params.fluidRestDistance)/g_dt;