mirror/blockbench
2
0
Fork 0
mirror of https://github.com/JannisX11/blockbench.git synced 2025-01-18 15:26:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixes in animations

Browse Source 
Prevent snapping value from being set to 0
Fix animation dialog saving
This commit is contained in:
JannisX11 2020-12-28 10:38:05 +01:00
parent 6d89105dd3
commit ed0afd6e83
2 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
js/animations/animation.js
View File

@ -9,7 +9,7 @@ class Animation {
this.anim_time_update = '';
this.blend_weight = '';
this.length = 0;
this.snapping = settings.animation_snap.value;
this.snapping = Math.clamp(settings.animation_snap.value, 10, 500);
this.animators = {};
this.markers = [];
for (var key in Animation.properties) {
@ -30,6 +30,7 @@ class Animation {
Merge.string(this, data, 'blend_weight')
Merge.number(this, data, 'length')
Merge.number(this, data, 'snapping')
this.snapping = Math.clamp(this.snapping, 10, 500);
if (typeof data.length == 'number') {
this.setLength(this.length)
}
@ -520,19 +521,22 @@ class Animation {
|| form_data.loop != this.loop
|| form_data.override != this.override
|| form_data.snapping != this.snapping
|| vue_data.anim_time_update != this.anim_time_update
|| vue_data.blend_weight != this.blend_weight
|| dialog.component.data.anim_time_update != this.anim_time_update
|| dialog.component.data.blend_weight != this.blend_weight
) {
Undo.initEdit({animations: [this]});
this.loop = form_data.loop;
this.name = form_data.name;
this.extend({
loop: form_data.loop,
name: form_data.name,
override: form_data.override,
snapping: form_data.snapping,
anim_time_update: dialog.component.data.anim_time_update.trim().replace(/\n/g, ''),
blend_weight: dialog.component.data.blend_weight.trim().replace(/\n/g, ''),
})
this.createUniqueName();
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, 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');
}
},

8
js/animations/timeline.js
View File

@ -181,10 +181,12 @@ const Timeline = {
Timeline.revealTime(seconds)
},
revealTime(time) {
var scroll = $('#timeline_body').scrollLeft()
var playhead = time * Timeline.vue._data.size + 8
var scroll = $('#timeline_body').scrollLeft();
var playhead = time * Timeline.vue._data.size + 8;
if (playhead < scroll || playhead > scroll + $('#timeline_body').width() - Timeline.vue._data.head_width) {
$('#timeline_body').scrollLeft(playhead-16)
$('#timeline_body').scrollLeft(playhead-16);
} else if (time == 0) {
$('#timeline_body').scrollLeft(0);
}
},
setTimecode(time) {