fixup: copy from bevy examples

Author: lovebaihezi

Cargo.lock

@@ -13,6 +13,7 @@ log = { version = "*", features = [
     "max_level_debug",
     "release_max_level_warn",
 ] }
+flume = { version = "0.11.1" }
 
 [profile.dev]
 opt-level = 1

Cargo.toml

@@ -1,4 +1,3 @@
-
 [package]
 name = "dinosaur-e2e"
 version = "0.0.1"

crates/e2e/Cargo.toml

@@ -1,5 +1,7 @@
+use dinosaur_game::app::{AppType, Game};
 #[test]
 fn game_time_pause_as_no_focus() {
+    let test_game = Game::init(AppType::TestNoRender);
     //let _app = App::new();
 
     //app.add_plugins((

crates/e2e/tests/game_control.rs renamed to crates/e2e/tests/time_paused_on_start.rs

@@ -7,3 +7,4 @@ build = "build.rs"
 [dependencies]
 bevy = { workspace = true }
 log = { workspace = true }
+flume = { workspace = true }

crates/game/Cargo.toml

@@ -0,0 +1,104 @@
+use crate::{
+    dino_jump_animation, dino_jump_system, dino_pos_fix_system, game_info,
+    game_logic::{dino_touched_tree, reset_game},
+    setup_camera, setup_dino, setup_game_control, setup_ground, setup_tree,
+    test_functions::{CaptureFramePlugin, ImageCopyPlugin},
+    tree_move_animation, update_ground, user_control, GameStatus,
+};
+use bevy::{
+    app::PluginGroupBuilder,
+    dev_tools::fps_overlay::{FpsOverlayConfig, FpsOverlayPlugin},
+    prelude::*,
+    text::FontSmoothing,
+    winit::WinitPlugin,
+};
+
+pub struct Game {
+    app: App,
+}
+
+/// # AppType: Control App init, plugins and systems
+#[derive(Debug, Clone, Copy)]
+pub enum AppType {
+    Normal,
+    TestNoRender,
+}
+
+fn default_plugins(app_type: AppType) -> PluginGroupBuilder {
+    let primary_window = match app_type {
+        AppType::Normal => Some(Window {
+            title: "Dinosaur Game".to_string(),
+            canvas: Some("#game".to_string()),
+            fit_canvas_to_parent: true,
+            ..Default::default()
+        }),
+        AppType::TestNoRender => None,
+    };
+    let plugin = DefaultPlugins.set(WindowPlugin {
+        primary_window,
+        ..Default::default()
+    });
+    match app_type {
+        AppType::TestNoRender => plugin.disable::<WinitPlugin>(),
+        AppType::Normal => plugin,
+    }
+}
+
+fn fps_plugin() -> FpsOverlayPlugin {
+    FpsOverlayPlugin {
+        config: FpsOverlayConfig {
+            text_config: TextFont {
+                font_size: 16.0,
+                font: default(),
+                font_smoothing: FontSmoothing::default(),
+            },
+            // We can also change color of the overlay
+            text_color: Color::linear_rgba(0.0, 1.0, 0.0, 1.0),
+            enabled: true,
+        },
+    }
+}
+
+impl Game {
+    pub fn init(app_type: AppType) -> Self {
+        let mut game = Game { app: App::new() };
+        game.app
+            .add_plugins((default_plugins(app_type), fps_plugin()))
+            .insert_resource(GameStatus { speed: 5, score: 0 })
+            .insert_resource(ClearColor(Color::srgb(1.0, 1.0, 1.0)))
+            .add_systems(
+                Startup,
+                (
+                    setup_ground,
+                    setup_dino,
+                    setup_camera,
+                    setup_tree,
+                    setup_game_control,
+                ),
+            )
+            .add_systems(
+                Update,
+                (
+                    update_ground,
+                    dino_jump_system,
+                    (user_control, game_info).chain(),
+                    (dino_pos_fix_system, dino_jump_animation).chain(),
+                    tree_move_animation,
+                    (dino_touched_tree, reset_game).chain(),
+                ),
+            );
+        match app_type {
+            AppType::Normal => {}
+            AppType::TestNoRender => {
+                game.app
+                    .add_plugins(ImageCopyPlugin)
+                    .add_plugins(CaptureFramePlugin);
+            }
+        };
+        game
+    }
+
+    pub fn run(mut self) -> AppExit {
+        self.app.run()
+    }
+}

crates/game/src/app.rs

@@ -1,10 +1,12 @@
+pub mod app;
 mod camera;
 pub mod components;
 mod dino;
 mod game_control;
 pub mod game_logic;
 mod ground;
 mod resources;
+pub mod test_functions;
 mod tree;
 
 pub use camera::setup_camera;

crates/game/src/lib.rs

@@ -1,69 +1,9 @@
-use bevy::{
-    dev_tools::fps_overlay::{FpsOverlayConfig, FpsOverlayPlugin},
-    prelude::*,
-    text::FontSmoothing,
-};
-use dinosaur_game::{
-    dino_jump_animation, dino_jump_system, dino_pos_fix_system, game_info,
-    game_logic::{dino_touched_tree, reset_game},
-    setup_camera, setup_dino, setup_game_control, setup_ground, setup_tree, tree_move_animation,
-    update_ground, user_control, GameStatus,
-};
+use bevy::app::AppExit;
+use dinosaur_game::app::{AppType, Game};
 
 fn main() {
-    // Using OpenGL backend
-    let default_plugin = DefaultPlugins.set(WindowPlugin {
-        primary_window: Some(Window {
-            title: "Dinosaur Game".to_string(),
-            canvas: Some("#game".to_string()),
-            fit_canvas_to_parent: true,
-            ..Default::default()
-        }),
-        ..Default::default()
-    });
-    let exit = App::new()
-        .add_plugins((
-            default_plugin,
-            FpsOverlayPlugin {
-                config: FpsOverlayConfig {
-                    text_config: TextFont {
-                        // Here we define size of our overlay
-                        font_size: 16.0,
-                        // If we want, we can use a custom font
-                        font: default(),
-                        // We could also disable font smoothing,
-                        font_smoothing: FontSmoothing::default(),
-                    },
-                    // We can also change color of the overlay
-                    text_color: Color::linear_rgba(0.0, 1.0, 0.0, 1.0),
-                    enabled: true,
-                },
-            },
-        ))
-        .insert_resource(GameStatus { speed: 5, score: 0 })
-        .insert_resource(ClearColor(Color::srgb(1.0, 1.0, 1.0)))
-        .add_systems(
-            Startup,
-            (
-                setup_ground,
-                setup_dino,
-                setup_camera,
-                setup_tree,
-                setup_game_control,
-            ),
-        )
-        .add_systems(
-            Update,
-            (
-                update_ground,
-                dino_jump_system,
-                (user_control, game_info).chain(),
-                (dino_pos_fix_system, dino_jump_animation).chain(),
-                tree_move_animation,
-                (dino_touched_tree, reset_game).chain(),
-            ),
-        )
-        .run();
+    let game = Game::init(AppType::Normal);
+    let exit = game.run();
     match exit {
         AppExit::Success => {}
         AppExit::Error(_) => panic!("An error occurred while running the app"),