Fix shaders to support --optimize mode

nacmartin · Jan 4, 2020 · 203b33b · 203b33b
1 parent 9b348ff
commit 203b33b
Show file tree

Hide file tree

Showing 7 changed files with 105 additions and 56 deletions.
diff --git a/lessons/Lesson07.elm b/lessons/Lesson07.elm
@@ -441,7 +441,7 @@ renderEntity mesh thetaX thetaY texture position lighting directionalColour dire
             [ WebGL.entity vertexShader fragmentShader mesh (uniformsCube thetaX thetaY tex position lighting directionalColour directional ambientColour) ]
 
 
-uniformsCube : Float -> Float -> Texture -> Vec3 -> Bool -> Vec3 -> Vec3 -> Vec3 -> { texture : Texture, worldSpace : Mat4, perspective : Mat4, camera : Mat4, normalMatrix : Mat4, lighting : Bool, directionalColour : Vec3, ambientColour : Vec3, directional : Vec3 }
+uniformsCube : Float -> Float -> Texture -> Vec3 -> Bool -> Vec3 -> Vec3 -> Vec3 -> { texture : Texture, worldSpace : Mat4, perspective : Mat4, camera : Mat4, normalMatrix : Mat4, lighting : Int, directionalColour : Vec3, ambientColour : Vec3, directional : Vec3 }
 uniformsCube tx ty texture displacement lighting directionalColour directional ambientColour =
     let
         worldSpace =
@@ -452,13 +452,20 @@ uniformsCube tx ty texture displacement lighting directionalColour directional a
 
         perspective =
             makePerspective 45 1 0.1 100
