improve ui

jan-tennert · May 7, 2024 · da05de2 · da05de2
1 parent 1a820ed
commit da05de2
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 10 deletions.
diff --git a/src/flower.rs b/src/flower.rs
@@ -48,20 +48,17 @@ pub fn spawn_flowers(
     seed_radius: f32,
     seed_distance: f32,
     seed_rotation: f32
-) {
-    // Golden ratio
-
-    // Starting angle
+) {    
     let start_angle = 0.0;
 
     for i in 1..num_seeds {
         let angle = start_angle + ((2.0 * PI)/ (1. / seed_rotation)) * (i as f32);
-        let radius = 5.0 * (i as f32).sqrt(); // Adjust radius based on index
-        let x = angle.cos() * radius * seed_distance; // Multiply by 2.0 to space them out more
+        let radius = 5.0 * (i as f32).sqrt(); 
+        let x = angle.cos() * radius * seed_distance; 
         let y = angle.sin() * radius * seed_distance;
 
         commands.spawn(MaterialMesh2dBundle {
-            mesh: Mesh2dHandle(meshes.add(Circle { radius: seed_radius })), // Use smaller radius for points
+            mesh: Mesh2dHandle(meshes.add(Circle { radius: seed_radius })), 
             material: materials.add(Color::ORANGE),
             transform: Transform::from_xyz(x, y, 0.0),
             ..Default::default()

diff --git a/src/ui.rs b/src/ui.rs
@@ -1,7 +1,7 @@
 use std::f32::consts::PI;
 use bevy::{prelude::*, sprite::{Mesh2dHandle, MaterialMesh2dBundle}};
 use crate::{constants::PHI, flower::{clear_flowers, spawn_flowers, FlowerSeed, NumberSeeds, SeedDistance, SeedRadius, SeedRotation}};
-use bevy_egui::{egui::{self, InnerResponse, Response, Ui, ScrollArea}, EguiContexts};
+use bevy_egui::{egui::{self, InnerResponse, Response, ScrollArea, Ui}, EguiContexts, EguiSettings};
 
 pub struct UiPlugin;
 
@@ -21,7 +21,9 @@ pub fn settings_ui(
     mut num_seeds: ResMut<NumberSeeds>,
     mut seed_radius: ResMut<SeedRadius>,
     mut seed_distance: ResMut<SeedDistance>,   
-    flowers: Query<Entity, With<FlowerSeed>> 
+    flowers: Query<Entity, With<FlowerSeed>>,
+    mut egui_settings: ResMut<EguiSettings>,
+    keys: Res<ButtonInput<KeyCode>>,
 ) {
     let mut changed = false;
     egui::SidePanel::left("settings_ui")
@@ -32,7 +34,17 @@ pub fn settings_ui(
                 .auto_shrink(true)
                 .show(ui, |ui| {
                     ui.heading("Settings");
-                    let r_changed = ui.add(egui::Slider::new(&mut seed_rotation.0, 0.0..=1.0).text("Rotation per seed")).changed();
+                    let mut r_changed = ui.add(egui::Slider::new(&mut seed_rotation.0, 0.0..=1.0).step_by(0.00001).drag_value_speed(0.0001).text("Rotation per seed")).changed();
+                    ui.horizontal(|ui| {
+                        if ui.button("1/PI").clicked() {
+                            r_changed = true;
+                            seed_rotation.0 = 1.0 / PI;
+                        }
+                        if ui.button("1/PHI").clicked() {
+                            r_changed = true;
+                            seed_rotation.0 = 1.0 / PHI;
+                        }
+                    });
                     let d_changed = ui.add(egui::Slider::new(&mut seed_distance.0, 0.0..=30.0).text("Seed density")).changed();
                     let ra_changed = ui.add(egui::Slider::new(&mut seed_radius.0, 0.0..=20.0).text("Seed radius")).changed();
                     let n_changed = ui.add(egui::Slider::new(&mut num_seeds.0, 0..=1000).text("Number seeds")).changed();
@@ -43,4 +55,10 @@ pub fn settings_ui(
         clear_flowers(&mut commands, flowers);
         spawn_flowers(&mut commands, &mut meshes, &mut materials, num_seeds.0, seed_radius.0, seed_distance.0, seed_rotation.0);
     }
+
+    if keys.pressed(KeyCode::ControlLeft) && keys.just_pressed(KeyCode::Comma) {
+            egui_settings.scale_factor *= 1.1;
+    } else if keys.pressed(KeyCode::ControlLeft) && keys.just_pressed(KeyCode::Period) {
+            egui_settings.scale_factor *= 0.9;
+    }
 }