POC: Neothesia Web

PolyMeilex · Jun 4, 2023 · 71ffad4 · 71ffad4
1 parent 25f809a
commit 71ffad4
Show file tree

Hide file tree

Showing 13 changed files with 383 additions and 8 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -6,6 +6,7 @@ members = [
     "neothesia-cli",
     "neothesia-core",
     "neothesia-pipelines",
+    "neothesia-web",
     "midi-file",
     "midi-io",
 ]

diff --git a/midi-file/Cargo.toml b/midi-file/Cargo.toml
@@ -5,4 +5,4 @@ authors = ["Poly <[email protected]>"]
 edition = "2021"
 
 [dependencies]
-midly = "0.5"
+midly = { version = "0.5", default-features = false, features = ["std"] }
diff --git a/midi-file/src/midi.rs b/midi-file/src/midi.rs
@@ -16,7 +16,11 @@ impl Midi {
             Err(_) => return Err(String::from("Could Not Open File")),
         };
 
-        let smf = match Smf::parse(&data) {
+        Self::new_from_bytes(&data)
+    }
+
+    pub fn new_from_bytes(data: &[u8]) -> Result<Self, String> {
+        let smf = match Smf::parse(data) {
             Ok(smf) => smf,
             Err(_) => return Err(String::from("Midi Parsing Error (midly lib)")),
         };

diff --git a/neothesia-core/src/utils/resources.rs b/neothesia-core/src/utils/resources.rs
@@ -48,6 +48,9 @@ pub fn default_sf2() -> Option<PathBuf> {
 
     #[cfg(target_os = "macos")]
     return bundled_resource_path("default", "sf2").map(PathBuf::from);
+
+    #[cfg(target_family = "wasm")]
+    return None;
 }
 
 pub fn settings_ron() -> Option<PathBuf> {
@@ -59,6 +62,9 @@ pub fn settings_ron() -> Option<PathBuf> {
 
     #[cfg(target_os = "macos")]
     return bundled_resource_path("settings", "ron").map(PathBuf::from);
+
+    #[cfg(target_family = "wasm")]
+    return None;
 }
 
 #[cfg(target_os = "macos")]

diff --git a/neothesia-pipelines/src/waterfall/mod.rs b/neothesia-pipelines/src/waterfall/mod.rs
@@ -26,7 +26,7 @@ impl<'a> WaterfallPipeline {
         let shader = gpu
             .device
             .create_shader_module(wgpu::ShaderModuleDescriptor {
-                label: Some("RectanglePipeline::shader"),
+                label: Some("waterfall::shader"),
                 source: wgpu::ShaderSource::Wgsl(std::borrow::Cow::Borrowed(include_str!(
                     "./shader.wgsl"
                 ))),
@@ -41,7 +41,7 @@ impl<'a> WaterfallPipeline {
         let render_pipeline_layout =
             &gpu.device
                 .create_pipeline_layout(&wgpu::PipelineLayoutDescriptor {
-                    label: None,
+                    label: Some("waterfall::pipeline"),
                     bind_group_layouts: &[
                         &transform_uniform.bind_group_layout,
                         &time_uniform.bind_group_layout,
@@ -106,10 +106,18 @@ impl<'a> WaterfallPipeline {
 #[derive(Clone, Copy, Pod, Zeroable)]
 struct TimeUniform {
     time: f32,
+    _pad1: f32,
+    _pad2: f32,
+    _pad3: f32,
 }
 
 impl Default for TimeUniform {
     fn default() -> Self {
-        Self { time: 0.0 }
+        Self {
+            time: 0.0,
+            _pad1: 0.0,
+            _pad2: 0.0,
+            _pad3: 0.0,
+        }
     }
 }
diff --git a/neothesia-pipelines/src/waterfall/shader.wgsl b/neothesia-pipelines/src/waterfall/shader.wgsl
@@ -6,6 +6,9 @@ struct ViewUniform {
 
 struct TimeUniform {
     time: f32,
+    _pad1: f32,
+    _pad2: f32,
+    _pad3: f32,
 }
 
 @group(0) @binding(0)

diff --git a/neothesia-web/.gitignore b/neothesia-web/.gitignore
@@ -0,0 +1 @@
+dist
diff --git a/neothesia-web/Cargo.toml b/neothesia-web/Cargo.toml
@@ -0,0 +1,25 @@
+[package]
+name = "neothesia-web"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+neothesia-core = { workspace = true }
+wgpu = { workspace = true, features = ["webgl"] }
+wgpu-jumpstart = { workspace = true }
+
+winit = { version = "0.28.2" }
+env_logger = { workspace = true }
+pollster = "0.3.0"
+console_log = "1.0.0"
+web-sys = "0.3.61"
+wasm-bindgen = "0.2"
+wasm-bindgen-futures = "0.4.34"
+console_error_panic_hook = "0.1.7"
+
+midi-file = { workspace = true }
+piano-math = { workspace = true }
+log = { workspace = true }
+instant = "0.1.12"
+
+getrandom = { version = "0.2", features = ["js"] }
diff --git a/neothesia-web/README.md b/neothesia-web/README.md
@@ -0,0 +1,4 @@
+# Run
+```
+trunk serve --open
+```
diff --git a/neothesia-web/index.html b/neothesia-web/index.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <title>Trunk | Vanilla | web-sys</title>
+
+    <base data-trunk-public-url />
+
+    <style>
+        html {
+            background-color: black;
+            height: 100%;
+
+            margin: 0;
+            padding: 0;
+        }
+
+        body {
+            margin: 0;
+            padding: 0;
+            height: 100%;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+        }
+    </style>
+</head>
+
+<body>
+    <link data-trunk rel="rust" href="Cargo.toml" data-wasm-opt="z" data-bin="neothesia-web" />
+</body>
+
+</html>