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

Adjust UV when cropping texture to selection

Browse Source 
Reduce decimal digits in texture list resolution factor
This commit is contained in:
JannisX11 2024-05-03 15:27:52 +02:00
parent b86fbe28cd
commit 3d8bde2a33
2 changed files with 71 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
js/texturing/edit_texture.js
View File

@ -804,20 +804,22 @@ BARS.defineActions(function() {
new Action('resize_texture', {
icon: 'photo_size_select_large',
category: 'textures',
condition: () => Texture.all.length,
condition: () => Texture.selected,
click() {
let texture = Texture.getDefault();
let texture = Texture.selected;
texture.resizeDialog();
}
})
new Action('crop_texture_to_selection', {
icon: 'crop',
category: 'textures',
condition: () => Texture.all.length,
condition: () => Texture.selected,
click() {
let texture = Texture.getDefault();
let texture = Texture.selected;
let rect = texture.selection.getBoundingRect();
let uv_factor = texture.width / texture.uv_width;
let old_width = texture.width;
let old_height = texture.height;
if (!rect.width || !rect.height) return;
Undo.initEdit({textures: [texture], bitmap: true});
@ -844,6 +846,69 @@ BARS.defineActions(function() {
Undo.finishEdit('Crop texture to selection');
setTimeout(updateSelection, 100);
// Fix UV
let elements_to_change = [];
Outliner.elements.forEach(element => {
if (!element.faces) return;
for (let key in element.faces) {
if (element.faces[key].getTexture() == texture) {
elements_to_change.safePush(element);
break;
}
}
})
if (elements_to_change.length) {
Undo.initEdit({elements: elements_to_change});
let uv_adjust_x = 1;
let uv_adjust_y = 1;
if (Format.single_texture || Texture.all.length == 1 || Format.per_texture_uv_size) {
if (!Format.per_texture_uv_size) {
Undo.current_save.uv_mode = {
box_uv: Project.box_uv,
width: Project.texture_width,
height: Project.texture_height
}
Undo.current_save.aspects.uv_mode = true;
Project.texture_width = Project.texture_width * (rect.width / old_width);
Project.texture_height = Project.texture_height * (rect.height / old_height);
}
} else {
uv_adjust_x = rect.width / old_width;
uv_adjust_y = rect.height / old_height;
}
elements_to_change.forEach(element => {
if (element instanceof Cube) {
for (let key in element.faces) {
if (element.faces[key].getTexture() != texture) continue;
if (element.box_uv) {
element.uv_offset[0] -= (rect.start_x * uv_factor);
element.uv_offset[1] -= (rect.start_y * uv_factor);
} else {
let uv = element.faces[key].uv;
uv[0] = uv[0] / uv_adjust_x - (rect.start_x * uv_factor);
uv[2] = uv[2] / uv_adjust_x - (rect.start_x * uv_factor);
uv[1] = uv[1] / uv_adjust_y - (rect.start_y * uv_factor);
uv[3] = uv[3] / uv_adjust_y - (rect.start_y * uv_factor);
}
}
} else if (element instanceof Mesh) {
for (let key in element.faces) {
if (element.faces[key].getTexture() != texture) continue;
let uv = element.faces[key].uv;
for (let vkey in uv) {
uv[vkey][0] = uv[vkey][0] / uv_adjust_x - (rect.start_x * uv_factor);
uv[vkey][1] = uv[vkey][1] / uv_adjust_y - (rect.start_y * uv_factor);
}
}
}
})
console.log({elements_to_change, rect, uv_factor, uv_adjust_x})
Canvas.updateView({elements: elements_to_change, element_aspects: {uv: true}})
Undo.finishEdit('Adjust UV after cropping texture');
}
}
})
})

3
js/texturing/textures.js
View File

@ -2461,7 +2461,8 @@ Interface.definePanels(function() {
} else {
let message = texture.width + ' x ' + texture.height + 'px';
if (!Format.image_editor) {
message += ` (${texture.width / texture.getUVWidth() * 16}x)`;
let uv_size = texture.width / texture.getUVWidth() * 16;
message += ` (${trimFloatNumber(uv_size, 2)}x)`;
}
if (texture.frameCount > 1) {
message += ` - ${texture.currentFrame+1}/${texture.frameCount}`