feat: macOS NAPI (#133)

* feat: macOS NAPI

* chore: updates

* fix: shadow paint

* fix: macos bool

* feat: shadow color string

* chore: updates

* chore: updates

* chore: flappyBird

* feat: save & restore

* chore: updates

* chore: update demo

* chore: updates

* chore: updates

* chore: updates

* feat: webgl2

* chore: updates

* chore: updates

* chore: updates

* chore: updates

* chore: updates

* chore(node-demo): start script

* chore: node start script

* chore: updates

* chore: updates

* chore: updates

* chore: updates

* chore: updates

* chore: updates

* feat: 0.0.1

* feat: 0.0.2

* chore: 0.0.5

* fix: magnify -> wheel event

* chore: demo

* chore: bump

* chore: updates

* chore: fix build

* chore: move napi into crates

Author: triniwiz

.vscode/settings.json

@@ -0,0 +1,5 @@
+{
+	"files.associations": {
+		"new": "cpp"
+	}
+}

.yarn/releases/yarn-4.5.2.cjs

@@ -0,0 +1 @@
+yarnPath: .yarn/releases/yarn-4.5.2.cjs

.yarnrc.yml

@@ -10,7 +10,9 @@ members = [
     "crates/canvas-ios",
     "crates/playground",
     "crates/canvas-c",
-    "crates/canvas-svg"]
+    "crates/canvas-svg",
+    "crates/canvas-napi",
+]
 
 [profile.release]
 panic = "abort"
@@ -25,7 +27,7 @@ strip = true
 [workspace.dependencies.wgt]
 package = "wgpu-types"
 git = "https://github.com/triniwiz/wgpu"
-rev = "48f663f70d5b6e99a5b8a708876ce9642d78fbde"
+rev = "6f163cdf622bd183fcfc20224294b797312550bb"
 
 [workspace.dependencies]
 env_logger = "0.11.5"
@@ -37,9 +39,9 @@ canvas-core = { path = "./crates/canvas-core" }
 canvas-webgl = { path = "./crates/canvas-webgl" }
 gl-bindings = { path = "./crates/gl-bindings" }
 canvas-c = { path = "./crates/canvas-c" }
-skia-safe = { version = "0.78.2", features = ["textlayout"] }
+skia-safe = { version = "0.80.0", features = ["textlayout"] }
 itertools = "0.13.0"
-wgpu-core = { git = "https://github.com/triniwiz/wgpu", rev = "48f663f70d5b6e99a5b8a708876ce9642d78fbde", features = ["wgsl", "vulkan", "metal", "raw-window-handle"] }
-wgpu-types = { git = "https://github.com/triniwiz/wgpu", rev = "48f663f70d5b6e99a5b8a708876ce9642d78fbde" }
+wgpu-core = { git = "https://github.com/triniwiz/wgpu", rev = "6f163cdf622bd183fcfc20224294b797312550bb", features = ["wgsl", "vulkan", "metal", "raw-window-handle"] }
+wgpu-types = { git = "https://github.com/triniwiz/wgpu", rev = "6f163cdf622bd183fcfc20224294b797312550bb" }
 ureq = "2.10.1"
 jni = "0.21.1"

Cargo.toml

@@ -26,4 +26,5 @@ raw-window-handle.workspace = true
 bitflags = "2.6.0"
 
 [target.'cfg(any(target_os = "ios", target_os="macos"))'.dependencies]
-foreign-types-shared = "0.3.1"
+foreign-types-shared = "0.3.1"
+objc2-foundation = { version = "0.2.2", features = ["NSAutoreleasePool"] }

crates/canvas-2d/Cargo.toml

