Use spatial interval as default for extrude/solidify; fix inset UV computation

Author: nklbdev

js/modeling/mesh_editing.js

@@ -9,6 +9,7 @@ import './mesh/merge_split'
 import './mesh/import_obj'
 import { autoFixMeshEdit } from './mesh/auto_fix'
 import { sameMeshEdge } from './mesh/util';
+import { getSpatialInterval } from './transform';
 
 export function uncorruptMesh() {
 	for (let mesh of Mesh.selected) {
@@ -520,7 +521,6 @@ BARS.defineActions(function() {
 					}
 				}
 			})
-			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})
 		}
@@ -699,7 +699,7 @@ BARS.defineActions(function() {
 		keybind: new Keybind({key: 'e', shift: true}),
 		condition: {modes: ['edit'], features: ['meshes'], selected: {mesh: true}, method: () => (Mesh.selected[0] && Mesh.selected[0].getSelectedVertices().length)},
 		click() {
-			function runEdit(amended, extend = 1, direction_mode, even_extend) {
+			function runEdit(amended, extend = getSpatialInterval(), direction_mode, even_extend) {
 				Undo.initEdit({elements: Mesh.selected, selection: true}, amended);
 
 				Mesh.selected.forEach(mesh => {
@@ -931,16 +931,14 @@ BARS.defineActions(function() {
 							edge[i] = new_vertices[original_vertices.indexOf(vkey)];
 						});
 					})
-
-					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});
 			}
 			runEdit();
 
 			Undo.amendEdit({
-				extend: {type: 'num_slider', value: 1, label: 'edit.extrude_mesh_selection.extend', interval_type: 'position'},
+				extend: {type: 'num_slider', value: getSpatialInterval(), label: 'edit.extrude_mesh_selection.extend', interval_type: 'position'},
 				direction_mode: {type: 'select', label: 'edit.extrude_mesh_selection.direction', options: {
 					outwards: 'edit.extrude_mesh_selection.direction.outwards',
 					average: 'edit.extrude_mesh_selection.direction.average',
@@ -962,7 +960,7 @@ BARS.defineActions(function() {
 		category: 'edit',
 		condition: {modes: ['edit'], features: ['meshes'], method: () => (Mesh.selected[0] && Mesh.selected[0].getSelectedFaces().length)},
 		click() {
-			function runEdit(amended, extend = 1) {
+			function runEdit(amended, extend = getSpatialInterval()) {
 				Undo.initEdit({elements: Mesh.selected, selection: true}, amended);
 
 				Mesh.selected.forEach(mesh => {
@@ -1111,16 +1109,14 @@ BARS.defineActions(function() {
 
 						if (vertices.length == 2) delete mesh.faces[selected_face_keys[face_index]];
 					})
-
-					UVEditor.setAutoSize(null, true, new_face_keys);
 				})
 				Undo.finishEdit('Solidify mesh selection');
 				Canvas.updateView({elements: Mesh.selected, element_aspects: {geometry: true, uv: true, faces: true}, selection: true});
 			}
 			runEdit();
 
 			Undo.amendEdit({
-				thickness: {type: 'num_slider', value: 1, label: 'edit.solidify_mesh_selection.thickness', interval_type: 'position'},
+				thickness: {type: 'num_slider', value: getSpatialInterval(), label: 'edit.solidify_mesh_selection.thickness', interval_type: 'position'},
 			}, form => {
 				runEdit(true, form.thickness);
 			})
@@ -1132,6 +1128,7 @@ BARS.defineActions(function() {
 		keybind: new Keybind({key: 'i', shift: true}),
 		condition: {modes: ['edit'], features: ['meshes'], method: () => (Mesh.selected[0] && Mesh.selected[0].getSelectedVertices().length >= 3)},
 		click() {
+			const vec1 = new THREE.Vector3();
 			function runEdit(amended, offset = 50) {
 				Undo.initEdit({elements: Mesh.selected, selection: true}, amended);
 				Mesh.selected.forEach(mesh => {
@@ -1181,12 +1178,20 @@ BARS.defineActions(function() {
 
 					// Move Faces
 					selected_faces.forEach(face => {
-						face.vertices.forEach((key, index) => {
-							face.vertices[index] = new_vertices[original_vertices.indexOf(key)];
-							let uv = face.uv[key];
-							delete face.uv[key];
-							face.uv[face.vertices[index]] = uv;
-						})
+						// Calculate new UVs for new vertex positions before modifying face contents.
+						const new_uvs = {}
+						for (const vertex_key of face.vertices) {
+							const new_vertex_key = new_vertices[original_vertices.indexOf(vertex_key)];
+							const new_vertex_position = mesh.vertices[new_vertex_key];
+							new_uvs[new_vertex_key] = face.localToUV(vec1.fromArray(new_vertex_position));
+						}
+						// Modify face after calculating UVs
+						face.vertices.forEach((vertex_key, index) => {
+							const new_vertex_key = new_vertices[original_vertices.indexOf(vertex_key)];
+							face.vertices[index] = new_vertex_key;
+							delete face.uv[vertex_key];
+							face.uv[new_vertex_key] = new_uvs[new_vertex_key];
+						});
 					})
 
 					// Create extra quads on sides
@@ -1235,8 +1240,6 @@ BARS.defineActions(function() {
 						}
 						delete mesh.vertices[b];
 					})
-					UVEditor.setAutoSize(null, true, modified_face_keys);
-
 				})
 				Undo.finishEdit('Extrude mesh selection')
 				Canvas.updateView({elements: Mesh.selected, element_aspects: {geometry: true, uv: true, faces: true}, selection: true})

js/modeling/spline_editing.js

@@ -333,7 +333,7 @@ BARS.defineActions(function() {
 			return (spline && selectedHandles.length && (isFirstSelected || isLastSelected));
 		}},
 		click() {
-			function runEdit(amended, extend = 1) {
+			function runEdit(amended, extend = getSpatialInterval()) {
 				Undo.initEdit({elements: SplineMesh.selected, selection: true}, amended);
 
 				function extrudeAlongSpline(spline, cKey, hKey, isEnd = false) {