History

first cut at atmospheres in batch (doesn't work)

ZappoMan committed 11 years ago

Commit 167e7d11 parent 03409fa9 files · +217 −46Browse files

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

Unified · Split

interface/src/Application.cpp+8−2
@@ -3255,6 +3255,9 @@ namespace render { · 3254 unmodified lines
32553255 template <> const Item::Bound payloadGetBound(const BackgroundRenderData::Pointer& stuff) { return Item::Bound(); }
32563256 template <> void payloadRender(const BackgroundRenderData::Pointer& background, RenderArgs* args) {
32573257
3258+ Q_ASSERT(args->_batch);
3259+ gpu::Batch& batch = *args->_batch;
3260+
32583261 // Background rendering decision
32593262 auto skyStage = DependencyManager::get<SceneScriptingInterface>()->getSkyStage();
32603263 auto skybox = model::SkyboxPointer();
@@ -3322,7 +3325,11 @@ namespace render { · 61 unmodified lines
33223325 PerformanceTimer perfTimer("atmosphere");
33233326 PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings),
33243327 "Application::displaySide() ... atmosphere...");
3325− background->_environment->renderAtmospheres(*(args->_viewFrustum));
3328+ //gpu::Batch batch;
3329+ background->_environment->renderAtmospheres(batch, *(args->_viewFrustum));
3330+ //gpu::GLBackend::renderBatch(batch, true);
3331+ //glUseProgram(0);
3332+
33263333 }
33273334
33283335 }
@@ -3333,7 +3340,6 @@ namespace render { · 4 unmodified lines
33333340 if (skybox) {
33343341 gpu::Batch batch;
33353342 model::Skybox::render(batch, *(Application::getInstance()->getDisplayViewFrustum()), *skybox);
3336−
33373343 gpu::GLBackend::renderBatch(batch, true);
33383344 glUseProgram(0);
33393345 }

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