Improve drawing
This commit is contained in:
parent
9f01a9e236
commit
de7fcc15d0
6 changed files with 221 additions and 56 deletions
|
|
@ -1,14 +1,11 @@
|
|||
struct Settings {
|
||||
size : vec2<f32>,
|
||||
swipePrevious : vec2<f32>,
|
||||
swipeCurrent : vec2<f32>,
|
||||
diffusionRate : f32,
|
||||
decayRate : f32,
|
||||
deltaTime : f32,
|
||||
time : f32,
|
||||
swipeRadius : f32,
|
||||
swipeBlur : f32,
|
||||
isSwipeActive : f32
|
||||
};
|
||||
|
||||
@group(0) @binding(0) var<uniform> settings : Settings;
|
||||
|
|
@ -26,18 +23,6 @@ fn fragment(@location(0) uv: vec2<f32>) -> @location(0) vec4<f32> {
|
|||
+ textureSample(trailMap, Sampler, uv + vec2<f32>(1, 0) / settings.size)
|
||||
);
|
||||
|
||||
if (settings.isSwipeActive == 1.0) {
|
||||
let pa = (uv - settings.swipePrevious) * normalize(settings.size);
|
||||
let direction = (settings.swipeCurrent - settings.swipePrevious) * normalize(settings.size);
|
||||
let q = clamp(dot(pa, direction) / dot(direction, direction), 0, 1);
|
||||
let distance = length(pa - direction * q) - settings.swipeRadius;
|
||||
|
||||
if(distance < 0) {
|
||||
let opacity = -distance / settings.swipeBlur;
|
||||
return clamp(vec4(1), current, vec4(1));
|
||||
}
|
||||
}
|
||||
|
||||
return mix(
|
||||
current,
|
||||
neighbours / 4.0,
|
||||
|
|
|
|||
|
|
@ -1,19 +1,13 @@
|
|||
import { setUpFullScreenQuad } from '../../utils/full-screen-quad';
|
||||
import shader from './diffuse.wgsl';
|
||||
|
||||
import { vec2 } from 'gl-matrix';
|
||||
|
||||
export class DiffusionPipeline {
|
||||
private static readonly UNIFORM_COUNT = 14;
|
||||
private static readonly UNIFORM_COUNT = 16;
|
||||
|
||||
private readonly pipeline: GPURenderPipeline;
|
||||
private readonly uniforms: GPUBuffer;
|
||||
private readonly quadVertexBuffer: GPUBuffer;
|
||||
|
||||
private swipes: Array<vec2> = [
|
||||
vec2.fromValues(Number.NaN, Number.NaN),
|
||||
vec2.fromValues(Number.NaN, Number.NaN),
|
||||
];
|
||||
private bindGroup?: GPUBindGroup;
|
||||
private previousTrailMapIn?: GPUTexture;
|
||||
|
||||
|
|
@ -53,40 +47,30 @@ export class DiffusionPipeline {
|
|||
decayRate,
|
||||
deltaTime,
|
||||
time,
|
||||
swipe,
|
||||
swipeRadius,
|
||||
swipeBlur,
|
||||
isSwipeActive,
|
||||
}: {
|
||||
width: number;
|
||||
height: number;
|
||||
swipe: vec2;
|
||||
diffusionRate: number;
|
||||
decayRate: number;
|
||||
deltaTime: number;
|
||||
time: number;
|
||||
swipeRadius: number;
|
||||
swipeBlur: number;
|
||||
isSwipeActive: boolean;
|
||||
}) {
|
||||
if (swipe) {
|
||||
this.swipes = [...this.swipes.slice(-1), swipe];
|
||||
}
|
||||
|
||||
this.device.queue.writeBuffer(
|
||||
this.uniforms,
|
||||
0,
|
||||
new Float32Array([
|
||||
width,
|
||||
height,
|
||||
...this.swipes.flatMap((s) => [s[0], s[1]]),
|
||||
diffusionRate,
|
||||
decayRate,
|
||||
deltaTime,
|
||||
time,
|
||||
swipeRadius,
|
||||
swipeBlur,
|
||||
isSwipeActive ? 1.0 : 0.0,
|
||||
])
|
||||
);
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue