Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion engine/src/base/Selection.js
Original file line number Diff line number Diff line change
Expand Up @@ -367,8 +367,12 @@ 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) {
return 'wickobjasset';
} else {
return 'multiassetmixed'
return 'unknown';
}
} else {
return 'unknown';
Expand Down
6 changes: 5 additions & 1 deletion src/Editor/Panels/Inspector/Inspector.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,8 @@ class Inspector extends Component {
"multicanvas": this.renderMultiCanvas,
"imageasset": this.renderAsset,
"soundasset": this.renderAsset,
"fontasset": this.renderAsset,
"wickobjasset": this.renderAsset,
"multiassetmixed": this.renderAsset,
"multisoundasset": this.renderAsset,
"multiimageasset": this.renderAsset,
Expand All @@ -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", "wickobjasset"],
// 'alignX': [ "multipath"] // H.A.
}

Expand All @@ -111,6 +113,8 @@ class Inspector extends Component {
"multicanvas": "Multi-Canvas",
"imageasset": "Image Asset",
"soundasset": "Sound Asset",
"fontasset": "Font Asset",
"wickobjasset": "WickObject Asset",
"multiassetmixed": "Multi-Asset",
"multisoundasset": "Multi-Asset Sound",
"multiimageasset": "Multi-Asset Image",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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", "wickobjasset"],
}

/**
Expand All @@ -91,6 +91,8 @@ class MobileInspector extends Component {
"multicanvas": "Multi-Canvas",
"imageasset": "Image Asset",
"soundasset": "Sound Asset",
"fontasset": "Font Asset",
"wickobjasset": "WickObject Asset",
"multiassetmixed": "Multi-Asset",
"multisoundasset": "Multi-Asset Sound",
"multiimageasset": "Multi-Asset Image",
Expand Down Expand Up @@ -127,6 +129,8 @@ class MobileInspector extends Component {
"multicanvas": ['transform'],
"imageasset": ['assetSettings', 'name'],
"soundasset": ['assetSettings', 'name'],
"fontasset": [],
"wickobjasset": [],
"multiassetmixed": ['assetSettings'],
"multisoundasset": ['assetSettings'],
"multiimageasset": ['assetSettings'],
Expand Down