working

Author: arrxy

crates/processing_glfw/src/lib.rs

@@ -301,8 +301,12 @@ impl GlfwContext {
                     input_set_focus(surface, focused).unwrap();
                 }
                 WindowEvent::Size(width, height) => {
-                    processing_render::surface_resize(surface, width.max(1) as u32, height.max(1) as u32)
-                        .unwrap();
+                    processing_render::surface_resize(
+                        surface,
+                        width.max(1) as u32,
+                        height.max(1) as u32,
+                    )
+                    .unwrap();
                 }
                 _ => {}
             }

crates/processing_pyo3/src/lib.rs

@@ -34,7 +34,6 @@ use graphics::{
 };
 use material::Material;
 
-use processing_render::surface_logical_width;
 use pyo3::{
     BoundObject,
     exceptions::PyRuntimeError,
@@ -121,9 +120,9 @@ pub(crate) fn reset_tracked_globals() {
 fn sync_globals(module: &Bound<'_, PyModule>, globals: &Bound<'_, PyAny>) -> PyResult<()> {
     let graphics =
         get_graphics(module)?.ok_or_else(|| PyRuntimeError::new_err("call size() first"))?;
-    let width = ::processing::prelude::surface_logical_width(graphics.surface.entity)
+    let width = ::processing::prelude::surface_width(graphics.surface.entity)
         .map_err(|e| PyRuntimeError::new_err(format!("{e}")))?;
-    let height = ::processing::prelude::surface_logical_height(graphics.surface.entity)
+    let height = ::processing::prelude::surface_height(graphics.surface.entity)
         .map_err(|e| PyRuntimeError::new_err(format!("{e}")))?;
     input::sync_globals(globals, graphics.surface.entity, width, height)?;
     surface::sync_globals(globals, &graphics.surface, width, height)?;

crates/processing_render/src/lib.rs

@@ -1702,20 +1702,20 @@ pub fn surface_physical_height(entity: Entity) -> error::Result<u32> {
     })
 }
 
-pub fn surface_logical_width(entity: Entity) -> error::Result<u32> {
+pub fn surface_width(entity: Entity) -> error::Result<u32> {
     app_mut(|app| {
         Ok(app
             .world_mut()
-            .run_system_cached_with(surface::logical_width, entity)
+            .run_system_cached_with(surface::width, entity)
             .unwrap())
     })
 }
 
-pub fn surface_logical_height(entity: Entity) -> error::Result<u32> {
+pub fn surface_height(entity: Entity) -> error::Result<u32> {
     app_mut(|app| {
         Ok(app
             .world_mut()
-            .run_system_cached_with(surface::logical_height, entity)
+            .run_system_cached_with(surface::height, entity)
             .unwrap())
     })
 }

crates/processing_render/src/surface.rs

@@ -40,10 +40,7 @@ use processing_core::error::{self, ProcessingError, Result};
 #[cfg(not(target_os = "windows"))]
 use std::ptr::NonNull;
 
-use crate::{
-    graphics::SurfaceSize,
-    image::Image,
-};
+use crate::{graphics::SurfaceSize, image::Image};
 
 #[derive(Component, Debug, Clone)]
 pub struct Surface;
@@ -464,14 +461,14 @@ pub fn physical_height(In(entity): In<Entity>, query: Query<&Window>) -> u32 {
         .unwrap_or(0)
 }
 
-pub fn logical_width(In(entity): In<Entity>, query: Query<&Window>) -> u32 {
+pub fn width(In(entity): In<Entity>, query: Query<&Window>) -> u32 {
     query
         .get(entity)
         .map(|w| w.resolution.width() as u32)
         .unwrap_or(0)
 }
 
-pub fn logical_height(In(entity): In<Entity>, query: Query<&Window>) -> u32 {
+pub fn height(In(entity): In<Entity>, query: Query<&Window>) -> u32 {
     query
         .get(entity)
         .map(|w| w.resolution.height() as u32)