History

move entityCollisionWithEntity to PhysicalEntitySimulation

Andrew Meadows committed 8 years ago

Commit 6837d041 parent 542d1ad3 files · +5 −8Browse files

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

Unified · Split

interface/src/Application.cpp+1−1
@@ -4679,7 +4679,7 @@ void Application::init() { · 4678 unmodified lines
46794679 auto entityScriptingInterface = DependencyManager::get<EntityScriptingInterface>();
46804680
46814681 // connect the _entityCollisionSystem to our EntityTreeRenderer since that's what handles running entity scripts
4682− connect(_entitySimulation.get(), &EntitySimulation::entityCollisionWithEntity,
4682+ connect(_entitySimulation.get(), &PhysicalEntitySimulation::entityCollisionWithEntity,
46834683 getEntities().data(), &EntityTreeRenderer::entityCollisionWithEntity);
46844684
46854685 // connect the _entities (EntityTreeRenderer) to our script engine's EntityScriptingInterface for firing

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