Add Collision metatype to JS script system

Andrew Meadows committed 12 years ago

Commit d9025801 parent 5e2b8bb11 files · +81 −45Browse files

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

Unified · Split

interface/src/Application.cpp+4−4

@@ -1565,14 +1565,14 @@ void Application::init() { · 1564 unmodified lines
1565		1565
1566	// connect the _particleCollisionSystem to our script engine's ParticleScriptingInterface	1566	// connect the _particleCollisionSystem to our script engine's ParticleScriptingInterface
1567	connect(&_particleCollisionSystem,	1567	connect(&_particleCollisionSystem,
1568	SIGNAL(particleCollisionWithVoxel(const ParticleID&, const VoxelDetail&, const glm::vec3&)),	1568	SIGNAL(particleCollisionWithVoxel(const ParticleID&, const VoxelDetail&, const CollisionInfo&)),
1569	ScriptEngine::getParticlesScriptingInterface(),	1569	ScriptEngine::getParticlesScriptingInterface(),
1570	SIGNAL(particleCollisionWithVoxels(const ParticleID&, const VoxelDetail&, const glm::vec3&)));	1570	SIGNAL(particleCollisionWithVoxels(const ParticleID&, const VoxelDetail&, const CollisionInfo&)));
1571		1571
1572	connect(&_particleCollisionSystem,	1572	connect(&_particleCollisionSystem,
1573	SIGNAL(particleCollisionWithParticle(const ParticleID&, const ParticleID&, const glm::vec3&)),	1573	SIGNAL(particleCollisionWithParticle(const ParticleID&, const ParticleID&, const CollisionInfo&)),
1574	ScriptEngine::getParticlesScriptingInterface(),	1574	ScriptEngine::getParticlesScriptingInterface(),
1575	SIGNAL(particleCollisionWithParticle(const ParticleID&, const ParticleID&, const glm::vec3&)));	1575	SIGNAL(particleCollisionWithParticle(const ParticleID&, const ParticleID&, const CollisionInfo&)));
1576		1576
1577	_audio.init(_glWidget);	1577	_audio.init(_glWidget);
1578		1578