From a96ef7b5f00e4e2f773abdd1c6cd174f0ac5b2d5 Mon Sep 17 00:00:00 2001 From: Sam Gateau Date: Fri, 9 Aug 2019 18:34:36 -0700 Subject: [PATCH] Exloring the why.... --- .../src/RenderablePolyLineEntityItem.cpp | 17 +++++++++-------- scripts/developer/utilities/render/luci.qml | 12 ++++++++++-- .../utilities/render/luci/Antialiasing.qml | 11 ++++++++++- 3 files changed, 29 insertions(+), 11 deletions(-) diff --git a/libraries/entities-renderer/src/RenderablePolyLineEntityItem.cpp b/libraries/entities-renderer/src/RenderablePolyLineEntityItem.cpp index 4f9a408191..0c4e59ec18 100644 --- a/libraries/entities-renderer/src/RenderablePolyLineEntityItem.cpp +++ b/libraries/entities-renderer/src/RenderablePolyLineEntityItem.cpp @@ -52,24 +52,25 @@ void PolyLineEntityRenderer::buildPipelines() { gpu::ShaderPointer program = gpu::Shader::createProgram(key.first == render::Args::DEFERRED ? shader::entities_renderer::program::paintStroke : shader::entities_renderer::program::paintStroke_forward); gpu::StatePointer state = gpu::StatePointer(new gpu::State()); + state->setCullMode(gpu::State::CullMode::CULL_NONE); state->setDepthTest(true, !key.second, gpu::LESS_EQUAL); - PrepareStencil::testMask(*state); - state->setBlendFunction(true, - gpu::State::SRC_ALPHA, gpu::State::BLEND_OP_ADD, gpu::State::INV_SRC_ALPHA, - gpu::State::FACTOR_ALPHA, gpu::State::BLEND_OP_ADD, gpu::State::ONE); + PrepareStencil::testMaskDrawShape(*state); + + state->setBlendFunction(true, gpu::State::SRC_ALPHA, gpu::State::BLEND_OP_ADD, gpu::State::INV_SRC_ALPHA); + _pipelines[key] = gpu::Pipeline::create(program, state); } } ItemKey PolyLineEntityRenderer::getKey() { - // return ItemKey::Builder::transparentShape().withTypeMeta().withTagBits(getTagMask()).withLayer(getHifiRenderLayer()); - return ItemKey::Builder::opaqueShape().withTypeMeta().withTagBits(getTagMask()).withLayer(getHifiRenderLayer()); + return ItemKey::Builder::transparentShape().withTypeMeta().withTagBits(getTagMask()).withLayer(getHifiRenderLayer()); + // return ItemKey::Builder::opaqueShape().withTypeMeta().withTagBits(getTagMask()).withLayer(getHifiRenderLayer()); } ShapeKey PolyLineEntityRenderer::getShapeKey() { - // auto builder = ShapeKey::Builder().withOwnPipeline().withTranslucent().withoutCullFace(); - auto builder = ShapeKey::Builder().withOwnPipeline().withoutCullFace(); + auto builder = ShapeKey::Builder().withOwnPipeline().withTranslucent().withoutCullFace(); + //auto builder = ShapeKey::Builder().withOwnPipeline().withoutCullFace(); if (_primitiveMode == PrimitiveMode::LINES) { builder.withWireframe(); } diff --git a/scripts/developer/utilities/render/luci.qml b/scripts/developer/utilities/render/luci.qml index 803c8f0cb2..3a61a0394d 100644 --- a/scripts/developer/utilities/render/luci.qml +++ b/scripts/developer/utilities/render/luci.qml @@ -33,6 +33,14 @@ Rectangle { Column { width: parent.width + Prop.PropFolderPanel { + label: "Render Settings" + isUnfold: false + panelFrameData: Component { + RenderSettings { + } + } + } Prop.PropFolderPanel { label: "Shading Model" panelFrameData: Component { @@ -69,7 +77,7 @@ Rectangle { Culling {} } } - /* Prop.PropFolderPanel { + Prop.PropFolderPanel { label: "Tools" panelFrameData: Component { Row { @@ -87,7 +95,7 @@ Rectangle { } } } - }*/ + } /* Jet.TaskPropView { id: "le" jobPath: "" diff --git a/scripts/developer/utilities/render/luci/Antialiasing.qml b/scripts/developer/utilities/render/luci/Antialiasing.qml index e29bca43eb..0cea509761 100644 --- a/scripts/developer/utilities/render/luci/Antialiasing.qml +++ b/scripts/developer/utilities/render/luci/Antialiasing.qml @@ -18,6 +18,8 @@ import controlsUit 1.0 as HifiControls import "../configSlider" import "../../lib/plotperf" +import "../../lib/prop" as Prop + Column{ HifiConstants { id: hifi; } @@ -28,7 +30,14 @@ Column{ anchors.right: parent.right spacing: 10 - + Prop.PropScalar { + label: "MSAA" + object: Render.getConfig("RenderMainView.PreparePrimaryBufferForward") + property: "numSamples" + min: 1 + max: 4 + integral: true + } Row { spacing: 10 id: fxaaOnOff