From 4eb07ef82975fa055f6e2df2de6a1dfcf2149116 Mon Sep 17 00:00:00 2001 From: zheng han Date: Sun, 25 Apr 2021 20:37:16 +0800 Subject: [PATCH] fix preview window bug (#8518) Co-authored-by: pandamicro --- editor/inspector/assets/fbx/preview.js | 7 +++---- editor/inspector/assets/mesh-preview.js | 7 ++----- editor/inspector/assets/skeleton-preview.js | 7 ++----- 3 files changed, 7 insertions(+), 14 deletions(-) diff --git a/editor/inspector/assets/fbx/preview.js b/editor/inspector/assets/fbx/preview.js index add2f92ae7..a219a073ef 100644 --- a/editor/inspector/assets/fbx/preview.js +++ b/editor/inspector/assets/fbx/preview.js @@ -149,7 +149,8 @@ const Elements = { await panel.glPreview.init({ width: panel.$.canvas.clientWidth, height: panel.$.canvas.clientHeight }); if (panel.asset.redirect) { - await Editor.Message.request('scene', 'set-model-preview-model', panel.asset.redirect.uuid); + const info = await Editor.Message.request('scene', 'set-model-preview-model', panel.asset.redirect.uuid); + panel.infoUpdate(info); } panel.refreshPreview(); @@ -158,7 +159,6 @@ const Elements = { modelInfo: { ready () { this.infoUpdate = Elements.modelInfo.update.bind(this); - Editor.Message.addBroadcastListener('scene:model-preview-model-info', this.infoUpdate); }, update (info) { if (!info) { @@ -169,7 +169,6 @@ const Elements = { this.isPreviewDataDirty = true; }, close () { - Editor.Message.removeBroadcastListener('scene:model-preview-model-info', this.infoUpdate); Editor.Message.send('scene', 'hide-model-preview'); }, }, @@ -253,7 +252,7 @@ exports.methods = { return; } - if (panel.isPreviewDataDirty) { + if (panel.isPreviewDataDirty || this.curPlayState === PLAY_STATE.PLAYING) { try { const canvas = panel.$.canvas; const image = panel.$.image; diff --git a/editor/inspector/assets/mesh-preview.js b/editor/inspector/assets/mesh-preview.js index bc5232ca42..2ae9e699c6 100644 --- a/editor/inspector/assets/mesh-preview.js +++ b/editor/inspector/assets/mesh-preview.js @@ -97,8 +97,8 @@ const Elements = { } await panel.glPreview.init({ width: panel.$.canvas.clientWidth, height: panel.$.canvas.clientHeight }); - await Editor.Message.request('scene', 'set-mesh-preview-mesh', panel.asset.uuid); - + const info = await Editor.Message.request('scene', 'set-mesh-preview-mesh', panel.asset.uuid); + panel.infoUpdate(info); panel.refreshPreview(); }, close() { @@ -112,7 +112,6 @@ const Elements = { const panel = this; panel.infoUpdate = Elements.info.update.bind(panel); - Editor.Message.addBroadcastListener('scene:mesh-preview-mesh-info', panel.infoUpdate); }, update(info) { if (!info) { @@ -127,8 +126,6 @@ const Elements = { panel.isPreviewDataDirty = true; }, close() { - const panel = this; - Editor.Message.removeBroadcastListener('scene:mesh-preview-mesh-info', panel.infoUpdate); Editor.Message.request('scene', 'hide-mesh-preview'); }, }, diff --git a/editor/inspector/assets/skeleton-preview.js b/editor/inspector/assets/skeleton-preview.js index 068a6a7b23..4e32fc18c0 100644 --- a/editor/inspector/assets/skeleton-preview.js +++ b/editor/inspector/assets/skeleton-preview.js @@ -96,8 +96,8 @@ const Elements = { } await panel.glPreview.init({ width: panel.$.canvas.clientWidth, height: panel.$.canvas.clientHeight }); - await Editor.Message.request('scene', 'set-skeleton-preview-skeleton', panel.asset.uuid); - + const info = await Editor.Message.request('scene', 'set-skeleton-preview-skeleton', panel.asset.uuid); + panel.infoUpdate(info); panel.refreshPreview(); }, close() { @@ -111,7 +111,6 @@ const Elements = { const panel = this; panel.infoUpdate = Elements.info.update.bind(panel); - Editor.Message.addBroadcastListener('scene:skeleton-preview-skeleton-info', panel.infoUpdate); }, update(info) { if (!info) { @@ -125,8 +124,6 @@ const Elements = { panel.isPreviewDataDirty = true; }, close() { - const panel = this; - Editor.Message.removeBroadcastListener('scene:skeleton-preview-skeleton-info', panel.infoUpdate); Editor.Message.request('scene', 'hide-skeleton-preview'); }, },