From 6ce17965eb1ce25f2cf1b7a47da2e96e4ec1fa0c Mon Sep 17 00:00:00 2001 From: amandaghassaei <amandaghassaei@gmail.com> Date: Mon, 3 Apr 2017 23:52:40 -0400 Subject: [PATCH] eod --- index.html | 8 +++++++- main.css | 8 ++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/index.html b/index.html index 9e87d5c..39db1bf 100644 --- a/index.html +++ b/index.html @@ -311,7 +311,13 @@ <div class="modal-content"> <div class="modal-body"> <b>Fluid Simulation Shader</b><br/><br/> - I used the following sources to write this simulation:<br/><br/> + This simulation solves the <a href="https://en.wikipedia.org/wiki/Navier%E2%80%93Stokes_equations" target="_blank">Navier-Stokes equations</a> for incompressible fluids in a GPU fragment shader. + I implemented <a href="https://en.wikipedia.org/wiki/No-slip_condition" target="_blank">no-slip boundary conditions</a> at the borders to keep the fluid contained within the bounds of the screen. + To increase performance, I solved for the velocity vector field of the fluid at a lower resolution than I used to compute the visualization of fluid flow; I used bilinear interpolation to smooth out artifacts caused by this speedup. + <br/><br/> + <b>Instructions:</b> Click and drag to apply a force to the fluid. Over time, the colored material in the fluid will dissipate. + <br/><br/> + I found the following sources helpful while writing this simulation:<br/> <a href="https://pdfs.semanticscholar.org/84b8/c7b7eecf90ebd9d54a51544ca0f8ff93c137.pdf" target="_blank">Real-time ink simulation using a grid-particle method</a> - a method for real-time simulation of ink in water using a coarse-grained fluid simulation with a particle simulation on top.<br/> <a href="http://http.developer.nvidia.com/GPUGems/gpugems_ch38.html" target="_blank">Fast Fluid Dynamics Simulation on the GPU</a> - a very well written tutorial about programming the Navier-Stokes equations on a GPU.<br/> diff --git a/main.css b/main.css index 0724c4e..53356f6 100644 --- a/main.css +++ b/main.css @@ -22,11 +22,11 @@ canvas { z-index: 5; top:0; right:0; - background: #444; + background: rgba(40, 40, 40, 0.7); width: 30px; text-align: center; position: absolute; - color: #fff; + color: #faefd6; } .sliderInput{ @@ -44,7 +44,7 @@ canvas { } a, a:hover, a:visited, a:focus{ - color:#8cbaed; + color:#ec008b; } a.btn:visited, a.btn:focus{ @@ -119,7 +119,7 @@ input.form-control { } .flat-slider.ui-slider-vertical .ui-slider-handle{ - background: #8cbaed; + background: #ec008b; } .flat-slider.ui-slider-horizontal .ui-slider-handle { -- GitLab