fix after version bump, bring in touch hacks

Author: yjpark

Cargo.lock

@@ -22,4 +22,6 @@ opt-level = 's'
 [profile.dev]
 opt-level = 1
 
-
+[patch.crates-io]
+# winit = { git = "https://github.com/johanhelsing/winit/", branch = "web-touch-pr" }
+winit = { git = "https://github.com/yjpark/winit/", branch = "touch-input_0.24.0" }

Cargo.toml

@@ -35,10 +35,10 @@ native = [
 ]
 
 [dependencies]
-notation_bevy_utils = { version = "0.1.0", path = "../notation_bevy_utils" }
+notation_bevy_utils = { version = "0.2.0", path = "../notation_bevy_utils" }
 
-notation_model = { version = "0.1.0", path = "../notation_model" }
-notation_midi = { version = "0.1.0", path = "../notation_midi" }
+notation_model = { version = "0.2.0", path = "../notation_model" }
+notation_midi = { version = "0.2.0", path = "../notation_midi" }
 
 serde = {version = "1.0.126", features = ["derive"]}
 # https://github.com/serde-rs/serde/issues/1937
@@ -48,8 +48,7 @@ ron = "0.6"
 float_eq = "0.6"
 
 bevy = { version = "0.5.0", default-features = false }
-winit = "0.24.0"
-# winit = { git = "https://github.com/yjpark/winit/", branch = "touch-input_0.24.0", features = [ "web-sys" ] }
+
 rand = "0.8"
 getrandom = {version="0.2", features=["wasm-bindgen"]}
 

crates/notation_bevy/Cargo.toml

