Skip to content

Commit a54a6d2

Browse files
committed
Revert "glint ball setup ready, only simple phong lighting PBR set up with 1 light source on red sphere"
This reverts commit 81b22cd.
1 parent f6e463f commit a54a6d2

File tree

11 files changed

+26
-440
lines changed

11 files changed

+26
-440
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"name": "webgpu-glint-rendering",
2+
"name": "cis5650-project4-webgpu-forward-plus-and-clustered-deferred",
33
"private": true,
44
"version": "0.0.0",
55
"type": "module",

scenes/sphere/florbSphere.bin

-44 KB
Binary file not shown.

scenes/sphere/florbSphere.gltf

Lines changed: 0 additions & 139 deletions
This file was deleted.

src/main.ts

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import { initWebGPU, Renderer } from './renderer';
55
import { NaiveRenderer } from './renderers/naive';
66
import { ForwardPlusRenderer } from './renderers/forward_plus';
77
import { ClusteredDeferredRenderer } from './renderers/clustered_deferred';
8-
import { GlintRenderer } from './renderers/glint';
98

109
import { setupLoaders, Scene } from './stage/scene';
1110
import { Lights } from './stage/lights';
@@ -41,9 +40,6 @@ function setRenderer(mode: string) {
4140
case renderModes.naive:
4241
renderer = new NaiveRenderer(stage);
4342
break;
44-
case renderModes.glint:
45-
renderer = new GlintRenderer(stage);
46-
break;
4743
case renderModes.forwardPlus:
4844
renderer = new ForwardPlusRenderer(stage);
4945
break;
@@ -53,8 +49,8 @@ function setRenderer(mode: string) {
5349
}
5450
}
5551

56-
const renderModes = { naive: 'naive', glint: 'glint', forwardPlus: 'forward+', clusteredDeferred: 'clustered deferred' };
57-
let renderModeController = gui.add({ mode: renderModes.glint }, 'mode', renderModes);
52+
const renderModes = { naive: 'naive', forwardPlus: 'forward+', clusteredDeferred: 'clustered deferred' };
53+
let renderModeController = gui.add({ mode: renderModes.clusteredDeferred }, 'mode', renderModes);
5854
renderModeController.onChange(setRenderer);
5955

6056
setRenderer(renderModeController.getValue());

src/renderers/glint.ts

Lines changed: 0 additions & 180 deletions
This file was deleted.

src/shaders/common.wgsl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ struct ClusterSet {
2525
}
2626

2727
struct CameraUniforms {
28+
// TODO-1.3: add an entry for the view proj mat (of type mat4x4f)
2829
viewProjMat: mat4x4f,
2930
viewMat: mat4x4f,
3031
invProjMat: mat4x4f,
3132
invViewProjMat: mat4x4f,
32-
cameraPosition: vec3f,
3333
screenDimensions: vec2f
3434
}
3535

0 commit comments

Comments
 (0)