Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-21 17:24:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

More g-buffer debugging options

Browse source
This commit is contained in:
Atlante45 2015-12-04 18:33:11 -08:00
parent 1a404bb3bf
commit 41af377878
3 changed files with 73 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
examples/utilities/tools/renderEngineDebug.js
View file

@ -11,7 +11,7 @@
Script.include("cookies.js");
var MENU = "Developer>Render>Debug Deferred Buffer";
var ACTIONS = ["Off", "Diffuse", "Normal", "Specular", "Depth", "Lighting"];
var ACTIONS = ["Off", "Diffuse", "Alpha", "Specular", "Roughness", "Normal", "Depth", "Lighting", "Custom"];
var panel = new Panel(10, 100);

66
libraries/render-utils/src/DebugDeferredBuffer.cpp
View file

@ -11,6 +11,8 @@
#include "DebugDeferredBuffer.h"
#include <QString>
#include <gpu/Batch.h>
#include <gpu/Context.h>
#include <render/Scene.h>
@ -24,8 +26,16 @@
using namespace render;
static const std::string PLACEHOLDER { "DEBUG_PLACEHOLDER" };
static const std::array<std::string, DebugDeferredBuffer::NUM_SLOTS> SLOT_NAMES {{
enum Slots {
Diffuse = 0,
Normal,
Specular,
Depth,
Lighting,
NUM_SLOTS
};
static const std::array<std::string, Slots::NUM_SLOTS> SLOT_NAMES {{
"diffuseMap",
"normalMap",
"specularMap",
@ -33,14 +43,50 @@ static const std::array<std::string, DebugDeferredBuffer::NUM_SLOTS> SLOT_NAMES
"lightingMap"
}};
std::string getCode(int slot) {
return std::string("return texture(").append(SLOT_NAMES[slot]).append(", uv);");
static const std::string PLACEHOLDER { "DEBUG_PLACEHOLDER" };
std::string DebugDeferredBuffer::getCode(Modes mode) {
switch (mode) {
case DiffuseMode: {
QString code = "return vec4(texture(%1, uv).xyz, 1.0);";
return code.arg(SLOT_NAMES[Diffuse].c_str()).toStdString();
}
case AlphaMode: {
QString code = "return vec4(vec3(texture(%1, uv).a), 1.0);";
return code.arg(SLOT_NAMES[Diffuse].c_str()).toStdString();
}
case SpecularMode: {
QString code = "return vec4(texture(%1, uv).xyz, 1.0);";
return code.arg(SLOT_NAMES[Specular].c_str()).toStdString();
}
case RoughnessMode: {
QString code = "return vec4(vec3(texture(%1, uv).a), 1.0);";
return code.arg(SLOT_NAMES[Specular].c_str()).toStdString();
}
case NormalMode: {
QString code = "return vec4(texture(%1, uv).xyz, 1.0);";
return code.arg(SLOT_NAMES[Normal].c_str()).toStdString();
}
case DepthMode: {
QString code = "return vec4(vec3(texture(%1, uv).x), 1.0);";
return code.arg(SLOT_NAMES[Depth].c_str()).toStdString();
}
case LightingMode: {
QString code = "return vec4(texture(%1, uv).xyz, 1.0);";
return code.arg(SLOT_NAMES[Lighting].c_str()).toStdString();
}
case CustomMode:
return std::string("return vec4(1.0);");
case NUM_MODES:
Q_UNIMPLEMENTED();
return std::string("return vec4(1.0);");
}
}
const gpu::PipelinePointer& DebugDeferredBuffer::getPipeline(int slot) {
if (!_pipelines[slot]) {
const gpu::PipelinePointer& DebugDeferredBuffer::getPipeline(Modes mode) {
if (!_pipelines[mode]) {
std::string fragmentShader = debug_deferred_buffer_frag;
fragmentShader.replace(fragmentShader.find(PLACEHOLDER), PLACEHOLDER.size(), getCode(slot));
fragmentShader.replace(fragmentShader.find(PLACEHOLDER), PLACEHOLDER.size(), getCode(mode));
auto vs = gpu::ShaderPointer(gpu::Shader::createVertex({ debug_deferred_buffer_vert }));
auto ps = gpu::ShaderPointer(gpu::Shader::createPixel(fragmentShader));
@ -53,9 +99,9 @@ const gpu::PipelinePointer& DebugDeferredBuffer::getPipeline(int slot) {
gpu::Shader::makeProgram(*program, slotBindings);
// Good to go add the brand new pipeline
_pipelines[slot] = gpu::Pipeline::create(program, std::make_shared<gpu::State>());
_pipelines[mode] = gpu::Pipeline::create(program, std::make_shared<gpu::State>());
}
return _pipelines[slot];
return _pipelines[mode];
}
@ -76,7 +122,7 @@ void DebugDeferredBuffer::run(const SceneContextPointer& sceneContext, const Ren
batch.setViewTransform(viewMat);
batch.setModelTransform(Transform());
batch.setPipeline(getPipeline((DebugDeferredBufferSlot)(renderContext->_drawDebugDeferredBuffer - 1)));
batch.setPipeline(getPipeline(Modes(renderContext->_drawDebugDeferredBuffer - 1)));
batch.setResourceTexture(Diffuse, framebufferCache->getDeferredColorTexture());
batch.setResourceTexture(Normal, framebufferCache->getDeferredNormalTexture());

28
libraries/render-utils/src/DebugDeferredBuffer.h
View file

@ -18,22 +18,26 @@ class DebugDeferredBuffer {
public:
using JobModel = render::Job::Model<DebugDeferredBuffer>;
enum DebugDeferredBufferSlot : int {
Diffuse = 0,
Normal,
Specular,
Depth,
Lighting,
NUM_SLOTS
};
void run(const render::SceneContextPointer& sceneContext, const render::RenderContextPointer& renderContext);
private:
const gpu::PipelinePointer& getPipeline(int slot);
enum Modes : int {
DiffuseMode = 0,
AlphaMode,
SpecularMode,
RoughnessMode,
NormalMode,
DepthMode,
LightingMode,
CustomMode,
NUM_MODES
};
std::array<gpu::PipelinePointer, NUM_SLOTS> _pipelines;
const gpu::PipelinePointer& getPipeline(Modes mode);
std::string getCode(Modes mode);
std::array<gpu::PipelinePointer, NUM_MODES> _pipelines;
};
#endif // hifi_DebugDeferredBuffer_h