Cargo.lock

@@ -84,7 +84,7 @@ version = "0.8.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "getrandom",
  "once_cell",
  "version_check",
@@ -1094,7 +1094,7 @@ dependencies = [
  "arrayref",
  "arrayvec",
  "cc",
- "cfg-if 1.0.0",
+ "cfg-if",
  "constant_time_eq",
 ]
 
@@ -1233,12 +1233,6 @@ dependencies = [
  "nom",
 ]
 
-[[package]]
-name = "cfg-if"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
-
 [[package]]
 name = "cfg-if"
 version = "1.0.0"
@@ -1334,7 +1328,7 @@ version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a06aeb73f470f66dcdbf7223caeebb85984942f22f1adb2a088cf9668146bbbc"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "wasm-bindgen",
 ]
 
@@ -1460,7 +1454,7 @@ version = "1.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
 ]
 
 [[package]]
@@ -1733,7 +1727,6 @@ name = "game-jam-casino"
 version = "0.1.0"
 dependencies = [
  "bevy",
- "wee_alloc",
 ]
 
 [[package]]
@@ -1752,7 +1745,7 @@ version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "js-sys",
  "libc",
  "wasi",
@@ -2096,7 +2089,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97"
 dependencies = [
  "cesu8",
- "cfg-if 1.0.0",
+ "cfg-if",
  "combine",
  "jni-sys",
  "log",
@@ -2190,7 +2183,7 @@ version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "winapi",
 ]
 
@@ -2200,7 +2193,7 @@ version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "windows-targets 0.52.5",
 ]
 
@@ -2280,12 +2273,6 @@ version = "2.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d"
 
-[[package]]
-name = "memory_units"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8452105ba047068f40ff7093dd1d9da90898e63dd61736462e9cdda6a90ad3c3"
-
 [[package]]
 name = "metal"
 version = "0.27.0"
@@ -2395,7 +2382,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4"
 dependencies = [
  "bitflags 2.5.0",
- "cfg-if 1.0.0",
+ "cfg-if",
  "cfg_aliases",
  "libc",
 ]
@@ -2627,7 +2614,7 @@ version = "0.9.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "libc",
  "redox_syscall 0.5.1",
  "smallvec",
@@ -2698,7 +2685,7 @@ version = "3.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5e6a007746f34ed64099e88783b0ae369eaa3da6392868ba262e2af9b8fbaea1"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "concurrent-queue",
  "hermit-abi",
  "pin-project-lite",
@@ -3066,7 +3053,7 @@ version = "0.30.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "732ffa00f53e6b2af46208fba5718d9662a421049204e156328b66791ffa15ae"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "core-foundation-sys",
  "libc",
  "ntapi",
@@ -3121,7 +3108,7 @@ version = "1.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "once_cell",
 ]
 
@@ -3252,7 +3239,7 @@ version = "1.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "static_assertions",
 ]
 
@@ -3336,7 +3323,7 @@ version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "wasm-bindgen-macro",
 ]
 
@@ -3361,7 +3348,7 @@ version = "0.4.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "js-sys",
  "wasm-bindgen",
  "web-sys",
@@ -3416,18 +3403,6 @@ dependencies = [
  "wasm-bindgen",
 ]
 
-[[package]]
-name = "wee_alloc"
-version = "0.4.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbb3b5a6b2bb17cb6ad44a2e68a43e8d2722c997da10e928665c72ec6c0a0b8e"
-dependencies = [
- "cfg-if 0.1.10",
- "libc",
- "memory_units",
- "winapi",
-]
-
 [[package]]
 name = "wgpu"
 version = "0.19.4"
