History

support for global collision callbacks in JS

ZappoMan committed 12 years ago

Commit 08b06cc1 parent 616cfac21 files · +447 −240Browse files

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

Unified · Split

interface/src/Application.cpp+11−0
@@ -1879,6 +1879,17 @@ void Application::init() { · 1878 unmodified lines
1879 1879
1880 _particleCollisionSystem.init(&_particleEditSender, _particles.getTree(), _voxels.getTree(), &_audio, &_avatarManager);1880 _particleCollisionSystem.init(&_particleEditSender, _particles.getTree(), _voxels.getTree(), &_audio, &_avatarManager);
1881 1881
1882 // connect the _particleCollisionSystem to our script engine's ParticleScriptingInterface
1883 connect(&_particleCollisionSystem,
1884 SIGNAL(particleCollisionWithVoxel(const ParticleID&, const VoxelDetail&)),
1885 ScriptEngine::getParticlesScriptingInterface(),
1886 SLOT(forwardParticleCollisionWithVoxel(const ParticleID&, const VoxelDetail&)));
1887
1888 connect(&_particleCollisionSystem,
1889 SIGNAL(particleCollisionWithParticle(const ParticleID&, const ParticleID&)),
1890 ScriptEngine::getParticlesScriptingInterface(),
1891 SLOT(forwardParticleCollisionWithParticle(const ParticleID&, const ParticleID&)));
1892
1882 _palette.init(_glWidget->width(), _glWidget->height());1893 _palette.init(_glWidget->width(), _glWidget->height());
1883 _palette.addAction(Menu::getInstance()->getActionForOption(MenuOption::VoxelAddMode), 0, 0);1894 _palette.addAction(Menu::getInstance()->getActionForOption(MenuOption::VoxelAddMode), 0, 0);
1884 _palette.addAction(Menu::getInstance()->getActionForOption(MenuOption::VoxelDeleteMode), 0, 1);1895 _palette.addAction(Menu::getInstance()->getActionForOption(MenuOption::VoxelDeleteMode), 0, 1);

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