JannisX11/blockbench
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Shift floor to preview walk animations

Browse Source
This commit is contained in:
JannisX11 2022-04-21 19:22:05 +02:00
parent 07c7d101ed
commit 9334e9649e
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
js/animations/animation.js
View File

@ -867,6 +867,9 @@ const Animator = {
scene.remove(Animator.motion_trail);
Animator.resetParticles(true);
three_grid.position.z = three_grid.position.x;
Canvas.ground_plane.position.z = Canvas.ground_plane.position.x;
if (Panels.element) {
let anchor = Panels.element.node.querySelector('#element_origin_toolbar_anchor');
if (anchor) anchor.before(Toolbars.element_origin.node);
@ -1009,7 +1012,16 @@ const Animator = {
})
})
Animator.resetLastValues();
scene.updateMatrixWorld()
scene.updateMatrixWorld();
// Shift ground
if (Canvas.ground_plane.visible && Animation.selected && Animation.selected.anim_time_update.includes('modified_distance_moved')) {
let value = Animator.MolangParser.parse(Animation.selected.anim_time_update, {'query.modified_distance_moved': Timeline.time});
value = (Timeline.time / value) * Timeline.time * 3;
value = (value % 64) || 0;
Canvas.ground_plane.position.z = Canvas.ground_plane.position.x + value;
three_grid.position.z = three_grid.position.x + value;
}
// Effects
Animator.resetParticles(true);

5
js/interface/keyboard.js
View File

@ -587,7 +587,10 @@ window.addEventListener('focus', event => {
})
function getFocusedTextInput() {
return document.querySelector('input[type="text"]:focus, input[type="number"]:focus, *[contenteditable="true"]:focus, textarea:focus');
let element = document.activeElement;
if (element.nodeName == 'TEXTAREA' || (element.nodeName == 'INPUT' && ['number', 'text'].includes(element.type)) || element.isContentEditable) {
return element;
}
}
addEventListeners(document, 'keydown mousedown', function(e) {