@@ -147,6 +147,8 @@ impl Context {
     }
 
     pub fn draw_image_dx_dy(&mut self, image: &Image, x: f32, y: f32) {
+        #[cfg(any(target_os = "macos", target_os = "ios"))]
+        let _ = unsafe { objc2_foundation::NSAutoreleasePool::new() };
         #[cfg(feature = "gl")]{
             if let Some(ref context) = self.gl_context {
                 context.make_current();
@@ -174,6 +176,8 @@ impl Context {
     }
 
     fn draw_image(&mut self, image: &Image, src_rect: impl Into<Rect>, dst_rect: impl Into<Rect>) {
+        #[cfg(any(target_os = "macos", target_os = "ios"))]
+        let _ = unsafe { objc2_foundation::NSAutoreleasePool::new() };
         #[cfg(feature = "gl")]{
             if let Some(ref context) = self.gl_context {
                 context.make_current();
@@ -209,7 +213,8 @@ impl Context {
     }
 
     fn draw_image_with_rect(&mut self, image: &Image, dst_rect: impl Into<Rect>) {
-
+        #[cfg(any(target_os = "macos", target_os = "ios"))]
+        let _ = unsafe { objc2_foundation::NSAutoreleasePool::new() };
         #[cfg(feature = "gl")]{
             if let Some(ref context) = self.gl_context {
                 context.make_current();

crates/canvas-2d/src/context/drawing_images/mod.rs

@@ -2,16 +2,21 @@ use std::borrow::BorrowMut;
 
 use skia_safe::{ClipOp, Matrix, Point};
 
-use crate::context::Context;
 use crate::context::drawing_paths::fill_rule::FillRule;
 use crate::context::paths::path::Path;
+use crate::context::Context;
 
 pub mod fill_rule;
 
 impl Context {
-    fn fill_or_stroke(&mut self, is_fill: bool, path: Option<&mut Path>, fill_rule: Option<FillRule>) {
-
-        #[cfg(feature = "gl")]{
+    fn fill_or_stroke(
+        &mut self,
+        is_fill: bool,
+        path: Option<&mut Path>,
+        fill_rule: Option<FillRule>,
+    ) {
+        #[cfg(feature = "gl")]
+        {
             if let Some(ref context) = self.gl_context {
                 context.make_current();
             }
@@ -42,6 +47,9 @@ impl Context {
             )
         };
 
+        #[cfg(any(target_os = "macos", target_os = "ios"))]
+        let pool = unsafe { objc2_foundation::NSAutoreleasePool::new() };
+
         self.render_to_canvas(&paint, |canvas, paint| {
             if let Some(paint) = &shadow_paint {
                 canvas.draw_path(path, paint);

crates/canvas-2d/src/context/drawing_paths/mod.rs

@@ -51,6 +51,7 @@ impl PaintStyle {
         blue
     }
 
+    #[inline]
     pub fn new_color_str(color: &str) -> Option<Self> {
         parse(color)
             .map(|color| {
@@ -201,7 +202,7 @@ impl Paint {
         color: Color,
         blur: c_float,
     ) -> Option<skia_safe::Paint> {
-        if !(color != Color::TRANSPARENT && blur > 0.0) {
+        if color == Color::TRANSPARENT && blur > 0.0 {
             return None;
         }
         let mut paint = self.fill_paint().clone();
@@ -215,7 +216,7 @@ impl Paint {
         color: Color,
         blur: c_float,
     ) -> Option<skia_safe::Paint> {
-        if !(color != Color::TRANSPARENT && blur > 0.0) {
+        if color == Color::TRANSPARENT && blur > 0.0 {
             return None;
         }
         let mut paint = self.stroke_paint().clone();

crates/canvas-2d/src/context/fill_and_stroke_styles/paint.rs

@@ -560,6 +560,14 @@ impl Context {
         };
     }
 
+    pub fn reset(&mut self) {
+        self.reset_state();
+        self.reset_transform();
+        self.with_canvas_dirty(|canvas| {
+            canvas.clear(Color::TRANSPARENT);
+        });
+    }
+
     pub fn reset_state(&mut self) {
         let direction = self.state.direction;
         self.state = State::default();

crates/canvas-2d/src/context/mod.rs

@@ -14,6 +14,7 @@ struct ImageDataInner {
 }
 
 unsafe impl Send for ImageDataInner {}
+unsafe impl Sync for ImageDataInner {}
 
 #[derive(Debug, Clone)]
 pub struct ImageData(ImageDataInner);

crates/canvas-2d/src/context/pixel_manipulation/image_data.rs

@@ -3,6 +3,7 @@ use std::os::raw::c_float;
 use skia_safe::Color;
 
 use crate::context::Context;
+use crate::utils::color::parse_color;
 
 impl Context {
     pub fn set_shadow_blur(&mut self, blur: c_float) {
@@ -34,6 +35,12 @@ impl Context {
         self.state.shadow_color = color;
     }
 
+    pub fn set_shadow_color_str(&mut self, color: &str) {
+        if let Some(color) = parse_color(color) {
+            self.state.shadow_color = color;
+        }
+    }
+
     pub fn set_shadow_color_rgba(&mut self, r: u8, g: u8, b: u8, a: u8) {
         self.state.shadow_color = Color::from_argb(a, r, g, b);
     }

crates/canvas-2d/src/context/shadows.rs

@@ -34,6 +34,7 @@ impl Context {
             false,
             false,
             true,
+            false,
         );
 
         let bounds = skia_safe::Rect::from_wh(width, height);

crates/canvas-2d/src/context/surface_gl.rs

@@ -102,6 +102,6 @@ impl Context {
     }
 
     pub fn get_letter_spacing(&self) -> &str {
-        return self.state.letter_spacing_value.as_str();
+        self.state.letter_spacing_value.as_str()
     }
 }

crates/canvas-2d/src/context/text_styles/mod.rs

@@ -26,13 +26,15 @@ futures = "0.3"
 raw-window-handle.workspace = true
 wgpu-core = { workspace = true, features = ["wgsl", "vulkan", "metal", "raw-window-handle"] }
 infer = "0.16.0"
-image = {version = "0.25.5", optional = true}
+image = { version = "0.25.5", optional = true }
+
 [target.'cfg(target_os="ios")'.dependencies]
 display-link = { version = "0.2.0" }
 wgpu-core = { workspace = true, features = ["wgsl", "metal", "raw-window-handle"] }
 objc2-foundation = { version = "0.2.2", features = ["NSGeometry", "NSData", "NSAutoreleasePool"] }
 
 [target.'cfg(target_os="macos")'.dependencies]
+metal = { version = "0.30.0"}
 #display-link = { git = "https://github.com/servo/display-link", branch = "no-transmute" }
 #wgpu-core = { version = "22.0.0", features = ["wgsl", "metal", "raw-window-handle"] }
 #objc2-foundation = { version = "0.2.2", features = ["NSGeometry", "NSData", "NSAutoreleasePool"] }

crates/canvas-c/Cargo.toml

@@ -101,6 +101,10 @@ impl U16Buffer {
     pub fn length(&self) -> usize {
         self.0.len()
     }
+
+    pub fn into_vec(self) -> Vec<u16> {
+        self.0
+    }
 }
 
 impl Default for U16Buffer {
@@ -133,6 +137,10 @@ impl F32Buffer {
     pub fn length(&self) -> usize {
         self.0.len()
     }
+
+    pub fn into_vec(self) -> Vec<f32> {
+        self.0
+    }
 }
 
 impl Default for F32Buffer {
@@ -164,6 +172,10 @@ impl I32Buffer {
     pub fn length(&self) -> usize {
         self.0.len()
     }
+
+    pub fn into_vec(self) -> Vec<i32> {
+        self.0
+    }
 }
 
 impl Default for I32Buffer {
@@ -196,6 +208,10 @@ impl U32Buffer {
     pub fn length(&self) -> usize {
         self.0.len()
     }
+
+    pub fn into_vec(self) -> Vec<u32> {
+        self.0
+    }
 }
 
 impl Default for U32Buffer {
@@ -210,13 +226,56 @@ impl From<Vec<u32>> for U32Buffer {
     }
 }
 
+
+pub struct BoolBuffer(Vec<bool>);
+
+impl BoolBuffer {
+    pub fn new_with_vec(value: Vec<bool>) -> Self {
+        Self(value)
+    }
+
+    pub fn get_buffer(&self) -> &[bool] {
+        self.0.as_slice()
+    }
+
+    pub fn get_buffer_mut(&mut self) -> &mut [bool] {
+        self.0.as_mut_slice()
+    }
+
+    pub fn length(&self) -> usize {
+        self.0.len()
+    }
+
+    pub fn into_vec(self) -> Vec<bool> {
+        self.0
+    }
+}
+
+impl Default for BoolBuffer {
+    fn default() -> Self {
+        Self::new_with_vec(Vec::new())
+    }
+}
+
+impl From<Vec<bool>> for BoolBuffer {
+    fn from(value: Vec<bool>) -> Self {
+        Self::new_with_vec(value)
+    }
+}
+
 pub struct StringBuffer(Vec<String>);
 impl From<Vec<String>> for StringBuffer {
     fn from(value: Vec<String>) -> Self {
         Self(value)
     }
 }
 
+impl Into<Vec<String>> for StringBuffer {
+    fn into(self) -> Vec<String> {
+        self.0
+    }
+}
+
 // todo use convert StringBuffer to enum
 impl From<Vec<&str>> for StringBuffer {
     fn from(value: Vec<&str>) -> Self {