From 4e6779fcb22c79c11f6f2b894091cea172adc322 Mon Sep 17 00:00:00 2001 From: Baron <43506286+BaronAWC@users.noreply.github.com> Date: Mon, 2 Mar 2026 18:29:34 -0800 Subject: [PATCH 1/3] font asset and clip asset, as well as allowing "add to canvas" for clip assets in inspector --- engine/src/base/Selection.js | 7 ++++++- src/Editor/Panels/Inspector/Inspector.jsx | 6 +++++- .../MobileContainer/MobileInspector/MobileInspector.jsx | 6 +++++- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/engine/src/base/Selection.js b/engine/src/base/Selection.js index d7e3370c8..214cd8010 100644 --- a/engine/src/base/Selection.js +++ b/engine/src/base/Selection.js @@ -367,8 +367,13 @@ Wick.Selection = class extends Wick.Base { return 'soundasset'; } else if (selection.getSelectedObjects()[0] instanceof window.Wick.SVGAsset) { return 'svgasset'; + } else if(selection.getSelectedObjects()[0] instanceof window.Wick.FontAsset) { + return 'fontasset'; + } else if(selection.getSelectedObjects()[0] instanceof window.Wick.ClipAsset) { + console.log(selection.getSelectedObjects()[0]); + return 'clipasset'; } else { - return 'multiassetmixed' + return 'unknown'; } } else { return 'unknown'; diff --git a/src/Editor/Panels/Inspector/Inspector.jsx b/src/Editor/Panels/Inspector/Inspector.jsx index fcbeecc77..9bc61e12c 100644 --- a/src/Editor/Panels/Inspector/Inspector.jsx +++ b/src/Editor/Panels/Inspector/Inspector.jsx @@ -75,6 +75,8 @@ class Inspector extends Component { "multicanvas": this.renderMultiCanvas, "imageasset": this.renderAsset, "soundasset": this.renderAsset, + "fontasset": this.renderAsset, + "clipasset": this.renderAsset, "multiassetmixed": this.renderAsset, "multisoundasset": this.renderAsset, "multiimageasset": this.renderAsset, @@ -88,7 +90,7 @@ class Inspector extends Component { 'convertSelectionToButton': ["path", "text", "image", "multipath", "multiclip", "multicanvas"], 'convertSelectionToClip': ["path", "text", "image", "multipath", "multiclip", "multicanvas"], 'editTimeline': ["clip", "button"], - 'addAssetToCanvas': ["imageasset"], + 'addAssetToCanvas': ["imageasset", "clipasset"], // 'alignX': [ "multipath"] // H.A. } @@ -111,6 +113,8 @@ class Inspector extends Component { "multicanvas": "Multi-Canvas", "imageasset": "Image Asset", "soundasset": "Sound Asset", + "fontasset": "Font Asset", + "clipasset": "Clip Asset", "multiassetmixed": "Multi-Asset", "multisoundasset": "Multi-Asset Sound", "multiimageasset": "Multi-Asset Image", diff --git a/src/Editor/Panels/MobileContainer/MobileInspector/MobileInspector.jsx b/src/Editor/Panels/MobileContainer/MobileInspector/MobileInspector.jsx index d471c0ffd..894bb5369 100644 --- a/src/Editor/Panels/MobileContainer/MobileInspector/MobileInspector.jsx +++ b/src/Editor/Panels/MobileContainer/MobileInspector/MobileInspector.jsx @@ -69,7 +69,7 @@ class MobileInspector extends Component { 'convertSelectionToButton': ["path", "text", "image", "multipath", "multiclip", "multicanvas"], 'convertSelectionToClip': ["path", "text", "image", "multipath", "multiclip", "multicanvas"], 'editTimeline': ["clip", "button"], - 'addAssetToCanvas': ["imageasset"], + 'addAssetToCanvas': ["imageasset", "clipasset"], } /** @@ -91,6 +91,8 @@ class MobileInspector extends Component { "multicanvas": "Multi-Canvas", "imageasset": "Image Asset", "soundasset": "Sound Asset", + "fontasset": "Font Asset", + "clipasset": "Clip Asset", "multiassetmixed": "Multi-Asset", "multisoundasset": "Multi-Asset Sound", "multiimageasset": "Multi-Asset Image", @@ -127,6 +129,8 @@ class MobileInspector extends Component { "multicanvas": ['transform'], "imageasset": ['assetSettings', 'name'], "soundasset": ['assetSettings', 'name'], + "fontasset": [], + "clipasset": [], "multiassetmixed": ['assetSettings'], "multisoundasset": ['assetSettings'], "multiimageasset": ['assetSettings'], From e4c79a2b1409e8072c4c2dbbe2713478676cf04e Mon Sep 17 00:00:00 2001 From: Baron <43506286+BaronAWC@users.noreply.github.com> Date: Mon, 2 Mar 2026 20:23:50 -0800 Subject: [PATCH 2/3] rename clipasset to wickobjasset --- engine/src/base/Selection.js | 2 +- src/Editor/Panels/Inspector/Inspector.jsx | 6 +++--- .../MobileContainer/MobileInspector/MobileInspector.jsx | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/engine/src/base/Selection.js b/engine/src/base/Selection.js index 214cd8010..452f0933f 100644 --- a/engine/src/base/Selection.js +++ b/engine/src/base/Selection.js @@ -371,7 +371,7 @@ Wick.Selection = class extends Wick.Base { return 'fontasset'; } else if(selection.getSelectedObjects()[0] instanceof window.Wick.ClipAsset) { console.log(selection.getSelectedObjects()[0]); - return 'clipasset'; + return 'wickobjasset'; } else { return 'unknown'; } diff --git a/src/Editor/Panels/Inspector/Inspector.jsx b/src/Editor/Panels/Inspector/Inspector.jsx index 9bc61e12c..7e7c28030 100644 --- a/src/Editor/Panels/Inspector/Inspector.jsx +++ b/src/Editor/Panels/Inspector/Inspector.jsx @@ -76,7 +76,7 @@ class Inspector extends Component { "imageasset": this.renderAsset, "soundasset": this.renderAsset, "fontasset": this.renderAsset, - "clipasset": this.renderAsset, + "wickobjasset": this.renderAsset, "multiassetmixed": this.renderAsset, "multisoundasset": this.renderAsset, "multiimageasset": this.renderAsset, @@ -90,7 +90,7 @@ class Inspector extends Component { 'convertSelectionToButton': ["path", "text", "image", "multipath", "multiclip", "multicanvas"], 'convertSelectionToClip': ["path", "text", "image", "multipath", "multiclip", "multicanvas"], 'editTimeline': ["clip", "button"], - 'addAssetToCanvas': ["imageasset", "clipasset"], + 'addAssetToCanvas': ["imageasset", "wickobjasset"], // 'alignX': [ "multipath"] // H.A. } @@ -114,7 +114,7 @@ class Inspector extends Component { "imageasset": "Image Asset", "soundasset": "Sound Asset", "fontasset": "Font Asset", - "clipasset": "Clip Asset", + "wickobjasset": "WickObject Asset", "multiassetmixed": "Multi-Asset", "multisoundasset": "Multi-Asset Sound", "multiimageasset": "Multi-Asset Image", diff --git a/src/Editor/Panels/MobileContainer/MobileInspector/MobileInspector.jsx b/src/Editor/Panels/MobileContainer/MobileInspector/MobileInspector.jsx index 894bb5369..f4f46f3ea 100644 --- a/src/Editor/Panels/MobileContainer/MobileInspector/MobileInspector.jsx +++ b/src/Editor/Panels/MobileContainer/MobileInspector/MobileInspector.jsx @@ -69,7 +69,7 @@ class MobileInspector extends Component { 'convertSelectionToButton': ["path", "text", "image", "multipath", "multiclip", "multicanvas"], 'convertSelectionToClip': ["path", "text", "image", "multipath", "multiclip", "multicanvas"], 'editTimeline': ["clip", "button"], - 'addAssetToCanvas': ["imageasset", "clipasset"], + 'addAssetToCanvas': ["imageasset", "wickobjasset"], } /** @@ -92,7 +92,7 @@ class MobileInspector extends Component { "imageasset": "Image Asset", "soundasset": "Sound Asset", "fontasset": "Font Asset", - "clipasset": "Clip Asset", + "wickobjasset": "WickObject Asset", "multiassetmixed": "Multi-Asset", "multisoundasset": "Multi-Asset Sound", "multiimageasset": "Multi-Asset Image", @@ -130,7 +130,7 @@ class MobileInspector extends Component { "imageasset": ['assetSettings', 'name'], "soundasset": ['assetSettings', 'name'], "fontasset": [], - "clipasset": [], + "wickobjasset": [], "multiassetmixed": ['assetSettings'], "multisoundasset": ['assetSettings'], "multiimageasset": ['assetSettings'], From 63c04f1a0c7be5a2e715f04b3650ed9906f49e89 Mon Sep 17 00:00:00 2001 From: Baron <43506286+BaronAWC@users.noreply.github.com> Date: Mon, 2 Mar 2026 23:42:49 -0800 Subject: [PATCH 3/3] remove console log --- engine/src/base/Selection.js | 1 - 1 file changed, 1 deletion(-) diff --git a/engine/src/base/Selection.js b/engine/src/base/Selection.js index 452f0933f..fe7685626 100644 --- a/engine/src/base/Selection.js +++ b/engine/src/base/Selection.js @@ -370,7 +370,6 @@ Wick.Selection = class extends Wick.Base { } else if(selection.getSelectedObjects()[0] instanceof window.Wick.FontAsset) { return 'fontasset'; } else if(selection.getSelectedObjects()[0] instanceof window.Wick.ClipAsset) { - console.log(selection.getSelectedObjects()[0]); return 'wickobjasset'; } else { return 'unknown';