placing works sometimes, scaling is weird

ecrax · ecrax · commit 3f091e275438 · 2025-02-22T21:48:39.000+01:00
diff --git a/index.html b/index.html
@@ -2,5 +2,13 @@
     <head>
         <link data-trunk rel="scss" href="index.scss" />
     </head>
-    <body></body>
+    <body>
+
+        <div class="centered" id="center_text">
+            <p style="font-size:16px">
+                Loading...
+            </p>
+            <div class="lds-dual-ring"></div>
+        </div>
+    </body>
 </html>
diff --git a/index.scss b/index.scss
@@ -1,9 +1,66 @@
 body {
     margin: 0;
     padding: 0;
-}	
+    background-color: #191919;
+}
 
 canvas {
+    margin-right: auto !important;
+    margin-left: auto !important;
+    display: block !important;
+    position: absolute !important;
+    top: 0 !important;
+    left: 0 !important;
     width: 100% !important;
     height: 100% !important;
-}
+}
+
+.centered {
+    margin-right: auto;
+    margin-left: auto;
+    display: block;
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+    color: #f0f0f0;
+    font-size: 24px;
+    font-family: Ubuntu-Light, Helvetica, sans-serif;
+    text-align: center;
+}
+
+/* ---------------------------------------------- */
+/* Loading animation from https://loading.io/css/ */
+
+.lds-dual-ring {
+/* change color here */
+    color: #fff
+}
+.lds-dual-ring,
+.lds-dual-ring:after {
+    box-sizing: border-box;
+}
+.lds-dual-ring {
+    display: inline-block;
+    width: 40px;
+    height: 40px;
+}
+.lds-dual-ring:after {
+    content: " ";
+    display: block;
+    width: 48px;
+    height: 48px;
+    margin: 8px;
+    border-radius: 50%;
+    border: 6.4px solid currentColor;
+    border-color: currentColor transparent currentColor transparent;
+    animation: lds-dual-ring 1.2s linear infinite;
+}
+@keyframes lds-dual-ring {
+    0% {
+        transform: rotate(0deg);
+    }
+    100% {
+        transform: rotate(360deg);
+    }
+}
diff --git a/src/input/systems.rs b/src/input/systems.rs
@@ -1,6 +1,5 @@
 use bevy::app::AppExit;
 use bevy::prelude::*;
-use bevy::window::PrimaryWindow;
 
 use crate::components::microphone::Microphone;
 use crate::components::source::{Source, SourceType};
@@ -84,7 +83,6 @@ pub fn button_input(
     mouse_buttons: Res<ButtonInput<MouseButton>>,
     keys: Res<ButtonInput<KeyCode>>,
     mut commands: Commands,
-    q_windows: Query<&Window, With<PrimaryWindow>>,
     mut wall_update_ev: EventWriter<UpdateWalls>,
     mut component_ids: ResMut<ComponentIDs>,
     mut ui_state: ResMut<UiState>,
@@ -104,6 +102,7 @@ pub fn button_input(
         MoveCircWalls,
         ResizeCircWalls,
     )>,
+    touches: Res<Touches>,
 ) {
     #[cfg(not(target_os = "macos"))]
     let ctrl = keys.any_pressed([KeyCode::ControlLeft, KeyCode::ControlRight]);
@@ -113,15 +112,14 @@ pub fn button_input(
 
     // depending on the tool, a click could relate to different actions
     // add `Move`, `WResize` or `Selected` tags to the entities as needed
-    if mouse_buttons.just_pressed(MouseButton::Left)
+    if touches.any_just_pressed()
         && ui_state.tools_enabled
         && ui_state.tool_use_enabled
     {
-        let window = q_windows.single();
         selected.iter_mut().for_each(|entity| {
             commands.entity(entity).remove::<Selected>();
         });
-        if let Some(position) = window.cursor_position() {
+        if let Some(position) = touches.first_pressed_position() {
             match ui_state.current_tool {
                 ToolType::Select => {
                     if let Some((x, y)) =
@@ -318,10 +316,8 @@ pub fn button_input(
     }
 
     // while the mouse is held down, move the selected object(s)
-    if mouse_buttons.pressed(MouseButton::Left) && ui_state.tools_enabled {
-        let window = q_windows.single();
-
-        if let Some(position) = window.cursor_position() {
+    if touches.any_just_pressed() && ui_state.tools_enabled {
+        if let Some(position) = touches.first_pressed_position() {
             match ui_state.current_tool {
                 ToolType::Edit => {
                     if let Some((x, y)) =
@@ -461,10 +457,6 @@ pub fn button_input(
         }
     }
 
-    if mouse_buttons.just_released(MouseButton::Left) && ui_state.tool_use_enabled {
-        ui_state.collapse_header = true;
-    }
-
     // handle all other keyboard shortcuts
     if keys.just_pressed(KeyCode::Space) {
         ui_state.is_running = !ui_state.is_running;
diff --git a/src/ui/draw.rs b/src/ui/draw.rs
@@ -146,6 +146,8 @@ pub fn draw_egui(
     egui_extras::install_image_loaders(ctx);
     // disable window shadows
     ctx.style_mut(|style| style.visuals.window_shadow = egui::epaint::Shadow::NONE);
+    // ctx.set_zoom_factor(2.0);
+    // println!("zoom factor: {}", ctx.zoom_factor());
 
     // Quick Settings
     egui::TopBottomPanel::bottom("quick_settings_bottom_panel").show(ctx, |ui| {
@@ -598,6 +600,4 @@ pub fn draw_egui(
                 }
             }
         });
-
-    ui_state.collapse_header = false;
 }
diff --git a/src/ui/state.rs b/src/ui/state.rs
@@ -91,7 +91,6 @@ pub struct UiState {
     pub highest_y_volume_plot: f64,
     pub show_fft_approx: bool,
     pub fft_window_size: usize,
-    pub collapse_header: bool,
     pub max_gradient: f32,
     pub min_gradient: f32,
     pub hide_gizmos: bool,
@@ -116,12 +115,11 @@ impl Default for UiState {
             reset_on_change: true,
             tool_use_enabled: true,
             fft_scaling: FftScaling::Normalized,
-            framerate: 60.,
+            framerate: 30.,
             scroll_volume_plot: true,
             highest_y_volume_plot: 0.,
             show_fft_approx: false,
             fft_window_size: 1024,
-            collapse_header: false,
             max_gradient: 1.25,
             min_gradient: -1.25,
             hide_gizmos: false,

Original file line number	Diff line number	Diff line change
`@@ -146,6 +146,8 @@ pub fn draw_egui(`
`146`	`146`	`egui_extras::install_image_loaders(ctx);`
`147`	`147`	`// disable window shadows`
`148`	`148`	`ctx.style_mut(\|style\| style.visuals.window_shadow = egui::epaint::Shadow::NONE);`
	`149`	`+ // ctx.set_zoom_factor(2.0);`
	`150`	`+ // println!("zoom factor: {}", ctx.zoom_factor());`
`149`	`151`
`150`	`152`	`// Quick Settings`
`151`	`153`	`egui::TopBottomPanel::bottom("quick_settings_bottom_panel").show(ctx, \|ui\| {`
`@@ -598,6 +600,4 @@ pub fn draw_egui(`
`598`	`600`	`}`
`599`	`601`	`}`
`600`	`602`	`});`
`601`		`-`
`602`		`- ui_state.collapse_header = false;`
`603`	`603`	`}`