wire up collision signals

ZappoMan committed 12 years ago

Commit c7d544c1 parent bb0479b4 files · +15 −4Browse files

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

Unified · Split

interface/src/Application.cpp+7−0

@@ -1851,6 +1851,13 @@ void Application::init() { · 1850 unmodified lines
1851		1851
1852	_entityCollisionSystem.init(&_entityEditSender, _entities.getTree(), _voxels.getTree(), &_audio, &_avatarManager);	1852	_entityCollisionSystem.init(&_entityEditSender, _entities.getTree(), _voxels.getTree(), &_audio, &_avatarManager);
1853		1853
		1854	// connect the _entityCollisionSystem to our script engine's EntityScriptingInterface
		1855	connect(&_entityCollisionSystem, &EntityCollisionSystem::entityCollisionWithVoxel,
		1856	ScriptEngine::getEntityScriptingInterface(), &EntityScriptingInterface::entityCollisionWithVoxel);
		1857
		1858	connect(&_entityCollisionSystem, &EntityCollisionSystem::entityCollisionWithEntity,
		1859	ScriptEngine::getEntityScriptingInterface(), &EntityScriptingInterface::entityCollisionWithEntity);
		1860
1854	_entityClipboardRenderer.init();	1861	_entityClipboardRenderer.init();
1855	_entityClipboardRenderer.setViewFrustum(getViewFrustum());	1862	_entityClipboardRenderer.setViewFrustum(getViewFrustum());
1856	_entityClipboardRenderer.setTree(&_entityClipboard);	1863	_entityClipboardRenderer.setTree(&_entityClipboard);