mirror/blockbench
2
0
Fork 0
mirror of https://github.com/JannisX11/blockbench.git synced 2025-04-06 17:31:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revamp how undo tracks selections in regular edits

Browse Source
This commit is contained in:
JannisX11 2025-01-19 17:50:40 +01:00
parent a11651b3ab
commit 09bbf45c5f
3 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
js/outliner/group.js
View File

@ -399,6 +399,7 @@ class Group extends OutlinerNode {
obj.locked = this.locked;
obj.visibility = this.visibility;
obj.autouv = this.autouv;
obj.selected = Group.multi_selected.includes(this);
}
if (this.rotation.allEqual(0)) {

6
js/outliner/outliner.js
View File

@ -800,7 +800,8 @@ function parseGroups(array, import_reference, startIndex) {
OutlinerNode.uuids[array[i].uuid].removeFromParent();
delete OutlinerNode.uuids[array[i].uuid];
}
var obj = new Group(array[i], array[i].uuid)
// todo: Update old groups instead of rebuilding all
let obj = new Group(array[i], array[i].uuid)
obj.parent = addGroup
obj.isOpen = !!array[i].isOpen
if (array[i].uuid) {
@ -814,6 +815,9 @@ function parseGroups(array, import_reference, startIndex) {
if (array[i].content && array[i].content.length > 0) {
iterate(array[i].content, obj.children, obj)
}
if (array[i].selected) {
obj.multiSelect();
}
}
i++;
}

29
js/undo.js
View File

@ -15,12 +15,16 @@ class UndoSystem {
}
}
initEdit(aspects, amended = false) {
// todo: selecting all groups, moving, then undoing, unselects all multi-selected groups
if (aspects && aspects.cubes) {
console.warn('Aspect "cubes" is deprecated. Please use "elements" instead.');
aspects.elements = aspects.cubes;
}
this.startChange(amended);
this.current_save = new UndoSystem.save(aspects)
this.current_save = new UndoSystem.save(aspects);
if (aspects.selection) {
this.current_selection_save = new UndoSystem.selectionSave(typeof aspects.selection == 'object' ? typeof aspects.selection : 0);
}
Blockbench.dispatchEvent('init_edit', {aspects, amended, save: this.current_save})
return this.current_save;
}
@ -40,7 +44,18 @@ class UndoSystem {
type: 'edit',
time: Date.now()
}
this.current_save = entry.post
if (aspects.selection && this.current_selection_save) {
let selection_aspects = typeof aspects.selection == 'object' ? aspects.selection : this.current_selection_save.aspects;
let selection_before = this.current_selection_save;
let selection_post = new UndoSystem.selectionSave(selection_aspects);
if (!selection_before.matches(selection_post)) {
entry.selection_before = selection_before;
entry.selection_post = selection_post;
}
}
if (this.history.length > this.index) {
this.history.length = this.index;
}
@ -89,7 +104,6 @@ class UndoSystem {
type: 'selection',
time: Date.now()
}
this.current_selection_save = entry.selection_post
if (this.history.length > this.index) {
this.history.length = this.index;
}
@ -239,7 +253,7 @@ UndoSystem.save = class {
this.mode = Modes.selected.id;
if (aspects.selection) {
/*if (aspects.selection) {
this.selection = [];
this.mesh_selection = {};
selected.forEach(obj => {
@ -251,8 +265,7 @@ UndoSystem.save = class {
if (Group.multi_selected.length) {
this.selected_groups = Group.multi_selected.map(g => g.uuid);
}
}
}*/
if (aspects.elements) {
this.elements = {}
@ -440,7 +453,7 @@ UndoSystem.save = class {
}
}
if (this.selection && !is_session) {
/*if (this.selection && !is_session) {
selected.length = 0;
Outliner.elements.forEach((obj) => {
if (this.selection.includes(obj.uuid)) {
@ -450,7 +463,7 @@ UndoSystem.save = class {
}
}
})
}
}*/
if (this.groups) {
for (let saved_group of this.groups) {