feat: 🎸 upgrade thorvg v1.0-pre10

LottieFiles · Jan 10, 2025 · b4e4d82 · b4e4d82
1 parent 9ad8c18
commit b4e4d82
Show file tree

Hide file tree

Showing 9 changed files with 44 additions and 34 deletions.
diff --git a/.github/workflows/check-pr.yaml b/.github/workflows/check-pr.yaml
@@ -40,7 +40,7 @@ jobs:
 
       - name: Lint
         run: |
-          cargo clippy --manifest-path=./dotlottie-rs/Cargo.toml --all-targets --all-features -- -D clippy::print_stdout
-          cargo clippy --manifest-path=./dotlottie-ffi/Cargo.toml --all-targets --all-features -- -D clippy::print_stdout
+          cargo clippy --manifest-path=./dotlottie-rs/Cargo.toml --all-targets -- -D clippy::print_stdout
+          cargo clippy --manifest-path=./dotlottie-ffi/Cargo.toml --all-targets -- -D clippy::print_stdout
         env:
           RUSTFLAGS: "-Dwarnings"
diff --git a/Makefile b/Makefile
@@ -405,7 +405,8 @@ define UNIFFI_BINDINGS_BUILD
 	rm -rf $(RUNTIME_FFI)/$(RUNTIME_FFI_UNIFFI_BINDINGS)/$(BINDINGS_LANGUAGE)
 	cargo run \
 		--manifest-path $(RUNTIME_FFI)/Cargo.toml \
-		--features=uniffi/cli \
+		--no-default-features \
+		--features=uniffi/cli,thorvg-v1 \
 		--bin uniffi-bindgen \
 		generate $(RUNTIME_FFI)/src/dotlottie_player.udl \
 		--language $(BINDINGS_LANGUAGE) \
@@ -1024,8 +1025,8 @@ bench:
 .PHONY: clippy
 clippy:
 	$(info $(YELLOW)Running clippy for workspace$(NC))
-	cargo clippy --manifest-path $(CORE)/Cargo.toml --all-targets --all-features -- -D clippy::print_stdout
-	cargo clippy --manifest-path $(RUNTIME_FFI)/Cargo.toml --all-targets --all-features -- -D clippy::print_stdout
+	cargo clippy --manifest-path $(CORE)/Cargo.toml --all-targets -- -D clippy::print_stdout
+	cargo clippy --manifest-path $(RUNTIME_FFI)/Cargo.toml --all-targets -- -D clippy::print_stdout
 
 .PHONY: help
 help:

