From 0896ffdcbc92402de7eb386bc6444e6cef2cf9b1 Mon Sep 17 00:00:00 2001 From: Hanno Braun Date: Mon, 25 Nov 2024 22:45:21 +0100 Subject: [PATCH] Prepare for rendering list of operations --- experiments/2024-10-30/src/app.rs | 7 ++----- experiments/2024-10-30/src/render/renderer.rs | 4 ++-- experiments/2024-10-30/src/render/text.rs | 4 ++-- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/experiments/2024-10-30/src/app.rs b/experiments/2024-10-30/src/app.rs index b877efa79..d0b5a8b9e 100644 --- a/experiments/2024-10-30/src/app.rs +++ b/experiments/2024-10-30/src/app.rs @@ -111,12 +111,9 @@ impl ApplicationHandler for App { WindowEvent::RedrawRequested => { let selected_operation = self.ops.operations.get(self.selected_op); - let last_operation = self.ops.operations.last(); - if let (Some(selected), Some(last)) = - (selected_operation, last_operation) - { - if let Err(err) = renderer.render(selected, last) { + if let Some(selected) = selected_operation { + if let Err(err) = renderer.render(selected, &self.ops) { eprintln!("Render error: {err}"); } } diff --git a/experiments/2024-10-30/src/render/renderer.rs b/experiments/2024-10-30/src/render/renderer.rs index 7cb3c2fbe..d22534a6d 100644 --- a/experiments/2024-10-30/src/render/renderer.rs +++ b/experiments/2024-10-30/src/render/renderer.rs @@ -3,7 +3,7 @@ use std::sync::Arc; use anyhow::anyhow; use winit::window::Window; -use crate::geometry::Operation; +use crate::geometry::{Operation, OpsLog}; use super::{geometry::Geometry, pipelines::Pipelines, text::TextRenderer}; @@ -90,7 +90,7 @@ impl Renderer { pub fn render( &mut self, selected_operation: &impl Operation, - last_operation: &impl Operation, + last_operation: &OpsLog, ) -> anyhow::Result<()> { let vertices = Geometry::vertices(&self.device, selected_operation); let triangles = Geometry::triangles(&self.device, selected_operation); diff --git a/experiments/2024-10-30/src/render/text.rs b/experiments/2024-10-30/src/render/text.rs index e6e2f3090..f158b3005 100644 --- a/experiments/2024-10-30/src/render/text.rs +++ b/experiments/2024-10-30/src/render/text.rs @@ -1,4 +1,4 @@ -use crate::geometry::Operation; +use crate::geometry::{Operation, OpsLog}; pub struct TextRenderer { text_atlas: glyphon::TextAtlas, @@ -66,7 +66,7 @@ impl TextRenderer { queue: &wgpu::Queue, surface_config: &wgpu::SurfaceConfiguration, _selected_operation: &impl Operation, - _last_operation: &impl Operation, + _last_operation: &OpsLog, render_pass: &mut wgpu::RenderPass, ) -> anyhow::Result<()> { let mut buffer = glyphon::Buffer::new(