mirror/blockbench
2
0
Fork 0
mirror of https://github.com/JannisX11/blockbench.git synced 2024-11-27 04:21:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Intersect selection mode

Browse Source
This commit is contained in:
JannisX11 2023-10-22 20:02:25 +02:00
parent 95b363479b
commit ac0d097be0
1 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
js/texturing/uv.js
View File

@ -2257,7 +2257,7 @@ Interface.definePanels(function() {
if (this.texture && this.texture.frameCount) {
this.mouse_coords.y += (this.texture.height / this.texture.frameCount) * this.texture.currentFrame
}
let grab = Toolbox.selected.id == 'selection_tool' && this.texture && this.texture.texture_selection.get(this.mouse_coords.x, this.mouse_coords.y);
let grab = Toolbox.selected.id == 'selection_tool' && this.texture && this.texture.texture_selection.get(this.mouse_coords.x, this.mouse_coords.y) && BarItems.selection_tool_operation_mode.value == 'create';
this.$refs.frame.style.cursor = grab ? 'move' : '';
},
onMouseWheel(event) {
@ -3439,6 +3439,12 @@ Interface.definePanels(function() {
texture.texture_selection.set(x, y, 0);
break;
}
case 'intersect': {
if (texture.texture_selection.get(x, y)) {
texture.texture_selection.set(x, y, 2);
}
break;
}
}
}
}
@ -3459,6 +3465,24 @@ Interface.definePanels(function() {
texture.texture_selection.set(x, y, 0);
break;
}
case 'intersect': {
if (texture.texture_selection.get(x, y)) {
texture.texture_selection.set(x, y, 2);
}
break;
}
}
}
}
}
if (op_mode == 'intersect') {
for (let x = 0; x < texture.width; x++) {
for (let y = 0; y < texture.height; y++) {
let val = texture.texture_selection.getDirect(x, y);
if (val == 2) {
texture.texture_selection.set(x, y, 1);
} else if (val == 1) {
texture.texture_selection.set(x, y, 0);
}
}
}