Set asset directory and load assets from there

Author: catilac

crates/processing_pyo3/examples/assets/images/logo.png

@@ -38,12 +38,11 @@ impl Drop for Graphics {
 #[pymethods]
 impl Graphics {
     #[new]
-    pub fn new(width: u32, height: u32) -> PyResult<Self> {
+    pub fn new(width: u32, height: u32, asset_path: &str) -> PyResult<Self> {
         let glfw_ctx =
             GlfwContext::new(width, height).map_err(|e| PyRuntimeError::new_err(format!("{e}")))?;
 
-        // TODO: pass in something to set the directory?
-        init().map_err(|e| PyRuntimeError::new_err(format!("{e}")))?;
+        init(Some(asset_path)).map_err(|e| PyRuntimeError::new_err(format!("{e}")))?;
 
         let surface = glfw_ctx
             .create_surface(width, height, 1.0)

crates/processing_pyo3/src/graphics.rs

@@ -12,7 +12,7 @@ mod glfw;
 mod graphics;
 
 use graphics::{Graphics, get_graphics, get_graphics_mut};
-use pyo3::{exceptions::PyRuntimeError, prelude::*};
+use pyo3::{exceptions::PyRuntimeError, prelude::*, types::PyString};
 
 #[pymodule]
 fn processing(m: &Bound<'_, PyModule>) -> PyResult<()> {
@@ -27,10 +27,9 @@ fn processing(m: &Bound<'_, PyModule>) -> PyResult<()> {
         let abspath = path
             .getattr("abspath")?
             .call1(pyo3::types::PyTuple::new(py, &[dirname])?)?;
+        let abspath = path.getattr("join")?.call1((abspath, "assets"))?;
 
-        println!("DEBUG MOMENT OF SUCCESS: {}", abspath);
-        // TODO: Pass this into Graphics for App init
-
+        m.add("_root_dir", abspath)?;
         m.add_class::<Graphics>()?;
         m.add_function(wrap_pyfunction!(size, m)?)?;
         m.add_function(wrap_pyfunction!(run, m)?)?;
@@ -49,9 +48,8 @@ fn processing(m: &Bound<'_, PyModule>) -> PyResult<()> {
 #[pyfunction]
 #[pyo3(pass_module)]
 fn size(module: &Bound<'_, PyModule>, width: u32, height: u32) -> PyResult<()> {
-    // would we get a directory here?
-
-    let graphics = Graphics::new(width, height)?;
+    let asset_path: String = module.getattr("_root_dir")?.extract()?;
+    let graphics = Graphics::new(width, height, asset_path.as_str())?;
     module.setattr("_graphics", graphics)?;
     Ok(())
 }

crates/processing_pyo3/src/lib.rs

@@ -204,7 +204,7 @@ pub fn surface_resize(graphics_entity: Entity, width: u32, height: u32) -> error
     })
 }
 
-fn create_app() -> App {
+fn create_app(asset_path: Option<&str>) -> App {
     let mut app = App::new();
 
     #[cfg(not(target_arch = "wasm32"))]
@@ -233,7 +233,7 @@ fn create_app() -> App {
     app.register_asset_source(
         "assets_directory",
         // TODO: set this path to the directory containing the main sketch file
-        AssetSourceBuilder::platform_default("TODO/TODO/TODO/libprocessing/assets", None),
+        AssetSourceBuilder::platform_default(asset_path.unwrap(), None),
     );
 
     app.add_plugins(plugins);
@@ -266,14 +266,15 @@ 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() -> error::Result<()> {
+pub fn init(asset_path: Option<&str>) -> error::Result<()> {
     setup_tracing()?;
     if is_already_init()? {
         return Ok(());
     }
 
-    let mut app = create_app();
+    let mut app = create_app(asset_path);
     app.finish();
     app.cleanup();
     set_app(app);

crates/processing_render/src/lib.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;