@@ -180,7 +180,7 @@ fn handle_keyboard_inputs(
 fn handle_mouse_inputs(
     windows: Res<Windows>,
     mouse_input: Res<Input<MouseButton>>,
-    settings: ResMut<NotationSettings>,
+    settings: Res<NotationSettings>,
     mut mouse_motion_events: EventReader<MouseMotion>,
     mut mouse_wheel_input: EventReader<bevy::input::mouse::MouseWheel>,
     mut mouse_clicked: EventWriter<MouseClickedEvent>,
@@ -218,22 +218,40 @@ fn handle_mouse_inputs(
 }
 
 fn handle_touch_inputs(
+    windows: Res<Windows>,
     touch_input: Res<Touches>,
+    mut app_state: ResMut<NotationAppState>,
     mut mouse_clicked: EventWriter<MouseClickedEvent>,
-    mut mouse_dragged: EventWriter<MouseDraggedEvent>,
+    //mut mouse_dragged: EventWriter<MouseDraggedEvent>,
 ) {
-    for (index, finger) in touch_input.iter().enumerate() {
-        if index == 0 {
-            if touch_input.just_pressed(finger.id()) {
-                mouse_clicked.send(MouseClickedEvent { cursor_position: finger.position() });
-            }
-        } else if index == 1 {
-            if touch_input.just_pressed(finger.id()) {
-            } else if touch_input.just_released(finger.id()) {
-            } else {
-                let delta = finger.position() - finger.previous_position();
-                mouse_dragged.send(MouseDraggedEvent { delta: delta });
-            }
+    for (_index, finger) in touch_input.iter().enumerate() {
+        if touch_input.just_pressed(finger.id()) {
+            windows
+                .get_primary()
+                .map(|w| (w.physical_width() as f32, w.physical_height() as f32))
+                .map(| (physical_width, physical_height) | {
+                    /*
+                    Super hacky way to get the touch input in mobile browsers (WASM).
+                    winit not support it yet, using a pull request version, which seems to have some issues
+                    as well, also the touch event triggering is very unreliable during my test, but at least
+                    it's better than no touch at all.
+                    */
+                    let dpi_x = physical_width / app_state.window_width;
+                    let dpi_y = physical_height / app_state.window_height;
+                    let x = finger.position().x * dpi_x;
+                    let y = app_state.window_height - finger.position().y * dpi_y;
+                    app_state.debug_str = Some(format!("Touch: {} {:?} -> {} {}", _index, finger.position(), x, y));
+                    mouse_clicked.send(MouseClickedEvent { cursor_position: Vec2::new(x, y) });
+                });
+        } else if touch_input.just_released(finger.id()) {
+            app_state.debug_str = None;
+        } else {
+            app_state.debug_str = Some(format!("Touch: {} - {:?}", _index, finger.position()));
+            /*
+            let delta = finger.position() - finger.previous_position();
+            app_state.debug_str = Some(format!("Dragged: {}, {:?}", _index, delta));
+            mouse_dragged.send(MouseDraggedEvent { delta: delta });
+             */
         }
     }
 }
@@ -268,6 +286,7 @@ fn on_window_resized(
             window.height = evt.height;
             app_state.window_width = evt.width;
             app_state.window_height = evt.height;
+            app_state.scale_factor_override = window.scale_factor_override;
             window_resized_evts.send(WindowResizedEvent());
         }
     }

crates/notation_bevy/src/app/app.rs

@@ -10,12 +10,14 @@ pub struct TabPathes(pub Vec<String>);
 pub struct NotationAppState {
     pub window_width: f32,
     pub window_height: f32,
+    pub scale_factor_override: Option<f64>,
     pub tab_path: String,
     pub tab_asset: Handle<TabAsset>,
     pub tab: Option<Arc<Tab>>,
     pub hide_control: bool,
     pub viewer_uuid: Uuid,
     pub parse_error: Option<ParseError>,
+    pub debug_str: Option<String>,
 }
 
 impl NotationAppState {
@@ -24,12 +26,14 @@ impl NotationAppState {
         Self {
             window_width: 0.0,
             window_height: 0.0,
+            scale_factor_override: None,
             tab_path,
             tab_asset,
             tab: None,
             hide_control: true,
             viewer_uuid: Uuid::new_v4(),
             parse_error: None,
+            debug_str: None,
         }
     }
     pub fn change_tab(&mut self, asset_server: &AssetServer, tab_path: String) {

crates/notation_bevy/src/app/app_state.rs

@@ -75,7 +75,7 @@ impl MiniMap {
     ) -> Entity {
         let minimap = MiniMap::new(tab.clone());
         let map_entity = BevyUtil::spawn_child_bundle(commands, entity, ViewBundle::from(minimap));
-        ColorBackground::spawn(
+        let background_entity = ColorBackground::spawn(
             commands,
             map_entity,
             theme.core.mini_map_z,
@@ -84,6 +84,8 @@ impl MiniMap {
         for bar in tab.bars.iter() {
             MiniBar::spawn(commands, assets, theme, map_entity, bar);
         }
+        theme.texts.mini_map
+            .spawn_debug_text(commands, background_entity, &assets, "");
         map_entity
     }
     pub fn do_layout(
@@ -107,4 +109,20 @@ impl MiniMap {
             )
         }
     }
+    pub fn update_debug_str(
+        app_state: Res<NotationAppState>,
+        background_query: Query<&ColorBackground>,
+        mut font_query: Query<(&Parent, &mut Text)>,
+    ) {
+        for (parent, mut text) in font_query.iter_mut() {
+            if let Ok(_) = background_query.get(parent.0) {
+                let str = if let Some(debug_str) = &app_state.debug_str {
+                    debug_str.to_string()
+                } else {
+                    "".to_string()
+                };
+                BevyUtil::set_text_value(&mut text, str);
+            }
+        }
+    }
 }

crates/notation_bevy/src/mini/mini_map.rs

@@ -19,7 +19,8 @@ impl Plugin for MiniPlugin {
             SystemSet::on_update(NotationAssetsStates::Loaded)
                 .with_system(on_bar_playing_changed.system())
                 .with_system(MiniMap::do_layout.system())
-                .with_system(MiniBar::on_layout_changed.system()),
+                .with_system(MiniMap::update_debug_str.system())
+                .with_system(MiniBar::on_layout_changed.system())
         );
     }
 }

crates/notation_bevy/src/mini/mini_plugin.rs

@@ -188,4 +188,26 @@ impl MiniMapTexts {
             1.0,
         );
     }
+    pub fn spawn_debug_text(
+        &self,
+        commands: &mut Commands,
+        entity: Entity,
+        assets: &NotationAssets,
+        text: &str,
+    ) {
+        //NOTE: not sure why, using HorizontalAlign::Right here got the left behaviour
+        BevyUtil::spawn_text(
+            commands,
+            entity,
+            text,
+            assets.en_font.clone(),
+            24.0,
+            ThemeColors::hex_linear("000000"),
+            HorizontalAlign::Center,
+            VerticalAlign::Center,
+            0.0,
+            0.0,
+            10.0,
+        );
+    }
 }

crates/notation_bevy/src/theme/theme_texts.rs

@@ -35,13 +35,12 @@ ron = "0.6"
 float_eq = "0.6"
 
 bevy = { version = "0.5.0", default-features = false }
-winit = "0.24.0"
-# winit = { git = "https://github.com/yjpark/winit/", branch = "touch-input_0.24.0", features = [ "web-sys" ] }
+
 rand = "0.8"
 getrandom = { version="0.2", features=["wasm-bindgen"] }
 
 bevy_prototype_lyon = "0.3.1"
 bevy_egui = "0.6"
 bevy_easings = "0.4.1"
 
-bevy-inspector-egui = { version = "0.5.1", optional = true }
+bevy-inspector-egui = { version = "0.5.1", optional = true }

crates/notation_bevy_utils/Cargo.toml

@@ -13,7 +13,7 @@ description = "Fun notation - DSL to create notation files"
 proc-macro = true
 
 [dependencies]
-notation_proto = { version = "0.1.0", path = "../notation_proto" }
+notation_proto = { version = "0.2.0", path = "../notation_proto" }
 
 syn = { version = "1.0", features = ["full"] }
 quote = "1.0"