archive-gh-me/maplibre-rs
1
0
Fork 0
mirror of https://github.com/maplibre/maplibre-rs.git synced 2025-12-08 19:05:57 +00:00
Code Issues Projects Releases Wiki Activity

Optimize view_region_bounding_box

Browse Source
This commit is contained in:
Maximilian Ammann 2022-03-25 15:28:35 +01:00
parent ebaacd7da3
commit 018f8233e7
3 changed files with 42 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/lib.rs
View File

@ -49,6 +49,7 @@ impl Map {
pub fn run_sync_with_max_frames(self, max_frames: Option<u64>) {
tokio::runtime::Builder::new_multi_thread()
.enable_io()
.enable_time()
.build()
.unwrap()
.block_on(async {

57
src/render/camera.rs
View File

@ -220,36 +220,44 @@ impl Camera {
pub fn view_region_bounding_box(&self, perspective: &Perspective) -> Option<Aabb2<f64>> {
let view_proj = self.calc_view_proj(perspective);
let vec = vec![
let screen_bounding_box = [
Vector2::new(0.0, 0.0),
Vector2::new(self.width, 0.0),
Vector2::new(self.width, self.height),
Vector2::new(0.0, self.height),
]
.iter()
.filter_map(|point| self.window_to_world_at_ground(point, &view_proj))
.collect::<Vec<_>>();
.map(|point| self.window_to_world_at_ground(&point, &view_proj));
let min_x = vec
.iter()
.map(|point| point.x)
.min_by(|a, b| a.partial_cmp(b).unwrap())?;
let min_y = vec
.iter()
.map(|point| point.y)
.min_by(|a, b| a.partial_cmp(b).unwrap())?;
let max_x = vec
.iter()
.map(|point| point.x)
.max_by(|a, b| a.partial_cmp(b).unwrap())?;
let max_y = vec
.iter()
.map(|point| point.y)
.max_by(|a, b| a.partial_cmp(b).unwrap())?;
Some(Aabb2::new(
Point2::new(min_x, min_y),
Point2::new(max_x, max_y),
))
let mut min: Option<Point2<f64>> = None;
let mut max: Option<Point2<f64>> = None;
for vector in screen_bounding_box {
if let Some(vector) = vector {
if let Some(current_min) = &mut min {
if vector.x < current_min.x {
current_min.x = vector.x;
}
if vector.y < current_min.y {
current_min.y = vector.y;
}
} else {
min = Some(Point2::new(vector.x, vector.y))
}
if let Some(current_max) = &mut max {
if vector.x > current_max.x {
current_max.x = vector.x;
}
if vector.y > current_max.y {
current_max.y = vector.y;
}
} else {
max = Some(Point2::new(vector.x, vector.y))
}
}
}
Some(Aabb2::new(min?, max?))
}
/// An alternative implementation for `view_bounding_box`.
///
@ -340,7 +348,6 @@ impl Perspective {
#[cfg(test)]
mod tests {
use cgmath::{AbsDiffEq, Matrix4, SquareMatrix, Vector2, Vector3, Vector4};
use super::{Camera, Perspective};

17
src/render/render_state.rs
View File

@ -561,15 +561,14 @@ impl RenderState {
for world_coords in view_region.iter() {
if let Some(entries) = self.buffer_pool.index().get_layers(&world_coords) {
let mut to_render: Vec<&IndexEntry> = Vec::from_iter(entries);
to_render.sort_by(|a, b| {
a.style_layer.id.partial_cmp(&b.style_layer.id).unwrap()
});
to_render.sort_by_key(|entry| entry.style_layer.index);
for entry in to_render {
let reference = self
.tile_mask_pattern
.stencil_reference_value(&entry.coords)
as u32;
let reference = self
.tile_mask_pattern
.stencil_reference_value(&world_coords)
as u32;
if let Some(entry) = entries.front() {
// Draw mask
{
pass.set_pipeline(&self.mask_pipeline);
@ -582,7 +581,9 @@ impl RenderState {
);
pass.draw(0..6, 0..1);
}
}
for entry in to_render {
// Draw tile
{
pass.set_pipeline(&self.render_pipeline);