Set up text / font stuff

benfrankel · Dec 3, 2023 · b5ad821 · b5ad821
1 parent 4e18daf
commit b5ad821
Show file tree

Hide file tree

Showing 41 changed files with 218 additions and 56 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/assets/font/Kenney/Kenney Blocks.ttf b/assets/font/Kenney/Kenney Blocks.ttf
diff --git a/assets/font/Kenney/Kenney Future Narrow.ttf b/assets/font/Kenney/Kenney Future Narrow.ttf
diff --git a/assets/font/Kenney/Kenney Future.ttf b/assets/font/Kenney/Kenney Future.ttf
diff --git a/assets/font/Kenney/Kenney High Square.ttf b/assets/font/Kenney/Kenney High Square.ttf
diff --git a/assets/font/Kenney/Kenney High.ttf b/assets/font/Kenney/Kenney High.ttf
diff --git a/assets/font/Kenney/Kenney Mini Square Mono.ttf b/assets/font/Kenney/Kenney Mini Square Mono.ttf
diff --git a/assets/font/Kenney/Kenney Mini Square.ttf b/assets/font/Kenney/Kenney Mini Square.ttf
diff --git a/assets/font/Kenney/Kenney Mini.ttf b/assets/font/Kenney/Kenney Mini.ttf
diff --git a/assets/font/Kenney/Kenney Pixel Square.ttf b/assets/font/Kenney/Kenney Pixel Square.ttf
diff --git a/assets/font/Kenney/Kenney Pixel.ttf b/assets/font/Kenney/Kenney Pixel.ttf
diff --git a/assets/font/Kenney/Kenney Rocket Square.ttf b/assets/font/Kenney/Kenney Rocket Square.ttf
diff --git a/assets/font/Kenney/Kenney Rocket.ttf b/assets/font/Kenney/Kenney Rocket.ttf
diff --git a/assets/font/PyriousPixel-B.ttf b/assets/font/PyriousPixel-B.ttf
diff --git a/assets/font/PyriousPixel-R.ttf b/assets/font/PyriousPixel-R.ttf
diff --git a/assets/font/PyriousPixel.aseprite b/assets/font/PyriousPixel.aseprite
diff --git a/assets/font/anna anthropy/Chubster.ttf b/assets/font/anna anthropy/Chubster.ttf
diff --git a/assets/font/anna anthropy/CryptOfTomorrow.ttf b/assets/font/anna anthropy/CryptOfTomorrow.ttf
diff --git a/assets/font/anna anthropy/Floatpoints.ttf b/assets/font/anna anthropy/Floatpoints.ttf
diff --git a/assets/font/anna anthropy/FrogPrincess.ttf b/assets/font/anna anthropy/FrogPrincess.ttf
diff --git a/assets/font/anna anthropy/GhostButler.ttf b/assets/font/anna anthropy/GhostButler.ttf
diff --git a/assets/font/anna anthropy/Jaywalk.ttf b/assets/font/anna anthropy/Jaywalk.ttf
diff --git a/assets/font/anna anthropy/ListenHereMiss.ttf b/assets/font/anna anthropy/ListenHereMiss.ttf
diff --git a/assets/font/anna anthropy/Magic Forest.ttf b/assets/font/anna anthropy/Magic Forest.ttf
diff --git a/assets/font/anna anthropy/PlanetGemrule.ttf b/assets/font/anna anthropy/PlanetGemrule.ttf
diff --git a/assets/font/anna anthropy/Slanted.ttf b/assets/font/anna anthropy/Slanted.ttf
diff --git a/assets/font/anna anthropy/TroubleBeneathTheDome.ttf b/assets/font/anna anthropy/TroubleBeneathTheDome.ttf
diff --git a/assets/font/anna anthropy/WildBillYonder.ttf b/assets/font/anna anthropy/WildBillYonder.ttf
diff --git a/assets/font/anna anthropy/Witchqueen.ttf b/assets/font/anna anthropy/Witchqueen.ttf
diff --git a/assets/font/anna anthropy/Wizard's Manse.otf b/assets/font/anna anthropy/Wizard's Manse.otf
diff --git a/assets/font/anna anthropy/cyber-druids.ttf b/assets/font/anna anthropy/cyber-druids.ttf
diff --git a/assets/font/anna anthropy/dysin4mation.ttf b/assets/font/anna anthropy/dysin4mation.ttf
diff --git a/mockup/editor_ui.png b/mockup/editor_ui.png
diff --git a/src/camera.rs b/src/camera.rs
@@ -12,16 +12,19 @@ impl Plugin for CameraPlugin {
     }
 }
 
