From eb15703a3f87e4eadc8839b06de12b9c6ec54023 Mon Sep 17 00:00:00 2001 From: skal Date: Fri, 13 Feb 2026 08:21:34 +0100 Subject: Refactor: Reorganize workspaces and remove assets/ directory MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Workspace structure now: - workspaces/{main,test}/obj/ (3D models) - workspaces/{main,test}/shaders/ (WGSL shaders) - workspaces/{main,test}/music/ (audio samples) Changes: - Moved workspaces/*/assets/music/ → workspaces/*/music/ - Updated assets.txt paths (assets/music/ → music/) - Moved test_demo.{seq,track} to tools/ - Moved assets/originals/ → tools/originals/ - Removed assets/common/ (legacy, duplicated in workspaces) - Removed assets/final/ (legacy, superseded by workspaces) - Updated hot-reload paths in main.cc - Updated CMake references for test_demo and validation - Updated gen_spectrograms.sh paths handoff(Claude): Workspace reorganization complete --- assets/common/shaders/render/scene_query_bvh.wgsl | 67 ----------------------- 1 file changed, 67 deletions(-) delete mode 100644 assets/common/shaders/render/scene_query_bvh.wgsl (limited to 'assets/common/shaders/render/scene_query_bvh.wgsl') diff --git a/assets/common/shaders/render/scene_query_bvh.wgsl b/assets/common/shaders/render/scene_query_bvh.wgsl deleted file mode 100644 index 3e6f895..0000000 --- a/assets/common/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; -} -- cgit v1.2.3