History

Physics test ‘buckyballs’ moved to application.cpp

Philip Rosedale committed 12 years ago

Commit 246bb1f1 parent a9849c14 files · +20 −4Browse files

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

Unified · Split

interface/src/Application.cpp+4−0
@@ -1492,6 +1492,8 @@ void Application::idle() { · 1491 unmodified lines
1492 _idleLoopMeasuredJitter = _idleLoopStdev.getStDev();1492 _idleLoopMeasuredJitter = _idleLoopStdev.getStDev();
1493 _idleLoopStdev.reset();1493 _idleLoopStdev.reset();
1494 }1494 }
1495
1496 _buckyBalls.simulate(timeSinceLastUpdate / 1000.f, Application::getInstance()->getAvatar()->getHandData());
1495 1497
1496 // After finishing all of the above work, restart the idle timer, allowing 2ms to process events.1498 // After finishing all of the above work, restart the idle timer, allowing 2ms to process events.
1497 idleTimer->start(2);1499 idleTimer->start(2);
@@ -2809,6 +2811,8 @@ void Application::displaySide(Camera& whichCamera, bool selfAvatarOnly) { · 1311 unmodified lines
2809 "Application::displaySide() ... metavoxels...");2811 "Application::displaySide() ... metavoxels...");
2810 _metavoxels.render();2812 _metavoxels.render();
2811 }2813 }
2814
2815 _buckyBalls.render();
2812 2816
2813 // render particles...2817 // render particles...
2814 _particles.render();2818 _particles.render();

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