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

Fix #1226 Rotate UV does not update viewport on meshes

Browse Source 
Fix #1227 Converting to mesh does not retain marker color
Fix locked outliner nodes can be renamed
Fix #1223 Extruded meshes not UV-mapped correctly
Fix creating tri over quad not splitting quad
This commit is contained in:
JannisX11 2022-01-10 21:06:30 +01:00
parent 9b58f7ca34
commit dfd4c1e641
3 changed files with 33 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
js/outliner/mesh.js
View File

@ -1214,8 +1214,7 @@ BARS.defineActions(function() {
mesh.init()
if (Group.selected) Group.selected.unselect()
mesh.select()
UVEditor.selected_faces.replace(Object.keys(mesh.faces));
UVEditor.setAutoSize(null, true);
UVEditor.setAutoSize(null, true, Object.keys(mesh.faces));
UVEditor.selected_faces.empty();
Undo.finishEdit('Add primitive');
Blockbench.dispatchEvent( 'add_mesh', {object: mesh} )
@ -1288,6 +1287,7 @@ BARS.defineActions(function() {
vec3 = new THREE.Vector3(),
vec4 = new THREE.Vector3();
Undo.initEdit({elements: Mesh.selected});
let faces_to_autouv = [];
Mesh.selected.forEach(mesh => {
UVEditor.selected_faces.empty();
let selected_vertices = mesh.getSelectedVertices();
@ -1305,21 +1305,29 @@ BARS.defineActions(function() {
delete mesh.faces[key];
}
}
if (selected_vertices.length == 2 && reference_face.vertices.length == 4 && reference_face.vertices.filter(vkey => selected_vertices.includes(vkey)).length == 2) {
// Split face
if (
(selected_vertices.length == 2 || selected_vertices.length == 3) &&
reference_face.vertices.length == 4 &&
reference_face.vertices.filter(vkey => selected_vertices.includes(vkey)).length == selected_vertices.length
) {
let sorted_vertices = reference_face.getSortedVertices();
let unselected_vertices = sorted_vertices.filter(vkey => !selected_vertices.includes(vkey));
let side_index_diff = Math.abs(sorted_vertices.indexOf(selected_vertices[0]) - sorted_vertices.indexOf(selected_vertices[1]));
if (side_index_diff != 1) {
if (side_index_diff != 1 || selected_vertices.length == 3) {
let new_face = new MeshFace(mesh, reference_face);
new_face.vertices.remove(unselected_vertices[0]);
delete new_face.uv[unselected_vertices[0]];
reference_face.vertices.remove(unselected_vertices[1]);
delete reference_face.uv[unselected_vertices[1]];
let reference_corner_vertex = unselected_vertices[1]
|| sorted_vertices[sorted_vertices.indexOf(unselected_vertices[0]) + 2]
|| sorted_vertices[sorted_vertices.indexOf(unselected_vertices[0]) - 2];
reference_face.vertices.remove(reference_corner_vertex);
delete reference_face.uv[reference_corner_vertex];
let [face_key] = mesh.addFaces(new_face);
UVEditor.selected_faces.push(face_key);
@ -1337,6 +1345,7 @@ BARS.defineActions(function() {
} );
let [face_key] = mesh.addFaces(new_face);
UVEditor.selected_faces.push(face_key);
faces_to_autouv.push(face_key);
// Correct direction
if (selected_vertices.length > 2) {
@ -1426,7 +1435,7 @@ BARS.defineActions(function() {
}
}
})
UVEditor.setAutoSize(null, true);
UVEditor.setAutoSize(null, true, faces_to_autouv);
Undo.finishEdit('Create mesh face')
Canvas.updateView({elements: Mesh.selected, element_aspects: {geometry: true, uv: true, faces: true}, selection: true})
}
@ -1443,6 +1452,7 @@ BARS.defineActions(function() {
let mesh = new Mesh({
name: cube.name,
color: cube.color,
origin: cube.origin,
rotation: cube.rotation,
vertices: [
@ -1514,9 +1524,11 @@ BARS.defineActions(function() {
click() {
function runEdit(amended, extend = 1) {
Undo.initEdit({elements: Mesh.selected, selection: true}, amended);
Mesh.selected.forEach(mesh => {
let original_vertices = Project.selected_vertices[mesh.uuid].slice();
let new_vertices;
let new_face_keys = [];
let selected_faces = [];
let selected_face_keys = [];
let combined_direction;
@ -1628,7 +1640,8 @@ BARS.defineActions(function() {
original_vertices[new_vertices.indexOf(b)],
]
});
mesh.addFaces(new_face);
let [face_key] = mesh.addFaces(new_face);
new_face_keys.push(face_key);
remaining_vertices.remove(a);
remaining_vertices.remove(b);
})
@ -1661,8 +1674,9 @@ BARS.defineActions(function() {
let new_face = new MeshFace(mesh, face).extend({
vertices: [a, b, c, d]
});
let [face_key] = mesh.addFaces(new_face);
new_face_keys.push(face_key);
new_faces.push(new_face);
mesh.addFaces(new_face);
remaining_vertices.remove(a);
remaining_vertices.remove(b);
}
@ -1676,9 +1690,10 @@ BARS.defineActions(function() {
mesh.addFaces(new_face);
})
UVEditor.setAutoSize(null, true, new_face_keys);
})
Undo.finishEdit('Extrude mesh selection')
Canvas.updateView({elements: Mesh.selected, element_aspects: {geometry: true, uv: true, faces: true}, selection: true})
Undo.finishEdit('Extrude mesh selection');
Canvas.updateView({elements: Mesh.selected, element_aspects: {geometry: true, uv: true, faces: true}, selection: true});
}
runEdit();

2
js/outliner/outliner.js
View File

@ -1132,7 +1132,7 @@ Interface.definePanels(function() {
@contextmenu.prevent.stop="node.showContextMenu($event)"
@click="node.select($event, true)"
@touchstart="node.select($event)" :title="node.title"
@dblclick.stop.self="renameOutliner()"
@dblclick.stop.self="!node.locked && renameOutliner()"
>` +
//Opener

8
js/texturing/uv.js
View File

@ -671,7 +671,7 @@ const UVEditor = {
this.message('uv_editor.turned');
this.loadData();
},
setAutoSize(event, silent) {
setAutoSize(event, silent, face_keys) {
let vec1 = new THREE.Vector3(),
vec2 = new THREE.Vector3(),
vec3 = new THREE.Vector3(),
@ -680,8 +680,9 @@ const UVEditor = {
this.getMappableElements().forEach(obj => {
var top2, left2;
let faces = face_keys || this.getFaces(obj, event);
if (obj instanceof Cube) {
this.getFaces(obj, event).forEach(function(side) {
faces.forEach(function(side) {
let face = obj.faces[side];
let mirror_x = face.uv[0] > face.uv[2];
let mirror_y = face.uv[1] > face.uv[3];
@ -709,7 +710,7 @@ const UVEditor = {
obj.autouv = 0
} else if (obj instanceof Mesh) {
this.getFaces(obj, event).forEach(fkey => {
faces.forEach(fkey => {
let face = obj.faces[fkey];
let vertex_uvs = {};
let uv_center = [0, 0];
@ -1034,6 +1035,7 @@ const UVEditor = {
face.uv[vkey][1] = Math.clamp(b + center[1], 0, Project.texture_height);
})
})
Mesh.preview_controller.updateUV(mesh);
})
this.loadData();
this.message('uv_editor.rotated')