mirror of
https://github.com/Rezmason/matrix.git
synced 2026-04-18 14:19:30 -07:00
Fixed some major bugs: the WebGPU cache should store loaded images and text, never GPU resource handles; renamed renderer "formulate" to "configure"; WebGPU renderer's configure function needs early returns after each major await, in case there's a new config; the render loops are now locally stored closures; renderers now have start and stop functions; fixed bugs in the REGL and WebGPU mirror passes; WebGPU bloom pass now enforces texture dimensions are greater than zero; the react component now stores the renderer type in a useRef and returns early from renderer init awaits to prevent multiple renderers from instantiating.
This commit is contained in:
@@ -1,19 +1,21 @@
|
||||
import { loadText, makePassFBO, makePass } from "./utils.js";
|
||||
|
||||
let start;
|
||||
const numClicks = 5;
|
||||
const clicks = Array(numClicks).fill([0, 0, -Infinity]).flat();
|
||||
let aspectRatio = 1;
|
||||
export default ({ regl, canvas, cache, config, cameraTex, cameraAspectRatio }, inputs) => {
|
||||
|
||||
let index = 0;
|
||||
window.onclick = (e) => {
|
||||
clicks[index * 3 + 0] = 0 + e.clientX / e.srcElement.clientWidth;
|
||||
clicks[index * 3 + 1] = 1 - e.clientY / e.srcElement.clientHeight;
|
||||
clicks[index * 3 + 2] = (Date.now() - start) / 1000;
|
||||
index = (index + 1) % numClicks;
|
||||
};
|
||||
let start;
|
||||
const numClicks = 5;
|
||||
const clicks = Array(numClicks).fill().map(_ => ([0, 0, -Infinity]));
|
||||
let aspectRatio = 1;
|
||||
|
||||
let index = 0;
|
||||
canvas.onmousedown = (e) => {
|
||||
const rect = e.srcElement.getBoundingClientRect();
|
||||
clicks[index][0] = 0 + (e.clientX - rect.x) / rect.width;
|
||||
clicks[index][1] = 1 - (e.clientY - rect.y) / rect.height;
|
||||
clicks[index][2] = (performance.now() - start) / 1000;
|
||||
index = (index + 1) % numClicks;
|
||||
};
|
||||
|
||||
export default ({ regl, cache, config, cameraTex, cameraAspectRatio }, inputs) => {
|
||||
const output = makePassFBO(regl, config.useHalfFloat);
|
||||
const mirrorPassFrag = loadText(cache, "shaders/glsl/mirrorPass.frag.glsl");
|
||||
const render = regl({
|
||||
@@ -23,14 +25,19 @@ export default ({ regl, cache, config, cameraTex, cameraAspectRatio }, inputs) =
|
||||
tex: inputs.primary,
|
||||
bloomTex: inputs.bloom,
|
||||
cameraTex,
|
||||
clicks: () => clicks,
|
||||
// REGL bug can misinterpret array uniforms
|
||||
["clicks[0]"]: () => clicks[0],
|
||||
["clicks[1]"]: () => clicks[1],
|
||||
["clicks[2]"]: () => clicks[2],
|
||||
["clicks[3]"]: () => clicks[3],
|
||||
["clicks[4]"]: () => clicks[4],
|
||||
aspectRatio: () => aspectRatio,
|
||||
cameraAspectRatio,
|
||||
},
|
||||
framebuffer: output,
|
||||
});
|
||||
|
||||
start = Date.now();
|
||||
start = performance.now();
|
||||
|
||||
return makePass(
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user