chore: clean up

(cherry picked from commit 0aa878b)

Author: triniwiz

Cargo.toml

@@ -20,24 +20,53 @@ members = [
 panic = "abort"
 codegen-units = 1
 lto = true
-opt-level = 3
+opt-level = "s"    # size-optimized default; hot rendering crates overridden below
 debug = false
 incremental = false
 strip = true
 
+# Keep rendering-critical crates at full speed
+[profile.release.package.canvas-2d]
+opt-level = 3
+
+[profile.release.package.canvas-core]
+opt-level = 3
+
+[profile.release.package.canvas-webgl]
+opt-level = 3
+
+[profile.release.package.skia-safe]
+opt-level = 3
+
+[profile.release.package.skia-bindings]
+opt-level = 3
+
+# Aggressively size-optimize heavy utility crates
+[profile.release.package.regex]
+opt-level = "z"
+
+[profile.release.package.regex-lite]
+opt-level = "z"
+
+[profile.release.package.ureq]
+opt-level = "z"
+
+[profile.release.package.image]
+opt-level = "z"
+
 
 [workspace.dependencies.wgt]
 package = "wgpu-types"
 git = "https://github.com/triniwiz/wgpu"
-rev = "9616414f16e5688192f6127f8104d8a07a3b1de6"
+rev = "4fb84f5a325d73d21416a2244d1cc062925350ef"
 
 
 
 
 [workspace.dependencies]
 env_logger = "0.11.5"
-log = "0.4.22"
-parking_lot = { version = "0.12.3", features = ["deadlock_detection"] }
+log = "0.4.29"
+parking_lot = { version = "0.12.3" }
 raw-window-handle = "0.6.2"
 canvas-2d = { path = "./crates/canvas-2d" }
 canvas-core = { path = "./crates/canvas-core" }
@@ -47,7 +76,7 @@ gl-bindings = { path = "./crates/gl-bindings" }
 canvas-c = { path = "./crates/canvas-c" }
 skia-safe = { version = "0.93.1", features = ["textlayout"] }
 itertools = "0.14.0"
-wgpu-core = { git = "https://github.com/triniwiz/wgpu", rev = "9616414f16e5688192f6127f8104d8a07a3b1de6", features = ["wgsl", "vulkan", "metal"] }
-wgpu-hal = { git = "https://github.com/triniwiz/wgpu", rev = "9616414f16e5688192f6127f8104d8a07a3b1de6", features = ["metal", "vulkan"] }
+wgpu-core = { git = "https://github.com/triniwiz/wgpu", rev = "4fb84f5a325d73d21416a2244d1cc062925350ef", features = ["wgsl"] }
+wgpu-hal = { git = "https://github.com/triniwiz/wgpu", rev = "4fb84f5a325d73d21416a2244d1cc062925350ef" }
 ureq = "2.10.1"
 jni = "0.21.1"

apps/demo/src/app-root.xml

@@ -1,2 +1,4 @@
 <Frame defaultPage="main-page">
 </Frame>
+<!-- <Frame defaultPage="plugin-demos/canvas-three">
+</Frame> -->

apps/demo/src/app.ts

@@ -111,7 +111,7 @@ Application.on('uncaughtError', (args) => {
 
 Application.on('launch', (args) => {
 	//require('@nativescript/canvas-polyfill');
-	if (global.isAndroid) {
+	if (__ANDROID__) {
 		jp.wasabeef.takt.Takt.stock(Utils.android.getApplicationContext()).seat(jp.wasabeef.takt.Seat.TOP_CENTER).color(-65536);
 	} else {
 		monitor = GDPerformanceMonitor.new();

apps/demo/src/plugin-demos/canvas-three.xml

@@ -5,7 +5,7 @@
     </ActionBar>
   </Page.actionBar>
   <GridLayout class="bg-black w-full h-full" iosOverflowSafeArea="true">
-    <canvas:Canvas style="width:100%;height:100%;" id="canvas" ready="{{ canvasLoaded }}" loaded="{{ loaded }}"
+    <canvas:Canvas id="canvas" ready="{{ canvasLoaded }}" loaded="{{ loaded }}"
                       unloaded="{{unloaded}}"/>
   </GridLayout>
 </Page>

apps/demo/src/plugin-demos/canvas.ts

@@ -168,7 +168,7 @@ export class DemoModel extends DemoSharedCanvas {
 			const maxHeight = view.parent.getMeasuredHeight() / Screen.mainScreen.scale;
 			const maxX = maxWidth - width;
 			const maxY = maxHeight - height;
-			if (global.isAndroid) {
+			if (__ANDROID__) {
 				const animator = android.animation.ValueAnimator.ofFloat([0, 1] as any);
 				animator.setDuration(3000);
 
@@ -179,7 +179,7 @@ export class DemoModel extends DemoSharedCanvas {
 							view.x = maxX * progress;
 							view.y = maxY * progress;
 						},
-					})
+					}),
 				);
 
 				animator.setInterpolator(new android.view.animation.AccelerateDecelerateInterpolator());

apps/demo/src/plugin-demos/canvas.xml

@@ -170,7 +170,7 @@ loaded="{{ rectLoaded }}"
   <!-- <WebView rowSpan="2" colSpan="2" height="100%" width="100%" loaded="loaded"/>" -->
 
   <GridLayout verticalAlignment="top" rowSpan="2" colSpan="2" height="100%" width="100%">
-   <canvas:Canvas ready="{{ canvasLoaded }}" style="width: 100%;height:100%;"/>
+   <canvas:Canvas isUserInteractionEnabled="true" ready="{{ canvasLoaded }}" style="width: 100%;height:100%;"/>
   </GridLayout>
 
     <!-- <Button height="40" text="Draw" tap="{{ draw }}"/> -->

apps/demo/webpack.config.js

@@ -12,8 +12,12 @@ module.exports = (env) => {
 		//	config.resolve.alias.set('three/tsl', 'three/tsl');
 
 		config.resolve.alias.set('three/examples', resolve(__dirname, '..', '..', 'node_modules', 'three', 'examples'));
+		config.resolve.alias.set('three/addons', resolve(__dirname, '..', '..', 'node_modules', 'three', 'examples', 'jsm'));
+		config.resolve.alias.set('three/src', resolve(__dirname, '..', '..', 'node_modules', 'three', 'src'));
+		//config.resolve.alias.set('three', resolve(__dirname, '..', '..', 'node_modules', 'three', 'src', 'Three.js'));
+		//		config.resolve.alias.set('three', resolve(__dirname, '..', '..', 'node_modules', 'three', 'build', 'three.module.js'));
 		config.resolve.alias.set('three', resolve(__dirname, '..', '..', 'node_modules', 'three', 'build', 'three.webgpu.js'));
-		config.resolve.alias.set('three/tsl', resolve(__dirname, '..', '..', 'node_modules', 'three', 'build', 'three.webgpu.js'));
+		config.resolve.alias.set('three/tsl', resolve(__dirname, '..', '..', 'node_modules', 'three', 'build', 'three.tsl.js'));
 	});
 
 	webpack.Utils.addCopyRule('**/*.svg');

crates/canvas-2d/Cargo.toml

@@ -12,7 +12,7 @@ default = ["gl"]
 [dependencies]
 canvas-core = { workspace = true, features = ["2d"] }
 parking_lot.workspace = true
-regex = "1.11.1"
+regex-lite = "0.1.6"
 base64 = "0.22.1"
 encoding_rs = "0.8.35"
 gl-bindings = { workspace = true }

crates/canvas-2d/src/context/drawing_text/typography.rs

@@ -1,6 +1,6 @@
 use std::str::FromStr;
 
-use regex::Regex;
+use regex_lite::Regex;
 use skia_safe::font_style::Width;
 use std::sync::OnceLock;
 

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

@@ -8,7 +8,7 @@ use crate::context::Context;
 use crate::utils::color::{to_parsed_color, to_parsed_color_4f};
 use canvas_core::context_attributes::ColorSpace;
 use csscolorparser::parse;
-use regex::Regex;
+use regex_lite::Regex;
 use skia_safe::paint::{Cap, Style};
 pub use skia_safe::Color;
 use skia_safe::{BlendMode, Color4f, Point};