undefined radius?

Author: geant04

src/main.ts

@@ -50,7 +50,7 @@ function setRenderer(mode: string) {
 }
 
 const renderModes = { naive: 'naive', forwardPlus: 'forward+', clusteredDeferred: 'clustered deferred' };
-let renderModeController = gui.add({ mode: renderModes.forwardPlus }, 'mode', renderModes);
+let renderModeController = gui.add({ mode: renderModes.clusteredDeferred }, 'mode', renderModes);
 renderModeController.onChange(setRenderer);
 
 setRenderer(renderModeController.getValue());

src/renderer.ts

@@ -2,6 +2,7 @@ import { Scene } from './stage/scene';
 import { Lights } from './stage/lights';
 import { Camera } from './stage/camera';
 import { Stage } from './stage/stage';
+import * as shaders from './shaders/shaders';
 
 export var canvas: HTMLCanvasElement;
 export var canvasFormat: GPUTextureFormat;
@@ -140,7 +141,7 @@ export abstract class Renderer {
 
         this.draw();
 
-        if (true)
+        if (shaders.constants.performanceTesting)
         {
             await device.queue.onSubmittedWorkDone();
         }

src/shaders/common.wgsl

@@ -35,7 +35,7 @@ struct CameraUniforms {
 
 // CHECKITOUT: this special attenuation function ensures lights don't affect geometry outside the maximum light radius
 fn rangeAttenuation(distance: f32) -> f32 {
-    return clamp(1.f - pow(distance / ${lightRadius}, 4.f), 0.f, 1.f) / (distance * distance);
+    return clamp(1.f - pow(distance / 2, 4.f), 0.f, 1.f) / (distance * distance);
 }
 
 fn calculateLightContrib(light: Light, posWorld: vec3f, nor: vec3f) -> vec3f {

src/shaders/shaders.ts

@@ -30,13 +30,15 @@ export const constants = {
     moveLightsWorkgroupSize: 128,
 
     clusterLightsWorkgroupX: 16,
-    clusterLightsWorkgroupY: 16,
-    clusterLightsWorkgroupZ: 1,
+    clusterLightsWorkgroupY: 8,
+    clusterLightsWorkgroupZ: 2,
 
     numSlices: 32,
     sliceLength: 1,
-    tileSize: 64,
-    maxLightsPerCluster: 256,
+    tileSize: 256,
+    maxLightsPerCluster: 512,
+
+    performanceTesting: false,
 
     near: 0.1,
     far: 5000,

src/stage/lights.ts

@@ -251,7 +251,7 @@ export class Lights {
 
     // CHECKITOUT: this is where the light movement compute shader is dispatched from the host
     onFrame(time: number) {
-        if (this.debugStopLights)
+        if (this.debugStopLights && shaders.constants.performanceTesting)
         {
             return;
         }