Merge pull request #38 from Cactice/reuse-in-other-repo

Multiple components & nested layout

Cargo.toml

@@ -1,15 +1,14 @@
 [workspace]
 resolver = "2"
 members = [
-  "concept",
+  "experiment",
   "guppies",
   "salvage",
   "run-wasm",
   "examples/life",
   "examples/layout",
   "examples/list",
 ]
-default-members = ["examples/layout"]
 
 [profile.release]
 lto = true

README.md

@@ -2,5 +2,8 @@
 
 Using svg to generate dynamic vector graphics for GUI purpose
 
+# Demo
+`cargo run --bin layout`
+
 # Status
 WIP: Don't look. It's a mess.

examples/layout/Cargo.toml

@@ -16,7 +16,7 @@ path = "src/main.rs"
 mobile-entry-point = "0.1.1"
 guppies = { path = "../../guppies" }
 salvage = { path = "../../salvage" }
-concept = { path = "../../concept" }
+experiment = { path = "../../experiment" }
 
 [target.'cfg(target_os = "android")'.dependencies]
 android_logger = "0.11.0"

examples/layout/src/main.rs

@@ -1,21 +1,17 @@
-use concept::{responsive::layout_machine::LayoutMachine, scroll::ScrollState, uses::use_svg};
+use experiment::{responsive::layout_machine::LayoutMachine, uses::use_svg};
 use guppies::bytemuck::cast_slice;
-use guppies::{
-    glam::Mat4,
-    winit::event::{ElementState, WindowEvent},
-    GpuRedraw, Guppy,
-};
+use guppies::{GpuRedraw, Guppy};
 use mobile_entry_point::mobile_entry_point;
-use std::vec;
 
 pub fn main() {
     let mut layout_machine = LayoutMachine::default();
 
     let svg_set = use_svg(
         include_str!("../MenuBar.svg").to_string(),
-        |node, _pass_down| {
-            layout_machine.add_node(node);
+        |node, mut _pass_down| {
+            layout_machine.add_node(&node, &mut _pass_down);
         },
+        None,
     );
 
     let mut guppy = Guppy::new([GpuRedraw::default()]);

examples/life/Cargo.toml

@@ -13,10 +13,10 @@ name = "life"
 path = "src/main.rs"
 
 [dependencies]
-mobile-entry-point = "0.1.0"
+mobile-entry-point = "0.1.1"
 guppies = { path = "../../guppies" }
 salvage = { path = "../../salvage" }
-concept = { path = "../../concept" }
+experiment = { path = "../../experiment" }
 regex = "1"
 bytemuck = "1.13.1"
 fastrand = "2.0.0"

examples/life/src/main.rs

@@ -1,10 +1,10 @@
-use concept::scroll::ScrollState;
-use concept::spring::SpringMat4;
-use concept::svg_init::get_center;
-use concept::uses::use_svg;
+use experiment::scroll::ScrollState;
+use experiment::spring::SpringMat4;
+use experiment::svg_init::get_center;
+use experiment::uses::use_svg;
 use guppies::bytemuck::{cast_slice, Pod, Zeroable};
 use guppies::glam::{Mat4, Vec2};
-use guppies::winit::event::Event;
+use guppies::winit::event::{Event, WindowEvent};
 use guppies::{GpuRedraw, Guppy};
 use regex::Regex;
 use salvage::svg_set::SvgSet;
@@ -84,6 +84,7 @@ pub fn main() {
                 }
             };
         },
+        None,
     );
     let mut life_game = LifeGame {
         position_to_coordinates,
@@ -99,16 +100,27 @@ pub fn main() {
         .map(|_| SpringMat4::default());
     let start_center = Mat4::from_translation((life_game.position_to_coordinates[0], 0.).into());
     let mut guppy = Guppy::new([GpuRedraw::default()]);
+
     guppy.register(move |event, gpu_redraw| {
         let clicked = scroll_state.event_handler(event);
-        if let Event::RedrawRequested(_) = event {
-            tip_animation.update(&mut texture.tip_transform, &mut player_animations);
-            player_animations
-                .iter_mut()
-                .enumerate()
-                .for_each(|(i, animation)| {
-                    animation.update(&mut texture.player_avatar_transforms[i], &mut svg_set);
-                });
+        match event {
+            Event::WindowEvent {
+                window_id: _,
+                event,
+            } => match event {
+                WindowEvent::RedrawRequested => {
+                    tip_animation.update(&mut texture.tip_transform, &mut player_animations);
+                    player_animations
+                        .iter_mut()
+                        .enumerate()
+                        .for_each(|(i, animation)| {
+                            animation
+                                .update(&mut texture.player_avatar_transforms[i], &mut svg_set);
+                        });
+                }
+                _ => {}
+            },
+            _ => (),
         }
         if clicked {
             if tip_animation.is_animating

examples/list/Cargo.toml

@@ -13,10 +13,10 @@ name = "list"
 path = "src/main.rs"
 
 [dependencies]
-mobile-entry-point = "0.1.0"
+mobile-entry-point = "0.1.1"
 guppies = { path = "../../guppies" }
 salvage = { path = "../../salvage" }
-concept = { path = "../../concept" }
+experiment = { path = "../../experiment" }
 
 [target.'cfg(target_os = "android")'.dependencies]
 android_logger = "0.11.0"