WindowBehavior::render unit return

CHANGELOG.md

@@ -21,6 +21,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   Users who are using Kludgine directly should invoke `Kludgine::resize` to
   apply the new size.
 - `Window::winit` now returns an `Arc`-wrapped winit Window.
+- `WindowBehavior::render` no longer returns a `bool`. Closing the window can be
+  done through the `RunningWindow` parameter.
 
 ### Added
 

examples/clipping.rs

@@ -47,7 +47,7 @@ impl WindowBehavior for Test {
         &'pass mut self,
         mut window: Window<'_>,
         graphics: &mut kludgine::RenderingGraphics<'_, 'pass>,
-    ) -> bool {
+    ) {
         window.redraw_in(Duration::from_millis(16));
         self.angle += window.elapsed().as_secs_f32() / 5.;
 
@@ -69,7 +69,5 @@ impl WindowBehavior for Test {
             .translate_by(Point::from(graphics.size().into_px(graphics.scale())) / 4 * 3)
             .rotate_by(self.angle)
             .render(graphics);
-
-        true
     }
 }

examples/offscreen.rs

@@ -75,9 +75,7 @@ impl WindowBehavior for Test {
         &'pass mut self,
         _window: Window<'_>,
         graphics: &mut RenderingGraphics<'_, 'pass>,
-    ) -> bool {
+    ) {
         self.prepared.render(graphics);
-
-        true
     }
 }

examples/shapes.rs

@@ -55,7 +55,7 @@ impl WindowBehavior for Test {
         &'pass mut self,
         mut window: Window<'_>,
         graphics: &mut kludgine::RenderingGraphics<'_, 'pass>,
-    ) -> bool {
+    ) {
         window.redraw_in(Duration::from_millis(16));
         self.angle += Angle::degrees(180) * window.elapsed();
         self.dips_square
@@ -66,6 +66,5 @@ impl WindowBehavior for Test {
             .translate_by(Point::new(BLUE_TRIANGLE_SIZE / 2, BLUE_TRIANGLE_SIZE / 2))
             .rotate_by(self.angle)
             .render(graphics);
-        true
     }
 }

examples/sprites.rs

@@ -151,7 +151,7 @@ impl WindowBehavior for Sprites {
         &'pass mut self,
         mut window: kludgine::app::Window<'_, ()>,
         graphics: &mut kludgine::RenderingGraphics<'_, 'pass>,
-    ) -> bool {
+    ) {
         if let Some(frame) = &self.current_frame {
             frame.render(graphics);
         }
@@ -161,7 +161,6 @@ impl WindowBehavior for Sprites {
                 .expect("valid tag")
                 .unwrap_or_default(),
         );
-        true
     }
 
     fn keyboard_input(

examples/text.rs

@@ -81,13 +81,12 @@ impl WindowBehavior for Test {
         &'pass mut self,
         mut window: Window<'_>,
         graphics: &mut kludgine::RenderingGraphics<'_, 'pass>,
-    ) -> bool {
+    ) {
         window.redraw_in(Duration::from_millis(16));
         self.angle += Angle::degrees(180) * window.elapsed() / 5;
         self.prepared
             .translate_by(Point::from_vec(graphics.size().into_px(graphics.scale())) / 2)
             .rotate_by(self.angle)
             .render(graphics);
-        true
     }
 }

examples/texture-collection.rs

@@ -58,7 +58,7 @@ impl WindowBehavior for Test {
         &'pass mut self,
         mut window: Window<'_>,
         graphics: &mut kludgine::RenderingGraphics<'_, 'pass>,
-    ) -> bool {
+    ) {
         window.redraw_in(Duration::from_millis(16));
         self.angle += Angle::degrees(180) * window.elapsed();
         self.k
@@ -78,7 +78,6 @@ impl WindowBehavior for Test {
                 .cast(),
             )
             .render(graphics);
-        true
     }
 
     fn clear_color(&self) -> Option<Color> {

examples/texture.rs

@@ -42,13 +42,12 @@ impl WindowBehavior for Test {
         &'pass mut self,
         mut window: Window<'_>,
         graphics: &mut kludgine::RenderingGraphics<'_, 'pass>,
-    ) -> bool {
+    ) {
         window.redraw_in(Duration::from_millis(16));
         self.angle += Angle::degrees(180) * window.elapsed();
         self.texture
             .translate_by(Point::inches(1, 1))
             .rotate_by(self.angle)
             .render(graphics);
-        true
     }
 }

src/app.rs

@@ -585,12 +585,11 @@ where
     fn prepare(&mut self, window: Window<'_, WindowEvent>, graphics: &mut Graphics<'_>) {}
 
     /// Render the contents of the window.
-    // TODO refactor away from bool return.
     fn render<'pass>(
         &'pass mut self,
         window: Window<'_, WindowEvent>,
         graphics: &mut RenderingGraphics<'_, 'pass>,
-    ) -> bool;
+    );
 
     /// Returns the swap chain present mode to use for this window.
     #[must_use]
@@ -1281,7 +1280,7 @@ impl<Behavior> KludgineWindow<Behavior> {
             &self.device,
             &self.queue,
         );
-        let close_after_frame = !self.behavior.render(
+        self.behavior.render(
             Window::new_in_frame(
                 window,
                 elapsed,
@@ -1297,9 +1296,6 @@ impl<Behavior> KludgineWindow<Behavior> {
         if let Some(id) = id {
             self.device.poll(wgpu::Maintain::WaitForSubmissionIndex(id));
         }
-        if close_after_frame {
-            window.close();
-        }
         pending_inner_size
     }
 }
@@ -1917,11 +1913,13 @@ where
 
     fn render<'pass>(
         &'pass mut self,
-        _window: Window<'_>,
+        mut window: Window<'_>,
         graphics: &mut RenderingGraphics<'_, 'pass>,
-    ) -> bool {
+    ) {
         self.rendering.render(1., graphics);
-        self.keep_running
+        if !self.keep_running {
+            window.close();
+        }
     }
 }
 

src/sprite.rs

@@ -236,8 +236,6 @@ impl Sprite {
     ///
     /// Returns an error when `raw_json` does not match the expected format.
     #[allow(clippy::too_many_lines)]
-    // TODO refactor. Now that I know more about serde, this probably can be parsed
-    // with a complex serde type.
     pub fn load_aseprite_json(
         raw_json: &str,
         texture: impl Into<ShareableTexture>,