Showing the changes to interface/src/Application.cpp (1 of 16 files). Show all
Unified · Split
| @@ -1142,7 +1142,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo · 1141 unmodified lines | |||
| 1142 | }); | 1142 | }); |
| 1143 | 1143 | ||
| 1144 | // If the user clicks somewhere where there is NO entity at all, we will release focus | 1144 | // If the user clicks somewhere where there is NO entity at all, we will release focus |
| 1145 | connect(getEntities(), &EntityTreeRenderer::mousePressOffEntity, [=]() { | 1145 | connect(getEntities().data(), &EntityTreeRenderer::mousePressOffEntity, [=]() { |
| 1146 | setKeyboardFocusEntity(UNKNOWN_ENTITY_ID); | 1146 | setKeyboardFocusEntity(UNKNOWN_ENTITY_ID); |
| 1147 | }); | 1147 | }); |
| 1148 | 1148 | ||
| @@ -3467,7 +3467,7 @@ void Application::init() { · 2318 unmodified lines | |||
| 3467 | 3467 | ||
| 3468 | // connect the _entityCollisionSystem to our EntityTreeRenderer since that's what handles running entity scripts | 3468 | // connect the _entityCollisionSystem to our EntityTreeRenderer since that's what handles running entity scripts |
| 3469 | connect(_entitySimulation.get(), &EntitySimulation::entityCollisionWithEntity, | 3469 | connect(_entitySimulation.get(), &EntitySimulation::entityCollisionWithEntity, |
| 3470 | getEntities(), &EntityTreeRenderer::entityCollisionWithEntity); | 3470 | getEntities().data(), &EntityTreeRenderer::entityCollisionWithEntity); |
| 3471 | 3471 | ||
| 3472 | // connect the _entities (EntityTreeRenderer) to our script engine's EntityScriptingInterface for firing | 3472 | // connect the _entities (EntityTreeRenderer) to our script engine's EntityScriptingInterface for firing |
| 3473 | // of events related clicking, hovering over, and entering entities | 3473 | // of events related clicking, hovering over, and entering entities |