Merge branch 'main' into pyo3/lights

Author: tychedelia

Cargo.lock

@@ -21,7 +21,7 @@ type_complexity = "allow"
 too_many_arguments = "allow"
 
 [workspace.dependencies]
-bevy = { git = "https://github.com/bevyengine/bevy", branch = "main" }
+bevy = { git = "https://github.com/bevyengine/bevy", branch = "main", features = ["file_watcher"] }
 processing = { path = "." }
 processing_pyo3 = { path = "crates/processing_pyo3" }
 processing_render = { path = "crates/processing_render" }

Cargo.toml

@@ -7,7 +7,7 @@ def draw():
     background(220)
 
     fill(255, 0, 100)
-    stroke(0)
+    stroke(1)
     stroke_weight(2)
     rect(100, 100, 200, 150)
 

crates/processing_pyo3/examples/rectangle.py

@@ -86,6 +86,11 @@ impl Topology {
     }
 }
 
+#[pyclass]
+pub struct Sketch {
+    pub source: String,
+}
+
 #[pymethods]
 impl Geometry {
     #[new]
@@ -140,12 +145,20 @@ impl Drop for Graphics {
 #[pymethods]
 impl Graphics {
     #[new]
-    pub fn new(width: u32, height: u32, asset_path: &str) -> PyResult<Self> {
+    pub fn new(
+        width: u32,
+        height: u32,
+        asset_path: &str,
+        sketch_root_path: &str,
+        sketch_file_name: &str,
+    ) -> PyResult<Self> {
         let glfw_ctx =
             GlfwContext::new(width, height).map_err(|e| PyRuntimeError::new_err(format!("{e}")))?;
 
         let mut config = Config::new();
         config.set(ConfigKey::AssetRootPath, asset_path.to_string());
+        config.set(ConfigKey::SketchRootPath, sketch_root_path.to_string());
+        config.set(ConfigKey::SketchFileName, sketch_file_name.to_string());
         init(config).map_err(|e| PyRuntimeError::new_err(format!("{e}")))?;
 
         let surface = glfw_ctx
@@ -166,6 +179,17 @@ impl Graphics {
         })
     }
 
+    pub fn poll_for_sketch_update(&self) -> PyResult<Sketch> {
+        match poll_for_sketch_updates().map_err(|_| PyRuntimeError::new_err("SKETCH UPDATE ERR"))? {
+            Some(sketch) => Ok(Sketch {
+                source: sketch.source,
+            }),
+            None => Ok(Sketch {
+                source: "".to_string(),
+            }),
+        }
+    }
+
     pub fn background(&self, args: Vec<f32>) -> PyResult<()> {
         let (r, g, b, a) = parse_color(&args)?;
         let color = bevy::color::Color::srgba(r, g, b, a);