mirror/blockbench
2
0
Fork 0
mirror of https://github.com/JannisX11/blockbench.git synced 2025-01-18 15:26:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

Move mesh loop cuts in units instead of percentage

Browse Source
This commit is contained in:
JannisX11 2022-08-24 22:04:04 +02:00
parent 93d3ec195a
commit 74c8f170c3
2 changed files with 63 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
js/modeling/mesh_editing.js
View File

@ -964,8 +964,31 @@ BARS.defineActions(function() {
keybind: new Keybind({key: 'r', shift: true}),
condition: {modes: ['edit'], features: ['meshes'], method: () => (Mesh.selected[0] && Mesh.selected[0].getSelectedVertices().length > 1)},
click() {
function runEdit(amended, offset = 50, direction = 0) {
let selected_face;
Mesh.selected.forEach(mesh => {
if (!selected_face) {
selected_face = mesh.faces[mesh.getSelectedFaces()[0]];
}
})
function getLength(direction = 0) {
if (selected_face) {
let vertices = selected_face.getSortedVertices();
let pos1 = Mesh.selected[0].vertices[vertices[0 + direction]];
let pos2 = Mesh.selected[0].vertices[vertices[1 + direction]];
return Math.sqrt(Math.pow(pos2[0] - pos1[0], 2) + Math.pow(pos2[1] - pos1[1], 2) + Math.pow(pos2[2] - pos1[2], 2));
} else {
let vertices = Mesh.selected[0].getSelectedVertices();
let pos1 = Mesh.selected[0].vertices[vertices[0]];
let pos2 = Mesh.selected[0].vertices[vertices[1]];
return Math.sqrt(Math.pow(pos2[0] - pos1[0], 2) + Math.pow(pos2[1] - pos1[1], 2) + Math.pow(pos2[2] - pos1[2], 2));
}
}
let length = getLength();
function runEdit(amended, offset, direction = 0) {
Undo.initEdit({elements: Mesh.selected, selection: true}, amended);
if (offset == undefined) offset = length/2;
Mesh.selected.forEach(mesh => {
let selected_vertices = mesh.getSelectedVertices();
let start_face;
@ -987,7 +1010,7 @@ BARS.defineActions(function() {
let existing_key = center_vertices[vertices[0]] || center_vertices[vertices[1]];
if (existing_key) return existing_key;
let vector = mesh.vertices[vertices[0]].map((v, i) => Math.lerp(v, mesh.vertices[vertices[1]][i], offset/100))
let vector = mesh.vertices[vertices[0]].map((v, i) => Math.lerp(v, mesh.vertices[vertices[1]][i], offset/length))
let [vkey] = mesh.addVertices(vector);
center_vertices[vertices[0]] = center_vertices[vertices[1]] = vkey;
return vkey;
@ -1108,20 +1131,15 @@ BARS.defineActions(function() {
Canvas.updateView({elements: Mesh.selected, element_aspects: {geometry: true, uv: true, faces: true}, selection: true})
}
let selected_face;
Mesh.selected.forEach(mesh => {
if (!selected_face) {
selected_face = mesh.getSelectedFaces()[0];
}
})
runEdit();
Undo.amendEdit({
direction: {type: 'number', value: 0, label: 'edit.loop_cut.direction', condition: !!selected_face, min: 0},
//cuts: {type: 'number', value: 1, label: 'edit.loop_cut.cuts', min: 0, max: 16},
offset: {type: 'number', value: 50, label: 'edit.loop_cut.offset', min: 0, max: 100},
}, form => {
offset: {type: 'number', value: length/2, label: 'edit.loop_cut.offset', min: 0, max: length},
}, (form, form_options) => {
length = getLength(form.direction);
form_options.offset.slider.settings.max = length;
runEdit(true, form.offset, form.direction);
})
}

54
js/undo.js
View File

@ -72,15 +72,19 @@ class UndoSystem {
}
closeAmendEditMenu() {
if (this.amend_edit_menu) {
this.amend_edit_menu.remove();
this.amend_edit_menu.node.remove();
delete this.amend_edit_menu;
}
}
amendEdit(form, callback) {
let scope = this;
let input_elements = {};
let dialog = document.createElement('div');
dialog.id = 'amend_edit_menu';
this.amend_edit_menu = dialog;
this.amend_edit_menu = {
node: dialog,
form: {}
};
let close_button = document.createElement('div');
close_button.append(Blockbench.getIconNode('clear'));
@ -94,12 +98,15 @@ class UndoSystem {
function updateValue() {
let form_values = {};
for (let key in form) {
if (input_elements[key]) {
form_values[key] = input_elements[key].get();
let input = scope.amend_edit_menu.form[key];
if (input) {
if (input.type == 'number') {
form_values[key] = input.slider.get();
}
}
}
Undo.undo(null, true);
callback(form_values);
callback(form_values, scope.amend_edit_menu.form);
}
for (let key in form) {
@ -108,22 +115,29 @@ class UndoSystem {
let line = document.createElement('div');
line.className = 'amend_edit_line';
dialog.append(line);
this.amend_edit_menu.form[key] = {
type: form_line.type || 'number',
label: form_line.label
}
let slider = new NumSlider({
id: 'amend_edit_slider',
name: tl(form_line.label),
private: true,
onChange: updateValue,
settings: {
default: form_line.value || 0,
min: form_line.min,
max: form_line.max,
step: form_line.step||1,
},
});
line.append(slider.node);
input_elements[key] = slider;
slider.update();
if (this.amend_edit_menu.form[key].type == 'number') {
let slider = new NumSlider({
id: 'amend_edit_slider',
name: tl(form_line.label),
private: true,
onChange: updateValue,
settings: {
default: form_line.value || 0,
min: form_line.min,
max: form_line.max,
step: form_line.step||1,
},
});
line.append(slider.node);
input_elements[key] = slider;
this.amend_edit_menu.form[key].slider = slider
slider.update();
}
let label = document.createElement('label');
label.innerText = tl(form_line.label);