History

More metavoxel bits.

Andrzej Kapolka committed 12 years ago

Commit 5ec90171 parent dce95998 files · +58 −14Browse files

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

Unified · Split

interface/src/Application.cpp+18−1
@@ -2320,6 +2320,15 @@ void Application::updateParticles(float deltaTime) { · 2319 unmodified lines
2320 }2320 }
2321}2321}
2322 2322
2323void Application::updateMetavoxels(float deltaTime) {
2324 bool showWarnings = Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings);
2325 PerformanceWarning warn(showWarnings, "Application::updateMetavoxels()");
2326
2327 if (Menu::getInstance()->isOptionChecked(MenuOption::Metavoxels)) {
2328 _metavoxels.simulate(deltaTime);
2329 }
2330}
2331
2323void Application::updateTransmitter(float deltaTime) {2332void Application::updateTransmitter(float deltaTime) {
2324 bool showWarnings = Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings);2333 bool showWarnings = Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings);
2325 PerformanceWarning warn(showWarnings, "Application::updateTransmitter()");2334 PerformanceWarning warn(showWarnings, "Application::updateTransmitter()");
@@ -2465,6 +2474,7 @@ void Application::update(float deltaTime) { · 139 unmodified lines
2465 updateAvatars(deltaTime, mouseRayOrigin, mouseRayDirection); //loop through all the other avatars and simulate them...2474 updateAvatars(deltaTime, mouseRayOrigin, mouseRayDirection); //loop through all the other avatars and simulate them...
2466 updateMyAvatarSimulation(deltaTime); // Simulate myself2475 updateMyAvatarSimulation(deltaTime); // Simulate myself
2467 updateParticles(deltaTime); // Simulate particle cloud movements2476 updateParticles(deltaTime); // Simulate particle cloud movements
2477 updateMetavoxels(deltaTime); // update metavoxels
2468 updateTransmitter(deltaTime); // transmitter drive or pick2478 updateTransmitter(deltaTime); // transmitter drive or pick
2469 updateCamera(deltaTime); // handle various camera tweaks like off axis projection2479 updateCamera(deltaTime); // handle various camera tweaks like off axis projection
2470 updateDialogs(deltaTime); // update various stats dialogs if present2480 updateDialogs(deltaTime); // update various stats dialogs if present
@@ -2999,7 +3009,14 @@ void Application::displaySide(Camera& whichCamera, bool selfAvatarOnly) { · 528 unmodified lines
2999 _voxels.render(Menu::getInstance()->isOptionChecked(MenuOption::VoxelTextures));3009 _voxels.render(Menu::getInstance()->isOptionChecked(MenuOption::VoxelTextures));
3000 }3010 }
3001 }3011 }
3002 3012
3013 // also, metavoxels
3014 if (Menu::getInstance()->isOptionChecked(MenuOption::Metavoxels)) {
3015 PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings),
3016 "Application::displaySide() ... metavoxels...");
3017 _metavoxels.render();
3018 }
3019
3003 // render the ambient occlusion effect if enabled3020 // render the ambient occlusion effect if enabled
3004 if (Menu::getInstance()->isOptionChecked(MenuOption::AmbientOcclusion)) {3021 if (Menu::getInstance()->isOptionChecked(MenuOption::AmbientOcclusion)) {
3005 PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings), 3022 PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings),

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