From d678a1ce05e2bc1675420b9dd7fc81939ab9113d Mon Sep 17 00:00:00 2001 From: Logan Date: Sun, 27 Oct 2024 22:43:37 -0700 Subject: [PATCH] tweaks --- src/Renderer.tsx | 12 ++++++------ src/projectModule.ts | 4 ++-- src/splatModule.ts | 4 +++- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/Renderer.tsx b/src/Renderer.tsx index 467d06e..ce2d600 100644 --- a/src/Renderer.tsx +++ b/src/Renderer.tsx @@ -9,7 +9,7 @@ import { ReadWritePrevTex } from "./ReadWritePrevTex"; import { projectModuleCode } from "./projectModule"; import { splatModuleCode } from "./splatModule"; -const N = 1024; +const N = 512; const workgroupDim = 8; export function Renderer({ @@ -770,8 +770,8 @@ export function Renderer({ dt, x: pointer.x, y: pointer.y, - vx: (pointer.x - pointer.px) * 0.1, - vy: (pointer.y - pointer.py) * 0.1, + vx: (pointer.x - pointer.px) * 0.2, + vy: (pointer.y - pointer.py) * 0.2, radius: N / 50, amount: 1, }); @@ -794,7 +794,7 @@ export function Renderer({ project({ encoder, dt, - iters: 50, + iters: 30, pressureTarget: pressure1Rwp, }); @@ -811,7 +811,7 @@ export function Renderer({ project({ encoder, dt, - iters: 50, + iters: 30, pressureTarget: pressure2Rwp, }); } @@ -869,11 +869,11 @@ export function Renderer({ linearSampler, splat, velocityRwp, + diffuse, project, pressure1Rwp, advect, pressure2Rwp, - diffuse, ]) ); diff --git a/src/projectModule.ts b/src/projectModule.ts index c336ee7..9dc7416 100644 --- a/src/projectModule.ts +++ b/src/projectModule.ts @@ -43,7 +43,7 @@ export function projectModuleCode({ let pressure = textureLoad(presReadTex, id.xy, 0).r; textureStore(divWriteTex, id.xy, vec4f(divergence, 0, 0, 0)); - textureStore(presWriteTex, id.xy, vec4f(pressure * 0.98, 0, 0, 0)); + textureStore(presWriteTex, id.xy, vec4f(pressure * 0.99, 0, 0, 0)); // textureStore(presWriteTex, id.xy, vec4f(0)); // TODO: boundary @@ -71,7 +71,7 @@ export function projectModuleCode({ textureLoad(presReadTex, vec2i(x, y + 1), 0) ) / 4.0; - textureStore(presWriteTex, id.xy, pressure); + textureStore(presWriteTex, id.xy, pressure * 0.99); // TODO: boundary } diff --git a/src/splatModule.ts b/src/splatModule.ts index 832f4ce..c919455 100644 --- a/src/splatModule.ts +++ b/src/splatModule.ts @@ -41,7 +41,9 @@ export function splatModuleCode({ // let f = 1.0; density += f * uniforms.amount; - velocity += f * uniforms.velocity; + if (length(f * uniforms.velocity) > length(velocity)) { + velocity = f * uniforms.velocity; + } } density *= 0.99;