background_image example in python

Cargo.toml

@@ -11,7 +11,6 @@ workspace = true
 default = ["wayland"]
 wayland = ["processing_render/wayland"]
 x11 = ["processing_render/x11"]
-python = ["processing_render/python"]
 
 [workspace]
 resolver = "3"

crates/processing_pyo3/Cargo.toml

@@ -17,7 +17,7 @@ x11 = ["processing/x11"]
 
 [dependencies]
 pyo3 = "0.27.0"
-processing = { workspace = true, features = ["python"] }
+processing = { workspace = true }
 bevy = { workspace = true }
 glfw = { version = "0.60.0"}
 

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/Cargo.toml

@@ -10,7 +10,6 @@ workspace = true
 default = []
 wayland = ["bevy/wayland"]
 x11 = ["bevy/x11"]
-python = []
 
 [dependencies]
 bevy = { workspace = true }

crates/processing_render/src/config.rs

@@ -2,23 +2,33 @@
 //!
 //! To add a new Config just add a new enum with associated value
 
+use bevy::prelude::Resource;
 use std::collections::HashMap;
 
-#[derive(Hash, Eq, PartialEq)]
+#[derive(Clone, Hash, Eq, PartialEq)]
 pub enum ConfigKey {
     AssetRootPath,
 }
+
 // TODO: Consider Box<dyn Any> instead of String
-pub type ConfigMap = HashMap<ConfigKey, String>;
+#[derive(Resource)]
 pub struct Config {
-    map: ConfigMap,
+    map: HashMap<ConfigKey, String>,
+}
+
+impl Clone for Config {
+    fn clone(&self) -> Self {
+        Config {
+            map: self.map.clone(),
+        }
+    }
 }
 
 impl Config {
     pub fn new() -> Self {
         // TODO consider defaults
         Config {
-            map: ConfigMap::new(),
+            map: HashMap::new(),
         }
     }
 

crates/processing_render/src/image.rs

@@ -3,11 +3,10 @@
 //! It can be created from raw pixel data, loaded from disk, resized, and read back to CPU memory.
 use std::path::PathBuf;
 
-#[cfg(feature = "python")]
-use bevy::asset::{AssetPath, io::AssetSourceId};
 use bevy::{
     asset::{
-        LoadState, RenderAssetUsages, handle_internal_asset_events, io::embedded::GetAssetServer,
+        AssetPath, LoadState, RenderAssetUsages, handle_internal_asset_events,
+        io::{AssetSourceId, embedded::GetAssetServer},
     },
     ecs::{entity::EntityHashMap, system::RunSystemOnce},
     prelude::*,
@@ -25,6 +24,7 @@ use bevy::{
 };
 use half::f16;
 
+use crate::config::{Config, ConfigKey};
 use crate::error::{ProcessingError, Result};
 
 pub struct ImagePlugin;
@@ -140,10 +140,16 @@ pub fn from_handle(
 }
 
 pub fn load(In(path): In<PathBuf>, world: &mut World) -> Result<Entity> {
-    #[cfg(feature = "python")]
-    let path = AssetPath::from_path_buf(path).with_source(AssetSourceId::from("assets_directory"));
+    let config = world.resource_mut::<Config>();
+    let path: AssetPath = match config.get(ConfigKey::AssetRootPath) {
+        Some(_) => {
+            AssetPath::from_path_buf(path).with_source(AssetSourceId::from("assets_directory"))
+        }
+        None => AssetPath::from_path_buf(path),
+    };
 
     let handle: Handle<bevy::image::Image> = world.get_asset_server().load(path);
+
     while let LoadState::Loading = world.get_asset_server().load_state(&handle) {
         world.run_system_once(handle_internal_asset_events).unwrap();
     }

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,9 +205,11 @@ 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();
 
+    app.insert_resource(config.clone());
+
     #[cfg(not(target_arch = "wasm32"))]
     let plugins = DefaultPlugins
         .build()
@@ -232,9 +232,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 +269,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;