Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixing the basic to compile the TestWindow

Browse source
This commit is contained in:
samcake 2016-07-01 14:39:32 -07:00
parent 9281b28d43
commit ab98614dd4
2 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
tests/gpu-test/src/TestWindow.cpp
View file

@ -98,7 +98,8 @@ void TestWindow::beginFrame() {
#ifdef DEFERRED_LIGHTING
auto deferredLightingEffect = DependencyManager::get<DeferredLightingEffect>();
deferredLightingEffect->prepare(_renderArgs);
_prepareDeferred.run(_sceneContext, _renderContext);
#else
gpu::doInBatch(_renderArgs->_context, [&](gpu::Batch& batch) {
batch.clearColorFramebuffer(gpu::Framebuffer::BUFFER_COLORS, { 0.0f, 0.1f, 0.2f, 1.0f });
@ -128,8 +129,14 @@ void TestWindow::endFrame() {
batch.setResourceTexture(0, nullptr);
});
auto deferredLightingEffect = DependencyManager::get<DeferredLightingEffect>();
deferredLightingEffect->render(_renderContext);
DeferredFrameTransformPointer frameTransform;
_generateDeferredFrameTransform.run(_sceneContext, _renderContext, frameTransform);
// auto deferredLightingEffect = DependencyManager::get<DeferredLightingEffect>();
// deferredLightingEffect->render(_renderContext);
RenderDeferred::Inputs deferredInputs;
deferredInputs.edit0() = frameTransform;
_renderDeferred.run(_sceneContext, _renderContext, deferredInputs);
gpu::doInBatch(_renderArgs->_context, [&](gpu::Batch& batch) {
PROFILE_RANGE_BATCH(batch, "blit");

9
tests/gpu-test/src/TestWindow.h
View file

@ -19,7 +19,7 @@
#include <render/ShapePipeline.h>
#include <render/Context.h>
//#define DEFERRED_LIGHTING
#define DEFERRED_LIGHTING
class TestWindow : public QWindow {
protected:
@ -31,9 +31,14 @@ protected:
#ifdef DEFERRED_LIGHTING
// Prepare the ShapePipelines
render::ShapePlumberPointer _shapePlumber { std::make_shared<render::ShapePlumber>() };
render::RenderContextPointer _renderContext { std::make_shared<render::RenderContext>() };
render::SceneContextPointer _sceneContext{ std::make_shared<render::SceneContext>() };
render::RenderContextPointer _renderContext{ std::make_shared<render::RenderContext>() };
gpu::PipelinePointer _opaquePipeline;
model::LightPointer _light { std::make_shared<model::Light>() };
GenerateDeferredFrameTransform _generateDeferredFrameTransform;
PrepareDeferred _prepareDeferred;
RenderDeferred _renderDeferred;
#endif
RenderArgs* _renderArgs { new RenderArgs() };