History

better implementation of particle palm collisions

ZappoMan committed 12 years ago

Commit d9f41241 parent 03869e811 files · +153 −16Browse files

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

Unified · Split

interface/src/Application.cpp+1−1
@@ -1858,7 +1858,7 @@ void Application::init() { · 1857 unmodified lines
1858 _particles.init();1858 _particles.init();
1859 _particles.setViewFrustum(getViewFrustum());1859 _particles.setViewFrustum(getViewFrustum());
1860 1860
1861 _particleCollisionSystem.init(&_particleEditSender, _particles.getTree(), _voxels.getTree(), &_audio);1861 _particleCollisionSystem.init(&_particleEditSender, _particles.getTree(), _voxels.getTree(), &_audio, &_myAvatar);
1862 1862
1863 _palette.init(_glWidget->width(), _glWidget->height());1863 _palette.init(_glWidget->width(), _glWidget->height());
1864 _palette.addAction(Menu::getInstance()->getActionForOption(MenuOption::VoxelAddMode), 0, 0);1864 _palette.addAction(Menu::getInstance()->getActionForOption(MenuOption::VoxelAddMode), 0, 0);

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