diff --git a/editor/i18n/en/assets.js b/editor/i18n/en/assets.js index a18ee6990f..6266bf0bcb 100644 --- a/editor/i18n/en/assets.js +++ b/editor/i18n/en/assets.js @@ -324,11 +324,11 @@ module.exports = { auto: 'Auto', }, promoteSingleRootNode: { - name: 'Promote single root node', + name: 'Promote Single Root Node', title: - 'If enabled and there is only one single root node in a FBX scene,
' + - 'the single root node is used as the root of prefab when converting the FBX scene to Cocos Creator prefab.
' + - "Otherwise, the FBX scene become prefab's root.", + 'If enabled and there is only one root node in model scene,
' + + 'the single node becomes prefab\'s root after importing.
' + + "Otherwise, each root node of the scene becomes prefab's child node.", }, preferLocalTimeSpan: { name: 'Prefer Local Time Span', diff --git a/editor/i18n/zh/assets.js b/editor/i18n/zh/assets.js index 17082fea92..8c39a5541f 100644 --- a/editor/i18n/zh/assets.js +++ b/editor/i18n/zh/assets.js @@ -322,8 +322,8 @@ module.exports = { auto: '自动', }, promoteSingleRootNode: { - name: '提升单一根结点', - title: '若开启并且 FBX 场景仅有一个根节点,那么当转换该 FBX 场景为 Cocos Creator 预制体时,
以该根节点作为预制体的根节点,否则以该 FBX 场景的根节点作为预制体的根节点。', + name: '提升单一根节点', + title: '若开启并且模型场景顶部仅有一个根节点,那么该节点就作为预制体的根节点。
否则,场景的所有根节点作为预制体的子节点。', }, preferLocalTimeSpan: { name: '优先使用文件时间范围', diff --git a/editor/inspector/assets/fbx/fbx.js b/editor/inspector/assets/fbx/fbx.js index c1c734e9fa..dacbb0a613 100644 --- a/editor/inspector/assets/fbx/fbx.js +++ b/editor/inspector/assets/fbx/fbx.js @@ -12,10 +12,6 @@ exports.template = ` - - - - @@ -75,7 +71,6 @@ exports.$ = { legacyImporter: '.legacy-importer', legacyFbxImporterCheckbox: '.legacyFbxImporter-checkbox', animationBakeRateSelect: '.animationBakeRate-select', - promoteSingleRootNodeCheckbox: '.promoteSingleRootNode-checkbox', preferLocalTimeSpanCheckbox: '.preferLocalTimeSpan-checkbox', smartMaterialEnabledCheckbox: '.smartMaterialEnabled-checkbox', smartMaterialEnabledProp: '.smart-material-prop', @@ -136,26 +131,6 @@ const Elements = { panel.updateReadonly(panel.$.animationBakeRateSelect); }, }, - promoteSingleRootNode: { - ready() { - const panel = this; - - panel.$.promoteSingleRootNodeCheckbox.addEventListener('change', panel.setProp.bind(panel, 'fbx.promoteSingleRootNode', 'boolean')); - }, - update() { - const panel = this; - - let defaultValue = false; - if (panel.meta.userData.fbx) { - defaultValue = panel.getDefault(panel.meta.userData.fbx.promoteSingleRootNode, defaultValue); - } - - panel.$.promoteSingleRootNodeCheckbox.value = defaultValue; - - panel.updateInvalid(panel.$.promoteSingleRootNodeCheckbox, 'fbx.promoteSingleRootNode'); - panel.updateReadonly(panel.$.promoteSingleRootNodeCheckbox); - }, - }, preferLocalTimeSpan: { ready() { const panel = this; diff --git a/editor/inspector/assets/fbx/model.js b/editor/inspector/assets/fbx/model.js index 1568403034..bb82838971 100644 --- a/editor/inspector/assets/fbx/model.js +++ b/editor/inspector/assets/fbx/model.js @@ -26,7 +26,11 @@ exports.template = ` - + + + + +
@@ -100,6 +104,7 @@ exports.$ = { skipValidationCheckbox: '.skipValidation-checkbox', disableMeshSplitCheckbox: '.disableMeshSplit-checkbox', allowMeshDataAccessCheckbox: '.allowMeshDataAccess-checkbox', + promoteSingleRootNodeCheckbox: '.promoteSingleRootNode-checkbox', meshOptimizerCheckbox: '.meshOptimizer-checkbox', meshOptimizerSISlider: '.meshOptimizer-si-slider', meshOptimizerSACheckbox: '.meshOptimizer-sa-checkbox', @@ -230,6 +235,27 @@ const Elements = { panel.updateReadonly(panel.$.allowMeshDataAccessCheckbox); }, }, + // move this from ./fbx.js in v3.6.0 + promoteSingleRootNode: { + ready() { + const panel = this; + + panel.$.promoteSingleRootNodeCheckbox.addEventListener('change', panel.setProp.bind(panel, 'promoteSingleRootNode')); + }, + update() { + const panel = this; + + let defaultValue = false; + if (panel.meta.userData) { + defaultValue = panel.getDefault(panel.meta.userData.promoteSingleRootNode, defaultValue); + } + + panel.$.promoteSingleRootNodeCheckbox.value = defaultValue; + + panel.updateInvalid(panel.$.promoteSingleRootNodeCheckbox, 'promoteSingleRootNode'); + panel.updateReadonly(panel.$.promoteSingleRootNodeCheckbox); + }, + }, meshOptimizer: { ready() { const panel = this; @@ -337,7 +363,7 @@ const Elements = { }, }; -exports.update = function (assetList, metaList) { +exports.update = function(assetList, metaList) { this.assetList = assetList; this.metaList = metaList; this.asset = assetList[0]; @@ -351,7 +377,7 @@ exports.update = function (assetList, metaList) { } }; -exports.ready = function () { +exports.ready = function() { for (const prop in Elements) { const element = Elements[prop]; if (element.ready) { @@ -360,7 +386,7 @@ exports.ready = function () { } }; -exports.close = function () { +exports.close = function() { for (const prop in Elements) { const element = Elements[prop]; if (element.close) { @@ -377,6 +403,9 @@ exports.methods = { case 'normals': case 'tangents': case 'morphNormals': value = Number(value); break; + case 'promoteSingleRootNode': + value = Boolean(value); + break; } meta.userData[prop] = value;