From a109983c194c45ad85f0e481232bc605c7cfd85b Mon Sep 17 00:00:00 2001 From: skal Date: Fri, 13 Feb 2026 08:34:24 +0100 Subject: Remediation: Implement shared common/shaders/ directory Eliminates 36 duplicate shader files across workspaces. Structure: - common/shaders/{math,render,compute}/ - Shared utilities (20 files) - workspaces/*/shaders/ - Workspace-specific only Changes: - Created common/shaders/ with math, render, compute subdirectories - Moved 20 common shaders from workspaces to common/ - Removed duplicates from test workspace - Updated assets.txt: ../../common/shaders/ references - Enhanced asset_packer.cc: filesystem path normalization for ../ resolution Implementation: Option 1 from SHADER_REUSE_INVESTIGATION.md - Single source of truth for common code - Workspace references via relative paths - Path normalization in asset packer handoff(Claude): Common shader directory implemented --- workspaces/main/shaders/render/lighting_utils.wgsl | 6 -- .../main/shaders/render/scene_query_bvh.wgsl | 67 ---------------------- .../main/shaders/render/scene_query_linear.wgsl | 56 ------------------ workspaces/main/shaders/render/shadows.wgsl | 13 ----- 4 files changed, 142 deletions(-) delete mode 100644 workspaces/main/shaders/render/lighting_utils.wgsl delete mode 100644 workspaces/main/shaders/render/scene_query_bvh.wgsl delete mode 100644 workspaces/main/shaders/render/scene_query_linear.wgsl delete mode 100644 workspaces/main/shaders/render/shadows.wgsl (limited to 'workspaces/main/shaders/render') diff --git a/workspaces/main/shaders/render/lighting_utils.wgsl b/workspaces/main/shaders/render/lighting_utils.wgsl deleted file mode 100644 index d2fd2e2..0000000 --- a/workspaces/main/shaders/render/lighting_utils.wgsl +++ /dev/null @@ -1,6 +0,0 @@ -fn calculate_lighting(color: vec3, normal: vec3, pos: vec3, shadow: f32) -> vec3 { - let light_dir = normalize(vec3(1.0, 1.0, 1.0)); - let diffuse = max(dot(normal, light_dir), 0.0); - let lighting = diffuse * (0.1 + 0.9 * shadow) + 0.1; // Ambient + Shadowed Diffuse - return color * lighting; -} diff --git a/workspaces/main/shaders/render/scene_query_bvh.wgsl b/workspaces/main/shaders/render/scene_query_bvh.wgsl deleted file mode 100644 index 3e6f895..0000000 --- a/workspaces/main/shaders/render/scene_query_bvh.wgsl +++ /dev/null @@ -1,67 +0,0 @@ -#include "math/sdf_shapes" -#include "math/sdf_utils" - -struct BVHNode { - min: vec3, - left_idx: i32, - max: vec3, - obj_idx_or_right: i32, -}; - -@group(0) @binding(2) var bvh_nodes: array; - -fn get_dist(p: vec3, obj_params: vec4) -> f32 { - let obj_type = obj_params.x; - if (obj_type == 1.0) { return length(p) - 1.0; } // Unit Sphere - if (obj_type == 2.0) { return sdBox(p, vec3(1.0)); } // Unit Box - if (obj_type == 3.0) { return sdTorus(p, vec2(1.0, 0.4)); } // Unit Torus - if (obj_type == 4.0) { return sdPlane(p, vec3(0.0, 1.0, 0.0), 0.0); } - if (obj_type == 5.0) { return sdBox(p, obj_params.yzw); } // MESH AABB - return 100.0; -} - -fn map_scene(p: vec3, skip_idx: u32) -> f32 { - var d = 1000.0; - var stack: array; - var stack_ptr = 0; - - if (arrayLength(&bvh_nodes) > 0u) { - stack[stack_ptr] = 0; - stack_ptr++; - } - - while (stack_ptr > 0) { - stack_ptr--; - let node_idx = stack[stack_ptr]; - let node = bvh_nodes[node_idx]; - - if (aabb_sdf(p, node.min, node.max) < d) { - if (node.left_idx < 0) { // Leaf - let obj_idx = u32(node.obj_idx_or_right); - if (obj_idx == skip_idx) { continue; } - let obj = object_data.objects[obj_idx]; - let q = (obj.inv_model * vec4(p, 1.0)).xyz; - - // Extract scale factors from the model matrix - let sx = length(obj.model[0].xyz); - let sy = length(obj.model[1].xyz); - let sz = length(obj.model[2].xyz); - - var s = min(sx, min(sy, sz)); - if (obj.params.x == 4.0) { - s = sy; // Plane normal is (0,1,0) in local space - } - - d = min(d, get_dist(q, obj.params) * s); - } else { // Internal - if (stack_ptr < 31) { - stack[stack_ptr] = node.left_idx; - stack_ptr++; - stack[stack_ptr] = node.obj_idx_or_right; - stack_ptr++; - } - } - } - } - return d; -} diff --git a/workspaces/main/shaders/render/scene_query_linear.wgsl b/workspaces/main/shaders/render/scene_query_linear.wgsl deleted file mode 100644 index 0497a40..0000000 --- a/workspaces/main/shaders/render/scene_query_linear.wgsl +++ /dev/null @@ -1,56 +0,0 @@ -#include "math/sdf_shapes" -#include "math/sdf_utils" - -fn get_dist(p: vec3, obj_params: vec4) -> f32 { - let obj_type = obj_params.x; - if (obj_type == 1.0) { return length(p) - 1.0; } // Unit Sphere - if (obj_type == 2.0) { return sdBox(p, vec3(1.0)); } // Unit Box - if (obj_type == 3.0) { return sdTorus(p, vec2(1.0, 0.4)); } // Unit Torus - if (obj_type == 4.0) { return sdPlane(p, vec3(0.0, 1.0, 0.0), 0.0); } - if (obj_type == 5.0) { return sdBox(p, obj_params.yzw); } // MESH AABB - return 100.0; -} - -fn map_scene(p: vec3, skip_idx: u32) -> f32 { - - var d = 1000.0; - - let num_objects = arrayLength(&object_data.objects); - - for (var i = 0u; i < num_objects; i++) { - - if (i == skip_idx) { continue; } - - let obj = object_data.objects[i]; - - let q = (obj.inv_model * vec4(p, 1.0)).xyz; - - - - // Extract scale factors from the model matrix - - let sx = length(obj.model[0].xyz); - - let sy = length(obj.model[1].xyz); - - let sz = length(obj.model[2].xyz); - - - - var s = min(sx, min(sy, sz)); - - if (obj.params.x == 4.0) { - - s = sy; // Plane normal is (0,1,0) in local space - - } - - - - d = min(d, get_dist(q, obj.params) * s); - - } - - return d; - -} diff --git a/workspaces/main/shaders/render/shadows.wgsl b/workspaces/main/shaders/render/shadows.wgsl deleted file mode 100644 index 7cba089..0000000 --- a/workspaces/main/shaders/render/shadows.wgsl +++ /dev/null @@ -1,13 +0,0 @@ -fn calc_shadow(ro: vec3, rd: vec3, tmin: f32, tmax: f32, skip_idx: u32) -> f32 { - var res = 1.0; - var t = tmin; - if (t < 0.05) { t = 0.05; } - for (var i = 0; i < 32; i = i + 1) { - let h = map_scene(ro + rd * t, skip_idx); - if (h < 0.001) { return 0.0; } - res = min(res, 16.0 * h / t); - t = t + clamp(h, 0.02, 0.4); - if (t > tmax) { break; } - } - return clamp(res, 0.0, 1.0); -} -- cgit v1.2.3