| Age | Commit message (Collapse) | Author |
|---|
|
Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
|
|
- Added --infer flag for single-image inference
- Loads checkpoint, runs forward pass, saves PNG output
- Useful for verifying shader matches trained model
Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
|
|
**Training changes:**
- Final layer now outputs [0,1] directly with torch.clamp()
- Removed denormalization step (was converting [-1,1] to [0,1])
- Network learns [0,1] output natively
**Shader generation fixes:**
- Layer 0 uses _src variant (5 params, normalizes [0,1] input internally)
- Removed pre-normalization of input texture (handled by _src)
- Final layer blending: gray_out already [0,1], no denormalization needed
- Added generate_conv_src_function() for all kernel sizes
- Auto-generates _src variants when exporting (skips if exists)
**Cleanup:**
- Removed obsolete 4-channel functions from cnn_conv5x5.wgsl
- Keep only 7-channel variants (_7to4, _7to1, _7to4_src)
**Normalization flow:**
[0,1] texture → _src normalizes to [-1,1] → tanh [-1,1] → ... → final conv [0,1] clipped
handoff(Claude): CNN normalization pipeline fixed and consistent with training
|
|
|
|
Allows regenerating just the .wgsl shader file without touching
.h/.cc files when iterating on shader code.
Usage: ./tools/shadertoy/convert_shadertoy.py shader.txt EffectName --shader-only
Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
|
|
Normalize textures once in fs_main instead of in every conv function.
Keep all intermediate layers in [-1,1] range, denormalize only for final display.
Changes:
- train_cnn.py: Generator normalizes input once, keeps [-1,1] between layers
- cnn_conv*.wgsl: Remove texture normalization (already [-1,1])
- cnn_layer.wgsl: Regenerated with new normalization flow
- CNN_EFFECT.md: Updated documentation
Eliminates redundant [0,1]↔[-1,1] conversions, reducing shader complexity.
handoff(Claude): CNN normalization optimized, all tests passing (35/36).
|
|
|
|
ShaderToy uses bottom-left origin with Y-up, but our system uses
top-left origin with Y-down. Added Y-flip in fragment shader to
correctly display ShaderToy effects.
**Changes:**
- workspaces/main/shaders/scene1.wgsl: Flip Y before coordinate conversion
- tools/shadertoy/convert_shadertoy.py: Generate Y-flip in all conversions
**Formula:**
```wgsl
let flipped = vec2<f32>(p.x, uniforms.resolution.y - p.y);
```
This ensures ShaderToy shaders display right-side up.
Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
|
|
Major improvements to reduce manual code changes after conversion:
**Scene vs Post-Process Detection:**
- Added --post-process flag (default: scene effect)
- Scene effects: Simple pattern like HeptagonEffect (no texture input)
- Post-process effects: Uses PostProcessEffect base class
**Generated Code Now Compiles As-Is:**
- Scene: Uses gpu_create_render_pass() helper
- Post-process: Uses create_post_process_pipeline() helper
- No manual Effect base class rewrites needed
- Correct shader bindings for each type
**Improved WGSL Conversion:**
- Better mainImage extraction and conversion
- Proper fragCoord -> p.xy mapping
- Handles iResolution/iTime -> uniforms automatically
- Fixed return statements (fragColor = ... -> return ...)
- Preserves helper functions from original shader
**Better Instructions:**
- Shows exact asset.txt format with SHADER_ prefix
- Includes shader declaration/definition steps
- Indicates correct test list (scene_effects vs post_process_effects)
**Example:**
```bash
./tools/shadertoy/convert_shadertoy.py shader.txt MyEffect
# Generates compile-ready scene effect
./tools/shadertoy/convert_shadertoy.py blur.txt Blur --post-process
# Generates compile-ready post-process effect
```
Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
|
|
Converted ShaderToy shader (Saturday cubism experiment) to Scene1Effect
following EFFECT_WORKFLOW.md automation guidelines.
**Changes:**
- Created Scene1Effect (.h, .cc) as scene effect (not post-process)
- Converted GLSL to WGSL with manual fixes:
- Replaced RESOLUTION/iTime with uniforms.resolution/time
- Fixed const expressions (normalize not allowed in const)
- Converted mainImage() to fs_main() return value
- Manual matrix rotation for scene transformation
- Added shader asset to workspaces/main/assets.txt
- Registered in CMakeLists.txt (both GPU_SOURCES sections)
- Added to demo_effects.h and shaders declarations
- Added to timeline.seq at 22.5s for 10s duration
- Added to test_demo_effects.cc scene_effects list
**Shader features:**
- Raymarching cube and sphere with ground plane
- Reflections and soft shadows
- Sky rendering with sun and horizon glow
- ACES tonemapping and sRGB output
- Time-based rotation animation
**Tests:** All effects tests passing (5/9 scene, 9/9 post-process)
Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
|
|
Remove incomplete ShaderToy conversion that was blocking builds:
- Removed include from src/gpu/demo_effects.h
- Removed shader asset from workspaces/main/assets.txt
- Removed effect reference from timeline.seq
- Deleted incomplete effect files (.h, .cc, .wgsl)
Effect remains disabled in CMakeLists.txt and can be re-added when
conversion is complete.
Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
|
|
Fix EFFECT keyword format across all documentation and scripts - priority
modifier (+/=/–) is required but was missing from examples.
**Documentation fixes:**
- doc/HOWTO.md: Added missing + to EFFECT example
- doc/RECIPE.md: Added priority modifiers to examples
- tools/shadertoy/README.md: Fixed test path, clarified workflow
- tools/shadertoy/convert_shadertoy.py: Updated output instructions
**New automation guide:**
- doc/EFFECT_WORKFLOW.md: Complete step-by-step checklist for AI agents
- Exact file paths and line numbers
- Common issues and fixes
- Asset ID naming conventions
- CMakeLists.txt dual-section requirement
- Test list instructions (post_process_effects vs scene_effects)
**Integration:**
- CLAUDE.md: Added EFFECT_WORKFLOW.md to Tier 2 (always loaded)
- doc/AI_RULES.md: Added "Adding Visual Effects" quick reference
- README.md: Added EFFECT_WORKFLOW.md to documentation list
**CMakeLists.txt:**
- Disabled incomplete cube_sphere_effect.cc (ShaderToy conversion WIP)
**Timeline:**
- Commented out incomplete CubeSphereEffect
- Removed obsolete constructor argument
Fixes #issue-with-effect-syntax
Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
|
|
Add automated conversion pipeline for ShaderToy shaders to demo effects:
- convert_shadertoy.py: Automated code generation script
- Manual templates: Header, implementation, and WGSL boilerplate
- Example shader: Test case for conversion workflow
- README: Complete conversion guide with examples
Handles basic GLSL→WGSL conversion (types, uniforms, mainImage extraction).
Manual fixes needed for fragColor returns and complex type inference.
Organized under tools/shadertoy/ for maintainability.
Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
|
|
Training script was hardcoded to generate cnn_conv3x3_* calls regardless
of actual kernel size, causing shader validation errors when layer 1 used
5×5 kernel (100 weights) but called 3×3 function (expected 36).
Changes:
- train_cnn.py: Generate correct conv function based on kernel_sizes[i]
- cnn_conv5x5.wgsl: Add cnn_conv5x5_7to4 and cnn_conv5x5_7to1 variants
- Regenerate cnn_layer.wgsl with correct function calls for [3,5,3]
- Document kernel size→function mapping in HOWTO.md
Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
|
|
Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
|
|
Add BindGroupLayoutBuilder, BindGroupBuilder, RenderPipelineBuilder,
and SamplerCache to reduce repetitive WGPU code. Refactor
post_process_helper, cnn_effect, and rotating_cube_effect.
Changes:
- Bind group creation: 19 instances, 14→4 lines each
- Pipeline creation: 30-50→8 lines
- Sampler deduplication: 6 instances → cached
- Total boilerplate reduction: -122 lines across 3 files
Builder pattern prevents binding index errors and consolidates
platform-specific #ifdef in fewer locations. Binary size unchanged
(6.3M debug). Tests pass.
Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
|
|
Upgrade CNN architecture to process RGBD input, output grayscale, with
7-channel layer inputs (RGBD + UV coords + grayscale).
Architecture changes:
- Inner layers: Conv2d(7→4) output RGBD
- Final layer: Conv2d(7→1) output grayscale
- All inputs normalized to [-1,1] for tanh activation
- Removed CoordConv2d in favor of unified 7-channel input
Training (train_cnn.py):
- SimpleCNN: 7→4 (inner), 7→1 (final) architecture
- Forward: Normalize RGBD/coords/gray to [-1,1]
- Weight export: array<array<f32, 8>, 36> (inner), array<f32, 8>, 9> (final)
- Dataset: Load RGBA (RGBD) input
Shaders (cnn_conv3x3.wgsl):
- Added cnn_conv3x3_7to4: 7-channel input → RGBD output
- Added cnn_conv3x3_7to1: 7-channel input → grayscale output
- Both normalize inputs and use flattened weight arrays
Documentation:
- CNN_EFFECT.md: Updated architecture, training, weight format
- CNN_RGBD_GRAYSCALE_SUMMARY.md: Implementation summary
- HOWTO.md: Added training command example
Next: Train with RGBD input data
Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
|
|
|
|
|
|
Two bugs causing black screen when CNN post-processing activated:
1. Framebuffer capture timing: Capture ran inside post-effect loop after
ping-pong swaps, causing layers 1+ to capture wrong buffer. Moved
capture before loop to copy framebuffer_a once before post-chain starts.
2. Missing uniforms update: CNNEffect never updated uniforms_ buffer,
leaving uniforms.resolution uninitialized (0,0). UV calculation
p.xy/uniforms.resolution produced NaN, causing all texture samples
to return black. Added uniforms update in update_bind_group().
Files modified:
- src/gpu/effect.cc: Capture before post-chain (lines 308-346)
- src/gpu/effects/cnn_effect.cc: Add uniforms update (lines 132-142)
- workspaces/main/shaders/cnn/cnn_layer.wgsl: Remove obsolete comment
- doc/CNN_DEBUG.md: Historical debugging doc
- CLAUDE.md: Reference CNN_DEBUG.md in historical section
Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
|
|
CNNEffect's "original" input was black because FadeEffect (priority 1) ran
before CNNEffect (priority 1), fading the scene. Changed framebuffer capture
to use framebuffer_a (scene output) instead of current_input (post-chain).
Also add seq_compiler validation to detect post-process priority collisions
within and across concurrent sequences, preventing similar render order issues.
Updated stub_types.h WGPULoadOp enum values to match webgpu.h spec.
Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
|
|
Implements automatic layer chaining and generic framebuffer capture API for
multi-layer neural network effects with proper original input preservation.
Key changes:
- Effect::needs_framebuffer_capture() - generic API for pre-render capture
- MainSequence: auto-capture to "captured_frame" auxiliary texture
- CNNEffect: multi-layer support via layer_index/total_layers params
- seq_compiler: expands "layers=N" to N chained effect instances
- Shader: @binding(4) original_input available to all layers
- Training: generates layer switches and original input binding
- Blend: mix(original, result, blend_amount) uses layer 0 input
Timeline syntax: CNNEffect layers=3 blend=0.7
Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
|
|
- Document coordinate-aware layer 0 architecture
- Add checkpointing examples and options table
- Consolidate training workflow with practical examples
- Clarify CoordConv2d usage and size impact
- Streamline training/README.md structure
Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
|
|
- Save checkpoints every N epochs (--checkpoint-every)
- Resume from checkpoint (--resume)
- Store model, optimizer, epoch, loss, and architecture info
- Auto-create checkpoint directory
Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
|
|
Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
|
|
|
|
- Implement CoordConv2d custom layer accepting (x,y) patch center
- Split layer 0 weights: rgba_weights (9x mat4x4) + coord_weights (mat2x4)
- Add *_with_coord() functions to 3x3/5x5/7x7 convolution shaders
- Update training script to generate coordinate grid and export split weights
- Regenerate placeholder weights with new format
Size impact: +32B coord weights + ~100B shader code = +132B total
All 36 tests passing (100%)
handoff(Claude): CNN coordinate awareness implemented, ready for training
Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
|
|
**New Documentation:**
- `doc/CNN_EFFECT.md` (223 lines): Comprehensive implementation guide
- Architecture overview (file structure, shader composition)
- Usage examples (C++ API, timeline integration)
- Training workflow (planned)
- Implementation details (convolution signatures, weight storage)
- Size budget breakdown (~5-8 KB total)
- Testing and troubleshooting
**Updated Documentation:**
- `doc/CNN.md`: Added implementation status section
- Completed items (✅ modular shaders, C++ class, tests)
- Pending items (⏳ training script, multi-layer, quantization)
- Size impact summary
- `PROJECT_CONTEXT.md`:
- Added "Effects: CNN post-processing foundation" to Current Status
- Added `CNN_EFFECT.md` to Technical Reference list
**Summary:**
CNN effect foundation complete with modular WGSL architecture, ready for
training script integration. All tests passing (36/36). ~5-8 KB footprint.
handoff(Claude): Documentation complete for CNN effect implementation
|
|
Implements multi-layer convolutional neural network shader for stylized
post-processing of 3D rendered scenes:
**Core Components:**
- CNNEffect: C++ effect class with single-layer rendering (expandable to multi-pass)
- Modular WGSL snippets: cnn_activation, cnn_conv3x3/5x5/7x7, cnn_weights_generated
- Placeholder identity-like weights for initial testing (to be replaced by trained weights)
**Architecture:**
- Flexible kernel sizes (3×3, 5×5, 7×7) via separate snippet files
- ShaderComposer integration (#include resolution)
- Residual connections (input + processed output)
- Supports parallel convolutions (design ready, single conv implemented)
**Size Impact:**
- ~3-4 KB shader code (snippets + main shader)
- ~2-4 KB weights (depends on network architecture when trained)
- Total: ~5-8 KB (acceptable for 64k demo)
**Testing:**
- CNNEffect added to test_demo_effects.cc
- 36/36 tests passing (100%)
**Next Steps:**
- Training script (scripts/train_cnn.py) to generate real weights
- Multi-layer rendering with ping-pong textures
- Weight quantization for size optimization
handoff(Claude): CNN effect foundation complete, ready for training integration
|
|
|
|
README.md: Streamlined quick start and feature overview
SHADER_EDITOR_DETAILS.md: Technical reference (architecture, uniforms, examples)
SHADER_EDITOR_PLAN.md: Development roadmap with 5 phases
Summary of implemented features:
- Live WebGPU preview (1280×720, autoplay)
- Syntax highlighting (placeholder-based, prevents overlap)
- #include composition (recursive resolution)
- Animation controls (time, beat, audio_peak)
- File I/O (load/save .wgsl)
Next priorities:
1. Multi-resolution support
2. Improved syntax highlighting
3. Texture upload
Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
|
|
Replace comments/strings with placeholders, highlight rest, restore.
Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
|
|
Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
|
|
Overlay highlighting: keywords, types, attributes, functions, numbers, comments.
Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
|
|
Preview: 57%, Editor: 43%
Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
|
|
Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
|
|
Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
|
|
Default resolution: 1280x720 (16:9)
Canvas uses object-fit: contain to preserve aspect ratio
Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
|
|
Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
|
|
WebGPU auto layout requires all bindings to be used in shader.
Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
|
|
Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
|
|
- Editor pane: 30% → 36% (20% larger)
- Preview pane: 70% → 64%
- Default shader: animated gradient + pulsing circle (was plain color)
Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
|
|
ShaderToy-like web tool for live WGSL shader editing with WebGPU preview.
Features:
- Live WebGPU preview with real-time shader updates
- Shader composition: #include directive support
- Animation controls: time, loop_time (0..1), audio_peak
- File I/O: Load/save .wgsl files
- CommonUniforms binding (resolution, time, beat, audio_intensity)
- Keyboard shortcuts: Ctrl+S (save), Ctrl+O (load), Space (play/pause)
Single-file HTML (no build step, no CORS issues).
handoff(Claude): Implemented HTML WGSL shader editor per plan
Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
|
|
Prevents user confusion when DEMO_HEADLESS is not defined at compile time.
The --headless and --duration flags are now only available when headless
support is compiled in.
Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
|
|
Restructured test suite for better organization and targeted testing:
**Structure:**
- src/tests/audio/ - 15 audio system tests
- src/tests/gpu/ - 12 GPU/shader tests
- src/tests/3d/ - 6 3D rendering tests
- src/tests/assets/ - 2 asset system tests
- src/tests/util/ - 3 utility tests
- src/tests/common/ - 3 shared test helpers
- src/tests/scripts/ - 2 bash test scripts (moved conceptually, not physically)
**CMake changes:**
- Updated add_demo_test macro to accept LABEL parameter
- Applied CTest labels to all 36 tests for subsystem filtering
- Updated all test file paths in CMakeLists.txt
- Fixed common helper paths (webgpu_test_fixture, etc.)
- Added custom targets for subsystem testing:
- run_audio_tests, run_gpu_tests, run_3d_tests
- run_assets_tests, run_util_tests, run_all_tests
**Include path updates:**
- Fixed relative includes in GPU tests to reference ../common/
**Documentation:**
- Updated doc/HOWTO.md with subsystem test commands
- Updated doc/CONTRIBUTING.md with new test organization
- Updated scripts/check_all.sh to reflect new structure
**Verification:**
- All 36 tests passing (100%)
- ctest -L <subsystem> filters work correctly
- make run_<subsystem>_tests targets functional
- scripts/check_all.sh passes
Backward compatible: make test and ctest continue to work unchanged.
handoff(Gemini): Test reorganization complete. 36/36 tests passing.
|
|
Reduced tracker pattern volumes:
- Kicks: 1.0 → 0.7
- Snares: 1.0/0.9 → 0.6
- Crash: 0.85 → 0.6
Multiple simultaneous voices were summing to excessive levels.
Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
|
|
Summary:
- HEADLESS_MODE.md: 58→32 lines (-45%)
- HOWTO.md: Condensed to one-liner + reference
- Removed implementation details (in code comments)
- Simplified comparison table
- Clearer use case description
handoff(Claude): Documentation cleanup
|
|
Implements DEMO_HEADLESS build option for fast iteration cycles:
- Functional GPU/platform stubs (not pure no-ops like STRIP_EXTERNAL_LIBS)
- Audio and timeline systems work normally
- No rendering overhead
- Useful for CI, audio development, timeline validation
Files added:
- doc/HEADLESS_MODE.md - Documentation
- src/gpu/headless_gpu.cc - Validated GPU stubs
- src/platform/headless_platform.cc - Time simulation (60Hz)
- scripts/test_headless.sh - End-to-end test script
Usage:
cmake -B build_headless -DDEMO_HEADLESS=ON
cmake --build build_headless -j4
./build_headless/demo64k --headless --duration 30
Progress printed every 5s. Compatible with --dump_wav mode.
handoff(Claude): Task #76 follow-up - headless mode complete
|
|
Update all doc references from old paths to workspace structure:
- assets/demo.seq → workspaces/main/timeline.seq
- assets/music.track → workspaces/main/music.track
- assets/final/demo_assets.txt → workspaces/main/assets.txt
- assets/test_demo.* → workspaces/test/*
Files updated:
- HOWTO.md: Add workspace selection, update paths
- SEQUENCE.md: Update examples and integration
- ASSET_SYSTEM.md: Workspace-aware workflow
- CONTRIBUTING.md: Workspace timeline paths
- ARCHITECTURE.md: Generic workspace reference
Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
|
|
Condense README, PROJECT_CONTEXT, and TODO:
- README: Remove verbose file listings, focus on quickstart
- PROJECT_CONTEXT: Condense status, remove recent completions
- TODO: Mark Task #77 complete, remove verbose details
- WORKSPACE_SYSTEM: Mark as completed
Details moved to individual doc/ files.
Net: -76 lines
Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
|