+
+        boolToInt bool =
+            if bool then
+                1
+
+            else
+                0
     in
     { texture = texture
     , worldSpace = worldSpace
     , perspective = perspective
     , camera = camera
     , normalMatrix = transpose (inverseOrthonormal worldSpace)
-    , lighting = lighting
+    , lighting = boolToInt lighting
     , directionalColour = directionalColour
     , ambientColour = ambientColour
     , directional = directional
@@ -469,7 +476,7 @@ uniformsCube tx ty texture displacement lighting directionalColour directional a
 -- SHADERS
 
 
-vertexShader : Shader { attr | position : Vec3, coord : Vec3, norm : Vec3 } { unif | worldSpace : Mat4, perspective : Mat4, camera : Mat4, normalMatrix : Mat4, lighting : Bool, directionalColour : Vec3, ambientColour : Vec3, directional : Vec3 } { vcoord : Vec2, lightWeighting : Vec3 }
+vertexShader : Shader { attr | position : Vec3, coord : Vec3, norm : Vec3 } { unif | worldSpace : Mat4, perspective : Mat4, camera : Mat4, normalMatrix : Mat4, lighting : Int, directionalColour : Vec3, ambientColour : Vec3, directional : Vec3 } { vcoord : Vec2, lightWeighting : Vec3 }
 vertexShader =
     [glsl|
 
@@ -483,7 +490,7 @@ vertexShader =
   uniform mat4 perspective;
   uniform mat4 normalMatrix;
   uniform mat4 camera;
-  uniform bool lighting;
+  uniform int lighting;
   uniform vec3 directionalColour;
   uniform vec3 directional;
   uniform vec3 ambientColour;
@@ -495,7 +502,7 @@ vertexShader =
     gl_Position = perspective * camera * worldSpace * vec4(position, 1.0);
     vcoord = coord.xy;
 
-    if (!lighting) {
+    if (lighting == 0) {
       lightWeighting = vec3(1.0, 1.0, 1.0);
     } else {
       vec4 transformedNormal = normalMatrix * vec4(norm, 0.0);

diff --git a/lessons/Lesson08.elm b/lessons/Lesson08.elm
@@ -480,7 +480,7 @@ renderEntity mesh thetaX thetaY texture position lighting blending alpha directi
             [ WebGL.entityWith settings vertexShader fragmentShader mesh (uniformsCube thetaX thetaY tex position lighting alpha directionalColour directional ambientColour) ]
 
 
-uniformsCube : Float -> Float -> Texture -> Vec3 -> Bool -> Float -> Vec3 -> Vec3 -> Vec3 -> { texture : Texture, worldSpace : Mat4, perspective : Mat4, camera : Mat4, normalMatrix : Mat4, lighting : Bool, alpha : Float, directionalColour : Vec3, ambientColour : Vec3, directional : Vec3 }
+uniformsCube : Float -> Float -> Texture -> Vec3 -> Bool -> Float -> Vec3 -> Vec3 -> Vec3 -> { texture : Texture, worldSpace : Mat4, perspective : Mat4, camera : Mat4, normalMatrix : Mat4, lighting : Int, alpha : Float, directionalColour : Vec3, ambientColour : Vec3, directional : Vec3 }
 uniformsCube tx ty texture displacement lighting alpha directionalColour directional ambientColour =
     let
         worldSpace =
@@ -491,13 +491,20 @@ uniformsCube tx ty texture displacement lighting alpha directionalColour directi
 
         perspective =
             makePerspective 45 1 0.1 100
+
+        boolToInt bool =
+            if bool then
+                1
+
+            else
+                0
     in
     { texture = texture
     , worldSpace = worldSpace
     , perspective = perspective
     , camera = camera
     , normalMatrix = transpose (inverseOrthonormal (mul worldSpace camera))
-    , lighting = lighting
+    , lighting = boolToInt lighting
     , alpha = alpha
     , directionalColour = directionalColour
     , ambientColour = ambientColour
@@ -509,7 +516,7 @@ uniformsCube tx ty texture displacement lighting alpha directionalColour directi
 -- SHADERS
 
 
-vertexShader : Shader { attr | position : Vec3, coord : Vec3, norm : Vec3 } { unif | worldSpace : Mat4, perspective : Mat4, camera : Mat4, normalMatrix : Mat4, lighting : Bool, directionalColour : Vec3, ambientColour : Vec3, directional : Vec3 } { vcoord : Vec2, lightWeighting : Vec3 }
+vertexShader : Shader { attr | position : Vec3, coord : Vec3, norm : Vec3 } { unif | worldSpace : Mat4, perspective : Mat4, camera : Mat4, normalMatrix : Mat4, lighting : Int, directionalColour : Vec3, ambientColour : Vec3, directional : Vec3 } { vcoord : Vec2, lightWeighting : Vec3 }
 vertexShader =
     [glsl|
 
@@ -523,7 +530,7 @@ vertexShader =
   uniform mat4 perspective;
   uniform mat4 normalMatrix;
   uniform mat4 camera;
-  uniform bool lighting;
+  uniform int lighting;
   uniform vec3 directionalColour;
   uniform vec3 directional;
   uniform vec3 ambientColour;
@@ -535,7 +542,7 @@ vertexShader =
     gl_Position = perspective * camera * worldSpace * vec4(position, 1.0);
     vcoord = coord.xy;
 
-    if (!lighting) {
+    if (lighting == 0) {
       lightWeighting = vec3(1.0, 1.0, 1.0);
     } else {
       vec4 transformedNormal = normalMatrix * vec4(norm, 0.0);

diff --git a/lessons/Lesson11.elm b/lessons/Lesson11.elm
@@ -388,7 +388,7 @@ renderEntity mesh thetaX thetaY texture position lighting directionalColour dire
             [ WebGL.entity vertexShader fragmentShader mesh (uniformsShpere thetaX thetaY tex position lighting directionalColour directional ambientColour) ]
 
 
-uniformsShpere : Float -> Float -> Texture -> Vec3 -> Bool -> Vec3 -> Vec3 -> Vec3 -> { texture : Texture, worldSpace : Mat4, perspective : Mat4, camera : Mat4, normalMatrix : Mat4, lighting : Bool, directionalColour : Vec3, ambientColour : Vec3, directional : Vec3 }
+uniformsShpere : Float -> Float -> Texture -> Vec3 -> Bool -> Vec3 -> Vec3 -> Vec3 -> { texture : Texture, worldSpace : Mat4, perspective : Mat4, camera : Mat4, normalMatrix : Mat4, lighting : Int, directionalColour : Vec3, ambientColour : Vec3, directional : Vec3 }
 uniformsShpere tx ty texture displacement lighting directionalColour directional ambientColour =
     let
         worldSpace =
@@ -399,13 +399,20 @@ uniformsShpere tx ty texture displacement lighting directionalColour directional
 
         perspective =
             makePerspective 45 1 0.1 100
+
+        boolToInt bool =
+            if bool then
+                1
+
+            else
+                0
     in
     { texture = texture
     , worldSpace = worldSpace
     , perspective = perspective
     , camera = camera
     , normalMatrix = transpose (inverseOrthonormal (mul worldSpace camera))
-    , lighting = lighting
+    , lighting = boolToInt lighting
     , directionalColour = directionalColour
     , ambientColour = ambientColour
     , directional = directional
@@ -416,7 +423,7 @@ uniformsShpere tx ty texture displacement lighting directionalColour directional
 -- SHADERS
 
 
-vertexShader : Shader { attr | position : Vec3, coord : Vec3, norm : Vec3 } { unif | worldSpace : Mat4, perspective : Mat4, camera : Mat4, normalMatrix : Mat4, lighting : Bool, directionalColour : Vec3, ambientColour : Vec3, directional : Vec3 } { vcoord : Vec2, lightWeighting : Vec3 }
+vertexShader : Shader { attr | position : Vec3, coord : Vec3, norm : Vec3 } { unif | worldSpace : Mat4, perspective : Mat4, camera : Mat4, normalMatrix : Mat4, lighting : Int, directionalColour : Vec3, ambientColour : Vec3, directional : Vec3 } { vcoord : Vec2, lightWeighting : Vec3 }
 vertexShader =
     [glsl|
 
@@ -430,7 +437,7 @@ vertexShader =
   uniform mat4 perspective;
   uniform mat4 normalMatrix;
   uniform mat4 camera;
-  uniform bool lighting;
+  uniform int lighting;
   uniform vec3 directionalColour;
   uniform vec3 directional;
   uniform vec3 ambientColour;
@@ -442,7 +449,7 @@ vertexShader =
     gl_Position = perspective * camera * worldSpace * vec4(position, 1.0);
     vcoord = coord.xy;
 
-    if (!lighting) {
+    if (lighting == 0) {
       lightWeighting = vec3(1.0, 1.0, 1.0);
     } else {
       vec4 transformedNormal = normalMatrix * vec4(norm, 0.0);

diff --git a/lessons/Lesson12.elm b/lessons/Lesson12.elm
@@ -384,7 +384,7 @@ renderEntity mesh theta texture position lighting pointColour point ambientColou
     [ WebGL.entity vertexShader fragmentShader mesh (uniformsShpere theta texture position lighting pointColour point ambientColour) ]
 
 
-uniformsShpere : Float -> Texture -> Vec3 -> Bool -> Vec3 -> Vec3 -> Vec3 -> { texture : Texture, worldSpace : Mat4, perspective : Mat4, camera : Mat4, normalMatrix : Mat4, lighting : Bool, pointColour : Vec3, ambientColour : Vec3, point : Vec3 }
+uniformsShpere : Float -> Texture -> Vec3 -> Bool -> Vec3 -> Vec3 -> Vec3 -> { texture : Texture, worldSpace : Mat4, perspective : Mat4, camera : Mat4, normalMatrix : Mat4, lighting : Int, pointColour : Vec3, ambientColour : Vec3, point : Vec3 }
 uniformsShpere tx texture displacement lighting pointColour point ambientColour =
     let
         worldSpace =
@@ -395,13 +395,20 @@ uniformsShpere tx texture displacement lighting pointColour point ambientColour
 
         perspective =
             makePerspective 45 1 0.1 100
+
+        boolToInt bool =
+            if bool then
+                1
+
+            else
+                0
     in
     { texture = texture
     , worldSpace = worldSpace
     , perspective = perspective
     , camera = camera
     , normalMatrix = transpose (inverseOrthonormal worldSpace)
-    , lighting = lighting
+    , lighting = boolToInt lighting
     , pointColour = pointColour
     , ambientColour = ambientColour
     , point = point
@@ -412,7 +419,7 @@ uniformsShpere tx texture displacement lighting pointColour point ambientColour
 -- SHADERS
 
 
-vertexShader : Shader { attr | position : Vec3, coord : Vec3, norm : Vec3 } { unif | worldSpace : Mat4, perspective : Mat4, camera : Mat4, normalMatrix : Mat4, lighting : Bool, pointColour : Vec3, ambientColour : Vec3, point : Vec3 } { vcoord : Vec2, lightWeighting : Vec3 }
+vertexShader : Shader { attr | position : Vec3, coord : Vec3, norm : Vec3 } { unif | worldSpace : Mat4, perspective : Mat4, camera : Mat4, normalMatrix : Mat4, lighting : Int, pointColour : Vec3, ambientColour : Vec3, point : Vec3 } { vcoord : Vec2, lightWeighting : Vec3 }
 vertexShader =
     [glsl|
 
@@ -426,7 +433,7 @@ vertexShader =
   uniform mat4 perspective;
   uniform mat4 normalMatrix;
   uniform mat4 camera;
-  uniform bool lighting;
+  uniform int lighting;
   uniform vec3 pointColour;
   uniform vec3 point;
   uniform vec3 ambientColour;
@@ -439,7 +446,7 @@ vertexShader =
     gl_Position = perspective * camera * mvPosition;
     vcoord = coord.xy;
 
-    if (!lighting) {
+    if (lighting == 0) {
       lightWeighting = vec3(1.0, 1.0, 1.0);
     } else {
       //vec4 directional = vec4(normalize(point), 0.0);

diff --git a/lessons/Lesson13.elm b/lessons/Lesson13.elm
@@ -406,7 +406,7 @@ renderEntity mesh theta texture position useLighting useTextures usePerFragment
             WebGL.entity vertexShaderPV fragmentShaderPV mesh (uniformsShpere theta texture position useLighting useTextures pointColour point ambientColour)
 
 
-uniformsShpere : Float -> Texture -> Vec3 -> Bool -> Bool -> Vec3 -> Vec3 -> Vec3 -> { texture : Texture, worldSpace : Mat4, perspective : Mat4, camera : Mat4, normalMatrix : Mat4, useLighting : Bool, useTextures : Bool, pointColour : Vec3, ambientColour : Vec3, point : Vec3 }
+uniformsShpere : Float -> Texture -> Vec3 -> Bool -> Bool -> Vec3 -> Vec3 -> Vec3 -> { texture : Texture, worldSpace : Mat4, perspective : Mat4, camera : Mat4, normalMatrix : Mat4, useLighting : Int, useTextures : Int, pointColour : Vec3, ambientColour : Vec3, point : Vec3 }
 uniformsShpere tx texture displacement useLighting useTextures pointColour point ambientColour =
     let
         worldSpace =
@@ -417,14 +417,21 @@ uniformsShpere tx texture displacement useLighting useTextures pointColour point
 
         perspective =
             makePerspective 45 1 0.1 100
+
+        boolToInt bool =
+            if bool then
+                1
+
+            else
+                0
     in
     { texture = texture
     , worldSpace = worldSpace
     , perspective = perspective
     , camera = camera
     , normalMatrix = transpose (inverseOrthonormal worldSpace)
-    , useLighting = useLighting
-    , useTextures = useTextures
+    , useLighting = boolToInt useLighting
+    , useTextures = boolToInt useTextures
     , pointColour = pointColour
     , ambientColour = ambientColour
     , point = point
@@ -464,14 +471,14 @@ vertexShaderPF =
 |]
 
 
-fragmentShaderPF : Shader {} { unif | texture : Texture, useLighting : Bool, useTextures : Bool, ambientColour : Vec3, pointColour : Vec3, point : Vec3 } { vcoord : Vec2, vPosition : Vec3, vTransformedNormal : Vec3 }
+fragmentShaderPF : Shader {} { unif | texture : Texture, useLighting : Int, useTextures : Int, ambientColour : Vec3, pointColour : Vec3, point : Vec3 } { vcoord : Vec2, vPosition : Vec3, vTransformedNormal : Vec3 }
 fragmentShaderPF =
     [glsl|
   precision mediump float;
 
   uniform sampler2D texture;
-  uniform bool useLighting;
-  uniform bool useTextures;
+  uniform int useLighting;
+  uniform int useTextures;
   uniform vec3 ambientColour;
   uniform vec3 pointColour;
   uniform vec3 point;
@@ -483,7 +490,7 @@ fragmentShaderPF =
   void main () {
       vec3 lightWeighting;
       lightWeighting = vec3(1.0, 1.0, 1.0);
-      if (!useLighting) {
+      if (useLighting == 0) {
         lightWeighting = vec3(1.0, 1.0, 1.0);
       } else {
         vec3 lightDirection = normalize(point - vPosition );
@@ -492,7 +499,7 @@ fragmentShaderPF =
         lightWeighting = ambientColour + pointColour * directionalLightWeighting;
       }
       vec4 fragmentColor;
-      if (useTextures) {
+      if (useTextures == 1) {
         fragmentColor = texture2D(texture, vec2(vcoord.s, vcoord.t));
       } else {
         fragmentColor = vec4(1.0, 1.0, 1.0, 1.0);
@@ -504,7 +511,7 @@ fragmentShaderPF =
 |]
 
 
-vertexShaderPV : Shader { attr | position : Vec3, coord : Vec3, norm : Vec3 } { unif | worldSpace : Mat4, perspective : Mat4, camera : Mat4, normalMatrix : Mat4, useLighting : Bool, pointColour : Vec3, ambientColour : Vec3, point : Vec3 } { vcoord : Vec2, lightWeighting : Vec3 }
+vertexShaderPV : Shader { attr | position : Vec3, coord : Vec3, norm : Vec3 } { unif | worldSpace : Mat4, perspective : Mat4, camera : Mat4, normalMatrix : Mat4, useLighting : Int, pointColour : Vec3, ambientColour : Vec3, point : Vec3 } { vcoord : Vec2, lightWeighting : Vec3 }
 vertexShaderPV =
     [glsl|
 
@@ -518,7 +525,7 @@ vertexShaderPV =
   uniform mat4 perspective;
   uniform mat4 normalMatrix;
   uniform mat4 camera;
-  uniform bool useLighting;
+  uniform int useLighting;
   uniform vec3 pointColour;
   uniform vec3 point;
   uniform vec3 ambientColour;
@@ -531,7 +538,7 @@ vertexShaderPV =
     gl_Position = perspective * camera * mvPosition;
     vcoord = coord.xy;
 
-    if (!useLighting) {
+    if (useLighting == 0) {
       lightWeighting = vec3(1.0, 1.0, 1.0);
     } else {
       vec3 transformedNormal = vec3(normalMatrix * vec4(norm, 0.0));
@@ -543,20 +550,20 @@ vertexShaderPV =
 |]
 
 
-fragmentShaderPV : Shader {} { unif | texture : Texture, useTextures : Bool } { vcoord : Vec2, lightWeighting : Vec3 }
+fragmentShaderPV : Shader {} { unif | texture : Texture, useTextures : Int } { vcoord : Vec2, lightWeighting : Vec3 }
 fragmentShaderPV =
     [glsl|
   precision mediump float;
 
   uniform sampler2D texture;
-  uniform bool useTextures;
+  uniform int useTextures;
 
   varying vec2 vcoord;
   varying vec3 lightWeighting;
 
   void main () {
       vec4 fragmentColor;
-      if (useTextures) {
+      if (useTextures == 1) {
         fragmentColor = texture2D(texture, vec2(vcoord.s, vcoord.t));
       } else {
         fragmentColor = vec4(1.0, 1.0, 1.0, 1.0);