cargo fmt

This commit is contained in:
scott-c 2019-08-17 00:11:06 +08:00
parent 2fabdfe0eb
commit fce74c6218
2 changed files with 10 additions and 3 deletions

View File

@ -1,8 +1,8 @@
use client::Client;
use common::vol::{ReadVol, Vox};
use frustum_query::frustum::Frustum;
use std::f32::consts::PI;
use vek::*;
use frustum_query::frustum::Frustum;
const NEAR_PLANE: f32 = 0.01;
const FAR_PLANE: f32 = 10000.0;

View File

@ -863,8 +863,15 @@ impl FigureMgr {
ecs.read_storage::<comp::Scale>().maybe(),
)
.join()
// Don't render figures outside of frustum (camera viewport, max draw distance is farplane)
.filter(|(_, pos, _, _, _, _, scale)| frustum.sphere_intersecting(&pos.0.x, &pos.0.y, &pos.0.z, &(scale.unwrap_or(&comp::Scale(1.0)).0 * 2.0)))
// Don't render figures outside of frustum (camera viewport, max draw distance is farplane)
.filter(|(_, pos, _, _, _, _, scale)| {
frustum.sphere_intersecting(
&pos.0.x,
&pos.0.y,
&pos.0.z,
&(scale.unwrap_or(&comp::Scale(1.0)).0 * 2.0),
)
})
// Don't render dead entities
.filter(|(_, _, _, _, _, stats, _)| stats.map_or(true, |s| !s.is_dead))
{