Integrated bevy transform

Author: mantou132

Cargo.lock

@@ -7,8 +7,3 @@ members = [
 ]
 
 exclude = ["deps"]
-
-[profile.release.package.nes]
-# Tell `rustc` to optimize for small code size.
-opt-level = "s"
-debug = true

Cargo.toml

@@ -11,4 +11,4 @@ crate-type = ["cdylib", "rlib"]
 nesbox-utils = { path = "../../packages/nes/utils" }
 
 # fixed ecs macro
-bevy_ecs = "0.10"
+bevy = { version = "0.10", default-features = false }

games/gomoku/Cargo.toml

@@ -3,7 +3,7 @@
 ## Development
 
 ```bash
-cargo watch -s "wasm-pack build --target web --out-name=index"
+cargo watch -s "wasm-pack build --target web --out-name=index --debug"
 ```
 
 ## Serve

games/gomoku/README.md

@@ -1,125 +1,137 @@
-use nesbox_utils::{bevy_app::*, bevy_ecs::prelude::*, input::*, prelude::*, render::*};
+use nesbox_utils::{input::*, prelude::*, render::*};
 
 pub const RENDER_WIDTH: u32 = 256;
 pub const RENDER_HEIGHT: u32 = 240;
 pub const RENDER_PIXELS: usize = (RENDER_WIDTH * RENDER_HEIGHT) as usize;
 pub const RENDER_SIZE: usize = 4 * RENDER_PIXELS;
 
-#[derive(Bundle, Debug)]
-struct ObjectBundle {
-    position: Position,
-    velocity: Velocity,
-    size: Size,
-    color: Color,
-}
+const OBJ_SIZE: f32 = 64.;
 
-#[derive(Bundle, Debug)]
-struct BgBundle {
-    position: Position,
-    size: Size,
-    color: Color,
-}
+#[derive(Component, Debug, Default)]
+struct Player;
 
-#[derive(Component)]
+#[derive(Component, Debug, Default)]
 struct Cursor;
 
 fn setup(mut commands: Commands) {
-    let bg = BgBundle {
-        position: Position { x: 0, y: 0 },
-        size: Size {
-            width: RENDER_WIDTH,
-            height: RENDER_HEIGHT,
-        },
-        color: Color(0x48, 0xb2, 0xe8, 0xff),
-    };
-    commands.spawn(bg);
-    let box_object = ObjectBundle {
-        position: Position { x: 24, y: 16 },
-        velocity: Velocity { x: 1, y: 1 },
-        size: Size {
-            width: 64,
-            height: 64,
-        },
-        color: Color(0x5e, 0x48, 0xe8, 0xff),
-    };
-    commands.spawn(box_object);
+    commands
+        .spawn((
+            Player,
+            Velocity { x: 1., y: 1. },
+            SpatialBundle {
+                transform: Transform::from_xyz(1., 1., 0.),
+                ..default()
+            },
+        ))
+        .with_children(|parent| {
+            for i in 0..2 {
+                for j in 0..2 {
+                    parent.spawn((
+                        SpatialBundle {
+                            transform: Transform::from_xyz(
+                                i as f32 * OBJ_SIZE / 2.,
+                                j as f32 * OBJ_SIZE / 2.,
+                                0.,
+                            ),
+                            ..default()
+                        },
+                        Size {
+                            width: OBJ_SIZE / 2.,
+                            height: OBJ_SIZE / 2.,
+                        },
+                        Color(random(), random(), random(), 0xff),
+                    ));
+                }
+            }
+        });
     commands.spawn((
+        SpatialBundle {
+            transform: Transform::from_xyz(0., 0., 0.),
+            ..default()
+        },
         Cursor,
-        Position { x: -2, y: -2 },
         Size {
-            width: 4,
-            height: 4,
+            width: 4.,
+            height: 4.,
         },
-        Color(0x00, 0x00, 0x00, 0xff),
+        Color(0xff, 0x00, 0x00, 0x66),
     ));
 }
 
