From 62b735c936ab97e6a64a2f0208630bbdbd791978 Mon Sep 17 00:00:00 2001
From: JannisX11 <jannis4236@gmail.com>
Date: Sun, 24 Jan 2021 11:39:04 +0100
Subject: [PATCH] Improvements to graph editor New keyframes inherit
 interpolation mode Update checkerboard color when updating

---
 css/panels.css             |  8 +++++---
 js/animations/animation.js | 17 +++++++++++++++--
 js/animations/timeline.js  | 19 ++++++++++++-------
 js/interface/themes.js     |  5 +++++
 4 files changed, 37 insertions(+), 12 deletions(-)

diff --git a/css/panels.css b/css/panels.css
index 4125cfb..d8fe7aa 100644
--- a/css/panels.css
+++ b/css/panels.css
@@ -765,7 +765,7 @@
 	}
 	#timeline_timestamp {
 		font-family: var(--font-code);
-		padding: 3px;
+		padding: 2px;
 		padding-left: 8px;
 		overflow: hidden;
 	}
@@ -856,13 +856,15 @@
 	}
 	.channel_axis_selector {
 		height: 24px;
+		margin-right: 1px;
 		display: flex;
 	}
 	.channel_axis_selector > div {
 		font-weight: bolder;
 		text-align: center;
-		width: 20px;
-		height: 24px;
+		width: 22px;
+		height: inherit;
+		padding-top: 2px;
 	}
 	.channel_axis_selector > div.selected {
 		border-bottom: 3px solid var(--color-accent);
diff --git a/js/animations/animation.js b/js/animations/animation.js
index e14b71e..ec68669 100644
--- a/js/animations/animation.js
+++ b/js/animations/animation.js
@@ -670,13 +670,14 @@ class GeneralAnimator {
 		});
 		keyframes.push(keyframe);
 
+		keyframe.channel = channel;
+		keyframe.time = time;
+
 		if (value) {
 			keyframe.extend(value);
 		} else if (this.fillValues) {
 			this.fillValues(keyframe, value, true);
 		}
-		keyframe.channel = channel;
-		keyframe.time = time;
 
 		this[channel].push(keyframe);
 		keyframe.animator = this;
@@ -831,7 +832,10 @@ class BoneAnimator extends GeneralAnimator {
 				}]
 			})
 		} else if (values == null) {
+			let original_time = Timeline.time;
+			Timeline.time = keyframe.time;
 			var ref = this.interpolate(keyframe.channel, allow_expression)
+			Timeline.time = original_time;
 			if (ref) {
 				let e = 1e2
 				ref.forEach((r, i) => {
@@ -847,6 +851,15 @@ class BoneAnimator extends GeneralAnimator {
 					}]
 				})
 			}
+			let closest;
+			this[keyframe.channel].forEach(kf => {
+				if (!closest || Math.abs(kf.time - keyframe.time) < Math.abs(closest.time - keyframe.time)) {
+					closest = kf;
+				}
+			});
+			keyframe.extend({
+				interpolation: closest && closest.interpolation
+			})
 		} else {
 			keyframe.extend(values)
 		}
diff --git a/js/animations/timeline.js b/js/animations/timeline.js
index 6476f2a..f66c0b9 100644
--- a/js/animations/timeline.js
+++ b/js/animations/timeline.js
@@ -35,6 +35,7 @@ TimelineMarker.prototype.menu = new Menu([
 	{icon: 'flag', color: markerColors[5].standard, name: 'cube.color.'+markerColors[5].name, click: function(marker) {marker.color = 5;}},
 	{icon: 'flag', color: markerColors[6].standard, name: 'cube.color.'+markerColors[6].name, click: function(marker) {marker.color = 6;}},
 	{icon: 'flag', color: markerColors[7].standard, name: 'cube.color.'+markerColors[7].name, click: function(marker) {marker.color = 7;}},
+	'_',
 	{icon: 'delete', name: 'generic.delete', click: function(marker) {
 		if (Animation.selected) Animation.selected.markers.remove(marker);
 	}}
@@ -426,6 +427,10 @@ const Timeline = {
 			})
 			i += step;
 		}
+
+		if (Timeline.vue.graph_editor_open) {
+			Timeline.vue.graph_size += 1e-5;
+		}
 	},
 	updateScroll(e) {
 		$('.channel_head').css('left', scroll_amount+'px')
@@ -573,12 +578,12 @@ onVueSetup(function() {
 	Timeline.vue = new Vue({
 		el: '#timeline_vue',
 		data: {
-			size: 150,
+			size: 200,
 			length: 10,
 			animation_length: 0,
 			scroll_left: 0,
 			scroll_top: 0,
-			head_width: 200,
+			head_width: 196,
 			timecodes: [],
 			animators: Timeline.animators,
 			markers: [],
@@ -832,6 +837,11 @@ onVueSetup(function() {
 				<div id="timeline_header">
 					<div id="timeline_corner" v-bind:style="{width: head_width+'px'}">
 						<div id="timeline_timestamp"></div>
+						<div class="channel_axis_selector" v-if="graph_editor_open">
+							<div @click="graph_editor_axis = 'x';" :class="{selected: graph_editor_axis == 'x'}" style="color: var(--color-axis-x);">X</div>
+							<div @click="graph_editor_axis = 'y';" :class="{selected: graph_editor_axis == 'y'}" style="color: var(--color-axis-y);">Y</div>
+							<div @click="graph_editor_axis = 'z';" :class="{selected: graph_editor_axis == 'z'}" style="color: var(--color-axis-z);">Z</div>
+						</div>
 					</div>
 					<div id="timeline_time_wrapper">
 						<div id="timeline_time" v-bind:style="{width: (size*length)+'px', left: -scroll_left+'px'}">
@@ -904,11 +914,6 @@ onVueSetup(function() {
 										</template>
 									</div>
 									<span>{{ tl('timeline.'+channel) }}</span>
-									<div class="channel_axis_selector" v-if="graph_editor_open && animator.selected && graph_editor_channel == channel">
-										<div @click="graph_editor_axis = 'x';" :class="{selected: graph_editor_axis == 'x'}" style="color: var(--color-axis-x);">X</div>
-										<div @click="graph_editor_axis = 'y';" :class="{selected: graph_editor_axis == 'y'}" style="color: var(--color-axis-y);">Y</div>
-										<div @click="graph_editor_axis = 'z';" :class="{selected: graph_editor_axis == 'z'}" style="color: var(--color-axis-z);">Z</div>
-									</div>
 									<div class="text_button" v-on:click.stop="animator.createKeyframe(null, Timeline.time, channel, true)">
 										<i class="material-icons">add</i>
 									</div>
diff --git a/js/interface/themes.js b/js/interface/themes.js
index f7cf672..7036da0 100644
--- a/js/interface/themes.js
+++ b/js/interface/themes.js
@@ -160,6 +160,11 @@ const CustomTheme = {
 				CustomTheme.data.colors[key] = legacy_colors[key].hex;
 			}
 		}
+		Blockbench.onUpdateTo('3.8', () => {
+			if (CustomTheme.data.colors.checkerboard == '#2f3339') {
+				CustomTheme.data.colors.checkerboard = CustomTheme.defaultColors.checkerboard;
+			}
+		})
 	},
 	import(file) {
 		var data = JSON.parse(file.content)