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

Fix issue with undoing dragged keyframes (#1370)

Browse Source 
Only show inside of Studio preview scene
This commit is contained in:
JannisX11 2022-07-25 20:26:01 +02:00
parent 972da05820
commit 49762b61bf
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
js/animations/timeline.js
View File

@ -950,7 +950,12 @@ Interface.definePanels(() => {
Blockbench.setStatusBarText(); Blockbench.setStatusBarText();
if (values_changed) { if (values_changed) {
Animation.selected.setLength(); Animation.selected.setLength();
Undo.finishEdit('Drag keyframes'); if (time_stretching) {
Undo.finishEdit('Stretch keyframes');
} else {
Undo.addKeyframeCasualties(deleted);
Undo.finishEdit('Drag keyframes');
}
} else { } else {
Undo.cancelEdit(); Undo.cancelEdit();
} }

10
js/preview/preview_scenes.js
View File

@ -60,6 +60,7 @@ class PreviewModel {
this.texture = data.texture; this.texture = data.texture;
this.color = data.color || '#ffffff'; this.color = data.color || '#ffffff';
this.shading = data.shading !== false; this.shading = data.shading !== false;
this.render_side = data.render_side == undefined ? THREE.DoubleSide : data.render_side;
this.texture_size = data.texture_size || [16, 16]; this.texture_size = data.texture_size || [16, 16];
this.buildModel(); this.buildModel();
@ -94,7 +95,7 @@ class PreviewModel {
this.material = new (this.shading ? THREE.MeshLambertMaterial : THREE.MeshBasicMaterial)({ this.material = new (this.shading ? THREE.MeshLambertMaterial : THREE.MeshBasicMaterial)({
color: this.color, color: this.color,
map: tex, map: tex,
side: 2, side: this.render_side,
alphaTest: 0.05 alphaTest: 0.05
}); });
@ -793,14 +794,11 @@ new PreviewModel('studio', {
texture: './assets/preview_scenes/studio.png', texture: './assets/preview_scenes/studio.png',
texture_size: [64, 64], texture_size: [64, 64],
shading: false, shading: false,
render_side: THREE.BackSide,
cubes: [ cubes: [
{position: [-256, 0, -256], size: [512, 128, 512], faces: { {position: [-240, 0, -240], size: [480, 128, 480], faces: {
up: {uv: [0, 16.04, 15.96, 31.96]}, up: {uv: [0, 16.04, 15.96, 31.96]},
down: {uv: [0, 0, 16, 16]}, down: {uv: [0, 0, 16, 16]},
east: {uv: [6, 50, 8, 60]},
west: {uv: [6, 50, 8, 60]},
north: {uv: [6, 50, 8, 60]},
south: {uv: [6, 50, 8, 60]},
}}, }},
{position: [48, 0, -240], size: [96, 128, 480], faces: { {position: [48, 0, -240], size: [96, 128, 480], faces: {
south: {uv: [16.06, 0, 64, 64]}, south: {uv: [16.06, 0, 64, 64]},