From 9ee410594a52cbc699b13de2bde4860d70c959a3 Mon Sep 17 00:00:00 2001 From: skal Date: Sat, 28 Feb 2026 09:08:57 +0100 Subject: refactor: move common/shaders/ to src/shaders/ Relocates shared WGSL shaders under src/ where all source code lives, eliminating the top-level common/ directory. - Update asset references in workspaces/main/assets.txt and workspaces/test/assets.txt - Update docs: PROJECT_CONTEXT.md, ARCHITECTURE.md, WORKSPACE_SYSTEM.md, SHADER_REUSE_INVESTIGATION.md Co-Authored-By: Claude Sonnet 4.6 --- doc/ARCHITECTURE.md | 2 +- doc/SHADER_REUSE_INVESTIGATION.md | 4 ++-- doc/WORKSPACE_SYSTEM.md | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'doc') diff --git a/doc/ARCHITECTURE.md b/doc/ARCHITECTURE.md index ebb2a59..582903b 100644 --- a/doc/ARCHITECTURE.md +++ b/doc/ARCHITECTURE.md @@ -17,7 +17,7 @@ Detailed system architecture for the 64k demo project. - Provides `update_camera()` helper methods (from Camera object or manual values) - Standard binding: 0=CommonUniforms, 1=CameraParams -**WGSL Helpers** (`common/shaders/camera_common.wgsl`): +**WGSL Helpers** (`src/shaders/camera_common.wgsl`): - `getCameraRay(cam, uv)`: Generate ray from screen UV coordinates - `getCameraPosition/Forward/Up/Right()`: Extract camera vectors from inv_view - Integrates with existing `render/raymarching.wgsl` (rayMarch, normal, shadow) diff --git a/doc/SHADER_REUSE_INVESTIGATION.md b/doc/SHADER_REUSE_INVESTIGATION.md index 0eb36f9..e840126 100644 --- a/doc/SHADER_REUSE_INVESTIGATION.md +++ b/doc/SHADER_REUSE_INVESTIGATION.md @@ -7,9 +7,9 @@ **Status:** IMPLEMENTED **Results:** -- Created `common/shaders/` with 20 shared shader files +- Created `src/shaders/` with 20 shared shader files (moved from `common/shaders/` 2026-02-28) - Eliminated 36 duplicate files across workspaces -- Asset references use `../../common/shaders/...` +- Asset references use `../../src/shaders/...` - Enhanced asset_packer with filesystem path normalization - Build passes, all tests pass diff --git a/doc/WORKSPACE_SYSTEM.md b/doc/WORKSPACE_SYSTEM.md index a0077d2..6b4319d 100644 --- a/doc/WORKSPACE_SYSTEM.md +++ b/doc/WORKSPACE_SYSTEM.md @@ -133,7 +133,7 @@ assets = "assets.txt" asset_dirs = ["assets/", "../common/audio/"] # Shader directories (order matters: workspace-specific first) -shader_dirs = ["shaders/", "../common/shaders/"] +shader_dirs = ["shaders/", "../src/shaders/"] [options] # Default resolution @@ -255,7 +255,7 @@ class ShaderComposer { ```wgsl // workspace-specific shader #include "custom_uniforms.wgsl" // From workspaces/main/shaders/ -#include "math/common_utils.wgsl" // From assets/common/shaders/ +#include "math/common_utils.wgsl" // From src/shaders/ ``` ### CLI Tool -- cgit v1.2.3