mirror of
https://github.com/eliasstepanik/FluidSimulation.git
synced 2026-01-11 21:48:28 +00:00
Removed Unused Code
This commit is contained in:
Elias Stepanik
parent
0e87a7e15d
commit
19910ea4e5
@ -2,6 +2,8 @@
|
||||
|
||||
public class Config
|
||||
{
|
||||
public List<Density> Densities { get; set; }
|
||||
public List<Velocity> Velocities { get; set; }
|
||||
public int Size { get; set; } = 128;
|
||||
public int Scale { get; set; } = 7;
|
||||
public string WindowTitle { get; set; } = "Fluid Simulation";
|
||||
public int TargetFps { get; set; } = 60;
|
||||
}
|
||||
@ -10,26 +10,26 @@
|
||||
{
|
||||
"x":32,
|
||||
"y":64,
|
||||
"amountX":0.1,
|
||||
"amountY":-0.1
|
||||
"amountX":0.3,
|
||||
"amountY":-0.3
|
||||
},
|
||||
{
|
||||
"x":96,
|
||||
"y":64,
|
||||
"amountX":-0.1,
|
||||
"amountY":0.1
|
||||
"amountX":-0.3,
|
||||
"amountY":0.3
|
||||
},
|
||||
{
|
||||
"x":64,
|
||||
"y":32,
|
||||
"amountX":0.1,
|
||||
"amountY":0.1
|
||||
"amountX":0.3,
|
||||
"amountY":0.3
|
||||
},
|
||||
{
|
||||
"x":64,
|
||||
"y":96,
|
||||
"amountX":-0.1,
|
||||
"amountY":-0.1
|
||||
"amountX":-0.3,
|
||||
"amountY":-0.3
|
||||
},
|
||||
|
||||
|
||||
@ -37,26 +37,26 @@
|
||||
{
|
||||
"x":64,
|
||||
"y":64,
|
||||
"amountX":0.1,
|
||||
"amountY":-0.1
|
||||
"amountX":0.3,
|
||||
"amountY":-0.3
|
||||
},
|
||||
{
|
||||
"x":64,
|
||||
"y":64,
|
||||
"amountX":-0.1,
|
||||
"amountY":0.1
|
||||
"amountX":-0.3,
|
||||
"amountY":0.3
|
||||
},
|
||||
{
|
||||
"x":64,
|
||||
"y":64,
|
||||
"amountX":0.1,
|
||||
"amountY":0.1
|
||||
"amountX":0.3,
|
||||
"amountY":0.3
|
||||
},
|
||||
{
|
||||
"x":64,
|
||||
"y":64,
|
||||
"amountX":-0.1,
|
||||
"amountY":-0.1
|
||||
"amountX":-0.3,
|
||||
"amountY":-0.3
|
||||
}
|
||||
]
|
||||
}
|
||||
@ -1,261 +0,0 @@
|
||||
using System.Numerics;
|
||||
using Raylib_CsLo;
|
||||
using static Raylib_CsLo.RayMath;
|
||||
|
||||
namespace PixelEngine;
|
||||
|
||||
public class Fluid
|
||||
{
|
||||
public int size { get; set; }
|
||||
public int scale { get; set; }
|
||||
public int iter { get; set; }
|
||||
|
||||
public float dt { get; set; }
|
||||
public float diff { get; set; }
|
||||
public float visc { get; set; }
|
||||
|
||||
public float[] s { get; set; }
|
||||
public float[] density { get; set; }
|
||||
|
||||
public float[] Vx { get; set; }
|
||||
public float[] Vy { get; set; }
|
||||
|
||||
public float[] Vx0 { get; set; }
|
||||
public float[] Vy0 { get; set; }
|
||||
|
||||
|
||||
public Fluid(float dt, float diffusion, float viscosity, int N, int iter, int scale) {
|
||||
|
||||
this.size = N;
|
||||
this.iter = iter;
|
||||
this.dt = dt;
|
||||
this.diff = diffusion;
|
||||
this.visc = viscosity;
|
||||
this.scale = scale;
|
||||
|
||||
this.s = new float[N*N];
|
||||
this.density = new float[N*N];
|
||||
|
||||
this.Vx = new float[N*N];
|
||||
this.Vy = new float[N*N];
|
||||
|
||||
this.Vx0 = new float[N*N];
|
||||
this.Vy0 = new float[N*N];
|
||||
}
|
||||
|
||||
private static dynamic wrapper;
|
||||
public void step() {
|
||||
int N = this.size;
|
||||
float visc = this.visc;
|
||||
float diff = this.diff;
|
||||
float dt = this.dt;
|
||||
float[] Vx = this.Vx;
|
||||
float[] Vy = this.Vy;
|
||||
float[] Vx0 = this.Vx0;
|
||||
float[] Vy0 = this.Vy0;
|
||||
float[] s = this.s;
|
||||
float[] density = this.density;
|
||||
|
||||
diffuse(1, Vx0, Vx, visc, dt);
|
||||
diffuse(2, Vy0, Vy, visc, dt);
|
||||
|
||||
project(Vx0, Vy0, Vx, Vy);
|
||||
advect(this, 1, Vx, Vx0, Vx0, Vy0, dt);
|
||||
advect(this,2, Vy, Vy0, Vx0, Vy0, dt);
|
||||
|
||||
project(Vx, Vy, Vx0, Vy0);
|
||||
|
||||
diffuse(0, s, density, diff, dt);
|
||||
advect(this,0, density, s, Vx, Vy, dt);
|
||||
}
|
||||
|
||||
|
||||
void fadeD() {
|
||||
for (int i = 0; i < this.density.Length; i++) {
|
||||
float d = density[i];
|
||||
density[i] = Clamp(d-0.02f, 0, 255);
|
||||
}
|
||||
}
|
||||
|
||||
public void renderD()
|
||||
{
|
||||
for (int i = 0; i < size; i++) {
|
||||
for (int j = 0; j < size; j++) {
|
||||
int x = i * scale;
|
||||
int y = j * scale;
|
||||
float d = this.density[IX(i, j)];
|
||||
|
||||
Color color = new Color(/*((d + 50) % 255)*/100,255,0,(int)d * 2);
|
||||
Raylib.DrawRectangle(x, y, scale, scale, color);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public int IX(int x, int y)
|
||||
{
|
||||
|
||||
var X = Clamp(x, 0, size - 1);;
|
||||
var Y = Clamp(y, 0, size - 1);
|
||||
return (int) (X + Y * size);
|
||||
}
|
||||
|
||||
public void addDensity(int x, int y, float amount) {
|
||||
int index = IX(x, y);
|
||||
this.density[index] += amount;
|
||||
}
|
||||
|
||||
public void reduceDensity(int x, int y, float amount, int rSize) {
|
||||
|
||||
Parallel.For(-rSize, rSize, i =>
|
||||
{
|
||||
for (int j = -rSize; j < rSize; j++)
|
||||
{
|
||||
int index = IX(x + i, y + j);
|
||||
|
||||
if (this.density[index] - amount < 0)
|
||||
{
|
||||
this.density[index] = 0;
|
||||
}
|
||||
else
|
||||
{
|
||||
this.density[index] -= amount;
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
public void addVelocity(int x, int y, float amountX, float amountY) {
|
||||
int index = IX(x, y);
|
||||
this.Vx[index] += amountX;
|
||||
this.Vy[index] += amountY;
|
||||
}
|
||||
|
||||
|
||||
void diffuse (int b, float[] x, float[] x0, float diff, float dt) {
|
||||
float a = dt * diff * (size - 2) * (size - 2);
|
||||
lin_solve(b, x, x0, a, 1 + 4 * a);
|
||||
}
|
||||
void lin_solve(int b, float[] x, float[] x0, float a, float c) {
|
||||
float cRecip = 1.0f / c;
|
||||
Parallel.For(0, iter, k =>
|
||||
{
|
||||
for (int j = 1; j < size - 1; j++) {
|
||||
for (int i = 1; i < size - 1; i++) {
|
||||
x[IX(i, j)] =
|
||||
(x0[IX(i, j)]
|
||||
+ a*( x[IX(i+1, j)]
|
||||
+x[IX(i-1, j)]
|
||||
+x[IX(i, j+1)]
|
||||
+x[IX(i, j-1)]
|
||||
)) * cRecip;
|
||||
}
|
||||
}
|
||||
|
||||
set_bnd(b, x);
|
||||
});
|
||||
}
|
||||
void project(float[] velocX, float[] velocY, float[] p, float[] div)
|
||||
{
|
||||
Parallel.For(1, size, j =>
|
||||
{
|
||||
for (int i = 1; i < size - 1; i++)
|
||||
{
|
||||
div[IX(i, j)] = -0.5f * (
|
||||
velocX[IX(i + 1, j)]
|
||||
- velocX[IX(i - 1, j)]
|
||||
+ velocY[IX(i, j + 1)]
|
||||
- velocY[IX(i, j - 1)]
|
||||
) / size;
|
||||
p[IX(i, j)] = 0;
|
||||
}
|
||||
});
|
||||
|
||||
set_bnd(0, div);
|
||||
set_bnd(0, p);
|
||||
lin_solve(0, p, div, 1, 4);
|
||||
|
||||
Parallel.For(1, size, j =>
|
||||
{
|
||||
for (int i = 1; i < size - 1; i++)
|
||||
{
|
||||
velocX[IX(i, j)] -= 0.5f * (p[IX(i + 1, j)]
|
||||
- p[IX(i - 1, j)]) * size;
|
||||
velocY[IX(i, j)] -= 0.5f * (p[IX(i, j + 1)]
|
||||
- p[IX(i, j - 1)]) * size;
|
||||
}
|
||||
});
|
||||
set_bnd(1, velocX);
|
||||
set_bnd(2, velocY);
|
||||
}
|
||||
|
||||
public void advect(Fluid fluid,int b, float[] d, float[] d0, float[] velocX, float[] velocY, float dt) {
|
||||
float i0, i1, j0, j1;
|
||||
|
||||
float dtx = dt * (fluid.size - 2);
|
||||
float dty = dt * (fluid.size - 2);
|
||||
|
||||
float s0, s1, t0, t1;
|
||||
float tmp1, tmp2, x, y;
|
||||
|
||||
float Nfloat = fluid.size;
|
||||
float ifloat, jfloat;
|
||||
int i, j;
|
||||
|
||||
for (j = 1, jfloat = 1; j < fluid.size - 1; j++, jfloat++) {
|
||||
for (i = 1, ifloat = 1; i < fluid.size - 1; i++, ifloat++) {
|
||||
tmp1 = dtx * velocX[fluid.IX(i, j)];
|
||||
tmp2 = dty * velocY[fluid.IX(i, j)];
|
||||
x = ifloat - tmp1;
|
||||
y = jfloat - tmp2;
|
||||
|
||||
if (x < 0.5f) x = 0.5f;
|
||||
if (x > Nfloat + 0.5f) x = Nfloat + 0.5f;
|
||||
i0 = floorf(x);
|
||||
i1 = i0 + 1.0f;
|
||||
if (y < 0.5f) y = 0.5f;
|
||||
if (y > Nfloat + 0.5f) y = Nfloat + 0.5f;
|
||||
j0 = floorf(y);
|
||||
j1 = j0 + 1.0f;
|
||||
|
||||
s1 = x - i0;
|
||||
s0 = 1.0f - s1;
|
||||
t1 = y - j0;
|
||||
t0 = 1.0f - t1;
|
||||
|
||||
int i0i = (int)i0;
|
||||
int i1i = (int)i1;
|
||||
int j0i = (int)j0;
|
||||
int j1i = (int)j1;
|
||||
|
||||
// DOUBLE CHECK THIS!!!
|
||||
d[fluid.IX(i, j)] =
|
||||
s0 * (t0 * d0[fluid.IX(i0i, j0i)] + t1 * d0[fluid.IX(i0i, j1i)]) +
|
||||
s1 * (t0 * d0[fluid.IX(i1i, j0i)] + t1 * d0[fluid.IX(i1i, j1i)]);
|
||||
}
|
||||
}
|
||||
|
||||
fluid.set_bnd(b, d);
|
||||
}
|
||||
void set_bnd(int b, float[] x)
|
||||
{
|
||||
Parallel.For(1, size, i =>
|
||||
{
|
||||
x[IX(i, 0 )] = b == 2 ? -x[IX(i, 1 )] : x[IX(i, 1 )];
|
||||
x[IX(i, size-1)] = b == 2 ? -x[IX(i, size-2)] : x[IX(i, size-2)];
|
||||
});
|
||||
|
||||
Parallel.For(1, size, j =>
|
||||
{
|
||||
x[IX(0, j)] = b == 1 ? -x[IX(1, j)] : x[IX(1, j)];
|
||||
x[IX(size - 1, j)] = b == 1 ? -x[IX(size - 2, j)] : x[IX(size - 2, j)];
|
||||
});
|
||||
|
||||
x[IX(0, 0)] = 0.5f * (x[IX(1, 0)] + x[IX(0, 1)]);
|
||||
x[IX(0, size-1)] = 0.5f * (x[IX(1, size-1)] + x[IX(0, size-2)]);
|
||||
x[IX(size-1, 0)] = 0.5f * (x[IX(size-2, 0)] + x[IX(size-1, 1)]);
|
||||
x[IX(size-1, size-1)] = 0.5f * (x[IX(size-2, size-1)] + x[IX(size-1, size-2)]);
|
||||
}
|
||||
|
||||
}
|
||||
@ -8,98 +8,35 @@ namespace PixelEngine;
|
||||
|
||||
public class Game
|
||||
{
|
||||
private const int Size = 128;
|
||||
private const int Scale = 7;
|
||||
private const int Iter = 10;
|
||||
private const float Dt = 0.2f;
|
||||
private const float Diffusion = 0f;
|
||||
private const float Viscosity = 0.0000001f;
|
||||
|
||||
private const string WindowTitle = "Fluid Simulation";
|
||||
private const int TargetFps = 60;
|
||||
public Config? config;
|
||||
|
||||
private Fluid _fluid = null!;
|
||||
|
||||
public Vector2 PMouse;
|
||||
|
||||
public void Start()
|
||||
{
|
||||
_fluid = new Fluid(Dt, Diffusion, Viscosity, Size, Iter, Scale);
|
||||
|
||||
InitWindow(Size * Scale, Size * Scale, WindowTitle);
|
||||
SetTargetFPS(TargetFps);
|
||||
|
||||
InitWindow(config.Size * config.Scale, config.Size * config.Scale, config.WindowTitle);
|
||||
SetTargetFPS(config.TargetFps);
|
||||
}
|
||||
|
||||
public void HandleInput()
|
||||
{
|
||||
|
||||
var config = JsonConvert.DeserializeObject<Config>(File.ReadAllText("Config.json"));
|
||||
|
||||
foreach (var configVelocity in config.Velocities)
|
||||
{
|
||||
DrawCircle(configVelocity.x * Scale, configVelocity.y *Scale, 5, RED);
|
||||
DrawLine(configVelocity.x * Scale,configVelocity.y *Scale, (int) ((configVelocity.x * Scale) + (configVelocity.amountX)),(int) ((configVelocity.y * Scale) + (configVelocity.amountY)), RED);
|
||||
_fluid.addVelocity(configVelocity.x, configVelocity.y, configVelocity.amountX, configVelocity.amountY);
|
||||
}
|
||||
|
||||
foreach (var configDensity in config.Densities)
|
||||
{
|
||||
_fluid.addDensity(configDensity.x, configDensity.y, configDensity.amount);
|
||||
}
|
||||
|
||||
// Add Density
|
||||
if (IsMouseButtonDown(MouseButton.MOUSE_BUTTON_LEFT))
|
||||
{
|
||||
_fluid.addDensity(GetMouseX() / Scale, GetMouseY() / Scale, 100);
|
||||
}
|
||||
|
||||
|
||||
// Reduce Density
|
||||
else if (IsMouseButtonDown(MouseButton.MOUSE_BUTTON_RIGHT))
|
||||
{
|
||||
_fluid.reduceDensity(GetMouseX() / Scale, GetMouseY() / Scale, 100,5);
|
||||
|
||||
|
||||
//TODO: Suction for Density Reduction
|
||||
|
||||
}
|
||||
|
||||
//Mouse Velocity
|
||||
if (Math.Abs(GetMouseX() - PMouse.X) > 0.1 || Math.Abs(GetMouseY() - PMouse.Y) > 0.1)
|
||||
{
|
||||
var amtX = GetMouseX() - PMouse.X;
|
||||
var amtY = GetMouseY() - PMouse.Y;
|
||||
|
||||
_fluid.addVelocity(GetMouseX() / Scale, GetMouseY() / Scale, amtX, amtY);
|
||||
|
||||
PMouse = GetMousePosition();
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
public void UpdateSim()
|
||||
{
|
||||
_fluid.step();
|
||||
|
||||
}
|
||||
|
||||
public void UpdateDraw()
|
||||
{
|
||||
BeginDrawing();
|
||||
ClearBackground(BLACK);
|
||||
|
||||
//Debug
|
||||
|
||||
|
||||
DrawText("FPS: " + GetFPS(), 10, 10, 10, WHITE);
|
||||
|
||||
|
||||
//Create a GUI Slider for Viscosity
|
||||
var rect = new Rectangle(10, 20, 100, 20);
|
||||
GuiSlider(rect, "", "", _fluid.visc, 0.0000001f, 0.01f);
|
||||
|
||||
_fluid.renderD();
|
||||
|
||||
EndDrawing();
|
||||
}
|
||||
|
||||
@ -6,18 +6,20 @@ using static Raylib_CsLo.Raylib;
|
||||
using static Raylib_CsLo.RayMath;
|
||||
using static Raylib_CsLo.RayGui;
|
||||
using System.Drawing;
|
||||
using Newtonsoft.Json;
|
||||
using PixelEngine;
|
||||
using Raylib_CsLo;
|
||||
|
||||
Game game = new Game();
|
||||
|
||||
game.PMouse = GetMousePosition();
|
||||
game.config = JsonConvert.DeserializeObject<Config>(File.ReadAllText("Config.json"));
|
||||
game.Start();
|
||||
|
||||
|
||||
|
||||
while (!WindowShouldClose())
|
||||
{
|
||||
game.config = JsonConvert.DeserializeObject<Config>(File.ReadAllText("Config.json"));
|
||||
game.HandleInput();
|
||||
game.UpdateSim();
|
||||
game.UpdateDraw();
|
||||
|
||||
@ -1,10 +0,0 @@
|
||||
namespace PixelEngine;
|
||||
|
||||
public class Velocity
|
||||
{
|
||||
public int x { get; set; }
|
||||
public int y { get; set; }
|
||||
public float amountX { get; set; }
|
||||
public float amountY { get; set; }
|
||||
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user