Add fonts, render ui

Author: CuddlyBunion341

Cargo.lock

@@ -1,52 +1,41 @@
 use crate::prelude::*;
 
-use bevy::{prelude::*, winit::WinitSettings};
-
 pub fn setup_gui_system(mut commands: Commands, asset_server: Res<AssetServer>) {
     commands.spawn(Camera2dBundle::default());
     commands
-        .spawn(Node {
-            // width: Val::Percent(100.0),
-            // height: Val::Percent(100.0),
-            // align_items: AlignItems::Center,
-            // justify_content: JustifyContent::Center,
+        .spawn(NodeBundle {
+            style: Style {
+                width: Val::Percent(100.0),
+                height: Val::Percent(100.0),
+                align_items: AlignItems::Center,
+                justify_content: JustifyContent::Center,
+                ..default()
+            },
             ..default()
         })
+    .with_children(|parent| {
+        parent
+            .spawn(ButtonBundle {
+                style: Style {
+                    width: Val::Px(150.0),
+                    height: Val::Px(65.0),
+                    border: UiRect::all(Val::Px(5.0)),
+                    justify_content: JustifyContent::Center,
+                    align_items: AlignItems::Center,
+                    ..default()
+                },
+                border_color: BorderColor(Color::BLACK),
+                ..default()
+            })
         .with_children(|parent| {
-            parent
-                .spawn((
-                    Button,
-                    Node {
-                        // width: Val::Px(150.0),
-                        // height: Val::Px(65.0),
-                        // border: UiRect::all(Val::Px(5.0)),
-                        // // horizontally center child text
-                        // justify_content: JustifyContent::Center,
-                        // // vertically center child text
-                        // align_items: AlignItems::Center,
-                        ..Default::default()
+            parent.spawn(TextBundle::from_section(
+                    "Button",
+                    TextStyle {
+                        font: asset_server.load("fonts/Terminus500.ttf"),
+                        font_size: 40.0,
+                        color: Color::rgb(0.9, 0.9, 0.9),
                     },
-                    BorderColor(Color::BLACK),
-                    // BorderRadius::MAX,
-                    // BackgroundColor(NORMAL_BUTTON),
-                ))
-                .with_children(|parent| {
-                    parent.spawn(Text::from_section(
-                        "Click me!",
-                        TextStyle {
-                            font: asset_server.load("fonts/FiraSans-Bold.ttf"),
-                            font_size: 30.0,
-                            color: Color::WHITE,
-                            ..default()
-                        },
-                    ));
-                    // Text::from_section("Hello World!", TextStyle { ..default() })
-                    // TextFont {
-                    //     font: asset_server.load("fonts/FiraSans-Bold.ttf"),
-                    //     font_size: 33.0,
-                    //     ..default()
-                    // },
-                    // TextColor(Color::srgb(0.9, 0.9, 0.9)),
-                });
+            ));
         });
+    });
 }

assets/fonts/Terminus500.ttf

@@ -5,3 +5,6 @@ pub struct HighlightCube;
 
 #[derive(Component, Default)]
 pub struct Player;
+
+#[derive(Component)]
+pub struct PlayerCamera;

assets/fonts/TerminusBold 700.ttf

@@ -14,6 +14,7 @@ pub fn setup_player_camera(mut commands: Commands) {
         RenderPlayer {
             logical_entity: Entity::from_raw(0),
         },
+        player_components::PlayerCamera,
     ));
 }
 

assets/fonts/TerminusBold Italic 700.ttf

@@ -3,10 +3,10 @@ use crate::prelude::*;
 pub fn broadcast_player_attributes_system(
     mut client: ResMut<RenetClient>,
     query: Query<(&player_components::Player, &Transform)>,
-    camera_query: Query<(&Camera3d, &Transform)>,
+    camera_query: Query<(&Camera3d, &player_components::PlayerCamera, &Transform)>,
 ) {
     let (_, transform) = query.single();
-    let (_, camera_transform) = camera_query.single();
+    let (_, _, camera_transform) = camera_query.single();
 
     let player_state = lib::PlayerState {
         position: transform.translation,

assets/fonts/TerminusItalic 500.ttf

@@ -22,10 +22,10 @@ pub fn setup_highlight_cube_system(
 pub fn raycast_system(
     mut raycast: Raycast,
     mut gizmos: Gizmos,
-    query: Query<&Transform, With<Camera>>,
+    query: Query<&Transform, With<player_components::PlayerCamera>>,
     mut highlight_query: Query<
         (&mut Transform, &player_components::HighlightCube),
-        Without<Camera>,
+        Without<player_components::PlayerCamera>,
     >,
     mut block_selection: ResMut<player_resources::BlockSelection>,
 ) {