Showing the changes to libraries/render-utils/src/SubsurfaceScattering.cpp (1 of 33 files). Show all
Unified · Split
| @@ -411,8 +411,8 @@ gpu::TexturePointer SubsurfaceScatteringResource::generateScatteringSpecularBeck · 410 unmodified lines | |||
| 411 | return beckmannMap; | 411 | return beckmannMap; |
| 412 | } | 412 | } |
| 413 | 413 | ||
| 414 | DebugSubsurfaceScattering::DebugSubsurfaceScattering() { | 414 | gpu::PipelinePointer DebugSubsurfaceScattering::_scatteringPipeline; |
| 415 | } | 415 | gpu::PipelinePointer DebugSubsurfaceScattering::_showLUTPipeline; |
| 416 | 416 | ||
| 417 | void DebugSubsurfaceScattering::configure(const Config& config) { | 417 | void DebugSubsurfaceScattering::configure(const Config& config) { |
| 418 | 418 | ||
| @@ -427,8 +427,6 @@ void DebugSubsurfaceScattering::configure(const Config& config) { · 8 unmodified lines | |||
| 427 | _debugParams->setSubData(0, _debugCursorTexcoord); | 427 | _debugParams->setSubData(0, _debugCursorTexcoord); |
| 428 | } | 428 | } |
| 429 | 429 | ||
| 430 | |||
| 431 | |||
| 432 | gpu::PipelinePointer DebugSubsurfaceScattering::getScatteringPipeline() { | 430 | gpu::PipelinePointer DebugSubsurfaceScattering::getScatteringPipeline() { |
| 433 | if (!_scatteringPipeline) { | 431 | if (!_scatteringPipeline) { |
| 434 | gpu::ShaderPointer program = gpu::Shader::createProgram(shader::render_utils::program::subsurfaceScattering_drawScattering); | 432 | gpu::ShaderPointer program = gpu::Shader::createProgram(shader::render_utils::program::subsurfaceScattering_drawScattering); |
| @@ -440,8 +438,6 @@ gpu::PipelinePointer DebugSubsurfaceScattering::getScatteringPipeline() { · 5 unmodified lines | |||
| 440 | return _scatteringPipeline; | 438 | return _scatteringPipeline; |
| 441 | } | 439 | } |
| 442 | 440 | ||
| 443 | gpu::PipelinePointer _showLUTPipeline; | ||
| 444 | |||
| 445 | gpu::PipelinePointer DebugSubsurfaceScattering::getShowLUTPipeline() { | 441 | gpu::PipelinePointer DebugSubsurfaceScattering::getShowLUTPipeline() { |
| 446 | if (!_showLUTPipeline) { | 442 | if (!_showLUTPipeline) { |
| 447 | gpu::ShaderPointer program = gpu::Shader::createProgram(shader::gpu::program::drawUnitQuatTextureOpaque); | 443 | gpu::ShaderPointer program = gpu::Shader::createProgram(shader::gpu::program::drawUnitQuatTextureOpaque); |
| @@ -452,14 +448,12 @@ gpu::PipelinePointer DebugSubsurfaceScattering::getShowLUTPipeline() { · 4 unmodified lines | |||
| 452 | return _showLUTPipeline; | 448 | return _showLUTPipeline; |
| 453 | } | 449 | } |
| 454 | 450 | ||
| 455 | |||
| 456 | void DebugSubsurfaceScattering::run(const render::RenderContextPointer& renderContext, const Inputs& inputs) { | 451 | void DebugSubsurfaceScattering::run(const render::RenderContextPointer& renderContext, const Inputs& inputs) { |
| 457 | assert(renderContext->args); | 452 | assert(renderContext->args); |
| 458 | assert(renderContext->args->hasViewFrustum()); | 453 | assert(renderContext->args->hasViewFrustum()); |
| 459 | 454 | ||
| 460 | RenderArgs* args = renderContext->args; | 455 | RenderArgs* args = renderContext->args; |
| 461 | 456 | ||
| 462 | |||
| 463 | auto& frameTransform = inputs.get0(); | 457 | auto& frameTransform = inputs.get0(); |
| 464 | auto& deferredFramebuffer = inputs.get1(); | 458 | auto& deferredFramebuffer = inputs.get1(); |
| 465 | 459 | ||
| @@ -477,8 +471,6 @@ void DebugSubsurfaceScattering::run(const render::RenderContextPointer& renderCo · 11 unmodified lines | |||
| 477 | auto scatteringTable = scatteringResource->getScatteringTable(); | 471 | auto scatteringTable = scatteringResource->getScatteringTable(); |
| 478 | auto scatteringSpecular = scatteringResource->getScatteringSpecular(); | 472 | auto scatteringSpecular = scatteringResource->getScatteringSpecular(); |
| 479 | 473 | ||
| 480 | |||
| 481 | |||
| 482 | auto lightStage = renderContext->_scene->getStage<LightStage>(); | 474 | auto lightStage = renderContext->_scene->getStage<LightStage>(); |
| 483 | assert(lightStage); | 475 | assert(lightStage); |
| 484 | // const auto light = DependencyManager::get<DeferredLightingEffect>()->getLightStage()->getLight(0); | 476 | // const auto light = DependencyManager::get<DeferredLightingEffect>()->getLightStage()->getLight(0); |
| @@ -491,7 +483,6 @@ void DebugSubsurfaceScattering::run(const render::RenderContextPointer& renderCo · 6 unmodified lines | |||
| 491 | gpu::doInBatch("DebugSubsurfaceScattering::run", args->_context, [=](gpu::Batch& batch) { | 483 | gpu::doInBatch("DebugSubsurfaceScattering::run", args->_context, [=](gpu::Batch& batch) { |
| 492 | batch.enableStereo(false); | 484 | batch.enableStereo(false); |
| 493 | 485 | ||
| 494 | |||
| 495 | auto viewportSize = std::min(args->_viewport.z, args->_viewport.w) >> 1; | 486 | auto viewportSize = std::min(args->_viewport.z, args->_viewport.w) >> 1; |
| 496 | auto offsetViewport = viewportSize * 0.1; | 487 | auto offsetViewport = viewportSize * 0.1; |
| 497 | 488 | ||