Move node graph execution result handling to app

Author: timon-schelling

desktop/src/app.rs

@@ -2,6 +2,7 @@ use crate::CustomEvent;
 use crate::WindowSize;
 use crate::consts::APP_NAME;
 use crate::desktop_wrapper::DesktopWrapper;
+use crate::desktop_wrapper::NodeGraphExecutionResult;
 use crate::desktop_wrapper::WgpuContext;
 use crate::desktop_wrapper::messages::DesktopFrontendMessage;
 use crate::desktop_wrapper::messages::DesktopWrapperMessage;
@@ -110,11 +111,6 @@ impl WinitApp {
 					}
 				});
 			}
-			DesktopFrontendMessage::UpdateViewport(texture) => {
-				if let Some(graphics_state) = &mut self.graphics_state {
-					graphics_state.bind_viewport_texture(texture);
-				}
-			}
 			DesktopFrontendMessage::UpdateViewportBounds { x, y, width, height } => {
 				if let Some(graphics_state) = &mut self.graphics_state
 					&& let Some(window) = &self.window
@@ -206,7 +202,19 @@ impl ApplicationHandler<CustomEvent> for WinitApp {
 	fn user_event(&mut self, _: &ActiveEventLoop, event: CustomEvent) {
 		match event {
 			CustomEvent::DesktopWrapperMessage(message) => self.dispatch_desktop_wrapper_message(message),
-			CustomEvent::DesktopFrontendMessage(message) => self.handle_desktop_frontend_message(message),
+			CustomEvent::NodeGraphExecutionResult(result) => match result {
+				NodeGraphExecutionResult::HasRun(texture) => {
+					self.dispatch_desktop_wrapper_message(DesktopWrapperMessage::PollNodeGraphEvaluation);
+					if let Some(texture) = texture
+						&& let Some(graphics_state) = self.graphics_state.as_mut()
+						&& let Some(window) = self.window.as_ref()
+					{
+						graphics_state.bind_viewport_texture(texture);
+						window.request_redraw();
+					}
+				}
+				NodeGraphExecutionResult::NotRun => {}
+			},
 			CustomEvent::UiUpdate(texture) => {
 				if let Some(graphics_state) = self.graphics_state.as_mut() {
 					graphics_state.resize(texture.width(), texture.height());

desktop/src/desktop_wrapper.rs

@@ -33,7 +33,7 @@ impl DesktopWrapper {
 		executor.execute()
 	}
 
-	pub async fn run_node_graph() -> NodeGraphExecutionResult {
+	pub async fn execute_node_graph() -> NodeGraphExecutionResult {
 		let result = graphite_editor::node_graph_executor::run_node_graph().await;
 		match result {
 			(true, texture) => NodeGraphExecutionResult::HasRun(texture.map(|t| t.texture)),

desktop/src/desktop_wrapper/messages.rs

@@ -21,7 +21,6 @@ pub enum DesktopFrontendMessage {
 		content: Vec<u8>,
 	},
 	OpenUrl(String),
-	UpdateViewport(wgpu::Texture),
 	UpdateViewportBounds {
 		x: f32,
 		y: f32,

desktop/src/main.rs

@@ -16,15 +16,15 @@ use app::WinitApp;
 mod dirs;
 
 mod desktop_wrapper;
-use desktop_wrapper::messages::{DesktopFrontendMessage, DesktopWrapperMessage};
+use desktop_wrapper::messages::DesktopWrapperMessage;
 use desktop_wrapper::{DesktopWrapper, NodeGraphExecutionResult};
 
 #[allow(clippy::large_enum_variant)]
 pub(crate) enum CustomEvent {
 	UiUpdate(wgpu::Texture),
 	ScheduleBrowserWork(Instant),
 	DesktopWrapperMessage(DesktopWrapperMessage),
-	DesktopFrontendMessage(DesktopFrontendMessage),
+	NodeGraphExecutionResult(NodeGraphExecutionResult),
 }
 
 fn main() {
@@ -64,16 +64,8 @@ fn main() {
 		loop {
 			let last_render = Instant::now();
 
-			let result = futures::executor::block_on(DesktopWrapper::run_node_graph());
-			match result {
-				NodeGraphExecutionResult::HasRun(texture) => {
-					let _ = rendering_loop_proxy.send_event(CustomEvent::DesktopWrapperMessage(DesktopWrapperMessage::PollNodeGraphEvaluation));
-					if let Some(texture) = texture {
-						let _ = rendering_loop_proxy.send_event(CustomEvent::DesktopFrontendMessage(DesktopFrontendMessage::UpdateViewport(texture)));
-					}
-				}
-				NodeGraphExecutionResult::NotRun => {}
-			}
+			let result = futures::executor::block_on(DesktopWrapper::execute_node_graph());
+			let _ = rendering_loop_proxy.send_event(CustomEvent::NodeGraphExecutionResult(result));
 
 			let frame_time = Duration::from_secs_f32((target_fps as f32).recip());
 			let sleep = last_render + frame_time - Instant::now();