From 9ed8efcc53f54dce8ec34279e47df851693854ec Mon Sep 17 00:00:00 2001
From: Adrian Kummerlaender
Date: Mon, 25 Feb 2019 21:29:03 +0100
Subject: Add cylinder and dampened inflow to open geometry

---
 src/shader/code/collide.glsl | 9 +++++----
 src/shader/code/vertex.glsl  | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'src/shader')

diff --git a/src/shader/code/collide.glsl b/src/shader/code/collide.glsl
index 4efd7fb..230f02e 100644
--- a/src/shader/code/collide.glsl
+++ b/src/shader/code/collide.glsl
@@ -7,10 +7,11 @@ layout (std430, binding=1) buffer bufferCollide  { float collideCells[];  };
 layout (std430, binding=2) buffer bufferStream   { float streamCells[];   };
 layout (std430, binding=3) buffer bufferFluid    { float fluidCells[];    };
 
-/// LBM constants
-
 uniform uint nX;
 uniform uint nY;
+uniform uint iT;
+
+/// LBM constants
 
 const uint  q         = 9;
 const float weight[q] = float[](
@@ -19,7 +20,7 @@ const float weight[q] = float[](
 	1./36 , 1./9., 1./36.
 );
 
-const float tau   = 0.8;
+const float tau   = 0.6;
 const float omega = 1/tau;
 
 /// Vector utilities
@@ -142,7 +143,7 @@ void main() {
 
 	if ( isBulkFluidCell(material) ) {
 		if ( isInflowCell(material) ) {
-			v = vec2(0.1,0.0);
+			v = vec2(min(float(iT)*0.2/2000.0, 0.2), 0.0);
 		}
 		if ( isOutflowCell(material) ) {
 			d = 1.0;
diff --git a/src/shader/code/vertex.glsl b/src/shader/code/vertex.glsl
index e0ce9a8..67a5d80 100644
--- a/src/shader/code/vertex.glsl
+++ b/src/shader/code/vertex.glsl
@@ -10,7 +10,7 @@ out VS_OUT {
 uniform uint nX;
 uniform uint nY;
 
-const float displayAmplifier = 10.0;
+const float displayAmplifier = 4.0;
 
 float unit(float x) {
 	return 1.0/(1.0+exp(-x));
-- 
cgit v1.2.3