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

Implement texture frame mirror painting option

Browse Source 
Closes #1156
Fix issue with stretched texture in UV editor while painting
This commit is contained in:
JannisX11 2022-08-18 13:41:12 +02:00
parent 38b76fd0ab
commit a6f8856b84
3 changed files with 51 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
js/animations/timeline.js
View File

@ -496,7 +496,6 @@ const Timeline = {
Timeline.pause()
} else {
Timeline.setTime(0)
Timeline.start()
}
}
},

75
js/texturing/painter.js
View File

@ -568,7 +568,6 @@ const Painter = {
ctx.globalCompositeOperation = 'source-over'
},
getMirrorPaintTargets(texture, x, y, uvTag) {
if (!uvTag || !Painter.current.element) return;
function getTargetWithOptions(symmetry_axes, local) {
let mirror_element = local ? Painter.current.element : Painter.getMirrorElement(Painter.current.element, symmetry_axes);
let even_brush_size = BarItems.slider_brush_size.get()%2 == 0 && Toolbox.selected.brush?.offset_even_radius && Condition(Toolbox.selected.brush?.floor_coordinates);
@ -681,36 +680,60 @@ const Painter = {
}
}
}
let targets = [];
let mirror_vectors = [[
Painter.mirror_painting_options.axis.x?1:0,
Painter.mirror_painting_options.axis.y?1:0,
Painter.mirror_painting_options.axis.z?1:0
]];
if (mirror_vectors[0].filter(v => v).length == 3) {
mirror_vectors = [
[1,0,0], [0,1,0], [0,0,1],
[1,1,0], [0,1,1], [1,0,1],
[1,1,1]
]
} else if (mirror_vectors[0].equals([1, 1, 0])) {
mirror_vectors = [[1,0,0], [0,1,0], [1,1,0]];
if (uvTag & Painter.current.element) {
let mirror_vectors = [[
Painter.mirror_painting_options.axis.x?1:0,
Painter.mirror_painting_options.axis.y?1:0,
Painter.mirror_painting_options.axis.z?1:0
]];
if (mirror_vectors[0].filter(v => v).length == 3) {
mirror_vectors = [
[1,0,0], [0,1,0], [0,0,1],
[1,1,0], [0,1,1], [1,0,1],
[1,1,1]
]
} else if (mirror_vectors[0].equals([1, 1, 0])) {
mirror_vectors = [[1,0,0], [0,1,0], [1,1,0]];
} else if (mirror_vectors[0].equals([0, 1, 1])) {
mirror_vectors = [[0,1,0], [0,0,1], [0,1,1]];
} else if (mirror_vectors[0].equals([0, 1, 1])) {
mirror_vectors = [[0,1,0], [0,0,1], [0,1,1]];
} else if (mirror_vectors[0].equals([1, 0, 1])) {
mirror_vectors = [[1,0,0], [0,0,1], [1,0,1]];
} else if (mirror_vectors[0].equals([1, 0, 1])) {
mirror_vectors = [[1,0,0], [0,0,1], [1,0,1]];
}
mirror_vectors.forEach((mirror_vector, i) => {
if (Painter.mirror_painting_options.global) {
targets.push(getTargetWithOptions(mirror_vector, false));
}
if (Painter.mirror_painting_options.local) {
targets.push(getTargetWithOptions(mirror_vector, true));
}
})
}
mirror_vectors.forEach((mirror_vector, i) => {
if (Painter.mirror_painting_options.global) {
targets.push(getTargetWithOptions(mirror_vector, false));
}
if (Painter.mirror_painting_options.local) {
targets.push(getTargetWithOptions(mirror_vector, true));
}
})
// Texture animation
if (Painter.mirror_painting_options.texture_frames && Format.animated_textures && texture && texture.frameCount > 1) {
let spatial_targets = targets.slice();
for (let frame = 0; frame < texture.frameCount; frame++) {
if (frame == texture.currentFrame) continue;
targets.push({
element: Painter.current.element,
x,
y: y + (frame - texture.currentFrame) * texture.display_height,
face: Painter.current.face
});
spatial_targets.forEach(spatial => {
targets.push({
element: spatial.element,
x: spatial.x,
y: spatial.y + (frame - texture.currentFrame) * texture.display_height,
face: spatial.face
});
})
}
}
return targets.filter(target => !!target);
},
drawBrushLine(texture, end_x, end_y, event, new_face, uv) {

2
js/texturing/uv.js
View File

@ -1908,6 +1908,8 @@ Interface.definePanels(function() {
if (this.texture && this.texture.display_canvas) {
Vue.nextTick(() => {
let wrapper = this.$refs.texture_canvas_wrapper;
this.texture.canvas.style.objectPosition = `0 ${-this.texture.currentFrame * this.inner_height}px`;
this.texture.canvas.style.objectFit = this.texture.frameCount > 1 ? 'cover' : 'fill';
wrapper.append(this.texture.canvas);
})
}