Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 23:36:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

added descendant checking

Browse source
This commit is contained in:
Dante Ruiz 2016-11-22 19:40:17 +00:00
parent c52f893273
commit 0c9cd5803a
2 changed files with 13 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libraries/entities/src/EntityScriptingInterface.cpp
View file

@ -1334,8 +1334,7 @@ bool EntityScriptingInterface::isChildOfParent(QUuid childID, QUuid parentID) {
} }
}); });
}); });
qDebug() << "Is Child of parent? : " << isChild;
return isChild; return isChild;
} }

28
scripts/system/edit.js
View file

@ -1029,28 +1029,24 @@ function selectAllEtitiesInCurrentSelectionBox(keepIfTouching) {
function sortDeleteSelected (selected) { function sortDeleteSelected (selected) {
var tempArray = selected; var array = selected.slice();
var begin = 0; var begin = 0;
while (begin < tempArray.length) { while (begin < array.length) {
var elementRemoved = false; var elementRemoved = false;
var next = begin + 1; var next = begin + 1;
while (next < tempArray.length) { while (next < array.length) {
var beginID = tempArray[begin]; var beginID = array[begin];
var nextID = tempArray[next]; var nextID = array[next];
var beginProperties = Entities.getEntityProperties(beginID);
var nextProperties = Entities.getEntityProperties(nextID);
var nextParentID = nextProperties.parentID;
var beginParentID = beginProperties.parentID;
if (beginID == nextParentID) { if (Entities.isChildOfParent(beginID, nextID)) {
var temp = beginID; var temp = beginID;
tempArray[begin] = nextID array[begin] = nextID
tempArray[next] = beginID array[next] = beginID
tempArray.splice(begin, 1); array.splice(next, 1);
elementRemoved = true; elementRemoved = true;
break; break;
} else if (nextID == beginParentID) { } else if (Entities.isChildOfParent(nextID, beginID)) {
tempArray.splice(begin, 1); array.splice(next, 1);
elementRemoved = true; elementRemoved = true;
break; break;
} }
@ -1060,7 +1056,7 @@ function sortDeleteSelected (selected) {
begin++; begin++;
} }
} }
return tempArray; return array;
} }
function recursiveDelete(entities, list) { function recursiveDelete(entities, list) {