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

Change selection center calculation behavior

Browse Source 
Fix animated texture frame slider only affecting selected texture
Make animated texture frame slider loop animation
This commit is contained in:
JannisX11 2022-01-25 17:28:53 +01:00
parent 9cdab6bab1
commit 31cb4535ea
2 changed files with 36 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
js/texturing/textures.js
View File

@ -1616,11 +1616,15 @@ BARS.defineActions(function() {
return tex ? tex.currentFrame+1 : 0;
},
change: function(modify) {
let tex = getSliderTexture()
if (tex) {
tex.currentFrame = Math.clamp(modify(tex.currentFrame+1), 1, tex.frameCount) - 1;
TextureAnimator.update([tex]);
}
let slider_tex = getSliderTexture()
if (!slider_tex) return;
slider_tex.currentFrame = (modify(slider_tex.currentFrame + slider_tex.frameCount) % slider_tex.frameCount);
let textures = Texture.all.filter(tex => tex.frameCount > 1);
Texture.all.forEach(tex => {
tex.currentFrame = slider_tex.currentFrame % tex.frameCount;
})
TextureAnimator.update(textures);
}
})
})

50
js/transform.js
View File

@ -56,22 +56,20 @@ function getSelectionCenter(all = false) {
let vec = THREE.fastWorldPosition(Group.selected.mesh, new THREE.Vector3());
return vec.toArray();
}
var center = [0, 0, 0]
var i = 0;
let items = (selected.length == 0 || all) ? elements : selected;
items.forEach(obj => {
if (obj.getWorldCenter) {
var pos = obj.getWorldCenter();
center[0] += pos.x
center[1] += pos.y
center[2] += pos.z
let max = [-Infinity, -Infinity, -Infinity];
let min = [ Infinity, Infinity, Infinity];
let elements = Outliner.selected.length ? Outliner.selected : Outliner.elements;
elements.forEach(element => {
if (element.getWorldCenter) {
var pos = element.getWorldCenter();
min[0] = Math.min(pos.x, min[0]); max[0] = Math.max(pos.x, max[0]);
min[1] = Math.min(pos.y, min[1]); max[1] = Math.max(pos.y, max[1]);
min[2] = Math.min(pos.z, min[2]); max[2] = Math.max(pos.z, max[2]);
}
})
if (items.length) {
for (var i = 0; i < 3; i++) {
center[i] = center[i] / items.length
}
}
let center = max.V3_add(min).V3_divide(2);
if (!Format.centered_grid) {
center.V3_add(8, 8, 8)
}
@ -598,7 +596,6 @@ function centerElementsAll(axis) {
centerElements(0, false)
centerElements(1, false)
centerElements(2, false)
Canvas.updatePositions()
}
function centerElements(axis, update) {
if (!Outliner.selected.length) return;
@ -610,10 +607,17 @@ function centerElements(axis, update) {
if (obj.to) obj.to[axis] = limitToBox(obj.to[axis] + difference, obj.inflate);
if (obj instanceof Cube) obj.from[axis] = limitToBox(obj.from[axis] + difference, obj.inflate);
})
if (update !== false) {
Canvas.updatePositions()
}
Group.all.forEach(group => {
if (!group.selected) return;
group.origin[axis] += difference;
})
Canvas.updateView({
elements: Outliner.selected,
groups: Group.all.filter(g => g.selected),
element_aspects: {transform: true},
group_aspects: {transform: true},
selection: true
})
}
//Move
@ -1549,7 +1553,7 @@ BARS.defineActions(function() {
color: 'x',
category: 'transform',
click: function () {
Undo.initEdit({elements: selected});
Undo.initEdit({elements: Outliner.selected, outliner: true});
centerElements(0);
Undo.finishEdit('Center selection on X axis')
}
@ -1560,7 +1564,7 @@ BARS.defineActions(function() {
color: 'y',
category: 'transform',
click: function () {
Undo.initEdit({elements: selected});
Undo.initEdit({elements: Outliner.selected, outliner: true});
centerElements(1);
Undo.finishEdit('Center selection on Y axis')
}
@ -1571,7 +1575,7 @@ BARS.defineActions(function() {
color: 'z',
category: 'transform',
click: function () {
Undo.initEdit({elements: selected});
Undo.initEdit({elements: Outliner.selected, outliner: true});
centerElements(2);
Undo.finishEdit('Center selection on Z axis')
}
@ -1580,7 +1584,7 @@ BARS.defineActions(function() {
icon: 'filter_center_focus',
category: 'transform',
click: function () {
Undo.initEdit({elements: selected});
Undo.initEdit({elements: Outliner.selected, outliner: true});
centerElementsAll();
Undo.finishEdit('Center selection')
}