Showing the changes to interface/src/Application.cpp (1 of 9 files). Show all
Unified · Split
| @@ -2019,6 +2019,13 @@ void Application::init() { · 2018 unmodified lines | |||
| 2019 | connect(&_entityCollisionSystem, &EntityCollisionSystem::entityCollisionWithEntity, | 2019 | connect(&_entityCollisionSystem, &EntityCollisionSystem::entityCollisionWithEntity, |
| 2020 | ScriptEngine::getEntityScriptingInterface(), &EntityScriptingInterface::entityCollisionWithEntity); | 2020 | ScriptEngine::getEntityScriptingInterface(), &EntityScriptingInterface::entityCollisionWithEntity); |
| 2021 | 2021 | ||
| 2022 | // connect the _entityCollisionSystem to our EntityTreeRenderer since that's what handles running entity scripts | ||
| 2023 | connect(&_entityCollisionSystem, &EntityCollisionSystem::entityCollisionWithVoxel, | ||
| 2024 | &_entities, &EntityTreeRenderer::entityCollisionWithVoxel); | ||
| 2025 | |||
| 2026 | connect(&_entityCollisionSystem, &EntityCollisionSystem::entityCollisionWithEntity, | ||
| 2027 | &_entities, &EntityTreeRenderer::entityCollisionWithEntity); | ||
| 2028 | |||
| 2022 | // connect the _entities (EntityTreeRenderer) to our script engine's EntityScriptingInterface for firing | 2029 | // connect the _entities (EntityTreeRenderer) to our script engine's EntityScriptingInterface for firing |
| 2023 | // of events related clicking, hovering over, and entering entities | 2030 | // of events related clicking, hovering over, and entering entities |
| 2024 | _entities.connectSignalsToSlots(ScriptEngine::getEntityScriptingInterface()); | 2031 | _entities.connectSignalsToSlots(ScriptEngine::getEntityScriptingInterface()); |