From fe9862718604bae55a4de4f039d847415d30dd3c Mon Sep 17 00:00:00 2001 From: Amatsugu Date: Mon, 11 Nov 2024 20:46:21 -0500 Subject: [PATCH] misc --- game/main/src/camera_system/camera_plugin.rs | 2 ++ game/main/src/main.rs | 1 - game/main/src/map_rendering/render_distance_system.rs | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/game/main/src/camera_system/camera_plugin.rs b/game/main/src/camera_system/camera_plugin.rs index e3bb960..65348f7 100644 --- a/game/main/src/camera_system/camera_plugin.rs +++ b/game/main/src/camera_system/camera_plugin.rs @@ -3,6 +3,7 @@ use bevy::core_pipeline::prepass::DepthPrepass; use bevy::input::mouse::{MouseMotion, MouseScrollUnit, MouseWheel}; use bevy::prelude::*; use bevy::window::{CursorGrabMode, PrimaryWindow}; +use bevy_lunex::prelude::MainUi; use shared::sets::GameplaySet; use shared::tags::MainCamera; use world_generation::hex_utils::HexCoord; @@ -59,6 +60,7 @@ fn setup(mut commands: Commands, mut msaa: ResMut) { MainCamera, DepthPrepass, PhosOrbitCamera::default(), + MainUi, )) .insert(TemporalAntiAliasBundle::default()); diff --git a/game/main/src/main.rs b/game/main/src/main.rs index 7181fca..d758662 100644 --- a/game/main/src/main.rs +++ b/game/main/src/main.rs @@ -14,7 +14,6 @@ mod prelude; mod shader_extensions; mod ui; mod utlis; -mod ui; fn main() { App::new() diff --git a/game/main/src/map_rendering/render_distance_system.rs b/game/main/src/map_rendering/render_distance_system.rs index e7aaa80..ea70ed9 100644 --- a/game/main/src/map_rendering/render_distance_system.rs +++ b/game/main/src/map_rendering/render_distance_system.rs @@ -1,4 +1,5 @@ use bevy::prelude::*; +use shared::tags::MainCamera; use crate::camera_system::components::PhosCamera; @@ -52,7 +53,7 @@ impl Default for RenderDistanceVisibility { fn render_distance_system( mut objects: Query<(&Transform, &mut Visibility, &RenderDistanceVisibility)>, - camera_query: Query<&Transform, With>, + camera_query: Query<&Transform, With>, settings: Res, ) { let camera = camera_query.single();