visualizer: Fix camera controls in web contexts

visualizer/Cargo.toml

@@ -6,13 +6,11 @@ edition = "2021"
 [dependencies]
 clap = { version = "4.4.11", features = ["derive"] }
 ewebsock = "0.4.0"
-gloo-net = "0.5.0"
 itertools = "0.12.0"
 reqwest = { version = "0.11.22", features = ["json", "blocking"] }
 serde = { version = "1.0.164", features = ["derive"] }
 serde_json = "1.0.108"
 url = "2.5.0"
-wasm-bindgen-futures = "0.4.39"
 
 [dependencies.bevy]
 version = "0.12.0"

visualizer/README.md

@@ -8,19 +8,8 @@ You can run the visualizer as a native binary with:
 cargo run [--release] --bin rustmas-visualizer
 ```
 
-Alternatively, you can run it in the web browser. First you will have to
-install `wasm-server-runner`:
-
-```
-cargo install wasm-server-runner
-```
-
-and then you can start the visualizer with:
-
-```
-cd visualizer
-cargo run [--release] --target wasm32-unknown-unknown --bin rustmas-visualizer
-```
+If you would like to run the visualizer in a web browser, the suggested way
+is to [run is as a part of WebUI](../webapi/README.md#running-webui).
 
 Visualizer needs to be started after WebAPI.
 

visualizer/src/bin/visualizer.rs

@@ -22,38 +22,24 @@ struct GetPointsResponse {
     points: Vec<(f32, f32, f32)>,
 }
 
-fn get_points_endpoint(endpoint: &Url) -> Url {
-    let mut endpoint = endpoint.clone();
-    endpoint.set_scheme("http").unwrap();
-    endpoint.join("points").unwrap()
+fn get_points(endpoint: &Url) -> Vec<(f32, f32, f32)> {
+    let endpoint = {
+        let mut endpoint = endpoint.clone();
+        endpoint.set_scheme("http").unwrap();
+        endpoint.join("points").unwrap()
+    };
+
+    reqwest::blocking::get(endpoint)
+        .unwrap()
+        .json::<GetPointsResponse>()
+        .unwrap()
+        .points
 }
 
 fn main() {
     let endpoint = Args::parse().endpoint;
     let frames_endpoint = get_frames_url(&endpoint);
-    let points_endpoint = get_points_endpoint(&endpoint);
-
-    #[cfg(not(target_arch = "wasm32"))]
-    {
-        let points = reqwest::blocking::get(points_endpoint)
-            .unwrap()
-            .json::<GetPointsResponse>()
-            .unwrap()
-            .points;
-
-        rustmas_visualizer::run(frames_endpoint, points);
-    }
+    let points = get_points(&endpoint);
 
-    #[cfg(target_arch = "wasm32")]
-    wasm_bindgen_futures::spawn_local(async move {
-        let points = gloo_net::http::Request::get(points_endpoint.as_str())
-            .send()
-            .await
-            .unwrap()
-            .json::<GetPointsResponse>()
-            .await
-            .unwrap()
-            .points;
-        rustmas_visualizer::run(frames_endpoint, points);
-    });
+    rustmas_visualizer::run(frames_endpoint, points);
 }

webui/src/visualizer.rs

@@ -1,4 +1,5 @@
 use log::error;
+use web_sys::MouseEvent;
 use yew::{html, prelude::Html, Callback, Component, Context};
 
 use crate::api;
@@ -53,7 +54,14 @@ impl Component for Visualizer {
     fn view(&self, _ctx: &Context<Self>) -> Html {
         html! {
             <section class="visualizer-container">
-                <canvas id="visualizer"></canvas>
+                <canvas id="visualizer"
+                    oncontextmenu={Callback::from(|e: MouseEvent| e.prevent_default())}
+                    onmousedown={Callback::from(|e: MouseEvent| {
+                        if e.button() == 1 {
+                            e.prevent_default();
+                        }
+                    })}
+                ></canvas>
             </section>
         }
     }