mirror/blockbench
2
0
Fork 0
mirror of https://github.com/JannisX11/blockbench.git synced 2025-03-31 17:21:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Show locked motion trails if nothing is selected

Browse Source 
Show rotation keyframes in motion trails if suitable
Increase max animation snapping
This commit is contained in:
JannisX11 2020-10-25 09:24:40 +01:00
parent 91f0b47ccd
commit 3938f70a57
4 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
js/animations/animation.js
View File

@ -494,7 +494,7 @@ class Animation {
},
},
override: {label: 'menu.animation.override', type: 'checkbox', value: this.override},
snapping: {label: 'menu.animation.snapping', type: 'number', value: this.snapping, step: 1, min: 10, max: 100},
snapping: {label: 'menu.animation.snapping', type: 'number', value: this.snapping, step: 1, min: 10, max: 500},
line: '_',
},
lines: [
@ -529,7 +529,7 @@ class Animation {
if (isApp) this.path = form_data.path;
this.loop = form_data.loop;
this.override = form_data.override;
this.snapping = Math.clamp(form_data.snapping, 10, 100);
this.snapping = Math.clamp(form_data.snapping, 10, 500);
this.anim_time_update = vue_data.anim_time_update.trim().replace(/\n/g, '');
this.blend_weight = vue_data.blend_weight.trim().replace(/\n/g, '');
Undo.finishEdit('edit animation properties');
@ -1256,10 +1256,13 @@ const Animator = {
}
iterate(target)
let keyframes = {};
let ba = Animation.selected.getBoneAnimator();
ba.position.forEach(kf => {
keyframes[Math.round(kf.time / step)] = kf;
})
if (Group.selected) {
let ba = Animation.selected.getBoneAnimator();
let channel = target == Group.selected ? ba.position : (ba[Toolbox.selected.animation_channel] || ba.position)
channel.forEach(kf => {
keyframes[Math.round(kf.time / step)] = kf;
})
}
function displayTime(time) {
Timeline.time = time;

2
js/animations/keyframe.js
View File

@ -430,7 +430,7 @@ function updateKeyframeSelection() {
BarItems.slider_keyframe_time.update()
BarItems.keyframe_interpolation.set(Timeline.selected[0].interpolation)
}
if (settings.motion_trails.value && Modes.animate && Animation.selected && Group.selected) {
if (settings.motion_trails.value && Modes.animate && Animation.selected && (Group.selected || Animator.motion_trail_lock)) {
Animator.showMotionTrail();
} else if (Animator.motion_trail.parent) {
Animator.motion_trail.children.forEachReverse(child => {

2
js/animations/timeline.js
View File

@ -421,7 +421,7 @@ const Timeline = {
if (event.ctrlKey) {
Blockbench.setStatusBarText(Math.round(time_factor * 100) + '%');
} else {
Blockbench.setStatusBarText(trimFloatNumber(difference));
Blockbench.setStatusBarText(trimFloatNumber(Timeline.snapTime(difference)));
}
BarItems.slider_keyframe_time.update()
Animator.preview()

1
js/io/project.js
View File

@ -83,6 +83,7 @@ class ModelProject {
Animator.animations.purge();
Timeline.animators.purge();
Animation.selected = undefined;
delete Animator.motion_trail_lock;
$('#var_placeholder_area').val('');
}
}