From fce74c621883bf191f3566b4be8367da0f0512f0 Mon Sep 17 00:00:00 2001 From: scott-c Date: Sat, 17 Aug 2019 00:11:06 +0800 Subject: [PATCH] cargo fmt --- voxygen/src/scene/camera.rs | 2 +- voxygen/src/scene/figure.rs | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/voxygen/src/scene/camera.rs b/voxygen/src/scene/camera.rs index b5923b0129..0b209da4d6 100644 --- a/voxygen/src/scene/camera.rs +++ b/voxygen/src/scene/camera.rs @@ -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; diff --git a/voxygen/src/scene/figure.rs b/voxygen/src/scene/figure.rs index b952184be1..1c7f8666aa 100644 --- a/voxygen/src/scene/figure.rs +++ b/voxygen/src/scene/figure.rs @@ -863,8 +863,15 @@ impl FigureMgr { ecs.read_storage::().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)) {