Showing the changes to libraries/entities/src/EntityScriptingInterface.cpp (1 of 9 files). Show all
Unified · Split
| @@ -279,16 +279,16 @@ QVector<QUuid> EntityScriptingInterface::findEntitiesInBox(const glm::vec3& corn · 278 unmodified lines | |||
| 279 | return result; | 279 | return result; |
| 280 | } | 280 | } |
| 281 | 281 | ||
| 282 | RayToEntityIntersectionResult EntityScriptingInterface::findRayIntersection(const PickRay& ray, bool precisionPicking) { | 282 | RayToEntityIntersectionResult EntityScriptingInterface::findRayIntersection(const PickRay& ray, const QVector<QUuid>& entityIdsToIgnore, bool precisionPicking) { |
| 283 | return findRayIntersectionWorker(ray, Octree::TryLock, precisionPicking); | 283 | return findRayIntersectionWorker(ray, Octree::TryLock, entityIdsToIgnore, precisionPicking); |
| 284 | } | 284 | } |
| 285 | 285 | ||
| 286 | RayToEntityIntersectionResult EntityScriptingInterface::findRayIntersectionBlocking(const PickRay& ray, bool precisionPicking) { | 286 | RayToEntityIntersectionResult EntityScriptingInterface::findRayIntersectionBlocking(const PickRay& ray, const QVector<QUuid>& entityIdsToIgnore, bool precisionPicking) { |
| 287 | return findRayIntersectionWorker(ray, Octree::Lock, precisionPicking); | 287 | return findRayIntersectionWorker(ray, Octree::Lock, entityIdsToIgnore, precisionPicking); |
| 288 | } | 288 | } |
| 289 | 289 | ||
| 290 | RayToEntityIntersectionResult EntityScriptingInterface::findRayIntersectionWorker(const PickRay& ray, | 290 | RayToEntityIntersectionResult EntityScriptingInterface::findRayIntersectionWorker(const PickRay& ray, |
| 291 | Octree::lockType lockType, | 291 | Octree::lockType lockType, const QVector<QUuid>& entityIdsToIgnore, |
| 292 | bool precisionPicking) { | 292 | bool precisionPicking) { |
| 293 | 293 | ||
| 294 | 294 | ||