diff --git a/dotlottie-rs/src/lottie_renderer/mod.rs b/dotlottie-rs/src/lottie_renderer/mod.rs
@@ -122,7 +122,7 @@ impl<R: Renderer> LottieRenderer for LottieRendererImpl<R> {
         height: u32,
         copy: bool,
     ) -> Result<(), LottieRendererError> {
-        self.renderer.clear(true, false).map_err(into_lottie::<R>)?;
+        self.renderer.clear(true).map_err(into_lottie::<R>)?;
 
         self.picture_width = 0.0;
         self.picture_height = 0.0;
@@ -224,11 +224,7 @@ impl<R: Renderer> LottieRenderer for LottieRendererImpl<R> {
 
     fn render(&mut self) -> Result<(), LottieRendererError> {
         self.renderer.update().map_err(into_lottie::<R>)?;
-
-        #[cfg(feature = "thorvg-v1")]
-        self.renderer.clear(false, true).map_err(into_lottie::<R>)?;
-
-        self.renderer.draw().map_err(into_lottie::<R>)?;
+        self.renderer.draw(true).map_err(into_lottie::<R>)?;
         self.renderer.sync().map_err(into_lottie::<R>)?;
 
         Ok(())

diff --git a/dotlottie-rs/src/lottie_renderer/renderer.rs b/dotlottie-rs/src/lottie_renderer/renderer.rs
@@ -74,11 +74,11 @@ pub trait Renderer: Sized + 'static {
         color_space: ColorSpace,
     ) -> Result<(), Self::Error>;
 
-    fn clear(&self, paints: bool, buffer: bool) -> Result<(), Self::Error>;
+    fn clear(&self, free: bool) -> Result<(), Self::Error>;
 
     fn push(&mut self, drawable: Drawable<Self>) -> Result<(), Self::Error>;
 
-    fn draw(&mut self) -> Result<(), Self::Error>;
+    fn draw(&mut self, clear_buffer: bool) -> Result<(), Self::Error>;
 
     fn sync(&mut self) -> Result<(), Self::Error>;
 

diff --git a/dotlottie-rs/src/lottie_renderer/thorvg.rs b/dotlottie-rs/src/lottie_renderer/thorvg.rs
@@ -137,16 +137,16 @@ impl Renderer for TvgRenderer {
         }
     }
 
-    fn clear(&self, paints: bool, _buffer: bool) -> Result<(), TvgError> {
+    fn clear(&self, free: bool) -> Result<(), TvgError> {
         unsafe {
             #[cfg(feature = "thorvg-v1")]
             {
-                tvg::tvg_canvas_clear(self.raw_canvas, paints, _buffer)
+                tvg::tvg_canvas_remove(self.raw_canvas, ptr::null_mut::<tvg::Tvg_Paint>())
             }
 
             #[cfg(feature = "thorvg-v0")]
             {
-                tvg::tvg_canvas_clear(self.raw_canvas, paints)
+                tvg::tvg_canvas_clear(self.raw_canvas, free)
             }
         }
         .into_result()
@@ -161,10 +161,19 @@ impl Renderer for TvgRenderer {
         unsafe { tvg::tvg_canvas_push(self.raw_canvas, raw_paint).into_result() }
     }
 
-    fn draw(&mut self) -> Result<(), TvgError> {
-        let result = unsafe { tvg::tvg_canvas_draw(self.raw_canvas) };
+    fn draw(&mut self, _clear_buffer: bool) -> Result<(), TvgError> {
+        unsafe {
+            #[cfg(feature = "thorvg-v1")]
+            {
+                tvg::tvg_canvas_draw(self.raw_canvas, _clear_buffer)
+            }
 
-        result.into_result()
+            #[cfg(feature = "thorvg-v0")]
+            {
+                tvg::tvg_canvas_draw(self.raw_canvas)
+            }
+        }
+        .into_result()
     }
 
     fn sync(&mut self) -> Result<(), TvgError> {
@@ -213,17 +222,21 @@ impl Animation for TvgAnimation {
     type Error = TvgError;
 
     fn load_data(&mut self, data: &str, mimetype: &str, copy: bool) -> Result<(), TvgError> {
-        let mimetype_cstr = CString::new(mimetype).expect("Failed to create CString");
-        let data_cstr = CString::new(data).expect("Failed to create CString");
+        let mimetype_cstr = CString::new(mimetype).unwrap();
+        let data_cstr = CString::new(data).unwrap();
+
+        let data_ptr: *const i8 = data_cstr.as_ptr();
+        let data_len = data.as_bytes().len() as u32;
+        let mimetype_ptr: *const i8 = mimetype_cstr.as_ptr();
 
         unsafe {
             #[cfg(feature = "thorvg-v1")]
             {
                 tvg::tvg_picture_load_data(
                     self.raw_paint,
-                    data.as_ptr(),
-                    data.as_bytes().len() as u32,
-                    mimetype.as_ptr(),
+                    data_ptr,
+                    data_len,
+                    mimetype_ptr,
                     ptr::null(),
                     copy,
                 )
@@ -233,14 +246,14 @@ impl Animation for TvgAnimation {
             {
                 tvg::tvg_picture_load_data(
                     self.raw_paint,
-                    data.as_ptr(),
-                    data.as_bytes().len() as u32,
-                    mimetype.as_ptr(),
+                    data_ptr,
+                    data_len,
+                    mimetype_ptr,
                     copy,
                 )
             }
         }
-        .into_result()?;
+        .into_result()
     }
 
     fn get_layer_bounds(&self, layer_name: &str) -> Result<(f32, f32, f32, f32), TvgError> {

diff --git a/examples/demo-player/Cargo.toml b/examples/demo-player/Cargo.toml
@@ -5,6 +5,6 @@ edition = "2021"
 
 [dependencies]
 minifb = "0.27"
-dotlottie-rs = { path = "../../dotlottie-rs", features = ["thorvg"] }
+dotlottie-rs = { path = "../../dotlottie-rs", features = ["thorvg-v0"] }
 sysinfo = "0.30"
 rand = "0.8"
diff --git a/examples/demo-state-machine/Cargo.toml b/examples/demo-state-machine/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 
 [dependencies]
 minifb = "0.27"
-dotlottie-rs = { path = "../../dotlottie-rs", features = ["thorvg"] }
+dotlottie-rs = { path = "../../dotlottie-rs", features = ["thorvg-v0"] }
 sysinfo = "0.30"
 rand = "0.8"
 

diff --git a/examples/demo-state-machine/src/bin/play-on-hover/play-on-hover.rs b/examples/demo-state-machine/src/bin/play-on-hover/play-on-hover.rs
@@ -1,5 +1,5 @@
-use dotlottie_player_core::events::Event;
-use dotlottie_player_core::{Config, DotLottiePlayer};
+use dotlottie_rs::events::Event;
+use dotlottie_rs::{Config, DotLottiePlayer};
 use minifb::{Key, MouseButton, MouseMode, Window, WindowOptions};
 use std::fs::{self, File};
 use std::io::Read;

diff --git a/examples/demo-state-machine/src/bin/star-rating/star-rating.rs b/examples/demo-state-machine/src/bin/star-rating/star-rating.rs
@@ -1,5 +1,5 @@
-use dotlottie_player_core::events::Event;
-use dotlottie_player_core::{Config, DotLottiePlayer};
+use dotlottie_rs::events::Event;
+use dotlottie_rs::{Config, DotLottiePlayer};
 use minifb::{Key, MouseButton, MouseMode, Window, WindowOptions};
 use std::fs::{self, File};
 use std::io::Read;