summaryrefslogtreecommitdiff
path: root/workspaces
diff options
context:
space:
mode:
Diffstat (limited to 'workspaces')
-rw-r--r--workspaces/main/assets.txt3
-rw-r--r--workspaces/main/timeline.seq26
-rw-r--r--workspaces/main/weights/cnn_v3_film_mlp.binbin0 -> 3104 bytes
-rw-r--r--workspaces/main/weights/cnn_v3_weights.binbin0 -> 3928 bytes
4 files changed, 20 insertions, 9 deletions
diff --git a/workspaces/main/assets.txt b/workspaces/main/assets.txt
index 4cb4f40..f22552b 100644
--- a/workspaces/main/assets.txt
+++ b/workspaces/main/assets.txt
@@ -101,6 +101,7 @@ SHADER_RENDER_NTSC_COMMON, WGSL, ../../src/shaders/render/ntsc_common.wgsl, "NTS
# --- CNN v3 G-Buffer ---
SHADER_GBUF_RASTER, WGSL, ../../cnn_v3/shaders/gbuf_raster.wgsl, "CNN v3 G-buffer MRT rasterization shader"
SHADER_GBUF_PACK, WGSL, ../../cnn_v3/shaders/gbuf_pack.wgsl, "CNN v3 G-buffer feature pack compute shader"
+SHADER_GBUF_VIEW, WGSL, ../../cnn_v3/shaders/gbuf_view.wgsl, "CNN v3 G-buffer channel visualization (4x5 grid)"
# --- CNN v3 Inference ---
SHADER_CNN_V3_COMMON, WGSL, ../../cnn_v3/shaders/cnn_v3_common.wgsl, "CNN v3 shared helpers snippet (get_w, unpack_8ch)"
@@ -110,6 +111,8 @@ SHADER_CNN_V3_BOTTLENECK, WGSL, ../../cnn_v3/shaders/cnn_v3_bottleneck.wgsl, "CN
SHADER_CNN_V3_DEC1, WGSL, ../../cnn_v3/shaders/cnn_v3_dec1.wgsl, "CNN v3 decoder level 1"
SHADER_CNN_V3_DEC0, WGSL, ../../cnn_v3/shaders/cnn_v3_dec0.wgsl, "CNN v3 decoder level 0 + sigmoid output"
SHADER_DEBUG_DEBUG_PRINT, WGSL, ../../src/shaders/debug/debug_print.wgsl, "Debug print snippet"
+WEIGHTS_CNN_V3, BINARY, weights/cnn_v3_weights.bin, "CNN v3 conv weights (f16, 3928 bytes)"
+WEIGHTS_CNN_V3_FILM_MLP, BINARY, weights/cnn_v3_film_mlp.bin, "CNN v3 FiLM MLP weights (f32, 3104 bytes)"
# --- Sequence Shaders ---
SHADER_SEQUENCE_V2_UNIFORMS, WGSL, ../../src/shaders/sequence_uniforms.wgsl, "Sequence Uniforms Snippet"
diff --git a/workspaces/main/timeline.seq b/workspaces/main/timeline.seq
index ee7e1e7..557e73d 100644
--- a/workspaces/main/timeline.seq
+++ b/workspaces/main/timeline.seq
@@ -10,21 +10,23 @@ SEQUENCE 8.00 0 "scene 2"
EFFECT + Scene2Effect source -> temp1 0.0 4.0
EFFECT + Ntsc temp1 -> sink 0.00 4.00
-SEQUENCE 12.00 1 "particles"
- # Particles -> Blur -> sink
- EFFECT + Particles source -> temp1 0.00 4.00
- EFFECT = GaussianBlur temp1 -> temp2 0.00 4.00
- EFFECT + Ntsc temp2 -> sink 0.00 4.00
+SEQUENCE 12.00 0 "cnn_v3_test"
+ NODE gbuf_feat0 gbuf_rgba32uint
+ NODE gbuf_feat1 gbuf_rgba32uint
+ NODE cnn_v3_out gbuf_albedo
+ EFFECT + GBufferEffect source -> gbuf_feat0 gbuf_feat1 0.00 8.00
+ EFFECT + CNNv3Effect gbuf_feat0 gbuf_feat1 -> cnn_v3_out 0.00 8.00
+ EFFECT + Passthrough cnn_v3_out -> sink 0.00 8.00
-SEQUENCE 16.00 2 "hybrid_heptagon"
+SEQUENCE 20.00 2 "hybrid_heptagon"
# Heptagon -> Hybrid3D -> sink
EFFECT + Heptagon source -> temp1 0.00 4.00
EFFECT + Hybrid3D temp1 -> temp2 0.00 4.00
EFFECT + Ntsc temp2 -> sink 0.00 4.00
-SEQUENCE 20.00 0 "heptagon_scene"
- EFFECT + Scene1 source -> temp1 0.00 8.00
- EFFECT + Ntsc temp1 -> sink 0.00 8.00
+SEQUENCE 24.00 0 "heptagon_scene"
+ EFFECT + Scene1 source -> temp1 0.00 4.00
+ EFFECT + Ntsc temp1 -> sink 0.00 4.00
SEQUENCE 28.00 0 "fade_test"
# Heptagon -> Ntsc -> sink
@@ -42,3 +44,9 @@ SEQUENCE 30.00 3 "complex_chain"
SEQUENCE 40.00 0 "ntsc"
EFFECT + Scene1 source -> temp1 0.00 8.00
EFFECT + Ntsc temp1 -> sink 0.00 8.00
+
+SEQUENCE 48.00 1 "particles"
+ # Particles -> Blur -> sink
+ EFFECT + Particles source -> temp1 0.00 4.00
+ EFFECT = GaussianBlur temp1 -> temp2 0.00 4.00
+ EFFECT + Ntsc temp2 -> sink 0.00 4.00
diff --git a/workspaces/main/weights/cnn_v3_film_mlp.bin b/workspaces/main/weights/cnn_v3_film_mlp.bin
new file mode 100644
index 0000000..a49dcbe
--- /dev/null
+++ b/workspaces/main/weights/cnn_v3_film_mlp.bin
Binary files differ
diff --git a/workspaces/main/weights/cnn_v3_weights.bin b/workspaces/main/weights/cnn_v3_weights.bin
new file mode 100644
index 0000000..7890fea
--- /dev/null
+++ b/workspaces/main/weights/cnn_v3_weights.bin
Binary files differ