From 5e8068705ab48a2cd810ef23c5e8f6b379a32fb8 Mon Sep 17 00:00:00 2001
From: Piotrek <piotrek54pl@gmail.com>
Date: Sun, 18 Apr 2021 23:02:17 +0200
Subject: [PATCH] getting subnode id

---
 src/shaders/bin/shader.frag.spv | Bin 5424 -> 4520 bytes
 src/shaders/raycasting.cginc    |  37 +++++++++++++++++++++-----------
 2 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/src/shaders/bin/shader.frag.spv b/src/shaders/bin/shader.frag.spv
index d33f54ecb3ddcde3311272de8de8e274b87d4bde..0823b7b52473309340623ab2e33cb3313a4dab0b 100644
GIT binary patch
literal 4520
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
KN9Lpbf60Gx%yLu!

literal 5424
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

diff --git a/src/shaders/raycasting.cginc b/src/shaders/raycasting.cginc
index a2bb3b5..bc0357d 100644
--- a/src/shaders/raycasting.cginc
+++ b/src/shaders/raycasting.cginc
@@ -1,4 +1,24 @@
 
+/*
+    point: Hit point
+    view: View vector (camera ray)
+    normal: Normal vector
+*/
+vec3 solve(vec3 point, vec3 view, vec3 normal)
+{
+    // Lighting
+    vec3 light_color = vec3(1.0, 1.0, 1.0);
+    vec3 light_dir = normalize(point-vec3(0.0, 1.5, 4.0));
+
+    vec3 ambient = light_color * 0.1;
+    vec3 diffuse = light_color * max(1.0-dot(normal, light_dir), 0.0);
+    vec3 specular = light_color * pow(max(dot(view, reflect(-light_dir, normal)), 0.0), 32);
+
+    // Combine colors
+    vec3 object_color = vec3(0.0, 0.1, 0.5);
+    return (ambient + diffuse + specular) * object_color;
+}
+
 vec3 raycast(vec3 origin, vec3 dir)
 {
     // Round input pos to nearest voxel
@@ -13,7 +33,7 @@ vec3 raycast(vec3 origin, vec3 dir)
     // Closest axis to increment in grid will be stored here (x=1 or y=1 or z=1)
     vec3 incAxis = vec3(0,0,0);
 
-
+    float level = 1;
     for(int i=0;i<50;i++)
     {
         // Get node
@@ -27,17 +47,10 @@ vec3 raycast(vec3 origin, vec3 dir)
             // Normal vector (negate previous increment axis and mult by sign)
             vec3 normal = -incAxis * raySign;
 
-            // Lighting
-            vec3 light_color = vec3(1.0, 1.0, 1.0);
-            vec3 light_dir = normalize(point-vec3(0.0, 1.5, 4.0));
-
-            vec3 ambient = light_color * 0.1;
-            vec3 diffuse = light_color * max(1.0-dot(normal, light_dir), 0.0);
-            vec3 specular = light_color * pow(max(dot(dir, reflect(-light_dir, normal)), 0.0), 32);
-
-            // Object color
-            vec3 object_color = vec3(0.0, 0.1, 0.5);
-            return (ambient + diffuse + specular) * object_color;
+            // Get subnode
+            return step(vec3(0.5, 0.5, 0.5), point - pos);
+            
+            //return solve(point, dir, normal);
         }
 
         // Get new closest axis to increment