Merge pull request #3 from ada-x64/split-crates

Split lib and app into separate crates

Author: attackgoat

Cargo.lock

@@ -4,18 +4,32 @@ version = "0.1.0"
 authors = ["John Wells <john@attackgoat.com>"]
 edition = "2021"
 
+[workspace]
+members = ["crates/*"]
+
+[workspace.dependencies]
+serde = { version = "1", features = ["derive"] }
+noise = "0.8"
+
+[profile.release]
+opt-level = 2 # fast and small wasm
+
+# Optimize all dependencies even in debug builds:
+[profile.dev.package."*"]
+opt-level = 2
+
 [dependencies]
 crossbeam-channel = "0.5"
 eframe = { version = "0.30", features = [
     "serde",
     "persistence",
-] }
+]}
 egui = "0.30"
 egui-snarl = { git = "https://github.com/zakarumych/egui-snarl", features = ["serde"], rev = "b17ce7513987729f1ebe62ed03ca60bd74dcbac2" }
 log = "0.4"
-noise = "0.8"
-ordered-float = "4.2"
-serde = { version = "1", features = ["derive"] }
+noise_expr={path="./crates/noise_expr"}
+serde = {workspace = true}
+noise={workspace = true}
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
 anyhow = "1.0"
@@ -31,10 +45,3 @@ web-sys = "0.3"
 anyhow = "1.0"
 lazy_static = "1.4"
 rand = "0.8"
-
-[profile.release]
-opt-level = 2 # fast and small wasm
-
-# Optimize all dependencies even in debug builds:
-[profile.dev.package."*"]
-opt-level = 2

Cargo.toml

@@ -65,6 +65,8 @@ trunk serve --open
 Completed noise graphs may be exported (_right-click on any node_). The output file is `.ron` format
 and may be deserialized for use in your programs.
 
+_See [`noise_expr`](crates/noise_expr/README.md)_
+
 Once deserialized into an `Expr` instance you may replace any decimal or integer values using their
 name and the `Expr::set_f64` and `Expr::set_u32` functions. Note that node names do not have to be
 unique and that all nodes sharing the provided name will be updated. The `Expr::noise` function may
@@ -73,5 +75,5 @@ be used to retrieve a Noise-rs `NoiseFn` implementation.
 See the example for more details:
 
 ```bash
-cargo run --example read_file
+cargo run --example read_file --package noise_expr
 ```

README.md

@@ -0,0 +1,20 @@
+[package]
+name = "noise_expr"
+version = "0.1.0"
+authors = ["John Wells <john@attackgoat.com>"]
+edition = "2021"
+
+[dependencies]
+noise = {workspace = true}
+ordered-float = "4.2"
+serde = {workspace = true}
+
+[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
+anyhow = "1.0"
+env_logger = "0.10"
+rfd = "0.12"
+ron = "0.8"
+
+[target.'cfg(target_arch = "wasm32")'.dependencies]
+wasm-bindgen-futures = "0.4"
+web-sys = "0.3"

crates/noise_expr/Cargo.toml

@@ -0,0 +1,11 @@
+# `noise_expr`
+
+[![GitHub](https://img.shields.io/badge/github-attackgoat/noise__expr-blue?logo=github)](https://github.com/attackgoat/noise_gui/crates/noise_expr)
+[![crates.io](https://img.shields.io/crates/v/noise_expr)](https://crates.io/crates/noise_expr)
+[![docs.rs](https://img.shields.io/docsrs/noise_expr)](https://docs.rs/noise_gui/latest/noise_expr/)
+[![MIT](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/attackgoat/noise_gui/blob/master/LICENSE-MIT)
+[![Apache](https://img.shields.io/badge/license-Apache-blue.svg)](https://github.com/attackgoat/noise_gui/blob/master/LICENSE-APACHE)
+
+---
+
+A graph serialization library for [`noise_gui`](https://github.com/attackgoat/noise_gui).

crates/noise_expr/README.md

@@ -0,0 +1,11 @@
+# Examples
+
+## Read Expression File
+
+```bash
+cargo run --example read_file
+```
+
+This example reads an exported expression `.ron` file and returns `NoiseFn` implementations with
+different variable values. You may export any expression in the desktop app by right-clicking on the
+node.

crates/noise_expr/examples/README.md

@@ -1,4 +1,4 @@
-use noise_gui::Expr;
+use noise_expr::Expr;
 
 fn main() {
     let mut test_expr: Expr = ron::from_str(include_str!("test.ron")).unwrap();

examples/read_file.rs crates/noise_expr/examples/read_file.rsexamples/read_file.rs renamed to crates/noise_expr/examples/read_file.rs

@@ -695,9 +695,10 @@ impl SelectExpr {
     }
 }
 
-#[derive(Clone, Copy, Debug, PartialEq, Serialize, Deserialize)]
+#[derive(Clone, Copy, Debug, PartialEq, Serialize, Deserialize, Default)]
 pub enum SourceType {
     OpenSimplex,
+    #[default]
     Perlin,
     PerlinSurflet,
     Simplex,