diff options
Diffstat (limited to 'workspaces')
| -rw-r--r-- | workspaces/main/assets.txt | 14 | ||||
| -rw-r--r-- | workspaces/main/timeline.seq | 4 |
2 files changed, 9 insertions, 9 deletions
diff --git a/workspaces/main/assets.txt b/workspaces/main/assets.txt index e1cf2bc..189e965 100644 --- a/workspaces/main/assets.txt +++ b/workspaces/main/assets.txt @@ -37,13 +37,13 @@ SHADER_PASSTHROUGH, NONE, ../../common/shaders/passthrough.wgsl, "Passthrough Sh SHADER_ELLIPSE, NONE, shaders/ellipse.wgsl, "Ellipse Shader" SHADER_PARTICLE_SPRAY_COMPUTE, NONE, shaders/particle_spray_compute.wgsl, "Particle Spray Compute" SHADER_GAUSSIAN_BLUR, NONE, shaders/gaussian_blur.wgsl, "Gaussian Blur Shader" -SHADER_CNN_ACTIVATION, NONE, shaders/cnn/cnn_activation.wgsl, "CNN Activation Functions" -SHADER_CNN_CONV1X1, NONE, shaders/cnn/cnn_conv1x1.wgsl, "CNN 1x1 Convolution" -SHADER_CNN_CONV3X3, NONE, shaders/cnn/cnn_conv3x3.wgsl, "CNN 3x3 Convolution" -SHADER_CNN_CONV5X5, NONE, shaders/cnn/cnn_conv5x5.wgsl, "CNN 5x5 Convolution" -SHADER_CNN_CONV7X7, NONE, shaders/cnn/cnn_conv7x7.wgsl, "CNN 7x7 Convolution" -SHADER_CNN_WEIGHTS, NONE, shaders/cnn/cnn_weights_generated.wgsl, "CNN Weights (Generated)" -SHADER_CNN_LAYER, NONE, shaders/cnn/cnn_layer.wgsl, "CNN Layer Shader" +SHADER_CNN_ACTIVATION, NONE, ../../cnn_v1/shaders/cnn_activation.wgsl, "CNN Activation Functions" +SHADER_CNN_CONV1X1, NONE, ../../cnn_v1/shaders/cnn_conv1x1.wgsl, "CNN 1x1 Convolution" +SHADER_CNN_CONV3X3, NONE, ../../cnn_v1/shaders/cnn_conv3x3.wgsl, "CNN 3x3 Convolution" +SHADER_CNN_CONV5X5, NONE, ../../cnn_v1/shaders/cnn_conv5x5.wgsl, "CNN 5x5 Convolution" +SHADER_CNN_CONV7X7, NONE, ../../cnn_v1/shaders/cnn_conv7x7.wgsl, "CNN 7x7 Convolution" +SHADER_CNN_WEIGHTS, NONE, ../../cnn_v1/shaders/cnn_weights_generated.wgsl, "CNN Weights (Generated)" +SHADER_CNN_LAYER, NONE, ../../cnn_v1/shaders/cnn_layer.wgsl, "CNN Layer Shader" SHADER_CNN_V2_STATIC, NONE, ../../cnn_v2/shaders/cnn_v2_static.wgsl, "CNN v2 Static Features" SHADER_CNN_V2_COMPUTE, NONE, ../../cnn_v2/shaders/cnn_v2_compute.wgsl, "CNN v2 Compute (Storage Buffer)" WEIGHTS_CNN_V2, NONE, ../../cnn_v2/weights/cnn_v2_weights.bin, "CNN v2 Binary Weights" diff --git a/workspaces/main/timeline.seq b/workspaces/main/timeline.seq index 05d9026..b4663bb 100644 --- a/workspaces/main/timeline.seq +++ b/workspaces/main/timeline.seq @@ -29,12 +29,12 @@ SEQUENCE 16.00 2 "Hybrid3D + CNN" EFFECT + ParticleSprayEffect 0.00 2.00 EFFECT = ParticlesEffect 2.00 4.00 EFFECT + Hybrid3DEffect 0.00 4.00 - EFFECT + CNNEffect 0.00 4.00 layers=3 blend=.9 + EFFECT + CNNv1Effect 0.00 4.00 layers=3 blend=.9 SEQUENCE 20.00 0 "CNN effect" EFFECT + HeptagonEffect 0.00 8.00 EFFECT + Scene1Effect 0.00 8.00 - EFFECT + CNNEffect 6.00 8.00 layers=3 blend=.5 + EFFECT + CNNv1Effect 6.00 8.00 layers=3 blend=.5 SEQUENCE 28.00 0 "buggy" EFFECT + HeptagonEffect 0.00 2.00 |