Add scale factor option for configuring video resolution.

Cargo.toml

@@ -7,6 +7,8 @@ edition = "2021"
 bevy = { version = "0.14.2", features = ["wav"] }
 bevy_dev_tools = "0.14.2"
 rand = "0.8.5"
+num-traits = "0.2"
+num-derive = "0.4"
 image = "0.25.2"
 log = { version = "*", features = [
     "max_level_debug",

dist/style.css

@@ -1,4 +1,6 @@
 body {
+  width: 100vw;
+  height: 100vh;
   display: flex;
   flex-direction: column;
   justify-content: center;

src/app_state.rs

@@ -7,4 +7,5 @@ pub enum AppState {
     GameModeMenu,
     LevelMenu,
     Game,
+    ChangeScale,
 }

src/main.rs

@@ -4,6 +4,10 @@ use bevy::{
     window::{PresentMode, WindowResolution},
 };
 
+#[macro_use]
+extern crate num_derive;
+extern crate num_traits;
+
 mod app_state;
 mod audio;
 mod controller;
@@ -12,6 +16,7 @@ mod game_option_menu;
 mod inputs;
 mod level_menu;
 mod logo;
+mod scale;
 mod splash;
 mod utility;
 
@@ -24,8 +29,11 @@ fn main() {
             DefaultPlugins
                 .set(WindowPlugin {
                     primary_window: Some(Window {
-                        resolution: WindowResolution::new(1280.0, 960.0),
+                        resolution: WindowResolution::new(1920.0, 1080.0)
+                            .with_scale_factor_override(1.0),
                         present_mode: PresentMode::AutoNoVsync,
+                        position: WindowPosition::Centered(MonitorSelection::Primary),
+                        fit_canvas_to_parent: true,
                         title: "TETRIS".into(),
                         ..default()
                     }),
@@ -53,6 +61,7 @@ fn main() {
             game_option_menu::plugin::setup,
             level_menu::plugin::setup,
             game::plugin::setup,
+            scale::plugin::setup,
         ))
         .run();
 }

src/scale/mod.rs

@@ -0,0 +1 @@
+pub mod plugin;

src/scale/plugin.rs

@@ -0,0 +1,65 @@
+use bevy::prelude::*;
+use num_traits::FromPrimitive;
+
+use crate::{
+    app_state::AppState, game::transform::GameTransform,
+    game_option_menu::transform::GameOptionMenuTransform,
+    level_menu::transform::LevelMenuTransform, splash::transform::SplashTransform,
+};
+
+pub fn setup(app: &mut App) {
+    app.insert_resource(ScaleFactor::default())
+        .add_systems(OnEnter(AppState::ChangeScale), change_scale_system);
+}
+
+#[derive(Default, Clone, Copy, FromPrimitive, Resource)]
+pub enum ScaleFactor {
+    S720 = 0,
+    #[default]
+    S1080,
+    S1440,
+    S1800,
+    S2160,
+    S3240,
+    S4320,
+}
+
+impl ScaleFactor {
+    pub fn mul(&self) -> f32 {
+        let base = 1080.0;
+
+        match self {
+            ScaleFactor::S720 => 720.0 / base,
+            ScaleFactor::S1080 => 1080.0 / base,
+            ScaleFactor::S1440 => 1440.0 / base,
+            ScaleFactor::S1800 => 1800.0 / base,
+            ScaleFactor::S2160 => 2160.0 / base,
+            ScaleFactor::S3240 => 3240.0 / base,
+            ScaleFactor::S4320 => 4320.0 / base,
+        }
+    }
+
+    pub fn prev(&mut self) -> Option<Self> {
+        FromPrimitive::from_i8(*self as i8 - 1).map(|n| std::mem::replace(self, n))
+    }
+
+    pub fn next(&mut self) -> Option<Self> {
+        FromPrimitive::from_i8(*self as i8 + 1).map(|n| std::mem::replace(self, n))
+    }
+}
+
+fn change_scale_system(
+    scale_factor: Res<ScaleFactor>,
+    mut splash_transform: ResMut<SplashTransform>,
+    mut game_option_menu_transform: ResMut<GameOptionMenuTransform>,
+    mut level_menu_transform: ResMut<LevelMenuTransform>,
+    mut game_transform: ResMut<GameTransform>,
+    mut app_state: ResMut<NextState<AppState>>,
+) {
+    *splash_transform = SplashTransform::new(scale_factor.mul());
+    *game_option_menu_transform = GameOptionMenuTransform::new(scale_factor.mul());
+    *level_menu_transform = LevelMenuTransform::new(scale_factor.mul());
+    *game_transform = GameTransform::new(scale_factor.mul());
+
+    app_state.set(AppState::GameModeMenu);
+}