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

Fix transformer occasionally soft-locking #673

Browse Source 
Fix global rotation messing up pivot points
Fix vertical toolbars
This commit is contained in:
JannisX11 2020-07-16 14:43:22 +02:00
parent 7be2a8e064
commit 6d2b284210
3 changed files with 4 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
css/general.css
View File

@ -310,6 +310,7 @@
}
.toolbar_wrapper > .toolbar.vertical {
width: 40px;
flex-direction: column-reverse;
}
.toolbar_wrapper > .toolbar.vertical .tool {
height: 36px;

2
js/preview/transformer.js
View File

@ -1012,9 +1012,9 @@
Canvas.outlineObjects(selected)
extendTransformLine(true);
}
_dragging = true;
}
}
_dragging = true;
}
function beforeFirstChange(event) {
if (scope.hasChanged) return;

29
js/transform.js
View File

@ -741,37 +741,12 @@ function rotateOnAxis(modify, axis, slider) {
origin = obj.origin
}
})
/*
Cube.selected.forEach(function(obj, i) {
if (obj.rotation.allEqual(0)) {
obj.origin.V3_set(origin)
}
var obj_val = modify(obj.rotation[axis]);
obj_val = Math.trimDeg(obj_val)
if (Format.rotation_limit) {
//Limit To 1 Axis
obj.rotation[(axis+1)%3] = 0
obj.rotation[(axis+2)%3] = 0
//Limit Angle
obj_val = Math.round(obj_val/22.5)*22.5
if (obj_val > 45 || obj_val < -45) {
let f = obj_val > 45
obj.roll(axis, f!=(axis==1) ? 1 : 3)
obj_val = f ? -22.5 : 22.5;
}
} else {
obj_val = Math.trimDeg(obj_val)
}
obj.rotation[axis] = obj_val
obj.rotation_axis = axis_letter
})
*/
let space = Transformer.getTransformSpace()
things.forEach(obj => {
let mesh = obj.mesh;
if (obj instanceof Cube) {
if (obj.rotation.allEqual(0)) {
if (obj instanceof Cube && !Format.bone_rig) {
if (obj.origin.allEqual(0)) {
obj.origin.V3_set(origin)
}
}