History

Merge branch 'master' of https://github.com/highfidelity/hifi into mouse_pick_in_oculus

Atlante45 committed 11 years ago

Commit ba810302 parents fa73730 db751ca12 files · +88 −29Browse files

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

Unified · Split

interface/src/Application.cpp+7−0
@@ -2019,6 +2019,13 @@ void Application::init() { · 2018 unmodified lines
20192019 connect(&_entityCollisionSystem, &EntityCollisionSystem::entityCollisionWithEntity,
20202020 ScriptEngine::getEntityScriptingInterface(), &EntityScriptingInterface::entityCollisionWithEntity);
20212021
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+
20222029 // connect the _entities (EntityTreeRenderer) to our script engine's EntityScriptingInterface for firing
20232030 // of events related clicking, hovering over, and entering entities
20242031 _entities.connectSignalsToSlots(ScriptEngine::getEntityScriptingInterface());

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t