History

updates based on austin's comments

SamGondelman committed 9 years ago

Commit 640ad511 parent 05f48835 files · +26 −27Browse files

Showing the changes to interface/src/Application.cpp (1 of 5 files). Show all

Unified · Split

interface/src/Application.cpp+2−2
@@ -1819,12 +1819,12 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo · 1818 unmodified lines
18191819
18201820 // Setup the mouse ray pick and related operators
18211821 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()),
18231823 0.0f, true));
18241824 DependencyManager::get<EntityTreeRenderer>()->setMouseRayPickResultOperator([&](QUuid rayPickID) {
18251825 RayToEntityIntersectionResult entityResult;
18261826 RayPickResult result = _rayPickManager.getPrevPickResult(rayPickID);
1827− entityResult.intersects = result.type != DependencyManager::get<RayPickScriptingInterface>()->INTERSECTED_NONE();
1827+ entityResult.intersects = result.type != RayPickScriptingInterface::INTERSECTED_NONE();
18281828 if (entityResult.intersects) {
18291829 entityResult.intersection = result.intersection;
18301830 entityResult.distance = result.distance;