From 18d2b006ac148b0263dbd00aebc9d9758e5f4be2 Mon Sep 17 00:00:00 2001 From: Sebastian K Date: Sat, 16 May 2020 10:47:06 -0700 Subject: [PATCH] Don't restrict render command listeners to the static lifetime --- renderer/src/builder.rs | 5 +++-- renderer/src/scene.rs | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/renderer/src/builder.rs b/renderer/src/builder.rs index e41ffe7a..4758cc72 100644 --- a/renderer/src/builder.rs +++ b/renderer/src/builder.rs @@ -43,7 +43,7 @@ pub(crate) struct SceneBuilder<'a, 'b> { scene: &'a mut Scene, built_options: &'b PreparedBuildOptions, next_alpha_tile_indices: [AtomicUsize; ALPHA_TILE_LEVEL_COUNT], - pub(crate) listener: Box, + pub(crate) listener: Box, } #[derive(Debug)] @@ -102,8 +102,9 @@ impl<'a, 'b> SceneBuilder<'a, 'b> { pub(crate) fn new( scene: &'a mut Scene, built_options: &'b PreparedBuildOptions, - listener: Box, + listener: Box, ) -> SceneBuilder<'a, 'b> { + let effective_view_box = scene.effective_view_box(built_options); SceneBuilder { scene, built_options, diff --git a/renderer/src/scene.rs b/renderer/src/scene.rs index 29bcef6c..1805c65d 100644 --- a/renderer/src/scene.rs +++ b/renderer/src/scene.rs @@ -238,9 +238,9 @@ impl Scene { } #[inline] - pub fn build(&mut self, + pub fn build<'a, E>(&mut self, options: BuildOptions, - listener: Box, + listener: Box, executor: &E) where E: Executor { let prepared_options = options.prepare(self.bounds);