Showing the changes to libraries/render-utils/src/DebugDeferredBuffer.cpp (1 of 31 files). Show all
Unified · Split
| @@ -39,7 +39,7 @@ void DebugDeferredBufferConfig::setMode(int newMode) { · 38 unmodified lines | ||
| 39 | 39 | } |
| 40 | 40 | |
| 41 | 41 | enum Slot { |
| 42 | − Diffuse = 0, | |
| 42 | + Albedo = 0, | |
| 43 | 43 | Normal, |
| 44 | 44 | Specular, |
| 45 | 45 | Depth, |
| @@ -52,9 +52,9 @@ enum Slot { · 6 unmodified lines | ||
| 52 | 52 | |
| 53 | 53 | |
| 54 | 54 | |
| 55 | −static const std::string DEFAULT_DIFFUSE_SHADER { | |
| 55 | +static const std::string DEFAULT_ALBEDO_SHADER { | |
| 56 | 56 | "vec4 getFragmentColor() {" |
| 57 | − " return vec4(pow(texture(diffuseMap, uv).xyz, vec3(1.0 / 2.2)), 1.0);" | |
| 57 | + " return vec4(pow(texture(albedoMap, uv).xyz, vec3(1.0 / 2.2)), 1.0);" | |
| 58 | 58 | " }" |
| 59 | 59 | }; |
| 60 | 60 | |
| @@ -144,8 +144,8 @@ DebugDeferredBuffer::DebugDeferredBuffer() { · 83 unmodified lines | ||
| 144 | 144 | |
| 145 | 145 | std::string DebugDeferredBuffer::getShaderSourceCode(Mode mode, std::string customFile) { |
| 146 | 146 | switch (mode) { |
| 147 | − case DiffuseMode: | |
| 148 | − return DEFAULT_DIFFUSE_SHADER; | |
| 147 | + case AlbedoMode: | |
| 148 | + return DEFAULT_ALBEDO_SHADER; | |
| 149 | 149 | case SpecularMode: |
| 150 | 150 | return DEFAULT_SPECULAR_SHADER; |
| 151 | 151 | case RoughnessMode: |
| @@ -206,7 +206,7 @@ const gpu::PipelinePointer& DebugDeferredBuffer::getPipeline(Mode mode, std::str · 54 unmodified lines | ||
| 206 | 206 | const auto program = gpu::Shader::createProgram(vs, ps); |
| 207 | 207 | |
| 208 | 208 | gpu::Shader::BindingSet slotBindings; |
| 209 | − slotBindings.insert(gpu::Shader::Binding("diffuseMap", Diffuse)); | |
| 209 | + slotBindings.insert(gpu::Shader::Binding("albedoMap", Albedo)); | |
| 210 | 210 | slotBindings.insert(gpu::Shader::Binding("normalMap", Normal)); |
| 211 | 211 | slotBindings.insert(gpu::Shader::Binding("specularMap", Specular)); |
| 212 | 212 | slotBindings.insert(gpu::Shader::Binding("depthMap", Depth)); |
| @@ -262,7 +262,7 @@ void DebugDeferredBuffer::run(const SceneContextPointer& sceneContext, const Ren · 49 unmodified lines | ||
| 262 | 262 | |
| 263 | 263 | batch.setPipeline(getPipeline(_mode, first)); |
| 264 | 264 | |
| 265 | − batch.setResourceTexture(Diffuse, framebufferCache->getDeferredColorTexture()); | |
| 265 | + batch.setResourceTexture(Albedo, framebufferCache->getDeferredColorTexture()); | |
| 266 | 266 | batch.setResourceTexture(Normal, framebufferCache->getDeferredNormalTexture()); |
| 267 | 267 | batch.setResourceTexture(Specular, framebufferCache->getDeferredSpecularTexture()); |
| 268 | 268 | batch.setResourceTexture(Depth, framebufferCache->getPrimaryDepthTexture()); |