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

keep MAX_TARGET_RANGE within voxygen

Browse Source
This commit is contained in:
anomaluridae 2021-09-14 14:30:01 -07:00
parent 2789d2ae29
commit a7cee0f11b
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/src/consts.rs
View File

@ -1,8 +1,6 @@
// The limit on distance between the entity and a collectible (squared) // The limit on distance between the entity and a collectible (squared)
pub const MAX_PICKUP_RANGE: f32 = 5.0; pub const MAX_PICKUP_RANGE: f32 = 5.0;
pub const MAX_MOUNT_RANGE: f32 = 14.0; pub const MAX_MOUNT_RANGE: f32 = 14.0;
/// Max distance an entity can be "targeted"
pub const MAX_TARGET_RANGE: f32 = 300.0;
pub const GRAVITY: f32 = 25.0; pub const GRAVITY: f32 = 25.0;
pub const FRIC_GROUND: f32 = 0.15; pub const FRIC_GROUND: f32 = 0.15;

4
voxygen/src/session/interactable.rs
View File

@ -2,11 +2,11 @@ use ordered_float::OrderedFloat;
use specs::{Join, WorldExt}; use specs::{Join, WorldExt};
use vek::*; use vek::*;
use super::target::{self, Target}; use super::target::{self, MAX_TARGET_RANGE, Target};
use client::Client; use client::Client;
use common::{ use common::{
comp, comp,
consts::{MAX_PICKUP_RANGE, MAX_TARGET_RANGE}, consts::MAX_PICKUP_RANGE,
terrain::Block, terrain::Block,
util::find_dist::{Cube, Cylinder, FindDist}, util::find_dist::{Cube, Cylinder, FindDist},
vol::ReadVol, vol::ReadVol,

5
voxygen/src/session/target.rs
View File

@ -5,7 +5,7 @@ use vek::*;
use client::{self, Client}; use client::{self, Client};
use common::{ use common::{
comp, comp,
consts::{MAX_PICKUP_RANGE, MAX_TARGET_RANGE}, consts::MAX_PICKUP_RANGE,
terrain::Block, terrain::Block,
util::find_dist::{Cylinder, FindDist}, util::find_dist::{Cylinder, FindDist},
vol::ReadVol, vol::ReadVol,
@ -39,6 +39,9 @@ impl<T> Target<T> {
pub fn position_int(self) -> Vec3<i32> { self.position.map(|p| p.floor() as i32) } pub fn position_int(self) -> Vec3<i32> { self.position.map(|p| p.floor() as i32) }
} }
/// Max distance an entity can be "targeted"
pub const MAX_TARGET_RANGE: f32 = 300.0;
/// Calculate what the cursor is pointing at within the 3d scene /// Calculate what the cursor is pointing at within the 3d scene
#[allow(clippy::type_complexity)] #[allow(clippy::type_complexity)]
pub(super) fn targets_under_cursor( pub(super) fn targets_under_cursor(