Summary Files Commits Branches @commit @diff @stats
path: root / Year 2 / Computer Graphics with WebGL / Project / shaders.js
diff options
context:
space:
mode:
1 files changed, 2 insertions, 1 deletions
-rw-r--r--Year 2/Computer Graphics with WebGL/Project/shaders.js3
diff --git a/Year 2/Computer Graphics with WebGL/Project/shaders.js b/Year 2/Computer Graphics with WebGL/Project/shaders.js
index 4027c6d..a77e9b3 100644
--- a/Year 2/Computer Graphics with WebGL/Project/shaders.js
+++ b/Year 2/Computer Graphics with WebGL/Project/shaders.js
@@ -45,6 +45,7 @@ var fShader = `
varying vec3 vXYZ;
// Settings
+ uniform bool uDisableRayMarching;
uniform vec4 uBlack;
uniform vec4 uBHBlack;
@@ -166,6 +167,6 @@ var fShader = `
void main()
{
vec3 step = normalize(vXYZ - uEye);
- gl_FragColor = rayMarch(uEye, step);
+ gl_FragColor = (uDisableRayMarching) ? vec4(vColor, 1.0) : rayMarch(uEye, step);
}
`;