Merge remote-tracking branch 'origin/main' into style

Author: tychedelia

Cargo.lock

@@ -0,0 +1,138 @@
+pub const CORNER: &str = "corner";
+pub const CORNERS: &str = "corners";
+pub const RADIUS: &str = "radius";
+pub const CENTER: &str = "center"; // also the middle mouse button
+
+pub const ROUND: &str = "round"; // caps and joins
+pub const SQUARE: &str = "square";
+pub const PROJECT: &str = "project";
+pub const MITER: &str = "miter";
+pub const BEVEL: &str = "bevel";
+
+pub const POLYGON: &str = "polygon";
+pub const POINTS: &str = "points";
+pub const LINES: &str = "lines";
+pub const TRIANGLES: &str = "triangles";
+pub const TRIANGLE_FAN: &str = "triangle_fan";
+pub const TRIANGLE_STRIP: &str = "triangle_strip";
+pub const QUADS: &str = "quads";
+pub const QUAD_STRIP: &str = "quad_strip";
+pub const LINE_STRIP: &str = "line_strip"; // geometry topology; no begin_shape equivalent
+
+pub const OPEN: &str = "open";
+pub const CHORD: &str = "chord";
+pub const PIE: &str = "pie";
+pub const CLOSE: bool = true;
+
+pub const LEFT: &str = "left";
+pub const RIGHT: &str = "right";
+
+pub const NEAREST: &str = "nearest";
+pub const CLAMP: &str = "clamp";
+pub const REPEAT: &str = "repeat";
+pub const MIRROR: &str = "mirror";
+
+pub const SRGB: &str = "srgb";
+pub const LINEAR: &str = "linear"; // also the Sampler filter
+pub const HSL: &str = "hsl";
+pub const HSV: &str = "hsv";
+pub const HWB: &str = "hwb";
+pub const OKLAB: &str = "oklab";
+pub const OKLCH: &str = "oklch";
+pub const LAB: &str = "lab";
+pub const LCH: &str = "lch";
+pub const XYZ: &str = "xyz";
+
+pub const PI: f32 = std::f32::consts::PI;
+pub const TWO_PI: f32 = std::f32::consts::TAU;
+pub const HALF_PI: f32 = std::f32::consts::FRAC_PI_2;
+pub const QUARTER_PI: f32 = std::f32::consts::FRAC_PI_4;
+pub const TAU: f32 = std::f32::consts::TAU;
+pub const DEG_TO_RAD: f32 = std::f32::consts::PI / 180.0;
+pub const RAD_TO_DEG: f32 = 180.0 / std::f32::consts::PI;
+
+// Key codes stay numeric (compared against `key_code`); values must match `key_code_to_u32`.
+
+pub const KEY_A: u32 = 65;
+pub const KEY_B: u32 = 66;
+pub const KEY_C: u32 = 67;
+pub const KEY_D: u32 = 68;
+pub const KEY_E: u32 = 69;
+pub const KEY_F: u32 = 70;
+pub const KEY_G: u32 = 71;
+pub const KEY_H: u32 = 72;
+pub const KEY_I: u32 = 73;
+pub const KEY_J: u32 = 74;
+pub const KEY_K: u32 = 75;
+pub const KEY_L: u32 = 76;
+pub const KEY_M: u32 = 77;
+pub const KEY_N: u32 = 78;
+pub const KEY_O: u32 = 79;
+pub const KEY_P: u32 = 80;
+pub const KEY_Q: u32 = 81;
+pub const KEY_R: u32 = 82;
+pub const KEY_S: u32 = 83;
+pub const KEY_T: u32 = 84;
+pub const KEY_U: u32 = 85;
+pub const KEY_V: u32 = 86;
+pub const KEY_W: u32 = 87;
+pub const KEY_X: u32 = 88;
+pub const KEY_Y: u32 = 89;
+pub const KEY_Z: u32 = 90;
+
+pub const KEY_0: u32 = 48;
+pub const KEY_1: u32 = 49;
+pub const KEY_2: u32 = 50;
+pub const KEY_3: u32 = 51;
+pub const KEY_4: u32 = 52;
+pub const KEY_5: u32 = 53;
+pub const KEY_6: u32 = 54;
+pub const KEY_7: u32 = 55;
+pub const KEY_8: u32 = 56;
+pub const KEY_9: u32 = 57;
+
+pub const SPACE: u32 = 32;
+pub const QUOTE: u32 = 39;
+pub const COMMA: u32 = 44;
+pub const MINUS: u32 = 45;
+pub const PERIOD: u32 = 46;
+pub const SLASH: u32 = 47;
+pub const SEMICOLON: u32 = 59;
+pub const EQUAL: u32 = 61;
+pub const BRACKET_LEFT: u32 = 91;
+pub const BACKSLASH: u32 = 92;
+pub const BRACKET_RIGHT: u32 = 93;
+pub const BACKQUOTE: u32 = 96;
+
+pub const ESCAPE: u32 = 256;
+pub const ENTER: u32 = 257;
+pub const TAB: u32 = 258;
+pub const BACKSPACE: u32 = 259;
+pub const INSERT: u32 = 260;
+pub const DELETE: u32 = 261;
+pub const UP: u32 = 265;
+pub const DOWN: u32 = 264;
+pub const LEFT_ARROW: u32 = 263;
+pub const RIGHT_ARROW: u32 = 262;
+pub const PAGE_UP: u32 = 266;
+pub const PAGE_DOWN: u32 = 267;
+pub const HOME: u32 = 268;
+pub const END: u32 = 269;
+
+pub const SHIFT: u32 = 340;
+pub const CONTROL: u32 = 341;
+pub const ALT: u32 = 342;
+pub const SUPER: u32 = 343;
+
+pub const F1: u32 = 290;
+pub const F2: u32 = 291;
+pub const F3: u32 = 292;
+pub const F4: u32 = 293;
+pub const F5: u32 = 294;
+pub const F6: u32 = 295;
+pub const F7: u32 = 296;
+pub const F8: u32 = 297;
+pub const F9: u32 = 298;
+pub const F10: u32 = 299;
+pub const F11: u32 = 300;
+pub const F12: u32 = 301;

