Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace uses of "65" with client::MAX_SELECTABLE_VD in client and

Browse Source 
voxygen crates.
This commit is contained in:
Imbris 2022-08-21 23:50:46 -04:00
parent 334937568e
commit 37caab539c
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/src/lib.rs
View File

@ -81,6 +81,8 @@ use tokio::runtime::Runtime;
use tracing::{debug, error, trace, warn}; use tracing::{debug, error, trace, warn};
use vek::*; use vek::*;
pub const MAX_SELECTABLE_VIEW_DISTANCE: u32 = 65;
const PING_ROLLING_AVERAGE_SECS: usize = 10; const PING_ROLLING_AVERAGE_SECS: usize = 10;
#[derive(Debug)] #[derive(Debug)]
@ -948,7 +950,7 @@ impl Client {
pub fn set_view_distances(&mut self, view_distances: common::ViewDistances) { pub fn set_view_distances(&mut self, view_distances: common::ViewDistances) {
if self.server_view_distance_limit.map_or(true, |limit| view_distances.terrain >= limit) { if self.server_view_distance_limit.map_or(true, |limit| view_distances.terrain >= limit) {
let view_distances = common::ViewDistances { let view_distances = common::ViewDistances {
terrain: view_distances.terrain.max(1).min(65), terrain: view_distances.terrain.max(1).min(MAX_SELECTABLE_VIEW_DISTANCE),
entity: view_distances.entity, entity: view_distances.entity,
}; };
self.view_distance = Some(view_distances.terrain); self.view_distance = Some(view_distances.terrain);

4
voxygen/src/hud/settings_window/networking.rs
View File

@ -107,7 +107,7 @@ impl<'a> Widget for Networking<'a> {
if let Some(new_val) = ImageSlider::discrete( if let Some(new_val) = ImageSlider::discrete(
terrain_view_distance, terrain_view_distance,
1, 1,
65, client::MAX_SELECTABLE_VIEW_DISTANCE,
self.imgs.slider_indicator, self.imgs.slider_indicator,
self.imgs.slider, self.imgs.slider,
) )
@ -153,7 +153,7 @@ impl<'a> Widget for Networking<'a> {
if let Some(new_val) = ImageSlider::discrete( if let Some(new_val) = ImageSlider::discrete(
entity_view_distance, entity_view_distance,
1, 1,
65, client::MAX_SELECTABLE_VIEW_DISTANCE,
self.imgs.slider_indicator, self.imgs.slider_indicator,
self.imgs.slider, self.imgs.slider,
) )

4
voxygen/src/hud/settings_window/video.rs
View File

@ -295,7 +295,7 @@ impl<'a> Widget for Video<'a> {
if let Some(new_val) = ImageSlider::discrete( if let Some(new_val) = ImageSlider::discrete(
terrain_view_distance, terrain_view_distance,
1, 1,
65, client::MAX_SELECTABLE_VIEW_DISTANCE,
self.imgs.slider_indicator, self.imgs.slider_indicator,
self.imgs.slider, self.imgs.slider,
) )
@ -330,7 +330,7 @@ impl<'a> Widget for Video<'a> {
if let Some(new_val) = ImageSlider::discrete( if let Some(new_val) = ImageSlider::discrete(
entity_view_distance, entity_view_distance,
1, 1,
65, client::MAX_SELECTABLE_VIEW_DISTANCE,
self.imgs.slider_indicator, self.imgs.slider_indicator,
self.imgs.slider, self.imgs.slider,
) )

2
voxygen/src/settings/graphics.rs
View File

@ -52,7 +52,7 @@ impl Default for GraphicsSettings {
fn default() -> Self { fn default() -> Self {
Self { Self {
terrain_view_distance: 10, terrain_view_distance: 10,
entity_view_distance: 65, entity_view_distance: client::MAX_SELECTABLE_VIEW_DISTANCE,
lod_distance: 200, lod_distance: 200,
sprite_render_distance: 100, sprite_render_distance: 100,
particles_enabled: true, particles_enabled: true,