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
4679	auto entityScriptingInterface = DependencyManager::get<EntityScriptingInterface>();	4679	auto entityScriptingInterface = DependencyManager::get<EntityScriptingInterface>();
4680		4680
4681	// connect the _entityCollisionSystem to our EntityTreeRenderer since that's what handles running entity scripts	4681	// 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,
4683	getEntities().data(), &EntityTreeRenderer::entityCollisionWithEntity);	4683	getEntities().data(), &EntityTreeRenderer::entityCollisionWithEntity);
4684		4684
4685	// connect the _entities (EntityTreeRenderer) to our script engine's EntityScriptingInterface for firing	4685	// connect the _entities (EntityTreeRenderer) to our script engine's EntityScriptingInterface for firing