Merge pull request #12 from LykenSol/mouse

Clean up mouse support.

Author: eddyb

shaders/src/lib.rs

@@ -61,15 +61,20 @@ pub fn fs(constants: &ShaderConstants, mut frag_coord: Vec2) -> Vec4 {
     );
     let time = constants.time;
     let mouse = vec4(
-        constants.last_lmb_down_x / COLS as f32,
-        constants.last_lmb_down_y / ROWS as f32,
-        constants.last_click_x / COLS as f32
+        constants.drag_end_x / COLS as f32,
+        constants.drag_end_y / ROWS as f32,
+        constants.drag_start_x / COLS as f32
             * if constants.mouse_left_pressed {
                 1.0
             } else {
                 -1.0
             },
-        constants.last_click_y / ROWS as f32 * if constants.mouse_clicked { 1.0 } else { -1.0 },
+        constants.drag_start_y / ROWS as f32
+            * if constants.mouse_left_clicked {
+                1.0
+            } else {
+                -1.0
+            },
     );
 
     let col = (frag_coord.x / resolution.x) as usize;

shared/src/lib.rs

@@ -21,12 +21,14 @@ pub struct ShaderConstants {
     pub width: u32,
     pub height: u32,
     pub time: f32,
-    pub last_lmb_down_x: f32,
-    pub last_lmb_down_y: f32,
-    pub last_click_x: f32,
-    pub last_click_y: f32,
+    pub cursor_x: f32,
+    pub cursor_y: f32,
+    pub drag_start_x: f32,
+    pub drag_start_y: f32,
+    pub drag_end_x: f32,
+    pub drag_end_y: f32,
     pub mouse_left_pressed: bool,
-    pub mouse_clicked: bool,
+    pub mouse_left_clicked: bool,
 }
 
 pub fn saturate(x: f32) -> f32 {

src/main.rs

@@ -101,11 +101,11 @@ async fn run(
         .map(|surface| device.create_swap_chain(&surface, &sc_desc));
 
     let start = std::time::Instant::now();
-    let mut mouse_left_pressed = false;
     let (mut cursor_x, mut cursor_y) = (0.0, 0.0);
-    let (mut last_lmb_down_x, mut last_lmb_down_y) = (0.0, 0.0);
-    let mut mouse_clicked = false;
-    let (mut last_click_x, mut last_click_y) = (0.0, 0.0);
+    let (mut drag_start_x, mut drag_start_y) = (0.0, 0.0);
+    let (mut drag_end_x, mut drag_end_y) = (0.0, 0.0);
+    let mut mouse_left_pressed = false;
+    let mut mouse_left_clicked = false;
 
     event_loop.run(move |event, _, control_flow| {
         // Have the closure take ownership of the resources.
@@ -162,14 +162,16 @@ async fn run(
                             width: window.inner_size().width,
                             height: window.inner_size().height,
                             time: start.elapsed().as_secs_f32(),
-                            last_lmb_down_x,
-                            last_lmb_down_y,
-                            last_click_x,
-                            last_click_y,
+                            cursor_x,
+                            cursor_y,
+                            drag_start_x,
+                            drag_start_y,
+                            drag_end_x,
+                            drag_end_y,
                             mouse_left_pressed,
-                            mouse_clicked,
+                            mouse_left_clicked,
                         };
-                        mouse_clicked = false;
+                        mouse_left_clicked = false;
                         rpass.set_pipeline(&render_pipeline);
                         rpass.set_push_constants(wgpu::ShaderStage::all(), 0, unsafe {
                             any_as_u32_slice(&push_constants)
@@ -207,11 +209,11 @@ async fn run(
             } => {
                 mouse_left_pressed = state == ElementState::Pressed;
                 if mouse_left_pressed {
-                    last_lmb_down_x = cursor_x;
-                    last_lmb_down_y = cursor_y;
-                    last_click_x = cursor_x;
-                    last_click_y = cursor_y;
-                    mouse_clicked = true;
+                    drag_start_x = cursor_x;
+                    drag_start_y = cursor_y;
+                    drag_end_x = cursor_x;
+                    drag_end_y = cursor_y;
+                    mouse_left_clicked = true;
                 }
             }
             Event::WindowEvent {
@@ -221,8 +223,8 @@ async fn run(
                 cursor_x = position.x as f32;
                 cursor_y = position.y as f32;
                 if mouse_left_pressed {
-                    last_lmb_down_x = cursor_x;
-                    last_lmb_down_y = cursor_y;
+                    drag_end_x = cursor_x;
+                    drag_end_y = cursor_y;
                 }
             }
             _ => {}