mirror/blockbench
2
0
Fork 0
mirror of https://github.com/JannisX11/blockbench.git synced 2024-11-27 04:21:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Include zero line option in graph editor

Browse Source
This commit is contained in:
JannisX11 2021-05-22 14:44:53 +02:00
parent 065cfeb891
commit 48d4b09999
3 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
js/animations/timeline.js
View File

@ -557,6 +557,8 @@ const Timeline = {
'bring_up_all_animations',
'fold_all_animations',
'clear_timeline',
'_',
'graph_editor_zero_line',
])
}
@ -582,7 +584,7 @@ onVueSetup(function() {
graph_editor_axis: 'x',
graph_offset: 200,
graph_size: 200,
show_zero_line: true,
channels: {
rotation: true,
@ -614,7 +616,8 @@ onVueSetup(function() {
let clientHeight = this.$refs.timeline_body ? this.$refs.timeline_body.clientHeight : 400;
let keyframes = ba[this.graph_editor_channel];
let points = [];
let min = -1, max = 1;
let min = this.show_zero_line ? -1 : 10000,
max = this.show_zero_line ? 1 : -10000;
for (let time = Math.clamp(this.scroll_left - 9, 0, Infinity); time < (clientWidth + this.scroll_left - this.head_width); time += step) {
Timeline.time = time / this.size;
@ -632,8 +635,13 @@ onVueSetup(function() {
Timeline.time = original_time;
let padding = 16;
this.graph_size = (clientHeight - 2*padding) / Math.clamp(max-min, 2.4, 1e4);
this.graph_offset = clientHeight - padding + (this.graph_size * min);
let min_size = 2.4;
let unit_size = Math.clamp(max-min, min_size, 1e4);
this.graph_size = (clientHeight - 2*padding) / unit_size;
let blend = Math.clamp(1 - (max-min) / min_size, 0, 1)
console.log(blend)
this.graph_offset = clientHeight - padding + (this.graph_size * (min - unit_size/2 * blend ) );
console.log(this.graph_size, clientHeight, padding, min, max)
let string = '';
points.forEach((value, i) => {
@ -1054,6 +1062,15 @@ BARS.defineActions(function() {
}
}
})
new Toggle('graph_editor_zero_line', {
icon: 'exposure_zero',
category: 'animation',
condition: {modes: ['animate'], method: () => Timeline.vue.graph_editor_open},
default: true,
onChange(state) {
Timeline.vue.show_zero_line = state;
}
})
new Action('play_animation', {
icon: 'play_arrow',
category: 'animation',

2
js/webpack/bundle.js
View File

File diff suppressed because one or more lines are too long

2
lang/en.json
View File

@ -1094,6 +1094,8 @@
"action.select_effect_animator.desc": "Opens timeline to add sound and particle effects",
"action.timeline_graph_editor": "Toggle Graph Editor",
"action.timeline_graph_editor.desc": "Toggle the timeline between graph editor view and keyframe view",
"action.graph_editor_zero_line": "Include Zero Line",
"action.graph_editor_zero_line.desc": "Whether the graph editor always includes the zero line in the view",
"action.timeline_focus": "Filter Channels",
"action.timeline_focus.desc": "Select the animation channels to display in the timeline",
"action.timeline_focus.hide_empty": "Hide empty channels",