History

New android toolchain

Bradley Austin Davis committed 9 years ago

Commit b93e91b1 parent 765031b199 files · +9406 −2350Browse files

Showing the changes to libraries/entities/src/EntityScriptingInterface.cpp (1 of 199 files). Show all

Unified · Split

libraries/entities/src/EntityScriptingInterface.cpp+16−16
@@ -659,22 +659,22 @@ QVector<QUuid> EntityScriptingInterface::findEntitiesInFrustum(QVariantMap frust · 658 unmodified lines
659}659}
660 660
661QVector<QUuid> EntityScriptingInterface::findEntitiesByType(const QString entityType, const glm::vec3& center, float radius) const {661QVector<QUuid> EntityScriptingInterface::findEntitiesByType(const QString entityType, const glm::vec3& center, float radius) const {
662 EntityTypes::EntityType type = EntityTypes::getEntityTypeFromName(entityType);662 EntityTypes::EntityType type = EntityTypes::getEntityTypeFromName(entityType);
663 663
664 QVector<QUuid> result;664 QVector<QUuid> result;
665 if (_entityTree) {665 if (_entityTree) {
666 QVector<EntityItemPointer> entities;666 QVector<EntityItemPointer> entities;
667 _entityTree->withReadLock([&] {667 _entityTree->withReadLock([&] {
668 _entityTree->findEntities(center, radius, entities);668 _entityTree->findEntities(center, radius, entities);
669 });669 });
670 670
671 foreach(EntityItemPointer entity, entities) {671 foreach(EntityItemPointer entity, entities) {
672 if (entity->getType() == type) {672 if (entity->getType() == type) {
673 result << entity->getEntityItemID();673 result << entity->getEntityItemID();
674 }674 }
675 }675 }
676 }676 }
677 return result;677 return result;
678}678}
679 679
680RayToEntityIntersectionResult EntityScriptingInterface::findRayIntersection(const PickRay& ray, bool precisionPicking, 680RayToEntityIntersectionResult EntityScriptingInterface::findRayIntersection(const PickRay& ray, bool precisionPicking,

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t