hook up hover events

Author: kayhhh

crates/unavi-player/src/input.rs

@@ -1,7 +1,10 @@
 use avian3d::prelude::*;
 use bevy::input::keyboard::KeyCode;
 use bevy::prelude::*;
-use unavi_scripting::api::wired::input::input_handler::{InputHandlerSender, ScriptInputEvent};
+use unavi_scripting::api::wired::input::{
+    bindings::types::InputAction,
+    input_handler::{InputHandlerSender, ScriptInputEvent},
+};
 
 use crate::{
     layers::{OTHER_PLAYER_LAYER, WORLD_LAYER},
@@ -95,7 +98,7 @@ pub fn handle_raycast_input(
         },
     ) {
         // Crosshair.
-        // TODO: Showing double on non-60hz monitors
+        // TODO: Fix showing double on non-60hz monitors
         if let Ok(normal) = Dir3::from_xyz(hit.normal.x, hit.normal.y, hit.normal.z) {
             gizmos.circle(
                 translation + direction * (hit.time_of_impact - 0.001),
@@ -106,19 +109,24 @@ pub fn handle_raycast_input(
         }
 
         // Script input.
-        if mouse.just_pressed(MouseButton::Left) {
-            for (ent, handler) in input_handlers.iter() {
-                // TODO: Recursive check if children were hit.
+        for (ent, handler) in input_handlers.iter() {
+            // TODO: Recursive check if children were hit.
+
+            let action = if mouse.just_pressed(MouseButton::Left) {
+                InputAction::Collision
+            } else {
+                InputAction::Hover
+            };
 
-                if hit.entity == ent {
-                    if let Err(e) = handler.send(ScriptInputEvent::Raycast {
-                        origin: translation,
-                        orientation: rotation,
-                    }) {
-                        error!("Failed to send script input event: {}", e);
-                    };
-                    break;
-                }
+            if hit.entity == ent {
+                if let Err(e) = handler.send(ScriptInputEvent::Raycast {
+                    action,
+                    origin: translation,
+                    orientation: rotation,
+                }) {
+                    error!("Failed to send script input event: {}", e);
+                };
+                break;
             }
         }
     };

crates/unavi-scripting/src/api/wired/input/input_handler.rs

@@ -16,6 +16,7 @@ use super::bindings::{
 
 pub enum ScriptInputEvent {
     Raycast {
+        action: InputAction,
         origin: bevy::math::Vec3,
         orientation: bevy::math::Quat,
     },
@@ -71,11 +72,12 @@ impl HostInputHandler for StoreState {
         if let Ok(event) = data.receiver.try_recv() {
             let e = match event {
                 ScriptInputEvent::Raycast {
+                    action,
                     origin,
                     orientation,
                 } => InputEvent {
-                    id: 0,
-                    action: InputAction::Collision,
+                    id: 0, // TODO: Set id
+                    action,
                     data: InputData::Ray(Ray {
                         origin: origin.into(),
                         orientation: orientation.into(),

wasm/unavi-ui/src/button.rs

@@ -4,7 +4,10 @@ use crate::{
     bindings::{
         exports::unavi::ui::button::{Guest, GuestButton},
         unavi::{layout::container::Container, shapes::api::Cuboid},
-        wired::input::{handler::InputHandler, types::InputAction},
+        wired::{
+            input::{handler::InputHandler, types::InputAction},
+            scene::material::{Color, Material},
+        },
     },
     GuestImpl, Updatable, ELEMENTS, ELEMENT_ID,
 };
@@ -23,8 +26,14 @@ impl Drop for Button {
 
 pub struct ButtonData {
     id: usize,
+
+    color: Color,
+    color_hover: Color,
+
     input: InputHandler,
+    material: Material,
     root: Container,
+
     hovered: Cell<bool>,
     pressed: Cell<bool>,
 }
@@ -35,6 +44,7 @@ impl Updatable for ButtonData {
     }
 
     fn update(&self, _delta: f32) {
+        // Handle input.
         self.hovered.set(false);
         self.pressed.set(false);
 
@@ -44,9 +54,18 @@ impl Updatable for ButtonData {
                 InputAction::Collision => self.pressed.set(true),
             }
         }
+
+        // Animation.
+        if self.hovered.get() {
+            self.material.set_color(self.color_hover);
+        } else {
+            self.material.set_color(self.color);
+        }
     }
 }
 
+const DARKEN_PERCENT: f32 = 0.5;
+
 impl GuestButton for Button {
     fn new(root: Container) -> Self {
         let size = root.size();
@@ -55,12 +74,37 @@ impl GuestButton for Button {
         let input = InputHandler::new();
         node.set_input_handler(Some(&input));
 
+        let material = Material::new();
+        for primitive in node.mesh().unwrap().list_primitives() {
+            primitive.set_material(Some(&material));
+        }
+
         root.inner().add_child(&node);
 
+        let color = Color {
+            r: 0.2,
+            g: 0.7,
+            b: 1.0,
+            a: 1.0,
+        };
+
+        let color_hover = Color {
+            r: color.r * DARKEN_PERCENT,
+            g: color.g * DARKEN_PERCENT,
+            b: color.b * DARKEN_PERCENT,
+            a: color.a,
+        };
+
         let data = Rc::new(ButtonData {
             id: ELEMENT_ID.fetch_add(1, Ordering::Relaxed),
+
+            color,
+            color_hover,
+
             input,
+            material,
             root,
+
             hovered: Cell::default(),
             pressed: Cell::default(),
         });