Merge pull request #11 from sdasda7777/sdasda7777_pages11

Fixed issues with WASM main variant

Cargo.toml

@@ -1,6 +1,7 @@
 [package]
 name = "minesweeper6d"
 version = "0.1.2"
+edition = "2021"
 
 [dependencies]
 eframe = "0.24"

src/main.rs

@@ -66,6 +66,8 @@ impl Shortcuts {
     }
 }
 
+// When compiling natively:
+#[cfg(not(target_arch = "wasm32"))]
 fn main() -> Result<(), eframe::Error> {
     let options = eframe::NativeOptions {
         ..Default::default()
@@ -85,6 +87,26 @@ fn main() -> Result<(), eframe::Error> {
     )
 }
 
+// When compiling to web using trunk:
+#[cfg(target_arch = "wasm32")]
+fn main() {
+    // Redirect `log` message to `console.log` and friends:
+    eframe::WebLogger::init(log::LevelFilter::Debug).ok();
+
+    let web_options = eframe::WebOptions::default();
+
+    wasm_bindgen_futures::spawn_local(async {
+        eframe::WebRunner::new()
+            .start(
+                "the_canvas_id", // hardcode it
+                web_options,
+                Box::new(|cc| Box::<MinesweeperViewController>::default()),
+            )
+            .await
+            .expect("failed to start eframe");
+    });
+}
+
 struct MinesweeperViewController {
     current_initial_settings: InitialGameSettings,
     next_initial_settings: InitialGameSettings,

src/minesweeper_model.rs

@@ -1,6 +1,6 @@
 
 extern crate rand;
-use bwi::BWI;
+use crate::bwi::BWI;
 use rand_chacha::{ChaCha8Rng, rand_core::SeedableRng};
 use self::rand::Rng;
 use std::collections::VecDeque;