basic phong lighting

src/shaders/shader.frag

@@ -24,19 +24,14 @@ layout(set=1,binding=0) uniform usampler3D diffuseTex;
 
 // Include
 #include "shapes.cginc"
-#include "raymarching.cginc"
+#include "raycasting.cginc"
 
 void main() 
 {
-    // Test
-    uint node = texelFetch(diffuseTex, ivec3(0, 0, 0), 0).r;
-    if(node == 4294967295) out_color = vec4(0.0, 0.5, 1.0, 1.0);
-    else out_color = vec4(1.0, 0.1, 0.0, 1.0);
-
-
     // Calculate ray direction
-    // vec3 view_dir = (proj_matrix_inv * vec4(vert_uv, 0, 1)).xyz;
-    // vec3 ray_dir = normalize(view_matrix * vec4(view_dir,0)).xyz;
-    // // Calculate color
-    // out_color = vec4(raymarch(cam_pos, ray_dir), 1);
+    vec3 view_dir = (proj_matrix_inv * vec4(vert_uv, 0, 1)).xyz;
+    vec3 ray_dir = normalize(view_matrix * vec4(view_dir,0)).xyz;
+
+    // Raycast
+    out_color = vec4(raycast(cam_pos, ray_dir), 1.0);
 }