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

Merge branch 'aweinstock/site2-prim-bounds' into 'master'

Browse Source 
Avoid duplicate work across chunks when blitting site2 primitives.

See merge request veloren/veloren!2687
This commit is contained in:
Forest Anderson 2021-07-28 14:42:40 +00:00
commit 94fd755264
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
world/src/site2/mod.rs
View File

@ -756,6 +756,12 @@ impl Site {
let mut plots_to_render = plots.into_iter().collect::<Vec<_>>();
plots_to_render.sort_unstable();
let wpos2d = canvas.info().wpos();
let chunk_aabr = Aabr {
min: wpos2d,
max: wpos2d + TerrainChunkSize::RECT_SIZE.as_::<i32>(),
};
for plot in plots_to_render {
let (prim_tree, fills) = match &self.plots[plot].kind {
PlotKind::House(house) => house.render_collect(self, &canvas.land()),
@ -765,7 +771,9 @@ impl Site {
};
for (prim, fill) in fills {
let aabb = fill.get_bounds(&prim_tree, prim);
let mut aabb = fill.get_bounds(&prim_tree, prim);
aabb.min = Vec2::max(aabb.min.xy(), chunk_aabr.min).with_z(aabb.min.z);
aabb.max = Vec2::min(aabb.max.xy(), chunk_aabr.max).with_z(aabb.max.z);
for x in aabb.min.x..aabb.max.x {
for y in aabb.min.y..aabb.max.y {