Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 07:19:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Updating documentation for getChildrenIDs + fixing issue #1934

Browse source
This commit is contained in:
Wayne Chen 2018-05-15 09:34:07 -07:00
parent bd6905b3d2
commit f82e597ac7
4 changed files with 6 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/ui/overlays/Overlays.h
View file

@ -482,7 +482,7 @@ public slots:
/**jsdoc /**jsdoc
* Check if there is an overlay of a given ID. * Check if there is an overlay of a given ID.
* @function Overlays.isAddedOverly * @function Overlays.isAddedOverlay
* @param {Uuid} overlayID - The ID to check. * @param {Uuid} overlayID - The ID to check.
* @returns {boolean} <code>true</code> if an overlay with the given ID exists, <code>false</code> otherwise. * @returns {boolean} <code>true</code> if an overlay with the given ID exists, <code>false</code> otherwise.
*/ */

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

@ -1659,12 +1659,6 @@ QVector<QUuid> EntityScriptingInterface::getChildrenIDs(const QUuid& parentID) {
if (!_entityTree) { if (!_entityTree) {
return result; return result;
} }
//EntityItemPointer entity = _entityTree->findEntityByEntityItemID(parentID);
//if (!entity) {
// qCDebug(entities) << "EntityScriptingInterface::getChildrenIDs - no entity with ID" << parentID;
// return result;
//}
_entityTree->withReadLock([&] { _entityTree->withReadLock([&] {
QSharedPointer<SpatialParentFinder> parentFinder = DependencyManager::get<SpatialParentFinder>(); QSharedPointer<SpatialParentFinder> parentFinder = DependencyManager::get<SpatialParentFinder>();
if (!parentFinder) { if (!parentFinder) {
@ -1679,8 +1673,6 @@ QVector<QUuid> EntityScriptingInterface::getChildrenIDs(const QUuid& parentID) {
if (!parent) { if (!parent) {
return; return;
} }
//_entityTree->withReadLock([&] {
//entity->forEachChild([&](SpatiallyNestablePointer child) {
parent->forEachChild([&](SpatiallyNestablePointer child) { parent->forEachChild([&](SpatiallyNestablePointer child) {
result.push_back(child->getID()); result.push_back(child->getID());
}); });

8
libraries/entities/src/EntityScriptingInterface.h
View file

@ -1216,12 +1216,12 @@ public slots:
/**jsdoc /**jsdoc
* Get the IDs of entities, overlays, and avatars that are directly parented to an entity. To get all descendants of an * Get the IDs of entities, overlays, and avatars that are directly parented to an entity, overlay, or avatar model. To get all descendants of an
* entity, recurse on the IDs returned by the function. * entity; overlay; or avatar, recurse on the IDs returned by the function.
* @function Entities.getChildrenIDs * @function Entities.getChildrenIDs
* @param {Uuid} parentID - The ID of the entity to get the children IDs of. * @param {Uuid} parentID - The ID of the entity, overlay, or avatar to get the children IDs of.
* @returns {Uuid[]} An array of entity, overlay, and avatar IDs that are parented directly to the <code>parentID</code> * @returns {Uuid[]} An array of entity, overlay, and avatar IDs that are parented directly to the <code>parentID</code>
* entity. Does not include children's children, etc. The array is empty if no children can be found or * entity, overlay, or avatar. Does not include children's children, etc. The array is empty if no children can be found or
* <code>parentID</code> cannot be found. * <code>parentID</code> cannot be found.
* @example <caption>Report the children of an entity.</caption> * @example <caption>Report the children of an entity.</caption>
* function createEntity(description, position, parent) { * function createEntity(description, position, parent) {

3
scripts/defaultScripts.js
View file

@ -30,8 +30,7 @@ var DEFAULT_SCRIPTS_COMBINED = [
"system/dialTone.js", "system/dialTone.js",
"system/firstPersonHMD.js", "system/firstPersonHMD.js",
"system/tablet-ui/tabletUI.js", "system/tablet-ui/tabletUI.js",
"system/emote.js", "system/emote.js"
"system/createobject.js"
]; ];
var DEFAULT_SCRIPTS_SEPARATE = [ var DEFAULT_SCRIPTS_SEPARATE = [
"system/controllers/controllerScripts.js" "system/controllers/controllerScripts.js"