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

Atlante45 committed 12 years ago

Commit eaca6992 parents e1a1ff3 db1a62225 files · +242 −113Browse files

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

Unified · Split

interface/src/Application.cpp+4−4

@@ -1572,14 +1572,14 @@ void Application::init() { · 1571 unmodified lines
1572		1572
1573	// connect the _particleCollisionSystem to our script engine's ParticleScriptingInterface	1573	// connect the _particleCollisionSystem to our script engine's ParticleScriptingInterface
1574	connect(&_particleCollisionSystem,	1574	connect(&_particleCollisionSystem,
1575	SIGNAL(particleCollisionWithVoxel(const ParticleID&, const VoxelDetail&, const glm::vec3&)),	1575	SIGNAL(particleCollisionWithVoxel(const ParticleID&, const VoxelDetail&, const CollisionInfo&)),
1576	ScriptEngine::getParticlesScriptingInterface(),	1576	ScriptEngine::getParticlesScriptingInterface(),
1577	SLOT(forwardParticleCollisionWithVoxel(const ParticleID&, const VoxelDetail&, const glm::vec3&)));	1577	SIGNAL(particleCollisionWithVoxels(const ParticleID&, const VoxelDetail&, const CollisionInfo&)));
1578		1578
1579	connect(&_particleCollisionSystem,	1579	connect(&_particleCollisionSystem,
1580	SIGNAL(particleCollisionWithParticle(const ParticleID&, const ParticleID&, const glm::vec3&)),	1580	SIGNAL(particleCollisionWithParticle(const ParticleID&, const ParticleID&, const CollisionInfo&)),
1581	ScriptEngine::getParticlesScriptingInterface(),	1581	ScriptEngine::getParticlesScriptingInterface(),
1582	SLOT(forwardParticleCollisionWithParticle(const ParticleID&, const ParticleID&, const glm::vec3&)));	1582	SIGNAL(particleCollisionWithParticle(const ParticleID&, const ParticleID&, const CollisionInfo&)));
1583		1583
1584	_audio.init(_glWidget);	1584	_audio.init(_glWidget);
1585		1585