Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-17 04:40:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add undo/redo for deleting entities

Browse source
This commit is contained in:
David Rowe 2017-09-12 21:39:30 +12:00
parent 3bb3e57f71
commit 93a5cae7d2
2 changed files with 26 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
scripts/vr-edit/modules/history.js
View file

@ -108,6 +108,7 @@ History = (function () {
function undo() {
var undoData,
entityID,
i,
length;
@ -116,6 +117,13 @@ History = (function () {
// TODO
if (undoData.createEntities) {
for (i = 0, length = undoData.createEntities.length; i < length; i += 1) {
entityID = Entities.addEntity(undoData.createEntities[i].properties);
updateEntityIDs(undoData.createEntities[i].entityID, entityID);
}
}
if (undoData.deleteEntities) {
for (i = 0, length = undoData.deleteEntities.length; i < length; i += 1) {
Entities.deleteEntity(undoData.deleteEntities[i].entityID);
@ -145,6 +153,12 @@ History = (function () {
}
}
if (redoData.deleteEntities) {
for (i = 0, length = redoData.deleteEntities.length; i < length; i += 1) {
Entities.deleteEntity(redoData.deleteEntities[i].entityID);
}
}
undoPosition += 1;
}
}

21
scripts/vr-edit/modules/selection.js
View file

@ -15,7 +15,8 @@ Selection = function (side) {
"use strict";
var selection = [],
var selection = [], // Subset of properties to provide externally.
selectionProperties = [], // Full set of properties for history.
intersectedEntityID = null,
intersectedEntityIndex,
rootEntityID = null,
@ -37,18 +38,17 @@ Selection = function (side) {
return new Selection(side);
}
function traverseEntityTree(id, result) {
function traverseEntityTree(id, selection, selectionProperties) {
// Recursively traverses tree of entities and their children, gather IDs and properties.
// The root entity is always the first entry.
var children,
properties,
SELECTION_PROPERTIES = ["type", "position", "registrationPoint", "rotation", "dimensions", "parentID",
"localPosition", "dynamic", "collisionless", "userData"],
i,
length;
properties = Entities.getEntityProperties(id, SELECTION_PROPERTIES);
result.push({
properties = Entities.getEntityProperties(id);
delete properties.entityID;
selection.push({
id: id,
type: properties.type,
position: properties.position,
@ -61,15 +61,16 @@ Selection = function (side) {
collisionless: properties.collisionless,
userData: properties.userData
});
selectionProperties.push({ entityID: id, properties: properties });
if (id === intersectedEntityID) {
intersectedEntityIndex = result.length - 1;
intersectedEntityIndex = selection.length - 1;
}
children = Entities.getChildrenIDs(id);
for (i = 0, length = children.length; i < length; i += 1) {
if (Entities.getNestableType(children[i]) === ENTITY_TYPE) {
traverseEntityTree(children[i], result);
traverseEntityTree(children[i], selection, selectionProperties);
}
}
}
@ -90,7 +91,8 @@ Selection = function (side) {
// Find all children.
selection = [];
traverseEntityTree(rootEntityID, selection);
selectionProperties = [];
traverseEntityTree(rootEntityID, selection, selectionProperties);
}
function getIntersectedEntityID() {
@ -517,6 +519,7 @@ Selection = function (side) {
function deleteEntities() {
if (rootEntityID) {
History.push({ createEntities: selectionProperties }, { deleteEntities: [{ entityID: rootEntityID }] });
Entities.deleteEntity(rootEntityID); // Children are automatically deleted.
clear();
}