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

Add keyframe market colors, #719

Browse Source
This commit is contained in:
JannisX11 2020-09-12 16:55:32 +02:00
parent e48d2ccbd7
commit eec815b736
5 changed files with 38 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
css/panels.css
View File

@ -582,7 +582,7 @@
color: var(--color-grid);
}
#timeline_body .keyframe.selected {
color: var(--color-accent);
color: var(--color-accent) !important;
z-index: 4;
}

2
index.html
View File

@ -1038,7 +1038,7 @@
<div class="keyframe_section">
<keyframe
v-for="keyframe in animator[channel]"
v-bind:style="{left: (8 + keyframe.time * size) + 'px'}"
v-bind:style="{left: (8 + keyframe.time * size) + 'px', color: getColor(keyframe.color)}"
class="keyframe"
v-bind:class="[keyframe.channel, keyframe.selected?'selected':'']"
v-bind:id="keyframe.uuid"

4
js/animations/animation.js
View File

@ -1005,9 +1005,7 @@ const Animator = {
override: a.override_previous_animation,
anim_time_update: a.anim_time_update,
length: a.animation_length,
blend_weight: a.blend_weight,
//particle_effects: a.particle_effects,
//sound_effects: a.sound_effects,
blend_weight: a.blend_weight
}).add()
//Bones
if (a.bones) {

31
js/animations/keyframe.js
View File

@ -3,6 +3,7 @@ class Keyframe {
this.type = 'keyframe'
this.channel = 'rotation';
this.time = 0;
this.color = -1;
this.selected = 0;
this.x = '0';
this.y = '0';
@ -26,6 +27,7 @@ class Keyframe {
}
extend(data) {
Merge.number(this, data, 'time')
Merge.number(this, data, 'color')
if (this.transform) {
if (data.values != undefined) {
@ -257,12 +259,30 @@ class Keyframe {
}
Timeline.selected.remove(this)
}
forSelected(fc, undo_tag) {
if (Timeline.selected.length <= 1 || !Timeline.selected.includes(this)) {
var edited = [this]
} else {
var edited = Timeline.selected
}
if (undo_tag) {
Undo.initEdit({keyframes: edited})
}
for (var i = 0; i < edited.length; i++) {
fc(edited[i])
}
if (undo_tag) {
Undo.finishEdit(undo_tag)
}
return edited;
}
getUndoCopy(save) {
var copy = {
animator: save ? undefined : this.animator && this.animator.uuid,
uuid: save && this.uuid,
channel: this.channel,
time: this.time,
color: this.color,
x: this.x,
y: this.y,
z: this.z,
@ -306,6 +326,17 @@ class Keyframe {
},*/
'change_keyframe_file',
'_',
{name: 'menu.cube.color', icon: 'color_lens', children: [
{icon: 'bubble_chart', name: 'generic.unset', click: function(kf) {kf.forSelected(kf2 => {kf2.color = -1}, 'change color')}},
{icon: 'bubble_chart', color: markerColors[0].standard, name: 'cube.color.'+markerColors[0].name, click: function(kf) {kf.forSelected(function(kf2){kf2.color = 0}, 'change color')}},
{icon: 'bubble_chart', color: markerColors[1].standard, name: 'cube.color.'+markerColors[1].name, click: function(kf) {kf.forSelected(function(kf2){kf2.color = 1}, 'change color')}},
{icon: 'bubble_chart', color: markerColors[2].standard, name: 'cube.color.'+markerColors[2].name, click: function(kf) {kf.forSelected(function(kf2){kf2.color = 2}, 'change color')}},
{icon: 'bubble_chart', color: markerColors[3].standard, name: 'cube.color.'+markerColors[3].name, click: function(kf) {kf.forSelected(function(kf2){kf2.color = 3}, 'change color')}},
{icon: 'bubble_chart', color: markerColors[4].standard, name: 'cube.color.'+markerColors[4].name, click: function(kf) {kf.forSelected(function(kf2){kf2.color = 4}, 'change color')}},
{icon: 'bubble_chart', color: markerColors[5].standard, name: 'cube.color.'+markerColors[5].name, click: function(kf) {kf.forSelected(function(kf2){kf2.color = 5}, 'change color')}},
{icon: 'bubble_chart', color: markerColors[6].standard, name: 'cube.color.'+markerColors[6].name, click: function(kf) {kf.forSelected(function(kf2){kf2.color = 6}, 'change color')}},
{icon: 'bubble_chart', color: markerColors[7].standard, name: 'cube.color.'+markerColors[7].name, click: function(kf) {kf.forSelected(function(kf2){kf2.color = 7}, 'change color')}}
]},
'copy',
'delete',
])

4
js/animations/timeline.js
View File

@ -568,6 +568,10 @@ onVueSetup(function() {
},
removeAnimator(animator) {
Timeline.animators.remove(animator);
},
getColor(index) {
if (index == -1 || index == undefined) return;
return markerColors[index].standard;
}
}
})