Cleanup: remove uniforms from shader datatype

2023-03-20 01:19:10 +00:00
parent 33f31aa385
commit 32ecf46343
17 changed files with 24 additions and 99 deletions
@@ -1,6 +1,6 @@
 #version 450 core
-uniform vec3 lightPos;
-uniform vec4 lumRad;
+layout(location=0)uniform vec3 lightPos;
+layout(location=1)uniform vec4 lumRad;
 layout (binding = 0) uniform sampler2D screenTexture;
 layout (binding = 1) uniform sampler2D normals;
 in vec2 vTexPos;
@@ -20,8 +20,8 @@ void main() {
  //float y3 = clamp(0.5 * (y1 + 1),0,1) ;
  float y3 = clamp(2*y1 + 1,0,1) ;
  //float y3 = clamp(0.5 * (y1 + 2),0,1) ;
-  float y = float(normbit.w == 0 ? y2 : y2);
-  //float y = y2;
+  //float y = float(normbit.w == 0 ? y3 : y2);
+  float y = y2;
  float x = 1 - dist / rad;
  vec3 c = y* (x * x * x) * lumRad.rgb;
  fColor = vec4(c, 0);