Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-14 07:47:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #11762 from ctrlaltdavid/21594

Browse source 
Speed up entity list update after deleting entities
This commit is contained in:
Seth Alves 2017-11-07 09:34:47 -08:00 committed by GitHub
commit e22926eb89
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
scripts/system/edit.js
View file

@ -1333,7 +1333,7 @@ function sortSelectedEntities(selected) {
return sortedEntities; return sortedEntities;
} }
function recursiveDelete(entities, childrenList) { function recursiveDelete(entities, childrenList, deletedIDs) {
var entitiesLength = entities.length; var entitiesLength = entities.length;
for (var i = 0; i < entitiesLength; i++) { for (var i = 0; i < entitiesLength; i++) {
var entityID = entities[i]; var entityID = entities[i];
@ -1346,6 +1346,7 @@ function recursiveDelete(entities, childrenList) {
properties: initialProperties, properties: initialProperties,
children: grandchildrenList children: grandchildrenList
}); });
deletedIDs.push(entityID);
Entities.deleteEntity(entityID); Entities.deleteEntity(entityID);
} }
} }
@ -1413,6 +1414,8 @@ function parentSelectedEntities() {
} }
function deleteSelectedEntities() { function deleteSelectedEntities() {
if (SelectionManager.hasSelection()) { if (SelectionManager.hasSelection()) {
var deletedIDs = [];
selectedParticleEntityID = null; selectedParticleEntityID = null;
particleExplorerTool.destroyWebView(); particleExplorerTool.destroyWebView();
SelectionManager.saveProperties(); SelectionManager.saveProperties();
@ -1423,16 +1426,22 @@ function deleteSelectedEntities() {
var initialProperties = SelectionManager.savedProperties[entityID]; var initialProperties = SelectionManager.savedProperties[entityID];
var children = Entities.getChildrenIDs(entityID); var children = Entities.getChildrenIDs(entityID);
var childList = []; var childList = [];
recursiveDelete(children, childList); recursiveDelete(children, childList, deletedIDs);
savedProperties.push({ savedProperties.push({
entityID: entityID, entityID: entityID,
properties: initialProperties, properties: initialProperties,
children: childList children: childList
}); });
deletedIDs.push(entityID);
Entities.deleteEntity(entityID); Entities.deleteEntity(entityID);
} }
SelectionManager.clearSelections(); SelectionManager.clearSelections();
pushCommandForSelections([], savedProperties); pushCommandForSelections([], savedProperties);
entityListTool.webView.emitScriptEvent(JSON.stringify({
type: "deleted",
ids: deletedIDs
}));
} }
} }

7
scripts/system/html/js/entityList.js
View file

@ -286,7 +286,6 @@ function loaded() {
} }
elDelete.onclick = function() { elDelete.onclick = function() {
EventBridge.emitWebEvent(JSON.stringify({ type: 'delete' })); EventBridge.emitWebEvent(JSON.stringify({ type: 'delete' }));
refreshEntities();
} }
document.addEventListener("keydown", function (keyDownEvent) { document.addEventListener("keydown", function (keyDownEvent) {
@ -362,6 +361,12 @@ function loaded() {
updateSelectedEntities(data.selectedIDs); updateSelectedEntities(data.selectedIDs);
resize(); resize();
} }
} else if (data.type === "deleted") {
for (i = 0, length = data.ids.length; i < length; i++) {
delete entities[data.ids[i]];
entityList.remove("id", data.ids[i]);
}
refreshFooter();
} }
}); });
setTimeout(refreshEntities, 1000); setTimeout(refreshEntities, 1000);