andras/fleeting-garden
andras/fleeting-garden
Watch
1
0
Fork
You've already forked fleeting-garden
 0
Code Issues Pull requests 10 Projects Releases Packages Wiki Activity Actions

Fix issues

Browse source
This commit is contained in:
Andras Schmelczer 2023-04-16 14:05:47 +01:00
commit 5feb7c929d
No known key found for this signature in database
GPG key ID: FC8F2C3D3D1A718C
12 changed files with 190 additions and 113 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/pipelines/agents/agent-pipeline.ts
View file

@ -1,4 +1,4 @@
import { AGENT_SIZE, Agent } from './agent';
import { AGENT_SIZE_IN_BYTES, Agent } from './agent';
import shader from './agent.wgsl';
export class AgentPipeline {
@ -8,11 +8,16 @@ export class AgentPipeline {
private readonly pipeline: GPUComputePipeline;
private readonly uniforms: GPUBuffer;
private readonly agentsBuffer: GPUBuffer;
private bindGroup?: GPUBindGroup;
private previousTrailMapIn?: GPUTexture;
private previousTrailMapOut?: GPUTexture;
public constructor(private readonly device: GPUDevice, agents: Array<Agent>) {
if (agents.length === 0) {
throw new Error('No agents provided');
}
this.pipeline = device.createComputePipeline({
layout: 'auto',
compute: {
@ -29,16 +34,16 @@ export class AgentPipeline {
});
const serializedAgents = new Float32Array(
new ArrayBuffer(agents.length * AGENT_SIZE)
new ArrayBuffer(agents.length * AGENT_SIZE_IN_BYTES)
);
agents.forEach((agent, index) => {
serializedAgents[index * 4 + 0] = agent.position[0];
serializedAgents[index * 4 + 1] = agent.position[1];
serializedAgents[index * 4 + 2] = agent.angle;
agents.forEach((agent, i) => {
serializedAgents[i * 4 + 0] = agent.position[0];
serializedAgents[i * 4 + 1] = agent.position[1];
serializedAgents[i * 4 + 2] = agent.angle;
});
this.agentsBuffer = device.createBuffer({
size: agents.length * AGENT_SIZE,
size: agents.length * AGENT_SIZE_IN_BYTES,
usage: GPUBufferUsage.STORAGE | GPUBufferUsage.COPY_SRC | GPUBufferUsage.COPY_DST,
});
@ -97,7 +102,9 @@ export class AgentPipeline {
passEncoder.setPipeline(this.pipeline);
passEncoder.setBindGroup(0, this.bindGroup);
passEncoder.dispatchWorkgroups(
Math.ceil(this.agentsBuffer.size / AGENT_SIZE / AgentPipeline.WORKGROUP_SIZE)
Math.ceil(
this.agentsBuffer.size / AGENT_SIZE_IN_BYTES / AgentPipeline.WORKGROUP_SIZE
)
);
passEncoder.end();
}

2
src/pipelines/agents/agent.ts
View file

@ -5,4 +5,4 @@ export interface Agent {
angle: number;
}
export const AGENT_SIZE = 4;
export const AGENT_SIZE_IN_BYTES = 4 * 4;

4
src/pipelines/agents/agent.wgsl
View file

@ -18,7 +18,7 @@ struct Settings {
};
@group(0) @binding(0) var<uniform> settings : Settings;
@group(0) @binding(1) var<storage, read_write> agents: array<Agent>;
@group(0) @binding(1) var<storage, read_write> agents : array<Agent>;
@group(0) @binding(2) var TrailMapIn : texture_2d<f32>;
@group(0) @binding(3) var TrailMapOut : texture_storage_2d<rgba16float, write>;
@ -46,8 +46,6 @@ fn main(@builtin(global_invocation_id) global_id : vec3<u32>) {
var agent = agents[id];
var random = f32(hash(
u32(
agent.position.y * f32(settings.width) + agent.position.x