Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improving the spine preview ui control #17899

Merged
merged 2 commits into from
Nov 21, 2024
Merged

Improving the spine preview ui control #17899

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b4d89ad
Improving the spine preview ui control
knoxHuang Nov 21, 2024
7b071b8
refine code
knoxHuang Nov 21, 2024
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
3 changes: 3 additions & 0 deletions cocos/spine/skeleton.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -654,6 +654,9 @@ export class Skeleton extends UIRenderer {

public __preload (): void {
super.__preload();
if (EDITOR_NOT_IN_PREVIEW) {
this.paused = true;
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The editor should stop playing by default

}
this._updateSkeletonData();
this._updateDebugDraw();
}
Expand Down
3 changes: 2 additions & 1 deletion editor/i18n/en/assets.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ module.exports = {
spine: {
skin: 'Skin',
animation: 'Animation',
loop: 'loop',
loop: 'Loop',
timeScale: 'Rate',
},
},

Expand Down
1 change: 1 addition & 0 deletions editor/i18n/zh/assets.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ module.exports = {
skin: '皮肤',
animation: '动画',
loop: '循环',
timeScale: '速率',
},
},

Expand Down
23 changes: 16 additions & 7 deletions editor/inspector/assets/spine-preview.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ exports.template = /* html */`
<ui-label slot="label" value="i18n:ENGINE.inspector.spine.loop"></ui-label>
<ui-checkbox slot="content" class="loop-check-box"></ui-checkbox>
</ui-prop>
<ui-prop class="timeScale">
<ui-label slot="label" value="i18n:ENGINE.inspector.spine.timeScale"></ui-label>
<ui-slider slot="content" class="time-scale-slider" value="1"></ui-slider>
</ui-prop>
</div>
<div class="image">
<canvas class="canvas"></canvas>
Expand Down Expand Up @@ -46,16 +50,14 @@ exports.style = /* css */`
.preview > .control {
padding-top: 8px;
padding-bottom: 8px;
padding-right: 8px;
display: flex;
width: 100%;
flex-direction: column;
align-items: flex-start;
}
.preview > .control[hidden] {
display: none;
}
.preview > .control > ui-prop {
min-width: 250px;
}
.preview > .image {
height: var(--inspector-footer-preview-height, 200px);
Expand Down Expand Up @@ -102,6 +104,7 @@ exports.$ = {
stop: '.stop',
duration: '.duration',
loop: '.loop-check-box',
timeScale: '.time-scale-slider',
animationCtrl: '.anim-control',
};

Expand Down Expand Up @@ -191,6 +194,7 @@ const Elements = {
close() {
const panel = this;

callFunction('stop').then(() => {});
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

.then is unnessary

panel.resizeObserver.unobserve(panel.$.image);
},
},
Expand Down Expand Up @@ -229,6 +233,7 @@ const Elements = {

if (!info) {
panel.$.loop.setAttribute('disabled', '');
panel.$.timeScale.setAttribute('disabled', '');
panel.$.play.setAttribute('disabled', '');
panel.$.stop.setAttribute('disabled', '');
panel.$.skinSelectPro.setAttribute('disabled', '');
Expand All @@ -237,6 +242,7 @@ const Elements = {
}

panel.$.loop.removeAttribute('disabled');
panel.$.timeScale.removeAttribute('disabled');
panel.$.play.removeAttribute('disabled');
panel.$.stop.removeAttribute('disabled');
panel.$.skinSelectPro.removeAttribute('disabled');
Expand All @@ -246,7 +252,7 @@ const Elements = {
Elements.spine.updateEnum.call(panel, panel.$.animationSelectPro, info.animation);
Elements.spine.updateDuration.call(panel, 0, info.animation.durations[panel.animationIndex]);
Elements.control.update.call(panel, false);
Elements.control.updateLoop.call(panel, info.loop);
Elements.control.updateInfo.call(panel, info);
panel.isPreviewDataDirty = true;
},
updateDuration(delay, duration) {
Expand All @@ -259,6 +265,9 @@ const Elements = {
ready() {
const panel = this;

panel.$.timeScale.addEventListener('change', (event) => {
callFunction('setTimeScale', Number(event.target.value)).then(() => {});
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

.then is unnessary

});
panel.$.loop.addEventListener('confirm', (event) => {
callFunction('setLoop', Boolean(event.target.value)).then(() => {});
});
Expand All @@ -272,10 +281,11 @@ const Elements = {
callFunction('stop').then(() => {});
});
},
updateLoop(loop) {
updateInfo(info) {
const panel = this;

panel.$.loop.setAttribute('value', Boolean(loop));
panel.$.loop.setAttribute('value', Boolean(info.loop));
panel.$.timeScale.setAttribute('value', Number(info.timeScale));
},
update(playing) {
const panel = this;
Expand Down Expand Up @@ -334,7 +344,6 @@ exports.methods = {

onAnimationUpdate(playing, delay, duration) {
const panel = this;
// this.$.playState.setAttribute('');
Elements.spine.updateDuration.call(panel, delay, duration);
Elements.control.update.call(panel, playing);
panel.isPreviewDataDirty = true;
Expand Down
Loading