basic guides in UI

wasm
mkhan45 · Apr 11, 2021 · e4e6aa1 · e4e6aa1
1 parent d48cec2
commit e4e6aa1
Show file tree

Hide file tree

Showing 7 changed files with 107 additions and 42 deletions.
diff --git a/docs/simple_electronics.wasm b/docs/simple_electronics.wasm
diff --git a/src/main.rs b/src/main.rs
@@ -11,10 +11,7 @@ mod svg;
 mod systems;
 mod ui;
 
-use components::{
-    nodes::{self, add_node_systems},
-    Orientation,
-};
+use components::nodes::{self, add_node_systems};
 use components::{Connected, Pos};
 use systems::draw_systems::add_draw_system;
 use systems::simulation_systems::*;
@@ -32,7 +29,8 @@ async fn main() {
     };
 
     let mut draw_dispatcher = {
-        let mut builder = DispatcherBuilder::new();
+        let mut builder =
+            DispatcherBuilder::new().with_thread_local(systems::ui_systems::CurrentModeSys);
         builder = add_draw_system(builder);
         builder.build()
     };
@@ -175,6 +173,12 @@ async fn main() {
         }
 
         egui_macroquad::ui(|egui_ctx| {
+            use egui::{FontDefinitions, TextStyle};
+            let mut fonts = FontDefinitions::default();
+            fonts.family_and_size.get_mut(&TextStyle::Button).unwrap().1 = 24.0;
+            fonts.family_and_size.get_mut(&TextStyle::Body).unwrap().1 = 28.0;
+            egui_ctx.set_fonts(fonts);
+
             egui::TopPanel::top("SIMple Electronics").show(egui_ctx, |ui| {
                 ui::top_panel::render_top_panel(ui, &mut world);
             });

diff --git a/src/resources.rs b/src/resources.rs
@@ -12,6 +12,9 @@ pub struct Textures(pub std::collections::BTreeMap<String, Texture2D>);
 #[derive(Default)]
 pub struct AddingNode(pub Option<NodeTy>);
 
+// should probably not be a tuple struct
+// it goes
+// input node entity, wire entity, x pos, y pos
 #[derive(Default)]
 pub struct AddingWire(pub Option<(Entity, Entity, Option<f32>, Option<f32>)>);
 
@@ -45,3 +48,13 @@ impl Default for GridMode {
         GridMode::CrossHatches
     }
 }
+
+pub struct CurrentModeText(pub String);
+
+impl Default for CurrentModeText {
+    fn default() -> Self {
+        CurrentModeText(
+            "Right click a node to add a wire or click on the menu to choose a node".to_string(),
+        )
+    }
+}
diff --git a/src/systems.rs b/src/systems.rs
@@ -2,3 +2,4 @@ pub mod draw_systems;
 pub mod place_node_sys;
 pub mod place_wire_sys;
 pub mod simulation_systems;
+pub mod ui_systems;
diff --git a/src/systems/draw_systems.rs b/src/systems/draw_systems.rs
@@ -263,7 +263,7 @@ impl<'a> System<'a> for DrawGridSys {
 
     fn run(&mut self, grid_mode: Self::SystemData) {
         use crate::components::SNAP;
-        let s = 3;
+        let s = 4;
 
         match *grid_mode {
             GridMode::Lines => {

diff --git a/src/systems/ui_systems.rs b/src/systems/ui_systems.rs
@@ -0,0 +1,37 @@
+use specs::prelude::*;
+
+use crate::resources::{AddingNode, AddingWire, CurrentModeText};
+
+pub struct CurrentModeSys;
+impl<'a> System<'a> for CurrentModeSys {
+    type SystemData = (
+        Write<'a, CurrentModeText>,
+        Read<'a, AddingNode>,
+        Read<'a, AddingWire>,
+    );
+
+    fn run(&mut self, (mut current_mode, adding_node, adding_wire): Self::SystemData) {
+        match adding_node.0 {
+            Some(_) => {
+                current_mode.0 = "Click to place node".to_string();
+                return;
+            }
+            _ => {}
+        };
+
+        match adding_wire.0 {
+            Some((_, _, None, Some(_))) => {
+                current_mode.0 = "Right click to set wire position".to_string();
+                return;
+            }
+            Some((_, _, Some(_), Some(_))) => {
+                current_mode.0 =
+                    "Right click a node to set wire output or left click to cancel".to_string();
+                return;
+            }
+            _ => {}
+        };
+
+        *current_mode = CurrentModeText::default();
+    }
+}
diff --git a/src/ui/top_panel.rs b/src/ui/top_panel.rs
@@ -1,52 +1,62 @@
+use crate::resources::CurrentModeText;
 use crate::resources::{self, GridMode};
 use crate::ResetSys;
 use crate::{components::nodes, UiSignal};
 use egui::menu;
+use egui::Layout;
 use macroquad::prelude::*;
 use specs::prelude::*;
 
 pub fn render_top_panel(ui: &mut egui::Ui, world: &mut World) {
     ui.horizontal(|ui| {
-        menu::menu(ui, "Nodes", |ui| {
-            macro_rules! node_button {
-                ( $name:expr, $node:ident ) => {
-                    if ui.button($name).clicked() {
-                        world
-                            .fetch_mut::<resources::UiSignals>()
-                            .0
-                            .push(UiSignal::AddNode(nodes::NodeTy::$node));
-                    }
-                };
-            }
+        ui.horizontal(|ui| {
+            menu::menu(ui, "Nodes", |ui| {
+                macro_rules! node_button {
+                    ( $name:expr, $node:ident ) => {
+                        if ui.button($name).clicked() {
+                            world
+                                .fetch_mut::<resources::UiSignals>()
+                                .0
+                                .push(UiSignal::AddNode(nodes::NodeTy::$node));
+                        }
+                    };
+                }
 
-            node_button!("Connection Node", Wire);
-            node_button!("On Node", OnNode);
-            node_button!("Off Node", OffNode);
-            node_button!("Not Node", NotNode);
-            node_button!("And Node", AndNode);
-            node_button!("Or Node", OrNode);
-            node_button!("Nand Node", NandNode);
-            node_button!("Nor Node", NorNode);
-            node_button!("Xor Node", XorNode);
-            node_button!("Xnor Node", XnorNode);
-        });
+                node_button!("Connection Node", Wire);
+                node_button!("On Node", OnNode);
+                node_button!("Off Node", OffNode);
+                node_button!("Not Node", NotNode);
+                node_button!("And Node", AndNode);
+                node_button!("Or Node", OrNode);
+                node_button!("Nand Node", NandNode);
+                node_button!("Nor Node", NorNode);
+                node_button!("Xor Node", XorNode);
+                node_button!("Xnor Node", XnorNode);
+            });
+
+            if ui.button("Restart Sim").clicked() || is_key_pressed(KeyCode::Space) {
+                ResetSys.run_now(&world);
+                world.insert(resources::Tick(0));
+            }
 
-        if ui.button("Restart Sim").clicked() || is_key_pressed(KeyCode::Space) {
-            ResetSys.run_now(&world);
-            world.insert(resources::Tick(0));
-        }
+            let mut grid_mode = *world.fetch::<GridMode>();
+            menu::menu(ui, "Grid Mode", |ui| {
+                ui.radio_value(&mut grid_mode, GridMode::CrossHatches, "Cross Hatches");
+                ui.radio_value(&mut grid_mode, GridMode::Lines, "Lines");
+                ui.radio_value(&mut grid_mode, GridMode::Dots, "Dots");
+                ui.radio_value(&mut grid_mode, GridMode::Off, "Off");
+            });
+            world.insert(grid_mode);
 
-        let mut grid_mode = *world.fetch::<GridMode>();
-        menu::menu(ui, "Grid Mode", |ui| {
-            ui.radio_value(&mut grid_mode, GridMode::CrossHatches, "Cross Hatches");
-            ui.radio_value(&mut grid_mode, GridMode::Lines, "Lines");
-            ui.radio_value(&mut grid_mode, GridMode::Dots, "Dots");
-            ui.radio_value(&mut grid_mode, GridMode::Off, "Off");
+            if ui.button("Remove All").clicked() {
+                world.delete_all();
+            }
         });
-        world.insert(grid_mode);
 
-        if ui.button("Remove All").clicked() {
-            world.delete_all();
-        }
+        ui.with_layout(Layout::right_to_left(), |ui| {
+            ui.label("\t\t");
+            let current_mode = world.fetch::<CurrentModeText>();
+            ui.label(&current_mode.0);
+        });
     });
 }