[WGL/P] Added a proper level management system, added more options to the menu

1 files changed, 6 insertions, 2 deletions

diff --git a/Year 2/Computer Graphics with WebGL/Project/shaders.js b/Year 2/Computer Graphics with WebGL/Project/shaders.js
index 302ed50..4027c6d 100644
--- a/Year 2/Computer Graphics with WebGL/Project/shaders.js
+++ b/Year 2/Computer Graphics with WebGL/Project/shaders.js
@@ -44,6 +44,10 @@ var fShader = `
 	varying vec3 vColor;

 	varying vec3 vXYZ;

 

+	// Settings

+	uniform vec4 uBlack;

+	uniform vec4 uBHBlack;

+

 	// For ray marching

 	uniform vec4 uStars[` + STAR_MAX_COUNT + `];

 	uniform vec4 uBH[` + BLACKHOLE_MAX_COUNT + `];

@@ -146,7 +150,7 @@ var fShader = `
 		}

 

 		if (bhStatus == 1) {

-			return vec4(0,1,0,1);

+			return uBHBlack;

 		}

 

 		// Does the ray hit a star

@@ -156,7 +160,7 @@ var fShader = `
 				return calculateColor(bhStatus == 2, uStars[i], ray, step);

 			}

 		}

-		return vec4(1,0,0,1);

+		return uBlack;

 	}

 

 	void main()