eric/matrix
1
0
Fork 0
mirror of https://github.com/Rezmason/matrix.git synced 2026-04-14 12:29:30 -07:00
Code Issues Packages Projects Releases Wiki Activity

The delimiter between WGSL struct fields is now a comma, which is also the delimiter between parameters in angle brackets, so gpu-buffer needs to be a little cleverer with the lines it separates.

Browse Source
This commit is contained in:
Rezmason
2022-04-30 18:00:35 -07:00
parent e8458a1304
commit e39c26a95a
10 changed files with 99 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
shaders/wgsl/rainPass.wgsl
View File

@@ -3,60 +3,60 @@
struct Config {
// common properties used for compute and rendering
animationSpeed : f32;
glyphSequenceLength : i32;
glyphTextureGridSize : vec2<i32>;
glyphHeightToWidth : f32;
resurrectingCodeRatio : f32;
gridSize : vec2<f32>;
showComputationTexture : i32;
animationSpeed : f32,
glyphSequenceLength : i32,
glyphTextureGridSize : vec2<i32>,
glyphHeightToWidth : f32,
resurrectingCodeRatio : f32,
gridSize : vec2<f32>,
showComputationTexture : i32,
// compute-specific properties
brightnessThreshold : f32;
brightnessOverride : f32;
brightnessDecay : f32;
cursorEffectThreshold : f32;
cycleSpeed : f32;
cycleFrameSkip : i32;
fallSpeed : f32;
hasSun : i32;
hasThunder : i32;
raindropLength : f32;
rippleScale : f32;
rippleSpeed : f32;
rippleThickness : f32;
cycleStyle : i32;
rippleType : i32;
brightnessThreshold : f32,
brightnessOverride : f32,
brightnessDecay : f32,
cursorEffectThreshold : f32,
cycleSpeed : f32,
cycleFrameSkip : i32,
fallSpeed : f32,
hasSun : i32,
hasThunder : i32,
raindropLength : f32,
rippleScale : f32,
rippleSpeed : f32,
rippleThickness : f32,
cycleStyle : i32,
rippleType : i32,
// render-specific properties
forwardSpeed : f32;
glyphVerticalSpacing : f32;
glyphEdgeCrop : f32;
isPolar : i32;
density : f32;
slantScale : f32;
slantVec : vec2<f32>;
volumetric : i32;
loops : i32;
highPassThreshold : f32;
forwardSpeed : f32,
glyphVerticalSpacing : f32,
glyphEdgeCrop : f32,
isPolar : i32,
density : f32,
slantScale : f32,
slantVec : vec2<f32>,
volumetric : i32,
loops : i32,
highPassThreshold : f32,
};
// The properties that change over time get their own buffer.
struct Time {
seconds : f32;
frames : i32;
seconds : f32,
frames : i32,
};
// The properties related to the size of the canvas get their own buffer.
struct Scene {
screenSize : vec2<f32>;
camera : mat4x4<f32>;
transform : mat4x4<f32>;
screenSize : vec2<f32>,
camera : mat4x4<f32>,
transform : mat4x4<f32>,
};
// The array of cells that the compute shader updates, and the fragment shader draws.
struct CellData {
cells: array<vec4<f32>>;
cells: array<vec4<f32>>,
};
// Shared bindings
@@ -75,23 +75,23 @@ struct CellData {
// Shader params
struct ComputeInput {
@builtin(global_invocation_id) id : vec3<u32>;
@builtin(global_invocation_id) id : vec3<u32>,
};
struct VertInput {
@builtin(vertex_index) index : u32;
@builtin(vertex_index) index : u32,
};
struct VertOutput {
@builtin(position) Position : vec4<f32>;
@location(0) uv : vec2<f32>;
@location(1) channel : vec3<f32>;
@location(2) glyph : vec4<f32>;
@builtin(position) Position : vec4<f32>,
@location(0) uv : vec2<f32>,
@location(1) channel : vec3<f32>,
@location(2) glyph : vec4<f32>,
};
struct FragOutput {
@location(0) color : vec4<f32>;
@location(1) highPassColor : vec4<f32>;
@location(0) color : vec4<f32>,
@location(1) highPassColor : vec4<f32>,
};
// Constants