Fixed G Norm

CIS565-Fall-2021 · Nov 1, 2021 · 5fe7777 · 5fe7777
1 parent d7983e1
commit 5fe7777
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/shaders/deferred.frag.glsl.js b/src/shaders/deferred.frag.glsl.js
@@ -96,7 +96,8 @@ export default function(params) {
   void main() {
     // TODO: extract data from g buffers and do lighting
      vec4 gbPos = texture2D(u_gbuffers[0], v_uv);
-     vec4 gbNor = texture2D(u_gbuffers[1], v_uv);
+     vec4 gNor = texture2D(u_gbuffers[1], v_uv);
+     vec4 gbNor = vec4(oct_to_float32x3(vec2(gNor.x, gNor.y)), 1.0);
      vec4 albedo = texture2D(u_gbuffers[2], v_uv);
 
      vec3 fragColor = vec3(0.0);

diff --git a/src/shaders/deferredToTexture.frag.glsl b/src/shaders/deferredToTexture.frag.glsl
@@ -43,7 +43,7 @@ void main() {
 
     // TODO: populate your g buffer
     gl_FragData[0] = vec4(v_position, 1.0);
-    gl_FragData[1] =  vec4(norm, 1.0);
+    gl_FragData[1] =  vec4(float32x3_to_Oct(norm), 0.0, 1.0);
     gl_FragData[2] =  vec4(col, 1.0);
     // gl_FragData[3] = ??
 }