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

Java animations: Step + discontinuous support

Browse Source
This commit is contained in:
JannisX11 2023-09-28 16:22:58 +02:00
parent 1be68d4f62
commit b8cc781483
2 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
js/io/formats/modded_entity.js
View File

@ -935,14 +935,25 @@ codec.compileAnimations = function(animations = Animation.all) {
for (let channel_id in channel_types) {
if (!(animator[channel_id] && animator[channel_id].length)) continue;
let keyframes = animator[channel_id].slice().sort((a, b) => a.time - b.time);
let keyframe_strings = keyframes.map(kf => {
let keyframe_strings = [];
function addKeyframe(time, x, y, z, interpolation) {
let kf_string = AnimationTemplates.get('keyframe_'+channel_id);
kf_string = kf_string.replace(R('time'), F(kf.time));
kf_string = kf_string.replace(R('x'), F(kf.calc('x')));
kf_string = kf_string.replace(R('y'), F(kf.calc('y')));
kf_string = kf_string.replace(R('z'), F(kf.calc('z')));
kf_string = kf_string.replace(R('interpolation'), interpolations[kf.interpolation] || interpolations.catmullrom);
return kf_string;
kf_string = kf_string.replace(R('time'), F(time));
kf_string = kf_string.replace(R('x'), F(x));
kf_string = kf_string.replace(R('y'), F(y));
kf_string = kf_string.replace(R('z'), F(z));
kf_string = kf_string.replace(R('interpolation'), interpolations[interpolation] || interpolations.linear);
keyframe_strings.push(kf_string);
}
keyframes.forEach((kf, i) => {
addKeyframe(kf.time, kf.calc('x'), kf.calc('y'), kf.calc('z'), kf.interpolation);
if (kf.data_points[1]) {
addKeyframe(kf.time+0.001, kf.calc('x', 1), kf.calc('y', 1), kf.calc('z', 1), kf.interpolation);
} else if (kf.interpolation == 'step' && keyframes[i+1]) {
let next = keyframes[i+1];
addKeyframe(next.time-0.001, kf.calc('x'), kf.calc('y'), kf.calc('z'), 'linear');
}
})
let channel_string = AnimationTemplates.get('channel');

2
package.json
View File

@ -1,7 +1,7 @@
{
"name": "Blockbench",
"description": "Low-poly modeling and animation software",
"version": "4.8.2",
"version": "4.9.0-beta.0",
"license": "GPL-3.0-or-later",
"author": {
"name": "JannisX11",