-fn bounce(mut query: Query<(&Position, &mut Velocity, &Size, &mut Color)>) {
-    for (position, mut velocity, size, mut color) in query.iter_mut() {
-        let mut bounce = false;
-        if position.x == 0 || position.x + size.width as i32 > RENDER_WIDTH as i32 {
-            velocity.x *= -1;
-            bounce = true;
-        }
-        if position.y == 0 || position.y + size.height as i32 > RENDER_HEIGHT as i32 {
-            velocity.y *= -1;
-            bounce = true;
-        }
-        if bounce {
+fn bounce(
+    mut query: Query<(&Transform, &mut Velocity, &Children), With<Player>>,
+    mut q_child: Query<&mut Color>,
+) {
+    let mut bounce = false;
+    let (transform, mut velocity, children) = query.single_mut();
+    let Vec3 { x, y, .. } = transform.translation;
+
+    if x < 0. || x + OBJ_SIZE > RENDER_WIDTH as f32 {
+        velocity.x *= -1.;
+        bounce = true;
+    }
+    if y < 0. || y + OBJ_SIZE > RENDER_HEIGHT as f32 {
+        velocity.y *= -1.;
+        bounce = true;
+    }
+
+    if bounce {
+        for &child in children.iter() {
+            let mut color = q_child.get_mut(child).unwrap();
             color.0 = random();
             color.1 = random();
             color.2 = random();
         }
     }
 }
 
-fn handle(input: Res<Input<Button>>, mut query: Query<&mut Velocity>) {
+fn handle(input: Res<Input<Button>>, mut query: Query<&mut Velocity, With<Player>>) {
     let mut velocity = query.single_mut();
 
     if input.just_pressed(Button::Joypad1Left) {
-        velocity.x = velocity.x.abs() * -1;
+        velocity.x = velocity.x.abs() * -1.;
     }
 
     if input.just_pressed(Button::Joypad1Right) {
         velocity.x = velocity.x.abs();
     }
 
     if input.just_pressed(Button::Joypad1Up) {
-        velocity.y = velocity.y.abs() * -1;
+        velocity.y = velocity.y.abs() * -1.;
     }
 
     if input.just_pressed(Button::Joypad1Down) {
         velocity.y = velocity.y.abs();
     }
 }
 
-fn movement(mut query: Query<(&mut Position, &Velocity)>) {
-    for (mut position, velocity) in query.iter_mut() {
-        position.x = position.x + velocity.x;
-        position.y = position.y + velocity.y;
+fn movement(mut query: Query<(&mut Transform, &Velocity), With<Player>>) {
+    for (mut transform, velocity) in query.iter_mut() {
+        transform.translation.x += velocity.x;
+        transform.translation.y += velocity.y;
     }
 }
 
 fn mouse_motion(
     mut mouse_evt: EventReader<MouseEvent>,
-    mut query: Query<(&Cursor, &mut Position)>,
+    mut query: Query<(&Cursor, &mut Transform)>,
 ) {
     if let Some(event) = mouse_evt.iter().last() {
-        if let Some((_, mut position)) = query.iter_mut().last() {
-            position.x = event.delta.x as i32 - 2;
-            position.y = event.delta.y as i32 - 2;
+        if let Some((_, mut transform)) = query.iter_mut().last() {
+            transform.translation.x = event.delta.x - 2.;
+            transform.translation.y = event.delta.y - 2.;
         }
     }
 }
 
 pub fn create_app() -> App {
-    let mut app = create_bevy_app(RENDER_WIDTH, RENDER_HEIGHT);
+    let mut app = create_bevy_app(RENDER_WIDTH, RENDER_HEIGHT, Color(0x48, 0xb2, 0xe8, 0xff));
 
     app.add_startup_system(setup)
         .add_system(bounce)
+        .add_system(movement.after(bounce))
         .add_system(mouse_motion)
-        .add_system(handle)
-        .add_system(movement.after(bounce));
+        .add_system(handle);
 
     app
 }

games/gomoku/src/game.rs

@@ -1,8 +1,5 @@
 use game::*;
-use nesbox_utils::{
-    bevy_app::App, bevy_ecs::prelude::*, bevy_ecs::system::*, bevy_math::Vec2, input::*,
-    prelude::*, render::*,
-};
+use nesbox_utils::{bevy::ecs::system::*, input::*, prelude::*};
 
 mod game;
 

games/gomoku/src/lib.rs

@@ -12,7 +12,7 @@ git submodule update
 
 ```bash
 # development
-cargo watch -s "wasm-pack build --out-dir ../nes-pkg --target web --scope mantou"
+cargo watch -s "wasm-pack build --out-dir ../nes-pkg --target web --scope mantou --debug"
 # build
 wasm-pack build --out-dir ../nes-pkg --target web --scope mantou
 ```

packages/nes/README.md

@@ -231,8 +231,8 @@ impl Nes {
         }
     }
 
-    /// 2k(0u16..=0x07FF) ram + 8K(0x6000u16..=0x7FFF) sram
     pub fn ram(&mut self) -> Vec<u8> {
+        // 2k(0u16..=0x07FF) ram + 8K(0x6000u16..=0x7FFF) sram
         let mut ram = Vec::new();
         for addr in 0u16..=0x07FF {
             ram.push(self.control_deck.cpu().bus.peek(addr));

packages/nes/src/lib.rs

@@ -7,21 +7,9 @@ edition = "2021"
 [lib]
 crate-type = ["cdylib", "rlib"]
 
-[features]
-default = ["console_error_panic_hook"]
-
 [dependencies]
 qoi = "0.4.0"
-bevy_ecs = "0.10"
-bevy_app = "0.10"
-bevy_input = "0.10"
-bevy_math = "0.10"
+bevy = { version = "0.10", default-features = false }
 bincode = "1.3.3"
 rand = "0.8"
 wasm-bindgen = "0.2.63"
-
-# The `console_error_panic_hook` crate provides better debugging of panics by
-# logging them with `console.error`. This is great for development, but requires
-# all the `std::fmt` and `std::panicking` infrastructure, so isn't great for
-# code size when deploying.
-console_error_panic_hook = { version = "0.1.6", optional = true }

packages/nes/utils/Cargo.toml

@@ -1,6 +1,6 @@
-pub use bevy_input::*;
+pub use bevy::input::*;
 
-use bevy_math::Vec2;
+use bevy::prelude::*;
 use wasm_bindgen::prelude::*;
 
 #[wasm_bindgen]

packages/nes/utils/src/input.rs

@@ -1,24 +1,25 @@
-pub use bevy_app;
-pub use bevy_ecs;
-pub use bevy_math;
-
 pub mod prelude {
     pub use crate::codes::*;
     pub use crate::create_bevy_app;
     pub use crate::log;
+    pub use crate::pixels::*;
+    pub use bevy::prelude::*;
     pub use rand::prelude::random;
     pub use wasm_bindgen;
     pub use wasm_bindgen::prelude::*;
 }
 
-use bevy_app::App;
+use bevy::{prelude::*, time::TimePlugin};
 use input::{Button, Input, MouseEvent};
+use pixels::Color;
 use render::RenderPlugin;
 
+pub use bevy;
 pub use wasm_bindgen;
 pub use wasm_bindgen::prelude::*;
 pub mod codes;
 pub mod input;
+pub mod pixels;
 pub mod render;
 
 #[wasm_bindgen]
@@ -34,23 +35,33 @@ macro_rules! log {
     }};
 }
 
-pub fn create_bevy_app(width: u32, height: u32) -> App {
+pub fn create_bevy_app(width: u32, height: u32, clear_color: Color) -> App {
     let mut app = App::new();
 
+    #[cfg(debug_assertions)]
+    app.add_plugin(bevy::log::LogPlugin::default());
+
     // TODO: audio
-    app.add_plugin(RenderPlugin { width, height })
-        .add_event::<MouseEvent>()
-        .init_resource::<Input<Button>>();
+    app.add_plugin(RenderPlugin {
+        width,
+        height,
+        clear_color,
+    })
+    .add_plugin(TaskPoolPlugin::default())
+    .add_plugin(TypeRegistrationPlugin::default())
+    .add_plugin(FrameCountPlugin::default())
+    .add_plugin(TimePlugin::default())
+    .add_plugin(TransformPlugin::default())
+    .add_plugin(HierarchyPlugin::default())
+    .add_event::<MouseEvent>()
+    .init_resource::<Input<Button>>();
 
     app
 }
 
 #[wasm_bindgen(start)]
 pub fn run() {
-    #[cfg(debug_assertions)]
-    console_error_panic_hook::set_once();
-    log!("WASM import console#log");
-    let mut app = create_bevy_app(1, 1);
+    let mut app = create_bevy_app(1, 1, Color::default());
     app.update();
     log!("WASM import bevy deps");
 }