From 1d227e6ca6b8b3e71acd5c449365509c4f35d0a6 Mon Sep 17 00:00:00 2001
From: Swrup <swrup@protonmail.com>
Date: Sun, 28 Nov 2021 17:54:30 +0100
Subject: [PATCH] clean

---
 Cargo.toml   | 22 ++++++++++++++++------
 src/main.rs  | 21 +++++++++++++++------
 src/score.rs |  1 -
 src/ui.rs    |  2 --
 4 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 2dff00e..78d4209 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -2,13 +2,23 @@
 name = "montociel"
 version = "0.1.0"
 edition = "2021"
+resolver = "2"
 
 [dependencies]
-bevy = "0.5"
+# bevy = {version="0.5", default-features = false}
+bevy = {version = "0.5", default-features = false, features = ["bevy_winit", "render"]}
+bevy_webgl2 = "0.5"
 bevy_rapier2d = "*"
-rand = "*"
+rand = "0.8"
+getrandom = { version = "0.2", features = ["js"] }
 
-[package.metadata.android]
-build_targets = ["aarch64-linux-android", "armv7-linux-androideabi"]
-target_sdk_version = 29
-min_sdk_version = 16
+wasm-bindgen = "0.2"
+
+# Dependencies for native only.
+[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
+bevy = {version = "0.5", default-features = false, features = ["bevy_wgpu", "bevy_winit", "render", "x11"]}
+
+# Dependencies for WASM only.
+[target.'cfg(target_arch = "wasm32")'.dependencies]
+bevy = {version = "0.5", default-features = false, features = ["bevy_winit", "render"]}
+bevy_webgl2 = "0.5"
diff --git a/src/main.rs b/src/main.rs
index 7ebe2c8..160e747 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,5 +1,7 @@
 use bevy::prelude::*;
 use bevy_rapier2d::prelude::*;
+use bevy_webgl2;
+use wasm_bindgen::prelude::*;
 
 mod cloud;
 mod montociel;
@@ -50,10 +52,16 @@ pub enum AppState {
     GameOver,
 }
 
-fn main() {
-    App::build()
-        .add_plugins(DefaultPlugins)
-        .add_plugin(RapierPhysicsPlugin::<NoUserData>::default())
+pub fn main() {
+    let mut app = App::build();
+
+    app.add_plugins(DefaultPlugins);
+
+    // when building for Web, use WebGL2 rendering
+    #[cfg(target_arch = "wasm32")]
+    app.add_plugin(bevy_webgl2::WebGL2Plugin);
+
+    app.add_plugin(RapierPhysicsPlugin::<NoUserData>::default())
         .insert_resource(ClearColor(Color::rgb(1.0, 0.714, 0.757)))
         .init_resource::<Materials>()
         .add_plugin(MontocielPlugin)
@@ -61,6 +69,7 @@ fn main() {
         .add_plugin(ScorePlugin)
         .add_plugin(UIPlugin)
         .add_state(AppState::Menu)
-        .add_system_set(SystemSet::on_enter(AppState::Menu).with_system(setup.system()))
-        .run();
+        .add_system_set(SystemSet::on_enter(AppState::Menu).with_system(setup.system()));
+
+    app.run();
 }
diff --git a/src/score.rs b/src/score.rs
index e41694f..7574add 100644
--- a/src/score.rs
+++ b/src/score.rs
@@ -48,7 +48,6 @@ fn setup_score_ui(
     mut score: ResMut<Score>,
     asset_server: Res<AssetServer>,
 ) {
-    //commands.spawn_bundle(UiCameraBundle::default());
     score.reset();
     commands
         .spawn_bundle(TextBundle {
diff --git a/src/ui.rs b/src/ui.rs
index 3678b84..9940944 100644
--- a/src/ui.rs
+++ b/src/ui.rs
@@ -14,7 +14,6 @@ impl Plugin for UIPlugin {
 }
 
 fn button_system(
-    //button_materials: Res<ButtonMaterials>,
     mut commands: Commands,
     mut interaction_query: Query<&Interaction, (Changed<Interaction>, With<Button>)>,
     entities: Query<Entity, Without<bevy::render::camera::Camera>>,
@@ -54,7 +53,6 @@ fn setup_button(
     mut commands: Commands,
     asset_server: Res<AssetServer>,
     state: Res<State<AppState>>,
-    //button_materials: Res<ButtonMaterials>,
 ) {
     let text = match state.current() {
         AppState::Menu => "Play!",