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/final/shaders/mesh_render.wgsl | 58 ----------------------------------- 1 file changed, 58 deletions(-) delete mode 100644 assets/final/shaders/mesh_render.wgsl (limited to 'assets/final/shaders/mesh_render.wgsl') diff --git a/assets/final/shaders/mesh_render.wgsl b/assets/final/shaders/mesh_render.wgsl deleted file mode 100644 index 7390b06..0000000 --- a/assets/final/shaders/mesh_render.wgsl +++ /dev/null @@ -1,58 +0,0 @@ -#include "common_uniforms" -#include "math/common_utils" - -@group(0) @binding(0) var globals: GlobalUniforms; -@group(0) @binding(1) var object_data: ObjectsBuffer; - -// Binding 2 is reserved for BVH (not used here but matches layout for simplicity) - -@group(0) @binding(3) var noise_tex: texture_2d; -@group(0) @binding(4) var noise_sampler: sampler; -@group(0) @binding(5) var sky_tex: texture_2d; - -struct VertexInput { - @location(0) position: vec3, - @location(1) normal: vec3, - @location(2) uv: vec2, -}; - -struct VertexOutput { - @builtin(position) clip_pos: vec4, - @location(0) world_pos: vec3, - @location(1) normal: vec3, - @location(2) uv: vec2, - @location(3) color: vec4, - @location(4) @interpolate(flat) instance_index: u32, -}; - -@vertex -fn vs_main(in: VertexInput, @builtin(instance_index) instance_index: u32) -> VertexOutput { - let obj = object_data.objects[instance_index]; - let world_pos = obj.model * vec4(in.position, 1.0); - - var out: VertexOutput; - out.clip_pos = globals.view_proj * world_pos; - out.world_pos = world_pos.xyz; - - // Transform normal from local to world space - out.normal = transform_normal(obj.inv_model, in.normal); - - out.uv = in.uv; - out.color = obj.color; - out.instance_index = instance_index; - return out; -} - -#include "render/scene_query_mode" -#include "render/shadows" -#include "render/lighting_utils" - -@fragment -fn fs_main(in: VertexOutput) -> @location(0) vec4 { - let light_dir = normalize(vec3(1.0, 1.0, 1.0)); - - let shadow = calc_shadow(in.world_pos, light_dir, 0.05, 20.0, in.instance_index); - let lit_color = calculate_lighting(in.color.rgb, in.normal, in.world_pos, shadow); - - return vec4(lit_color, in.color.a); -} \ No newline at end of file -- cgit v1.2.3