History

added penetration support to particle collisions JS callbacks

ZappoMan committed 12 years ago

Commit d89cb2b1 parent b32903013 files · +69 −40Browse files

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

Unified · Split

interface/src/Application.cpp+4−4
@@ -1560,14 +1560,14 @@ void Application::init() { · 1559 unmodified lines
15601560
15611561 // connect the _particleCollisionSystem to our script engine's ParticleScriptingInterface
15621562 connect(&_particleCollisionSystem,
1563− SIGNAL(particleCollisionWithVoxel(const ParticleID&, const VoxelDetail&)),
1563+ SIGNAL(particleCollisionWithVoxel(const ParticleID&, const VoxelDetail&, const glm::vec3&)),
15641564 ScriptEngine::getParticlesScriptingInterface(),
1565− SLOT(forwardParticleCollisionWithVoxel(const ParticleID&, const VoxelDetail&)));
1565+ SLOT(forwardParticleCollisionWithVoxel(const ParticleID&, const VoxelDetail&, const glm::vec3&)));
15661566
15671567 connect(&_particleCollisionSystem,
1568− SIGNAL(particleCollisionWithParticle(const ParticleID&, const ParticleID&)),
1568+ SIGNAL(particleCollisionWithParticle(const ParticleID&, const ParticleID&, const glm::vec3&)),
15691569 ScriptEngine::getParticlesScriptingInterface(),
1570− SLOT(forwardParticleCollisionWithParticle(const ParticleID&, const ParticleID&)));
1570+ SLOT(forwardParticleCollisionWithParticle(const ParticleID&, const ParticleID&, const glm::vec3&)));
15711571
15721572 _pieMenu.init("./resources/images/hifi-interface-tools-v2-pie.svg",
15731573 _glWidget->width(),

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