Showing the changes to interface/src/Application.cpp (1 of 7 files). Show all
Unified · Split
| @@ -1972,6 +1972,9 @@ void Application::update(float deltaTime) { · 1971 unmodified lines | |||
| 1972 | _myAvatar.simulate(deltaTime, NULL); | 1972 | _myAvatar.simulate(deltaTime, NULL); |
| 1973 | } | 1973 | } |
| 1974 | 1974 | ||
| 1975 | // Simulate particle cloud movements | ||
| 1976 | _cloud.simulate(deltaTime); | ||
| 1977 | |||
| 1975 | // no transmitter drive implies transmitter pick | 1978 | // no transmitter drive implies transmitter pick |
| 1976 | if (!Menu::getInstance()->isOptionChecked(MenuOption::TransmitterDrive) && _myTransmitter.isConnected()) { | 1979 | if (!Menu::getInstance()->isOptionChecked(MenuOption::TransmitterDrive) && _myTransmitter.isConnected()) { |
| 1977 | _transmitterPickStart = _myAvatar.getSkeleton().joint[AVATAR_JOINT_CHEST].position; | 1980 | _transmitterPickStart = _myAvatar.getSkeleton().joint[AVATAR_JOINT_CHEST].position; |
| @@ -2489,7 +2492,10 @@ void Application::displaySide(Camera& whichCamera) { · 511 unmodified lines | |||
| 2489 | glDisable(GL_NORMALIZE); | 2492 | glDisable(GL_NORMALIZE); |
| 2490 | 2493 | ||
| 2491 | //renderGroundPlaneGrid(EDGE_SIZE_GROUND_PLANE, _audio.getCollisionSoundMagnitude()); | 2494 | //renderGroundPlaneGrid(EDGE_SIZE_GROUND_PLANE, _audio.getCollisionSoundMagnitude()); |
| 2492 | } | 2495 | } |
| 2496 | // Draw Cloud Particles | ||
| 2497 | _cloud.render(); | ||
| 2498 | |||
| 2493 | // Draw voxels | 2499 | // Draw voxels |
| 2494 | if (Menu::getInstance()->isOptionChecked(MenuOption::Voxels)) { | 2500 | if (Menu::getInstance()->isOptionChecked(MenuOption::Voxels)) { |
| 2495 | PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings), | 2501 | PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings), |
| @@ -2499,6 +2505,7 @@ void Application::displaySide(Camera& whichCamera) { · 3 unmodified lines | |||
| 2499 | } | 2505 | } |
| 2500 | } | 2506 | } |
| 2501 | 2507 | ||
| 2508 | |||
| 2502 | // restore default, white specular | 2509 | // restore default, white specular |
| 2503 | glMaterialfv(GL_FRONT, GL_SPECULAR, WHITE_SPECULAR_COLOR); | 2510 | glMaterialfv(GL_FRONT, GL_SPECULAR, WHITE_SPECULAR_COLOR); |
| 2504 | 2511 | ||