crates/processing_core/src/constants.rs

@@ -1,4 +1,5 @@
 pub mod config;
+pub mod constants;
 pub mod error;
 
 use std::cell::RefCell;

crates/processing_core/src/lib.rs

@@ -520,24 +520,32 @@ pub extern "C" fn processing_reset_matrix(graphics_id: u64) {
 /// - graphics_id is a valid ID returned from graphics_create.
 /// - This is called from the same thread as init.
 #[unsafe(no_mangle)]
-pub extern "C" fn processing_translate(graphics_id: u64, x: f32, y: f32) {
+pub extern "C" fn processing_translate(graphics_id: u64, x: f32, y: f32, z: f32) {
     error::clear_error();
     let graphics_entity = Entity::from_bits(graphics_id);
     error::check(|| {
-        graphics_record_command(graphics_entity, DrawCommand::Translate(Vec2::new(x, y)))
+        graphics_record_command(graphics_entity, DrawCommand::Translate(Vec3::new(x, y, z)))
     });
 }
 
-/// Rotate the coordinate system.
+/// Rotate the coordinate system by `angle` about the axis (x, y, z).
 ///
 /// SAFETY:
 /// - graphics_id is a valid ID returned from graphics_create.
 /// - This is called from the same thread as init.
 #[unsafe(no_mangle)]
-pub extern "C" fn processing_rotate(graphics_id: u64, angle: f32) {
+pub extern "C" fn processing_rotate(graphics_id: u64, angle: f32, x: f32, y: f32, z: f32) {
     error::clear_error();
     let graphics_entity = Entity::from_bits(graphics_id);
-    error::check(|| graphics_record_command(graphics_entity, DrawCommand::Rotate { angle }));
+    error::check(|| {
+        graphics_record_command(
+            graphics_entity,
+            DrawCommand::Rotate {
+                angle,
+                axis: Vec3::new(x, y, z),
+            },
+        )
+    });
 }
 
 /// Scale the coordinate system.
@@ -546,10 +554,12 @@ pub extern "C" fn processing_rotate(graphics_id: u64, angle: f32) {
 /// - graphics_id is a valid ID returned from graphics_create.
 /// - This is called from the same thread as init.
 #[unsafe(no_mangle)]
-pub extern "C" fn processing_scale(graphics_id: u64, x: f32, y: f32) {
+pub extern "C" fn processing_scale(graphics_id: u64, x: f32, y: f32, z: f32) {
     error::clear_error();
     let graphics_entity = Entity::from_bits(graphics_id);
-    error::check(|| graphics_record_command(graphics_entity, DrawCommand::Scale(Vec2::new(x, y))));
+    error::check(|| {
+        graphics_record_command(graphics_entity, DrawCommand::Scale(Vec3::new(x, y, z)))
+    });
 }
 
 /// Shear along the X axis.
@@ -1591,6 +1601,153 @@ pub unsafe extern "C" fn processing_image_readback(
     });
 }
 
+/// Set the tint color applied to images.
+///
+/// SAFETY:
+/// - graphics_id is a valid ID returned from graphics_create.
+/// - This is called from the same thread as init.
+#[unsafe(no_mangle)]
+pub extern "C" fn processing_tint(graphics_id: u64, color: Color) {
+    error::clear_error();
+    let graphics_entity = Entity::from_bits(graphics_id);
+    error::check(|| {
+        let mode = graphics_get_color_mode(graphics_entity)?;
+        graphics_record_command(graphics_entity, DrawCommand::Tint(color.resolve(&mode)))
+    });
+}
+
+/// Remove the image tint.
+///
+/// SAFETY:
+/// - graphics_id is a valid ID returned from graphics_create.
+/// - This is called from the same thread as init.
+#[unsafe(no_mangle)]
+pub extern "C" fn processing_no_tint(graphics_id: u64) {
+    error::clear_error();
+    let graphics_entity = Entity::from_bits(graphics_id);
+    error::check(|| graphics_record_command(graphics_entity, DrawCommand::NoTint));
+}
+
+/// Set how image() interprets its coordinates (CORNER/CORNERS/CENTER/RADIUS).
+///
+/// SAFETY:
+/// - graphics_id is a valid ID returned from graphics_create.
+/// - This is called from the same thread as init.
+#[unsafe(no_mangle)]
+pub extern "C" fn processing_image_mode(graphics_id: u64, mode: u8) {
+    error::clear_error();
+    let graphics_entity = Entity::from_bits(graphics_id);
+    error::check(|| {
+        graphics_record_command(
+            graphics_entity,
+            DrawCommand::ImageMode(processing::prelude::ShapeMode::from(mode)),
+        )
+    });
+}
+
+/// Draw an image at (dx, dy) at its native size.
+///
+/// SAFETY:
+/// - graphics_id and image_id are valid IDs from graphics_create/image_create.
+/// - This is called from the same thread as init.
+#[unsafe(no_mangle)]
+pub extern "C" fn processing_image(graphics_id: u64, image_id: u64, dx: f32, dy: f32) {
+    error::clear_error();
+    let graphics_entity = Entity::from_bits(graphics_id);
+    let image_entity = Entity::from_bits(image_id);
+    error::check(|| {
+        graphics_record_command(
+            graphics_entity,
+            DrawCommand::Image {
+                entity: image_entity,
+                dx,
+                dy,
+                d_width: None,
+                d_height: None,
+                sx: None,
+                sy: None,
+                s_width: None,
+                s_height: None,
+            },
+        )
+    });
+}
+
+/// Draw an image at (dx, dy) scaled to (d_width, d_height).
+///
+/// SAFETY:
+/// - graphics_id and image_id are valid IDs from graphics_create/image_create.
+/// - This is called from the same thread as init.
+#[unsafe(no_mangle)]
+pub extern "C" fn processing_image_scaled(
+    graphics_id: u64,
+    image_id: u64,
+    dx: f32,
+    dy: f32,
+    d_width: f32,
+    d_height: f32,
+) {
+    error::clear_error();
+    let graphics_entity = Entity::from_bits(graphics_id);
+    let image_entity = Entity::from_bits(image_id);
+    error::check(|| {
+        graphics_record_command(
+            graphics_entity,
+            DrawCommand::Image {
+                entity: image_entity,
+                dx,
+                dy,
+                d_width: Some(d_width),
+                d_height: Some(d_height),
+                sx: None,
+                sy: None,
+                s_width: None,
+                s_height: None,
+            },
+        )
+    });
+}
+
+/// Draw the (sx, sy, s_width, s_height) source region of an image into the
+/// (dx, dy, d_width, d_height) destination rectangle.
+///
+/// SAFETY:
+/// - graphics_id and image_id are valid IDs from graphics_create/image_create.
+/// - This is called from the same thread as init.
+#[unsafe(no_mangle)]
+pub extern "C" fn processing_image_region(
+    graphics_id: u64,
+    image_id: u64,
+    dx: f32,
+    dy: f32,
+    d_width: f32,
+    d_height: f32,
+    sx: f32,
+    sy: f32,
+    s_width: f32,
+    s_height: f32,
+) {
+    error::clear_error();
+    let graphics_entity = Entity::from_bits(graphics_id);
+    let image_entity = Entity::from_bits(image_id);
+    error::check(|| {
+        graphics_record_command(
+            graphics_entity,
+            DrawCommand::Image {
+                entity: image_entity,
+                dx,
+                dy,
+                d_width: Some(d_width),
+                d_height: Some(d_height),
+                sx: Some(sx),
+                sy: Some(sy),
+                s_width: Some(s_width),
+                s_height: Some(s_height),
+            },
+        )
+    });
+}
+
 #[unsafe(no_mangle)]
 pub extern "C" fn processing_mode_3d(graphics_id: u64) {
     error::clear_error();

crates/processing_ffi/src/lib.rs

@@ -8,10 +8,11 @@ workspace = true
 
 [features]
 wayland = ["glfw/wayland"]
-x11 = []
+x11 = ["dep:x11"]
 static-link = ["glfw/static-link"]
 
 [dependencies]
+x11 = { version = "2", features = ["xlib"], optional = true }
 bevy = { workspace = true }
 glfw = "0.60.0"
 processing_core = { workspace = true }