@@ -3435,7 +3410,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cbd7311dbd2abcfebaabf1841a2824ed7c8be443a0f29166e5d3c6a53a762c01"
 dependencies = [
  "arrayvec",
- "cfg-if 1.0.0",
+ "cfg-if",
  "cfg_aliases",
  "js-sys",
  "log",

Cargo.toml

@@ -4,11 +4,4 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-bevy = "0.13"
+bevy = "0.13"
-wee_alloc = "*"
-
-[profile.wasm-release]
-inherits = "release"
-opt-level = "z"
-lto = "fat"
-codegen-units = 1

scripts/build-web.sh

@@ -5,7 +5,7 @@ OUT_DIR="./platforms/web/"
 NAME="game-jam-casino"
 TARGET="wasm32-unknown-unknown"
 
-cargo build --profile wasm-release --target $TARGET
+cargo build --release --target $TARGET
 
 wasm-bindgen --target web \
 	--out-dir $OUT_DIR \

src/ecs.rs

@@ -1,19 +0,0 @@
-use bevy::prelude::*;
-
-/// Module mirroring bevy::ecs::schedule
-pub(crate) mod schedule {
-    use super::*;
-
-    /// Module mirroring bevy::ecs::schedule::common_conditions
-    pub(crate) mod common_conditions {
-        use super::*;
-
-        /// Missing (in my opinion) condition for checking if any of a given component have changed
-        pub(crate) fn any_component_changed<T>(q: Query<Entity, Changed<T>>) -> bool
-        where
-            T: Component,
-        {
-            !q.is_empty()
-        }
-    }
-}

src/game/dice.rs

@@ -1,22 +0,0 @@
-use crate::prelude::*;
-
-/// Menu Plugin; empty struct for Plugin impl
-
-pub(crate) struct DicePlugin;
-
-impl Plugin for DicePlugin {
-    fn build(&self, app: &mut App) {
-        app.add_systems(Startup, init_dice_ui);
-    }
-}
-
-/// Create UI for the Dice game at startup
-fn init_dice_ui(mut commands: Commands) {
-    commands
-        .spawn((
-            GameChoice::Dice,
-            SetState(GameChoice::Dice),
-            SetState(MenuState::Closed),
-        ))
-        .add(UiTitle { text: "Dice" });
-}

src/game/mod.rs

@@ -1,33 +0,0 @@
-use crate::prelude::*;
-
-/// Dice game module
-pub(crate) mod dice;
-
-/// Menu Plugin; empty struct for Plugin impl
-pub(crate) struct GamePlugin;
-
-impl Plugin for GamePlugin {
-    fn build(&self, app: &mut App) {
-        app.init_state::<GameChoice>();
-        app.add_systems(Startup, init_camera);
-        app.add_plugins(dice::DicePlugin);
-    }
-}
-
-#[derive(States, Debug, Clone, PartialEq, Eq, Hash, Default, Component)]
-pub(crate) enum GameChoice {
-    #[default]
-    None,
-    Dice,
-}
-
-/// Main game camera
-fn init_camera(mut commands: Commands) {
-    commands.spawn(Camera2dBundle {
-        camera: Camera {
-            clear_color: ClearColorConfig::Custom(Color::WHITE),
-            ..default()
-        },
-        ..default()
-    });
-}

src/main.rs

@@ -1,44 +1,7 @@
-// TODO: Should we use wee_alloc?
-// Use `wee_alloc` as the global allocator.
-#[global_allocator]
-static ALLOC: wee_alloc::WeeAlloc = wee_alloc::WeeAlloc::INIT;
-extern crate wee_alloc;
-
-/// Game Menu
-pub(crate) mod menu;
-
-/// Generic UI elements
-pub(crate) mod ui;
-
-/// Module mirroring bevy::ecs
-pub(crate) mod ecs;
-
-/// Imports used across the project
-pub(crate) mod prelude;
-
-pub(crate) mod game;
-
 use bevy::prelude::*;
 
 fn main() {
-    let mut app = App::new();
+    App::new()
-    app.add_plugins(DefaultPlugins);
+        .add_plugins(DefaultPlugins)
-    app.add_plugins(menu::MenuPlugin);
+        .run();
-    app.add_plugins(ui::UiPlugin);
-    app.add_plugins(game::GamePlugin);
-    app.run();
-}
-
-/// Hide entities with a given component
-pub(crate) fn manage_visibility<SC: States + Component>(
-    mut q: Query<(&mut Visibility, &SC)>,
-    r: Res<State<SC>>,
-) {
-    q.iter_mut().for_each(|(mut v, sc)| {
-        if *sc == *r.get() {
-            *v = Visibility::Inherited;
-        } else {
-            *v = Visibility::Hidden;
-        }
-    });
 }

src/menu.rs

@@ -1,36 +0,0 @@
-use crate::{manage_visibility, prelude::*};
-
-/// Menu Plugin; empty struct for Plugin impl
-pub(crate) struct MenuPlugin;
-
-impl Plugin for MenuPlugin {
-    fn build(&self, app: &mut App) {
-        app.init_state::<MenuState>();
-        app.add_systems(Startup, init_menu_ui);
-        app.add_systems(
-            Update,
-            manage_visibility::<MenuState>.run_if(state_changed::<MenuState>),
-        );
-    }
-}
-
-/// State tracking if the menu is open or closed
-#[derive(States, Debug, Clone, PartialEq, Eq, Hash, Default, Component)]
-pub(crate) enum MenuState {
-    #[default]
-    Open,
-    Closed,
-}
-
-/// Initialize menu UI nodes at startup
-fn init_menu_ui(mut commands: Commands) {
-    commands
-        .spawn(MenuState::Open)
-        .add(UiContainer)
-        .with_children(|parent| {
-            parent.spawn_empty().add(UiTitle {
-                text: "Game Jam Casino",
-            });
-            parent.spawn_empty().add(UiButton { label: "Dice" });
-        });
-}

src/prelude.rs

@@ -1,11 +0,0 @@
-/// Bevy imports
-pub(crate) use bevy::{ecs::system::EntityCommand, prelude::*};
-
-/// Intra-project imports
-pub(crate) use crate::ecs::schedule::common_conditions::*;
-pub(crate) use crate::game::GameChoice;
-pub(crate) use crate::manage_visibility;
-pub(crate) use crate::ui::button::UiButton;
-pub(crate) use crate::ui::container::UiContainer;
-pub(crate) use crate::ui::title::UiTitle;
-pub(crate) use crate::ui::SetState;

src/ui.rs

@@ -1,120 +0,0 @@
-use crate::prelude::*;
-
-/// Menu Plugin; empty struct for Plugin impl
-pub(crate) struct UiPlugin;
-
-impl Plugin for UiPlugin {
-    fn build(&self, app: &mut App) {
-        app.add_systems(
-            Update,
-            button_interaction.run_if(any_component_changed::<Interaction>),
-        );
-    }
-}
-
-fn button_interaction(mut query: Query<(&mut BackgroundColor, &Interaction)>) {
-    query.iter_mut().for_each(|(mut bg, i)| match i {
-        Interaction::Hovered => bg.0 = Color::ORANGE,
-        Interaction::Pressed => bg.0 = Color::GREEN,
-        Interaction::None => bg.0 = Color::WHITE,
-    });
-}
-
-/// Component for marking a button as a "Set State" action
-#[derive(Component)]
-pub(crate) struct SetState<S: States>(S);
-
-fn button_state_actions<S: States>(
-    q: Query<(&mut S, &SetState<S>, &Interaction), Changed<Interaction>>,
-    s: Res<State<S>>,
-    n: Res<NextState<S>>,
-) {
-    todo!("Change state when button is clicked")
-}
-
-pub(crate) mod button {
-    use super::*;
-
-    pub(crate) struct UiButton {
-        pub label: &'static str,
-    }
-
-    impl EntityCommand for UiButton {
-        fn apply(self, id: Entity, world: &mut World) {
-            let button_text_style = TextStyle {
-                color: Color::BLACK,
-                font_size: 16.0,
-                ..default()
-            };
-            world
-                .entity_mut(id)
-                .insert(ButtonBundle {
-                    style: Style {
-                        margin: UiRect::all(Val::Px(5.0)),
-                        padding: UiRect::all(Val::Px(5.0)),
-                        border: UiRect::all(Val::Px(1.0)),
-                        ..default()
-                    },
-                    border_color: BorderColor(Color::BLACK),
-                    ..default()
-                })
-                .with_children(|parent| {
-                    parent.spawn(TextBundle {
-                        text: Text::from_section(self.label, button_text_style),
-                        ..default()
-                    });
-                });
-        }
-    }
-}
-
-pub(crate) mod title {
-    use super::*;
-
-    pub(crate) struct UiTitle {
-        pub text: &'static str,
-    }
-
-    impl EntityCommand for UiTitle {
-        fn apply(self, id: Entity, world: &mut World) {
-            let title_text_style = TextStyle {
-                color: Color::BLACK,
-                font_size: 24.0,
-                ..default()
-            };
-            world.entity_mut(id).insert(TextBundle {
-                text: Text::from_section(self.text, title_text_style),
-                style: Style {
-                    margin: UiRect::all(Val::Px(5.0)),
-                    ..default()
-                },
-                ..default()
-            });
-        }
-    }
-}
-
-pub(crate) mod container {
-    use super::*;
-
-    pub(crate) struct UiContainer;
-
-    impl EntityCommand for UiContainer {
-        fn apply(self, id: Entity, world: &mut World) {
-            world.entity_mut(id).insert(NodeBundle {
-                style: Style {
-                    width: Val::Percent(100.0),
-                    height: Val::Percent(100.0),
-                    align_items: AlignItems::Center,
-                    align_content: AlignContent::Center,
-                    justify_items: JustifyItems::Center,
-                    justify_content: JustifyContent::Center,
-                    flex_direction: FlexDirection::Column,
-                    position_type: PositionType::Absolute,
-                    ..default()
-                },
-                ..default()
-            });
-        }
-    }
-}