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 mirror modeling issues

Browse Source
This commit is contained in:
JannisX11 2023-08-13 18:57:22 +02:00
parent 24dc619595
commit 28701087f8
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
js/modeling/mirror_modeling.js
View File

@ -22,7 +22,9 @@ const MirrorModeling = {
let mirror_element = MirrorModeling.cached_elements[original.uuid]?.counterpart;
let element_before_snapshot;
if (mirror_element && mirror_element !== original) {
if (mirror_element == original) return;
if (mirror_element) {
element_before_snapshot = mirror_element.getUndoCopy(undo_aspects);
mirror_element.extend(original);
@ -89,6 +91,7 @@ const MirrorModeling = {
preview_controller.updateGeometry(mirror_element);
preview_controller.updateFaces(mirror_element);
preview_controller.updateUV(mirror_element);
preview_controller.updateVisibility(mirror_element);
return mirror_element;
},
updateGroupCounterpart(group, original) {

14
js/texturing/painter.js
View File

@ -1172,15 +1172,26 @@ const Painter = {
let e = 0.01;
symmetry_axes = symmetry_axes.map((v, i) => v ? i : false).filter(v => v !== false);
let off_axes = [0, 1, 2].filter(i => !symmetry_axes.includes(i));
function getElementParents(el) {
let list = [];
let subject = el;
while (subject.parent instanceof Group) {
subject = subject.parent;
list.push(subject)
}
return list;
}
if (element instanceof Cube) {
if (
symmetry_axes.find((axis) => !Math.epsilon(element.from[axis]-center, center-element.to[axis], e)) == undefined &&
off_axes.find(axis => element.rotation[axis]) == undefined
off_axes.find(axis => element.rotation[axis]) == undefined &&
getElementParents(element).allEqual(group => off_axes.find(axis => group.rotation[axis]) == undefined)
) {
return element;
} else {
for (var element2 of Cube.all) {
if (
element2 != element &&
Math.epsilon(element.inflate, element2.inflate, e) &&
off_axes.find(axis => !Math.epsilon(element.from[axis], element2.from[axis], e)) == undefined &&
off_axes.find(axis => !Math.epsilon(element.to[axis], element2.to[axis], e)) == undefined &&
@ -1207,6 +1218,7 @@ const Painter = {
let other_center = element2.getCenter(true);
if (Object.keys(element.vertices).length !== Object.keys(element2.vertices).length) continue;
if (
element2 != element &&
symmetry_axes.find(axis => !Math.epsilon(element.origin[axis]-center, center-element2.origin[axis], e)) == undefined &&
symmetry_axes.find(axis => !Math.epsilon(this_center[axis]-center, center-other_center[axis], ep)) == undefined &&
off_axes.find(axis => !Math.epsilon(element.origin[axis], element2.origin[axis], e)) == undefined &&