+pub const CAMERA_WIDTH: f32 = 320.0;
+pub const CAMERA_HEIGHT: f32 = 180.0;
+
 fn spawn_camera(mut commands: Commands, mut root: ResMut<AppRoot>) {
     root.camera = commands
         .spawn((
             Name::new("MainCamera"),
             Camera2dBundle {
                 projection: OrthographicProjection {
                     near: -1000.0,
-                    scaling_mode: ScalingMode::AutoMax {
-                        max_width: 1920.0,
-                        max_height: 1080.0,
+                    scaling_mode: ScalingMode::Fixed {
+                        width: CAMERA_WIDTH,
+                        height: CAMERA_HEIGHT,
                     },
                     ..default()
                 },

diff --git a/src/debug.rs b/src/debug.rs
@@ -98,7 +98,7 @@ impl Plugin for DebugPlugin {
         // Editor
         if self.editor {
             app.add_plugins(EditorPlugin::new().in_new_window(Window {
-                mode: WindowMode::BorderlessFullscreen,
+                mode: WindowMode::Windowed,
                 title: "bevy_editor_pls".to_string(),
                 focused: false,
                 ..default()

diff --git a/src/lib.rs b/src/lib.rs
@@ -38,6 +38,7 @@ impl Plugin for AppPlugin {
         app.add_plugins(debug::DebugPlugin {
             ambiguity_detection: false,
             //editor: false,
+            start: state::AppState::TitleScreen,
             ..default()
         });
     }

diff --git a/src/state/end_screen.rs b/src/state/end_screen.rs
@@ -7,7 +7,7 @@ use leafwing_input_manager::prelude::*;
 use crate::config::Config;
 use crate::state::AppState;
 use crate::state::AppState::*;
-use crate::ui::FONT_HANDLE;
+use crate::ui::BOLD_FONT_HANDLE;
 use crate::AppRoot;
 
 pub struct EndScreenStatePlugin;
@@ -34,7 +34,7 @@ impl Plugin for EndScreenStatePlugin {
 #[reflect(Resource)]
 pub struct EndScreenAssets {}
 
-#[derive(Actionlike, Reflect, Clone)]
+#[derive(Actionlike, Reflect, PartialEq, Eq, Hash, Clone)]
 enum EndScreenAction {
     Restart,
     Quit,
@@ -81,7 +81,7 @@ fn enter_end_screen(mut commands: Commands, root: Res<AppRoot>, config: Res<Conf
                 text: Text::from_section(
                     "The End",
                     TextStyle {
-                        font: FONT_HANDLE,
+                        font: BOLD_FONT_HANDLE,
                         font_size: 64.0,
                         color: config.fg_color,
                     },

diff --git a/src/state/loading_screen.rs b/src/state/loading_screen.rs
@@ -6,7 +6,7 @@ use iyes_progress::prelude::*;
 use crate::config::Config;
 use crate::state::game::GameAssets;
 use crate::state::AppState::*;
-use crate::ui::FONT_HANDLE;
+use crate::ui::BOLD_FONT_HANDLE;
 use crate::AppRoot;
 
 pub struct LoadingScreenStatePlugin;
@@ -76,7 +76,7 @@ fn enter_loading(mut commands: Commands, root: Res<AppRoot>, config: Res<Config>
                     text: Text::from_section(
                         "Loading...",
                         TextStyle {
-                            font: FONT_HANDLE,
+                            font: BOLD_FONT_HANDLE,
                             font_size: 64.0,
                             color: config.fg_color,
                         },