Config HashMap

Author: catilac

crates/processing_pyo3/src/graphics.rs

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

crates/processing_render/src/config.rs

@@ -0,0 +1,32 @@
+//! Options object for configuring various aspects of libprocessing.
+//!
+//! To add a new Config just add a new enum with associated value
+
+use std::collections::HashMap;
+
+#[derive(Hash, Eq, PartialEq)]
+pub enum ConfigKey {
+    AssetRootPath,
+}
+// TODO: Consider Box<dyn Any> instead of String
+pub type ConfigMap = HashMap<ConfigKey, String>;
+pub struct Config {
+    map: ConfigMap,
+}
+
+impl Config {
+    pub fn new() -> Self {
+        // TODO consider defaults
+        Config {
+            map: ConfigMap::new(),
+        }
+    }
+
+    pub fn get(&self, k: ConfigKey) -> Option<&String> {
+        self.map.get(&k)
+    }
+
+    pub fn set(&mut self, k: ConfigKey, v: String) {
+        self.map.insert(k, v);
+    }
+}

crates/processing_render/src/lib.rs

@@ -1,3 +1,4 @@
+pub mod config;
 pub mod error;
 mod graphics;
 pub mod image;
@@ -6,6 +7,8 @@ mod surface;
 
 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"))]
@@ -204,7 +207,7 @@ pub fn surface_resize(graphics_entity: Entity, width: u32, height: u32) -> error
     })
 }
 
-fn create_app(asset_path: Option<&str>) -> App {
+fn create_app(_config: Config) -> App {
     let mut app = App::new();
 
     #[cfg(not(target_arch = "wasm32"))]
@@ -230,11 +233,13 @@ fn create_app(asset_path: Option<&str>) -> App {
         });
 
     #[cfg(feature = "python")]
-    app.register_asset_source(
-        "assets_directory",
-        // TODO: set this path to the directory containing the main sketch file
-        AssetSourceBuilder::platform_default(asset_path.unwrap(), None),
-    );
+    {
+        let asset_path = _config.get(ConfigKey::AssetRootPath).unwrap();
+        app.register_asset_source(
+            "assets_directory",
+            AssetSourceBuilder::platform_default(asset_path, None),
+        );
+    }
 
     app.add_plugins(plugins);
     app.add_plugins((ImagePlugin, GraphicsPlugin, SurfacePlugin));
@@ -268,13 +273,15 @@ fn set_app(app: App) {
 /// 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(asset_path: Option<&str>) -> error::Result<()> {
+pub fn init(config: Option<Config>) -> error::Result<()> {
+    let config = config.unwrap_or_else(|| Config::new());
+
     setup_tracing()?;
     if is_already_init()? {
         return Ok(());
     }
 
-    let mut app = create_app(asset_path);
+    let mut app = create_app(config);
     app.finish();
     app.cleanup();
     set_app(app);

examples/rectangle.rs

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

src/prelude.rs

@@ -1,2 +1,2 @@
 pub use bevy::prelude::default;
-pub use processing_render::{render::command::DrawCommand, *};
+pub use processing_render::{config::*, render::command::DrawCommand, *};