Reorg examples to top-level

jonmmease · Jan 10, 2024 · 6827496 · 6827496
1 parent 2c74f3e
commit 6827496
Show file tree

Hide file tree

Showing 16 changed files with 24 additions and 52 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,7 +2,7 @@
 /.idea
 /sg2d-wgpu/tests/output/
 .DS_Store
-/sg2d-wgpu/examples/wgpu-winit/pkg/
-/sg2d-wgpu/examples/wgpu-winit/target/
-/sg2d-wgpu/examples/scatter-panning/pkg/
-/sg2d-wgpu/examples/scatter-panning/target/
+examples/wgpu-winit/pkg/
+examples/wgpu-winit/target/
+examples/scatter-panning/pkg/
+examples/scatter-panning/target/
diff --git a/README.md b/README.md
@@ -18,11 +18,11 @@ cargo run
 ## Build wasm
 To build the example above to WASM + WebGL2, run the following:
 ```
-cd sg2d-wgpu/examples/wgpu-winit
+cd examples/wgpu-winit
 wasm-pack build --target web
 ```
 
-Then open `sg2d-wgpu/examples/wgpu-winit/index.html` in a web browser.
+Then open `examples/wgpu-winit/index.html` in a web browser.
 
 ## Export PNG
 The `PngCanvas` struct can be used to convert a scene graph to a PNG image headlessly. See the tests in

diff --git a/...-wgpu/examples/scatter-panning/Cargo.lock → examples/scatter-panning/Cargo.lock b/...-wgpu/examples/scatter-panning/Cargo.lock → examples/scatter-panning/Cargo.lock
diff --git a/...-wgpu/examples/scatter-panning/Cargo.toml → examples/scatter-panning/Cargo.toml b/...-wgpu/examples/scatter-panning/Cargo.toml → examples/scatter-panning/Cargo.toml
@@ -10,9 +10,9 @@ crate-type = ["cdylib", "rlib"]
 [workspace]
 
 [dependencies]
-sg2d-vega = { path = "../../../sg2d-vega" }
-sg2d-wgpu = { path = "../../../sg2d-wgpu" }
-sg2d = { path = "../../../sg2d" }
+sg2d-vega = { path = "../../sg2d-vega" }
+sg2d-wgpu = { path = "../../sg2d-wgpu" }
+sg2d = { path = "../../sg2d" }
 
 cfg-if = "1"
 winit = "0.28"

diff --git a/...-wgpu/examples/scatter-panning/index.html → examples/scatter-panning/index.html b/...-wgpu/examples/scatter-panning/index.html → examples/scatter-panning/index.html
diff --git a/examples/scatter-panning/src/lib.rs b/examples/scatter-panning/src/lib.rs
@@ -0,0 +1,2 @@
+pub mod util;
+pub use util::run;
diff --git a/sg2d-wgpu/examples/wgpu-winit/src/main.rs → examples/scatter-panning/src/main.rs b/sg2d-wgpu/examples/wgpu-winit/src/main.rs → examples/scatter-panning/src/main.rs
@@ -1,4 +1,6 @@
-use wgpu_winit::run;
+use crate::util::run;
+
+mod util;
 
 fn main() {
     pollster::block_on(run());

diff --git a/...-wgpu/examples/scatter-panning/src/lib.rs → examples/scatter-panning/src/util.rs b/...-wgpu/examples/scatter-panning/src/lib.rs → examples/scatter-panning/src/util.rs
diff --git a/sg2d-wgpu/examples/wgpu-winit/Cargo.lock → examples/wgpu-winit/Cargo.lock b/sg2d-wgpu/examples/wgpu-winit/Cargo.lock → examples/wgpu-winit/Cargo.lock
diff --git a/sg2d-wgpu/examples/wgpu-winit/Cargo.toml → examples/wgpu-winit/Cargo.toml b/sg2d-wgpu/examples/wgpu-winit/Cargo.toml → examples/wgpu-winit/Cargo.toml
@@ -10,9 +10,9 @@ crate-type = ["cdylib", "rlib"]
 [workspace]
 
 [dependencies]
-sg2d-vega = { path = "../../../sg2d-vega" }
-sg2d-wgpu = { path = "../../../sg2d-wgpu" }
-sg2d = { path = "../../../sg2d" }
+sg2d-vega = { path = "../../sg2d-vega" }
+sg2d-wgpu = { path = "../../sg2d-wgpu" }
+sg2d = { path = "../../sg2d" }
 
 cfg-if = "1"
 winit = "0.28"

diff --git a/sg2d-wgpu/examples/wgpu-winit/index.html → examples/wgpu-winit/index.html b/sg2d-wgpu/examples/wgpu-winit/index.html → examples/wgpu-winit/index.html
diff --git a/examples/wgpu-winit/src/lib.rs b/examples/wgpu-winit/src/lib.rs
@@ -0,0 +1,2 @@
+pub mod util;
+pub use util::run;
diff --git a/...wgpu/examples/scatter-panning/src/main.rs → examples/wgpu-winit/src/main.rs b/...wgpu/examples/scatter-panning/src/main.rs → examples/wgpu-winit/src/main.rs
@@ -1,4 +1,6 @@
-use scatter_panning::run;
+mod util;
+use crate::util::run;
+
 
 fn main() {
     pollster::block_on(run());

diff --git a/sg2d-wgpu/examples/wgpu-winit/src/lib.rs → examples/wgpu-winit/src/util.rs b/sg2d-wgpu/examples/wgpu-winit/src/lib.rs → examples/wgpu-winit/src/util.rs
@@ -43,13 +43,13 @@ pub async fn run() {
     }
     // Load scene graph
     let scene_spec: VegaSceneGraph = serde_json::from_str(include_str!(
-        "../../../../sg2d-vega-test-data/vega-scenegraphs/symbol/binned_scatter_cross_stroke.sg.json"
+        "../../../sg2d-vega-test-data/vega-scenegraphs/symbol/binned_scatter_cross_stroke.sg.json"
     ))
         .unwrap();
 
     // Load dims
     let scene_dims: VegaSceneGraphDims = serde_json::from_str(include_str!(
-        "../../../../sg2d-vega-test-data/vega-scenegraphs/symbol/binned_scatter_cross_stroke.dims.json"
+        "../../../sg2d-vega-test-data/vega-scenegraphs/symbol/binned_scatter_cross_stroke.dims.json"
     ))
         .unwrap();
 

diff --git a/sg2d-wgpu/Cargo.toml b/sg2d-wgpu/Cargo.toml
@@ -6,16 +6,6 @@ edition = "2021"
 [lib]
 crate-type = ["cdylib", "rlib"]
 
-[[example]]
-name = "wgpu-winit"
-path = "examples/wgpu-winit/src/main.rs"
-crate-type = ["cdylib", "rlib"]
-
-[[example]]
-name = "scatter-panning"
-path = "examples/scatter-panning/src/main.rs"
-crate-type = ["cdylib", "rlib"]
-
 [dependencies]
 sg2d = { path = "../sg2d" }
 

diff --git a/sg2d-wgpu/index.html b/sg2d-wgpu/index.html