Merge pipelines crates into one pipelines crate

PolyMeilex · Aug 19, 2022 · 37876ee · 37876ee
1 parent 19b15ad
commit 37876ee
Show file tree

Hide file tree

Showing 16 changed files with 22 additions and 39 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -10,8 +10,7 @@ members = [
     "lib-midi",
     "piano-math",
     "wgpu-jumpstart",
-    "quad-pipeline",
-    "waterfall-pipeline",
+    "neothesia-pipelines",
     "midi-io",
 ]
 
@@ -39,8 +38,7 @@ bytemuck = "1.5.0"
 futures = "0.3.12"
 
 wgpu-jumpstart = { path = "./wgpu-jumpstart" }
-quad-pipeline = { path = "./quad-pipeline" }
-waterfall-pipeline = { path = "./waterfall-pipeline" }
+neothesia-pipelines = { path = "./neothesia-pipelines" }
 midi-io = { path = "./midi-io" }
 
 winit = "0.27.2"

diff --git a/quad-pipeline/Cargo.toml → neothesia-pipelines/Cargo.toml b/quad-pipeline/Cargo.toml → neothesia-pipelines/Cargo.toml
@@ -1,8 +1,8 @@
 [package]
-name = "quad-pipeline"
+name = "neothesia-pipelines"
 version = "0.1.0"
 edition = "2021"
 
 [dependencies]
 wgpu-jumpstart = { path = "../wgpu-jumpstart" }
-bytemuck = "1.5"
+bytemuck = "1.5"
diff --git a/neothesia-pipelines/src/lib.rs b/neothesia-pipelines/src/lib.rs
@@ -0,0 +1,2 @@
+pub mod quad;
+pub mod waterfall;
diff --git a/quad-pipeline/src/instance_data.rs → ...hesia-pipelines/src/quad/instance_data.rs b/quad-pipeline/src/instance_data.rs → ...hesia-pipelines/src/quad/instance_data.rs
diff --git a/quad-pipeline/src/lib.rs → neothesia-pipelines/src/quad/mod.rs b/quad-pipeline/src/lib.rs → neothesia-pipelines/src/quad/mod.rs
@@ -18,7 +18,7 @@ impl<'a> QuadPipeline {
             .create_shader_module(wgpu::ShaderModuleDescriptor {
                 label: Some("RectanglePipeline::shader"),
                 source: wgpu::ShaderSource::Wgsl(std::borrow::Cow::Borrowed(include_str!(
-                    "./shader/quad.wgsl"
+                    "./shader.wgsl"
                 ))),
             });
 

diff --git a/quad-pipeline/src/shader/quad.wgsl → neothesia-pipelines/src/quad/shader.wgsl b/quad-pipeline/src/shader/quad.wgsl → neothesia-pipelines/src/quad/shader.wgsl
diff --git a/waterfall-pipeline/src/instance_data.rs → ...-pipelines/src/waterfall/instance_data.rs b/waterfall-pipeline/src/instance_data.rs → ...-pipelines/src/waterfall/instance_data.rs
diff --git a/waterfall-pipeline/src/lib.rs → neothesia-pipelines/src/waterfall/mod.rs b/waterfall-pipeline/src/lib.rs → neothesia-pipelines/src/waterfall/mod.rs
@@ -28,7 +28,7 @@ impl<'a> WaterfallPipeline {
             .create_shader_module(wgpu::ShaderModuleDescriptor {
                 label: Some("RectanglePipeline::shader"),
                 source: wgpu::ShaderSource::Wgsl(std::borrow::Cow::Borrowed(include_str!(
-                    "./shader/note.wgsl"
+                    "./shader.wgsl"
                 ))),
             });
 

diff --git a/waterfall-pipeline/src/shader/note.wgsl → ...hesia-pipelines/src/waterfall/shader.wgsl b/waterfall-pipeline/src/shader/note.wgsl → ...hesia-pipelines/src/waterfall/shader.wgsl
diff --git a/src/scene/playing_scene/keyboard.rs b/src/scene/playing_scene/keyboard.rs
@@ -2,7 +2,7 @@ use crate::target::Target;
 use crate::TransformUniform;
 use crate::Uniform;
 use lib_midi::MidiEvent;
-use quad_pipeline::{QuadInstance, QuadPipeline};
+use neothesia_pipelines::quad::{QuadInstance, QuadPipeline};
 
 use piano_math::range::KeyboardRange;
 

diff --git a/src/scene/playing_scene/keyboard/key.rs b/src/scene/playing_scene/keyboard/key.rs
@@ -1,5 +1,5 @@
 use crate::config::ColorSchema;
-use quad_pipeline::QuadInstance;
+use neothesia_pipelines::quad::QuadInstance;
 use wgpu_jumpstart::Color;
 
 pub struct Key {

diff --git a/src/scene/playing_scene/mod.rs b/src/scene/playing_scene/mod.rs
@@ -14,7 +14,7 @@ use notes::Notes;
 use super::{Scene, SceneType};
 
 use crate::{midi_event::MidiEvent, target::Target, NeothesiaEvent};
-use quad_pipeline::{QuadInstance, QuadPipeline};
+use neothesia_pipelines::quad::{QuadInstance, QuadPipeline};
 use wgpu_jumpstart::Color;
 
 use winit::event::WindowEvent;

diff --git a/src/scene/playing_scene/notes.rs b/src/scene/playing_scene/notes.rs
@@ -1,7 +1,7 @@
 use crate::target::Target;
 use crate::TransformUniform;
 use crate::Uniform;
-use waterfall_pipeline::{NoteInstance, WaterfallPipeline};
+use neothesia_pipelines::waterfall::{NoteInstance, WaterfallPipeline};
 use wgpu_jumpstart::Color;
 
 pub struct Notes {

diff --git a/src/scene/scene_transition.rs b/src/scene/scene_transition.rs
@@ -6,7 +6,7 @@ use crate::{
     target::Target,
     Gpu,
 };
-use quad_pipeline::{QuadInstance, QuadPipeline};
+use neothesia_pipelines::quad::{QuadInstance, QuadPipeline};
 
 use winit::event::WindowEvent;
 

diff --git a/waterfall-pipeline/Cargo.toml b/waterfall-pipeline/Cargo.toml