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 painting not working on duplicated meshes

Browse Source
This commit is contained in:
JannisX11 2023-05-27 13:48:08 +02:00
parent b6f4ceb028
commit c30d3477ff
1 changed files with 17 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
js/texturing/painter.js
View File

@ -460,16 +460,17 @@ const Painter = {
let softness = BarItems.slider_brush_softness.get()/100;
let b_opacity = BarItems.slider_brush_opacity.get()/255;
let tool = Toolbox.selected;
let matrix_id = Painter.current.element.uuid + Painter.current.face;
ctx.clip()
if (Painter.current.element instanceof Mesh) {
let face = Painter.current.element.faces[Painter.current.face];
if (face && face.vertices.length > 2 && !Painter.current.face_matrices[Painter.current.face]) {
Painter.current.face_matrices[Painter.current.face] = face.getOccupationMatrix(true, [0, 0]);
if (face && face.vertices.length > 2 && !Painter.current.face_matrices[matrix_id]) {
Painter.current.face_matrices[matrix_id] = face.getOccupationMatrix(true, [0, 0]);
let island = face.getUVIsland();
for (let fkey of island) {
let face = Painter.current.element.faces[fkey];
face.getOccupationMatrix(true, [0, 0], Painter.current.face_matrices[Painter.current.face]);
face.getOccupationMatrix(true, [0, 0], Painter.current.face_matrices[matrix_id]);
}
}
}
@ -497,27 +498,20 @@ const Painter = {
tool.brush.draw({ctx, x, y, size, softness, texture, event});
} else {
let run_per_pixel = (pxcolor, local_opacity, px, py) => {
if (Painter.current.face_matrices[matrix_id] && settings.paint_side_restrict.value) {
let matrix = Painter.current.face_matrices[matrix_id];
if (!matrix[px] || !matrix[px][py % texture.display_height]) {
return pxcolor;
}
}
return tool.brush.changePixel(px, py, pxcolor, local_opacity, {color, opacity: b_opacity, ctx, x, y, size, softness, texture, event});
}
let shape = BarItems.brush_shape.value;
if (shape == 'square') {
Painter.editSquare(ctx, x, y, size, softness, function(pxcolor, local_opacity, px, py) {
if (Painter.current.face_matrices[Painter.current.face] && settings.paint_side_restrict.value) {
let matrix = Painter.current.face_matrices[Painter.current.face];
if (!matrix[px] || !matrix[px][py % texture.display_height]) {
return pxcolor;
}
}
return tool.brush.changePixel(px, py, pxcolor, local_opacity, {color, opacity: b_opacity, ctx, x, y, size, softness, texture, event});
})
Painter.editSquare(ctx, x, y, size, softness, run_per_pixel);
} else if (shape == 'circle') {
Painter.editCircle(ctx, x, y, size, softness, function(pxcolor, local_opacity, px, py) {
if (Painter.current.face_matrices[Painter.current.face] && settings.paint_side_restrict.value) {
let matrix = Painter.current.face_matrices[Painter.current.face];
if (!matrix[px] || !matrix[px][py % texture.display_height]) {
return pxcolor;
}
}
return tool.brush.changePixel(px, py, pxcolor, local_opacity, {color, opacity: b_opacity, ctx, x, y, size, softness, texture, event});
})
Painter.editCircle(ctx, x, y, size, softness, run_per_pixel);
}
}
@ -572,8 +566,8 @@ const Painter = {
if (fill_mode === 'face' && fkey !== Painter.current.face) continue;
if (face.vertices.length <= 2 || face.getTexture() !== texture) continue;
let matrix = Painter.current.face_matrices[fkey] || face.getOccupationMatrix(true, [0, 0]);
Painter.current.face_matrices[fkey] = matrix;
let matrix = Painter.current.face_matrices[element.uuid + fkey] || face.getOccupationMatrix(true, [0, 0]);
Painter.current.face_matrices[element.uuid + fkey] = matrix;
for (let x in matrix) {
for (let y in matrix[x]) {
if (!matrix[x][y]) continue;