Merge remote-tracking branch 'origin/main' into window-settings

# Conflicts:
#	crates/processing_pyo3/examples/window_controls.py
#	crates/processing_pyo3/mewnala/__init__.py
#	crates/processing_render/src/surface.rs

Author: tychedelia

.github/workflows/release.yml

@@ -23,7 +23,7 @@ jobs:
       - uses: actions/upload-artifact@v4
         with:
           name: type-stubs
-          path: crates/processing_pyo3/mewnala/__init__.pyi
+          path: crates/processing_pyo3/mewnala/*.pyi
 
   linux:
     runs-on: ubuntu-22.04

Cargo.lock

@@ -39,6 +39,8 @@ processing_midi = { path = "crates/processing_midi" }
 processing_input = { path = "crates/processing_input" }
 processing_glfw = { path = "crates/processing_glfw" }
 processing_webcam = { path = "crates/processing_webcam" }
+rand = "0.10"
+rand_distr = "0.6"
 
 [dependencies]
 bevy = { workspace = true }
@@ -58,7 +60,7 @@ web-sys = { version = "0.3", features = ["Window"] }
 
 [dev-dependencies]
 processing_glfw = { workspace = true }
-rand = "0.10.0"
+rand = { workspace = true }
 
 [target.'cfg(target_os = "linux")'.dev-dependencies]
 processing_glfw = { workspace = true, features = ["wayland"] }

Cargo.toml

@@ -63,6 +63,7 @@ impl GlfwContext {
 
         glfw.window_hint(glfw::WindowHint::ClientApi(glfw::ClientApiHint::NoApi));
         glfw.window_hint(glfw::WindowHint::Visible(false));
+        glfw.window_hint(glfw::WindowHint::TransparentFramebuffer(true));
 
         let (mut window, events) = glfw
             .create_window(width, height, "Processing", WindowMode::Windowed)

crates/processing_glfw/src/lib.rs

@@ -1,6 +1,6 @@
 [package]
 name = "processing_pyo3"
-version = "0.0.3"
+version = "0.0.4"
 edition = "2024"
 
 [lints]
@@ -26,3 +26,5 @@ processing_glfw = { workspace = true }
 bevy = { workspace = true, features = ["file_watcher"] }
 png = "0.18"
 processing_cuda = { workspace = true, optional = true }
+rand = { workspace = true }
+rand_distr = { workspace = true }

crates/processing_pyo3/Cargo.toml

@@ -118,6 +118,7 @@ def draw():
     fill(80, 200, 120)
     rect(20, 240, width - 40, 60)
 
+    # Yellow dot tracks window_x / window_y wrapped into the canvas.
     fill(255, 220, 60)
     if width > 0 and height > 0:
         circle(window_x % width, window_y % height, 12)

crates/processing_pyo3/examples/window_controls.py

@@ -17,33 +17,54 @@
     "width",
     "height",
     "focused",
+    "pixel_density",
     "pixel_width",
     "pixel_height",
-)
-_DYNAMIC_FUNCTIONS = (
     "mouse_x",
     "mouse_y",
     "pmouse_x",
     "pmouse_y",
+    "mouse_is_pressed",
+    "mouse_button",
+    "mouse_wheel",
+    "moved_x",
+    "moved_y",
+    "key",
+    "key_code",
+    "key_is_pressed",
+)
+
+_DYNAMIC_TIME_ATTRS = (
     "frame_count",
     "delta_time",
     "elapsed_time",
 )
+
+_DEFAULT_GRAPHICS_VALUES = {
+    "width": 100,
+    "height": 100,
+    "focused": False,
+    "pixel_density": 1.0,
+    "pixel_width": 100,
+    "pixel_height": 100,
+    "mouse_x": 0.0,
+    "mouse_y": 0.0,
+    "pmouse_x": 0.0,
+    "pmouse_y": 0.0,
+    "mouse_is_pressed": False,
+    "mouse_button": None,
+    "mouse_wheel": 0.0,
+    "moved_x": 0.0,
+    "moved_y": 0.0,
+    "key": None,
+    "key_code": None,
+    "key_is_pressed": False,
+}
+
 _DYNAMIC = (
-    _DYNAMIC_GRAPHICS_ATTRS + _DYNAMIC_FUNCTIONS + (
-        "mouse_is_pressed",
-        "mouse_button",
-        "moved_x",
-        "moved_y",
-        "mouse_wheel",
-        "key",
-        "key_code",
-        "key_is_pressed",
-        "display_width",
-        "display_height",
-        "window_x",
-        "window_y",
-    )
+    _DYNAMIC_GRAPHICS_ATTRS
+    + _DYNAMIC_TIME_ATTRS
+    + ("display_width", "display_height", "window_x", "window_y")
 )
 
 
@@ -56,20 +77,38 @@ def __getattr__(name):
         g = _get_graphics()
         if g is not None:
             return getattr(g, name)
-    if name in _DYNAMIC_FUNCTIONS:
-        fn = getattr(_native, name, None)
-        if callable(fn):
+        return _DEFAULT_GRAPHICS_VALUES[name]
+    if name in _DYNAMIC_TIME_ATTRS:
+        fn = getattr(_native, f"_dyn_{name}", None)
+        if not callable(fn):
+            return 0
+        try:
             return fn()
+        except RuntimeError:
+            return 0 if name == "frame_count" else 0.0
     if name in ("display_width", "display_height"):
-        mon = getattr(_native, "primary_monitor", lambda: None)()
+        try:
+            mon = getattr(_native, "primary_monitor", lambda: None)()
+        except RuntimeError:
+            return 0
         if mon is None:
             return 0
         return mon.width if name == "display_width" else mon.height
+    if name in ("window_x", "window_y"):
+        g = _get_graphics()
+        if g is None:
+            return 0
+        x, y = g.surface.position
+        return x if name == "window_x" else y
     raise AttributeError(f"module {__name__!r} has no attribute {name!r}")
 
 
 def __dir__():
     return sorted(set(list(globals().keys()) + list(_DYNAMIC)))
 
 
+__all__ = sorted(
+    {n for n in dir(_native) if not n.startswith("_")} | set(_DYNAMIC)
+)
+
 del _sys, _name, _sub

crates/processing_pyo3/mewnala/__init__.py

@@ -603,9 +603,6 @@ mod mewnala {
     fn init(module: &Bound<'_, PyModule>) -> PyResult<()> {
         use processing::prelude::BlendMode;
 
-        module.add("width", super::DEFAULT_WIDTH)?;
-        module.add("height", super::DEFAULT_HEIGHT)?;
-
         module.add("BLEND", PyBlendMode::from_preset(BlendMode::Blend))?;
         module.add("ADD", PyBlendMode::from_preset(BlendMode::Add))?;
         module.add("SUBTRACT", PyBlendMode::from_preset(BlendMode::Subtract))?;
@@ -1762,38 +1759,6 @@ mod mewnala {
         midi::play_notes(note, duration)
     }
 
-    #[pyfunction]
-    #[pyo3(pass_module)]
-    fn mouse_x(module: &Bound<'_, PyModule>) -> PyResult<f32> {
-        let graphics =
-            get_graphics(module)?.ok_or_else(|| PyRuntimeError::new_err("call size() first"))?;
-        input::mouse_x(graphics.surface.entity, graphics.width)
-    }
-
-    #[pyfunction]
-    #[pyo3(pass_module)]
-    fn mouse_y(module: &Bound<'_, PyModule>) -> PyResult<f32> {
-        let graphics =
-            get_graphics(module)?.ok_or_else(|| PyRuntimeError::new_err("call size() first"))?;
-        input::mouse_y(graphics.surface.entity, graphics.height)
-    }
-
-    #[pyfunction]
-    #[pyo3(pass_module)]
-    fn pmouse_x(module: &Bound<'_, PyModule>) -> PyResult<f32> {
-        let graphics =
-            get_graphics(module)?.ok_or_else(|| PyRuntimeError::new_err("call size() first"))?;
-        input::pmouse_x(graphics.surface.entity, graphics.width)
-    }
-
-    #[pyfunction]
-    #[pyo3(pass_module)]
-    fn pmouse_y(module: &Bound<'_, PyModule>) -> PyResult<f32> {
-        let graphics =
-            get_graphics(module)?.ok_or_else(|| PyRuntimeError::new_err("call size() first"))?;
-        input::pmouse_y(graphics.surface.entity, graphics.height)
-    }
-
     #[pyfunction]
     fn key_is_down(key_code: u32) -> PyResult<bool> {
         input::key_is_down(key_code)
@@ -1833,18 +1798,20 @@ mod mewnala {
         graphics.surface.display_density()
     }
 
+    // private stuff
+
     #[pyfunction]
-    fn frame_count() -> PyResult<u32> {
+    fn _dyn_frame_count() -> PyResult<u32> {
         time::frame_count()
     }
 
     #[pyfunction]
-    fn delta_time() -> PyResult<f32> {
+    fn _dyn_delta_time() -> PyResult<f32> {
         time::delta_time()
     }
 
     #[pyfunction]
-    fn elapsed_time() -> PyResult<f32> {
+    fn _dyn_elapsed_time() -> PyResult<f32> {
         time::elapsed_time()
     }