diff --git a/Cargo.lock b/Cargo.lock index c6348cd..cacc418 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -474,46 +474,12 @@ dependencies = [ "num-traits 0.1.43", ] -[[package]] -name = "env_logger" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" -dependencies = [ - "humantime", - "is-terminal", - "log", - "regex", - "termcolor", -] - [[package]] name = "equivalent" version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" -[[package]] -name = "errno" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd" -dependencies = [ - "errno-dragonfly", - "libc", - "windows-sys 0.48.0", -] - -[[package]] -name = "errno-dragonfly" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" -dependencies = [ - "cc", - "libc", -] - [[package]] name = "event-listener" version = "2.5.3" @@ -744,24 +710,12 @@ dependencies = [ "winapi", ] -[[package]] -name = "hermit-abi" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" - [[package]] name = "hexf-parse" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df" -[[package]] -name = "humantime" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" - [[package]] name = "indexmap" version = "1.9.3" @@ -794,17 +748,6 @@ dependencies = [ "web-sys", ] -[[package]] -name = "is-terminal" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" -dependencies = [ - "hermit-abi", - "rustix", - "windows-sys 0.48.0", -] - [[package]] name = "jni-sys" version = "0.3.0" @@ -895,12 +838,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "linux-raw-sys" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503" - [[package]] name = "lock_api" version = "0.4.10" @@ -1563,19 +1500,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" -[[package]] -name = "rustix" -version = "0.38.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed6248e1caa625eb708e266e06159f135e8c26f2bb7ceb72dc4b2766d0340964" -dependencies = [ - "bitflags 2.4.0", - "errno", - "libc", - "linux-raw-sys", - "windows-sys 0.48.0", -] - [[package]] name = "scoped-tls" version = "1.0.1" @@ -1694,10 +1618,8 @@ dependencies = [ "bytemuck", "configparser", "ddsfile", - "env_logger", "glam", "lazy-regex", - "log", "obj", "parking_lot", "pollster", diff --git a/Cargo.toml b/Cargo.toml index 00031aa..0eb37a9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,10 +10,8 @@ async-executor = "1.5.1" bytemuck = { version = "1.13.1", features = ["derive"] } configparser = "3.0.2" ddsfile = "0.5.1" -env_logger = "0.10.0" glam = "0.24.1" lazy-regex = "3.0.2" -log = "0.4.20" obj = "0.10.2" parking_lot = "0.12.1" pollster = "0.3.0" diff --git a/src/framework.rs b/src/framework.rs index 7200346..d49b256 100644 --- a/src/framework.rs +++ b/src/framework.rs @@ -49,10 +49,6 @@ struct Setup { } async fn setup(title: &str) -> Setup { - { - env_logger::init(); - }; - let event_loop = EventLoop::new(); let mut builder = winit::window::WindowBuilder::new(); builder = builder.with_title(title); @@ -64,7 +60,7 @@ async fn setup(title: &str) -> Setup { let window = builder.build(&event_loop).unwrap(); - log::info!("Initializing the surface..."); + println!("Initializing the surface..."); let backends = wgpu::util::backend_bits_from_env().unwrap_or_else(wgpu::Backends::all); let dx12_shader_compiler = wgpu::util::dx12_shader_compiler_from_env().unwrap_or_default(); @@ -180,10 +176,10 @@ fn start( config.view_formats.push(surface_view_format); surface.configure(&device, &config); - log::info!("Initializing the example..."); + println!("Initializing the example..."); let mut example=E::init(); - log::info!("Entering render loop..."); + println!("Entering render loop..."); event_loop.run(move |event, _, control_flow| { let _ = (&instance, &adapter); // force ownership by the closure *control_flow = if cfg!(feature = "metal-auto-capture") { @@ -210,13 +206,13 @@ fn start( // https://github.com/rust-windowing/winit/issues/2876 let max_dimension = adapter.limits().max_texture_dimension_2d; if size.width > max_dimension || size.height > max_dimension { - log::warn!( + println!( "The resizing size {:?} exceeds the limit of {}.", size, max_dimension ); } else { - log::info!("Resizing to {:?}", size); + println!("Resizing to {:?}", size); config.width = size.width.max(1); config.height = size.height.max(1); example.resize(&config, &device, &queue); diff --git a/src/graphics.rs b/src/graphics.rs index 3f15497..53461ab 100644 --- a/src/graphics.rs +++ b/src/graphics.rs @@ -633,19 +633,19 @@ impl GraphicsState{ let skybox_texture_view={ let skybox_format = if device_features.contains(wgpu::Features::TEXTURE_COMPRESSION_ASTC) { - log::info!("Using ASTC"); + println!("Using ASTC"); wgpu::TextureFormat::Astc { block: AstcBlock::B4x4, channel: AstcChannel::UnormSrgb, } } else if device_features.contains(wgpu::Features::TEXTURE_COMPRESSION_ETC2) { - log::info!("Using ETC2"); + println!("Using ETC2"); wgpu::TextureFormat::Etc2Rgb8UnormSrgb } else if device_features.contains(wgpu::Features::TEXTURE_COMPRESSION_BC) { - log::info!("Using BC"); + println!("Using BC"); wgpu::TextureFormat::Bc1RgbaUnormSrgb } else { - log::info!("Using plain"); + println!("Using plain"); wgpu::TextureFormat::Bgra8UnormSrgb }; @@ -674,14 +674,6 @@ impl GraphicsState{ }; let max_mips = layer_size.max_mips(wgpu::TextureDimension::D2); - log::debug!( - "Copying {:?} skybox images of size {}, {}, 6 with {} mips to gpu", - skybox_format, - size.width, - size.height, - max_mips, - ); - let skybox_texture = device.create_texture_with_data( queue, &wgpu::TextureDescriptor {