Showing the changes to interface/src/Application.cpp (1 of 5 files). Show all
Unified · Split
| @@ -1819,12 +1819,12 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo · 1818 unmodified lines | |||
| 1819 | 1819 | ||
| 1820 | // Setup the mouse ray pick and related operators | 1820 | // Setup the mouse ray pick and related operators |
| 1821 | DependencyManager::get<EntityTreeRenderer>()->setMouseRayPickID(_rayPickManager.createRayPick( | 1821 | DependencyManager::get<EntityTreeRenderer>()->setMouseRayPickID(_rayPickManager.createRayPick( |
| 1822 | PickFilter(DependencyManager::get<RayPickScriptingInterface>()->PICK_ENTITIES() | DependencyManager::get<RayPickScriptingInterface>()->PICK_INCLUDE_NONCOLLIDABLE()), | 1822 | PickFilter(RayPickScriptingInterface::PICK_ENTITIES() | RayPickScriptingInterface::PICK_INCLUDE_NONCOLLIDABLE()), |
| 1823 | 0.0f, true)); | 1823 | 0.0f, true)); |
| 1824 | DependencyManager::get<EntityTreeRenderer>()->setMouseRayPickResultOperator([&](QUuid rayPickID) { | 1824 | DependencyManager::get<EntityTreeRenderer>()->setMouseRayPickResultOperator([&](QUuid rayPickID) { |
| 1825 | RayToEntityIntersectionResult entityResult; | 1825 | RayToEntityIntersectionResult entityResult; |
| 1826 | RayPickResult result = _rayPickManager.getPrevPickResult(rayPickID); | 1826 | RayPickResult result = _rayPickManager.getPrevPickResult(rayPickID); |
| 1827 | entityResult.intersects = result.type != DependencyManager::get<RayPickScriptingInterface>()->INTERSECTED_NONE(); | 1827 | entityResult.intersects = result.type != RayPickScriptingInterface::INTERSECTED_NONE(); |
| 1828 | if (entityResult.intersects) { | 1828 | if (entityResult.intersects) { |
| 1829 | entityResult.intersection = result.intersection; | 1829 | entityResult.intersection = result.intersection; |
| 1830 | entityResult.distance = result.distance; | 1830 | entityResult.distance = result.distance; |