Use tracing crate for logging instead of println

Author: TrueDoctor

desktop/src/app.rs

@@ -67,7 +67,7 @@ impl ApplicationHandler<CustomEvent> for WinitApp {
 					self.window = Some(window.clone());
 					s.graphics_state = Some(graphics_state);
 
-					println!("Winit window created and ready");
+					tracing::info!("Winit window created and ready");
 				}
 			})
 			.unwrap();
@@ -91,7 +91,7 @@ impl ApplicationHandler<CustomEvent> for WinitApp {
 
 		match event {
 			WindowEvent::CloseRequested => {
-				println!("The close button was pressed; stopping");
+				tracing::info!("The close button was pressed; stopping");
 				event_loop.exit();
 			}
 			WindowEvent::Resized(physical_size) => {
@@ -118,7 +118,7 @@ impl ApplicationHandler<CustomEvent> for WinitApp {
 							width: Some(width),
 							height: Some(height),
 							graphics_state: Some(graphics_state),
-							ui_fb,
+							ui_frame_buffer: ui_fb,
 							..
 						} = s
 						{
@@ -139,7 +139,7 @@ impl ApplicationHandler<CustomEvent> for WinitApp {
 								Err(wgpu::SurfaceError::OutOfMemory) => {
 									event_loop.exit();
 								}
-								Err(e) => eprintln!("{:?}", e),
+								Err(e) => tracing::error!("{:?}", e),
 							}
 						}
 					})

desktop/src/cef/mod.rs renamed to desktop/src/cef.rs

@@ -3,7 +3,8 @@ use std::process::exit;
 use std::sync::{Arc, Mutex, MutexGuard, PoisonError};
 use std::time::Instant;
 
-use winit::event_loop::{self, EventLoop, EventLoopProxy};
+use tracing_subscriber::EnvFilter;
+use winit::event_loop::{EventLoop, EventLoopProxy};
 
 mod cef;
 use cef::Setup;
@@ -20,11 +21,12 @@ pub(crate) enum CustomEvent {
 	ScheduleBrowserWork(Instant),
 }
 
+#[derive(Debug)]
 pub(crate) struct WindowState {
 	width: Option<usize>,
 	height: Option<usize>,
-	ui_fb: Option<FrameBuffer>,
-	preview_fb: Option<FrameBuffer>,
+	ui_frame_buffer: Option<FrameBuffer>,
+	_viewport_frame_buffer: Option<FrameBuffer>,
 	graphics_state: Option<GraphicsState>,
 	event_loop_proxy: Option<EventLoopProxy<CustomEvent>>,
 }
@@ -34,8 +36,8 @@ impl WindowState {
 		Self {
 			width: None,
 			height: None,
-			ui_fb: None,
-			preview_fb: None,
+			ui_frame_buffer: None,
+			_viewport_frame_buffer: None,
 			graphics_state: None,
 			event_loop_proxy: None,
 		}
@@ -46,18 +48,6 @@ impl WindowState {
 	}
 }
 
-impl Debug for WindowState {
-	fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-		f.debug_struct("WindowState")
-			.field("width", &self.width.is_some())
-			.field("height", &self.height.is_some())
-			.field("ui_fb", &self.ui_fb.is_some())
-			.field("preview_fb", &self.preview_fb.is_some())
-			.field("graphics_state", &self.graphics_state.is_some())
-			.finish()
-	}
-}
-
 pub(crate) struct WindowStateHandle {
 	inner: Arc<Mutex<WindowState>>,
 }
@@ -126,7 +116,7 @@ impl cef::CefEventHandler for CefHandler {
 				if frame_buffer.width() != s.width.unwrap_or(1) || frame_buffer.height() != s.height.unwrap_or(1) {
 					correct_size = false;
 				} else {
-					s.ui_fb = Some(frame_buffer);
+					s.ui_frame_buffer = Some(frame_buffer);
 				}
 			})
 			.unwrap();
@@ -145,11 +135,13 @@ impl cef::CefEventHandler for CefHandler {
 }
 
 fn main() {
+	tracing_subscriber::fmt().with_env_filter(EnvFilter::from_default_env()).init();
+
 	let cef_context = match cef::Context::<Setup>::new() {
 		Ok(c) => c,
 		Err(cef::SetupError::Subprocess) => exit(0),
 		Err(cef::SetupError::SubprocessFailed(t)) => {
-			println!("Subprocess of type {t} failed");
+			tracing::error!("Subprocess of type {t} failed");
 			exit(1);
 		}
 	};
@@ -170,12 +162,12 @@ fn main() {
 	let cef_context = match cef_context.init(CefHandler::new(window_state.clone())) {
 		Ok(c) => c,
 		Err(cef::InitError::InitializationFailed) => {
-			println!("Cef initialization failed");
+			tracing::error!("Cef initialization failed");
 			exit(1);
 		}
 	};
 
-	println!("Cef initialized successfully");
+	tracing::info!("Cef initialized successfully");
 
 	let mut winit_app = WinitApp::new(window_state, cef_context);
 

desktop/src/cef/input/mod.rs renamed to desktop/src/cef/input.rs

@@ -8,6 +8,15 @@ pub(crate) struct FrameBuffer {
 	width: usize,
 	height: usize,
 }
+impl std::fmt::Debug for FrameBuffer {
+	fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+		f.debug_struct("WindowState")
+			.field("width", &self.width)
+			.field("height", &self.height)
+			.field("len", &self.buffer.len())
+			.finish()
+	}
+}
 
 #[derive(Error, Debug)]
 pub(crate) enum FrameBufferError {
@@ -48,6 +57,7 @@ impl FrameBuffer {
 	}
 }
 
+#[derive(Debug)]
 pub(crate) struct GraphicsState {
 	surface: wgpu::Surface<'static>,
 	device: wgpu::Device,
@@ -109,7 +119,7 @@ impl GraphicsState {
 		surface.configure(&device, &config);
 
 		// Create shader module
-		let shader = device.create_shader_module(wgpu::include_wgsl!("fullscreen_texture.wgsl"));
+		let shader = device.create_shader_module(wgpu::include_wgsl!("render/fullscreen_texture.wgsl"));
 
 		// Create sampler
 		let sampler = device.create_sampler(&wgpu::SamplerDescriptor {
@@ -317,7 +327,7 @@ impl GraphicsState {
 				render_pass.set_bind_group(0, bind_group, &[]);
 				render_pass.draw(0..6, 0..1); // Draw 3 vertices for fullscreen triangle
 			} else {
-				println!("No bind group available - showing clear color only");
+				tracing::warn!("No bind group available - showing clear color only");
 			}
 		}
 		self.queue.submit(std::iter::once(encoder.finish()));