History

stop passing bare pointers to EntityTreeRenderer all around

Seth Alves committed 10 years ago

Commit f47aeae1 parent 4d55bc116 files · +43 −31Browse files

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

Unified · Split

interface/src/Application.cpp+2−2
@@ -1142,7 +1142,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo · 1141 unmodified lines
11421142 });
11431143
11441144 // 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, [=]() {
11461146 setKeyboardFocusEntity(UNKNOWN_ENTITY_ID);
11471147 });
11481148
@@ -3467,7 +3467,7 @@ void Application::init() { · 2318 unmodified lines
34673467
34683468 // connect the _entityCollisionSystem to our EntityTreeRenderer since that's what handles running entity scripts
34693469 connect(_entitySimulation.get(), &EntitySimulation::entityCollisionWithEntity,
3470− getEntities(), &EntityTreeRenderer::entityCollisionWithEntity);
3470+ getEntities().data(), &EntityTreeRenderer::entityCollisionWithEntity);
34713471
34723472 // connect the _entities (EntityTreeRenderer) to our script engine's EntityScriptingInterface for firing
34733473 // of events related clicking, hovering over, and entering entities