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

Another 5% boost to tree chunk performance

Browse Source 
(and over 25% improvement to giant tree throughput--they are under 1
ms/chunk now!)
This commit is contained in:
Joshua Yanovski 2022-07-28 12:12:15 -07:00
parent 233e12d279
commit 901aa8e1b4
1 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
world/src/site2/gen.rs
View File

@ -2858,27 +2858,21 @@ impl Painter<'_> {
/*if !(aabb.size().w > 8 || aabb.size().h > 8 || aabb.size().d > 16) */{ /*if !(aabb.size().w > 8 || aabb.size().h > 8 || aabb.size().d > 16) */{
let distance = segment.end - segment.start; let distance = segment.end - segment.start;
let distance2 = distance.magnitude_squared(); let distance_proj = distance / distance.magnitude_squared();
let segment_start = segment.start - 0.5;
return aabb_iter( return aabb_iter(
aabb.as_(), aabb.as_(),
mat, mat,
mask, mask,
// |_| true, // |_| true,
|pos| { |pos| {
let pos = pos.map(|e| e as f32) + 0.5; let pos = pos.as_::<f32>();
let length = pos - segment.start.as_(); let length = pos - segment_start;
let t = let t = length.dot(distance_proj).clamped(0.0, 1.0);
(length.as_().dot(distance) / distance2).clamped(0.0, 1.0); let mut diff = distance * t - length;
/* let t = length_factor(*segment, pos); */
let projected_point = /*segment.projected_point(pos)*/
segment.start + distance * t;
let mut diff = projected_point - pos;
diff.z *= z_scale; diff.z *= z_scale;
let radius = Lerp::lerp_unclamped(r0, r1, t)/* - 0.25 */; let radius = Lerp::lerp_unclamped(r0, r1, t);
diff.magnitude_squared() < radius * radius/* - 0.25/*0.01*/*/ diff.magnitude_squared() < radius * radius
/* segment.distance_to_point(pos.map(|e| e as f32)) < radius - 0.25 */
/* Self::contains_at::<TopAabr>(/*cache, */tree, prim_, pos) */
}, },
hit, hit,
); );