Remove unnecessary cfg conditionals for Config and pass ::default()

Author: catilac

crates/processing_pyo3/src/graphics.rs

@@ -44,7 +44,7 @@ impl Graphics {
 
         let mut config = Config::new();
         config.set(ConfigKey::AssetRootPath, asset_path.to_string());
-        init(Some(config)).map_err(|e| PyRuntimeError::new_err(format!("{e}")))?;
+        init(config).map_err(|e| PyRuntimeError::new_err(format!("{e}")))?;
 
         let surface = glfw_ctx
             .create_surface(width, height, 1.0)

crates/processing_render/src/lib.rs

@@ -9,13 +9,11 @@ use std::{cell::RefCell, num::NonZero, path::PathBuf, sync::OnceLock};
 
 use config::*;
 
-#[cfg(feature = "python")]
-use bevy::asset::io::AssetSourceBuilder;
 #[cfg(not(target_arch = "wasm32"))]
 use bevy::log::tracing_subscriber;
 use bevy::{
     app::{App, AppExit},
-    asset::AssetEventSystems,
+    asset::{AssetEventSystems, io::AssetSourceBuilder},
     prelude::*,
     render::render_resource::{Extent3d, TextureFormat},
 };
@@ -207,7 +205,7 @@ pub fn surface_resize(graphics_entity: Entity, width: u32, height: u32) -> error
     })
 }
 
-fn create_app(_config: Config) -> App {
+fn create_app(config: Config) -> App {
     let mut app = App::new();
 
     #[cfg(not(target_arch = "wasm32"))]
@@ -232,9 +230,7 @@ fn create_app(_config: Config) -> App {
             ..default()
         });
 
-    #[cfg(feature = "python")]
-    {
-        let asset_path = _config.get(ConfigKey::AssetRootPath).unwrap();
+    if let Some(asset_path) = config.get(ConfigKey::AssetRootPath) {
         app.register_asset_source(
             "assets_directory",
             AssetSourceBuilder::platform_default(asset_path, None),
@@ -271,11 +267,8 @@ fn set_app(app: App) {
 
 /// Initialize the app, if not already initialized. Must be called from the main thread and cannot
 /// be called concurrently from multiple threads.
-/// asset_path is Optional because only python needs to use it.
 #[cfg(not(target_arch = "wasm32"))]
-pub fn init(config: Option<Config>) -> error::Result<()> {
-    let config = config.unwrap_or_default();
-
+pub fn init(config: Config) -> error::Result<()> {
     setup_tracing()?;
     if is_already_init()? {
         return Ok(());

examples/background_image.rs

@@ -19,7 +19,7 @@ fn main() {
 
 fn sketch() -> error::Result<()> {
     let mut glfw_ctx = GlfwContext::new(400, 400)?;
-    init(None)?;
+    init(Config::default())?;
 
     let width = 400;
     let height = 400;

examples/rectangle.rs

@@ -19,7 +19,7 @@ fn main() {
 
 fn sketch() -> error::Result<()> {
     let mut glfw_ctx = GlfwContext::new(400, 400)?;
-    init(None)?;
+    init(Config::default())?;
 
     let width = 400;
     let height = 400;

examples/transforms.rs

@@ -13,7 +13,7 @@ fn main() {
 
 fn sketch() -> error::Result<()> {
     let mut glfw_ctx = GlfwContext::new(400, 400)?;
-    init(None)?;
+    init(Config::default())?;
 
     let surface = glfw_ctx.create_surface(400, 400, 1.0)?;
     let graphics = graphics_create(surface, 400, 400)?;

examples/update_pixels.rs

@@ -19,7 +19,7 @@ fn main() {
 
 fn sketch() -> error::Result<()> {
     let mut glfw_ctx = GlfwContext::new(100, 100)?;
-    init(None)?;
+    init(Config::default())?;
 
     let width = 100;
     let height = 100;