From a7bafed61b968a6ad9f9c83b9604e68ba69295b9 Mon Sep 17 00:00:00 2001 From: Zach Pomerantz Date: Mon, 8 Feb 2016 13:44:42 -0800 Subject: [PATCH] Change ShapeKey::CULL to NO_CULL_FACE --- interface/src/ui/overlays/Circle3DOverlay.cpp | 2 +- interface/src/ui/overlays/Image3DOverlay.cpp | 2 +- interface/src/ui/overlays/Web3DOverlay.cpp | 2 +- libraries/render-utils/src/RenderPipelines.cpp | 6 +++--- libraries/render/src/render/ShapePipeline.h | 16 ++++++++-------- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/interface/src/ui/overlays/Circle3DOverlay.cpp b/interface/src/ui/overlays/Circle3DOverlay.cpp index 698d3680e1..252aacef43 100644 --- a/interface/src/ui/overlays/Circle3DOverlay.cpp +++ b/interface/src/ui/overlays/Circle3DOverlay.cpp @@ -278,7 +278,7 @@ void Circle3DOverlay::render(RenderArgs* args) { } const render::ShapeKey Circle3DOverlay::getShapeKey() { - auto builder = render::ShapeKey::Builder().withNoCull(); + auto builder = render::ShapeKey::Builder().withoutCullFace(); if (getAlpha() != 1.0f) { builder.withTranslucent(); } diff --git a/interface/src/ui/overlays/Image3DOverlay.cpp b/interface/src/ui/overlays/Image3DOverlay.cpp index 379560e2a5..66f7143e83 100644 --- a/interface/src/ui/overlays/Image3DOverlay.cpp +++ b/interface/src/ui/overlays/Image3DOverlay.cpp @@ -104,7 +104,7 @@ void Image3DOverlay::render(RenderArgs* args) { } const render::ShapeKey Image3DOverlay::getShapeKey() { - auto builder = render::ShapeKey::Builder().withNoCull().withDepthBias(); + auto builder = render::ShapeKey::Builder().withoutCullFace().withDepthBias(); if (_emissive) { builder.withEmissive(); } diff --git a/interface/src/ui/overlays/Web3DOverlay.cpp b/interface/src/ui/overlays/Web3DOverlay.cpp index 24f70a233f..7ceff81dd2 100644 --- a/interface/src/ui/overlays/Web3DOverlay.cpp +++ b/interface/src/ui/overlays/Web3DOverlay.cpp @@ -106,7 +106,7 @@ void Web3DOverlay::render(RenderArgs* args) { } const render::ShapeKey Web3DOverlay::getShapeKey() { - auto builder = render::ShapeKey::Builder().withNoCull().withDepthBias(); + auto builder = render::ShapeKey::Builder().withoutCullFace().withDepthBias(); if (getAlpha() != 1.0f) { builder.withTranslucent(); } diff --git a/libraries/render-utils/src/RenderPipelines.cpp b/libraries/render-utils/src/RenderPipelines.cpp index 8404854e28..fce9ce1c28 100644 --- a/libraries/render-utils/src/RenderPipelines.cpp +++ b/libraries/render-utils/src/RenderPipelines.cpp @@ -135,7 +135,7 @@ void initOverlay3DPipelines(ShapePlumber& plumber) { } ShapeKey::Filter::Builder builder; - isCulled ? builder.withCull() : builder.withoutCull(); + isCulled ? builder.withCullFace() : builder.withoutCullFace(); isBiased ? builder.withDepthBias() : builder.withoutDepthBias(); isOpaque ? builder.withOpaque() : builder.withTranslucent(); @@ -154,7 +154,7 @@ void initDeferredPipelines(render::ShapePlumber& plumber) { // These keyvalues' pipelines will be added by this lamdba in addition to the key passed assert(!key.isWireFrame()); assert(!key.isDepthBiased()); - assert(key.isCulled()); + assert(key.isCullFace()); ShaderPointer program = gpu::Shader::createProgram(vertexShader, pixelShader); @@ -173,7 +173,7 @@ void initDeferredPipelines(render::ShapePlumber& plumber) { gpu::State::FACTOR_ALPHA, gpu::State::BLEND_OP_ADD, gpu::State::ONE); if (!isCulled) { - builder.withNoCull(); + builder.withoutCullFace(); } state->setCullMode(isCulled ? gpu::State::CULL_BACK : gpu::State::CULL_NONE); if (isWireframed) { diff --git a/libraries/render/src/render/ShapePipeline.h b/libraries/render/src/render/ShapePipeline.h index d35f3a500a..9b538395a0 100644 --- a/libraries/render/src/render/ShapePipeline.h +++ b/libraries/render/src/render/ShapePipeline.h @@ -30,7 +30,7 @@ public: DEPTH_ONLY, DEPTH_BIAS, WIREFRAME, - CULL, + NO_CULL_FACE, OWN_PIPELINE, INVALID, @@ -41,12 +41,12 @@ public: Flags _flags; - ShapeKey() : _flags{0} { _flags.set(CULL); } + ShapeKey() : _flags{ 0 } {} ShapeKey(const Flags& flags) : _flags{flags} {} class Builder { public: - Builder() { _flags.set(CULL); } + Builder() {} Builder(ShapeKey key) : _flags{key._flags} {} ShapeKey build() const { return ShapeKey{_flags}; } @@ -61,7 +61,7 @@ public: Builder& withDepthOnly() { _flags.set(DEPTH_ONLY); return (*this); } Builder& withDepthBias() { _flags.set(DEPTH_BIAS); return (*this); } Builder& withWireframe() { _flags.set(WIREFRAME); return (*this); } - Builder& withNoCull() { _flags.reset(CULL); return (*this); } + Builder& withoutCullFace() { _flags.reset(NO_CULL_FACE); return (*this); } Builder& withOwnPipeline() { _flags.set(OWN_PIPELINE); return (*this); } Builder& invalidate() { _flags.set(INVALID); return (*this); } @@ -117,8 +117,8 @@ public: Builder& withWireframe() { _flags.set(WIREFRAME); _mask.set(WIREFRAME); return (*this); } Builder& withoutWireframe() { _flags.reset(WIREFRAME); _mask.set(WIREFRAME); return (*this); } - Builder& withCull() { _flags.set(CULL); _mask.set(CULL); return (*this); } - Builder& withoutCull() { _flags.reset(CULL); _mask.set(CULL); return (*this); } + Builder& withCullFace() { _flags.reset(NO_CULL_FACE); _mask.set(NO_CULL_FACE); return (*this); } + Builder& withoutCullFace() { _flags.set(NO_CULL_FACE); _mask.set(NO_CULL_FACE); return (*this); } protected: friend class Filter; @@ -142,7 +142,7 @@ public: bool isDepthOnly() const { return _flags[DEPTH_ONLY]; } bool isDepthBiased() const { return _flags[DEPTH_BIAS]; } bool isWireFrame() const { return _flags[WIREFRAME]; } - bool isCulled() const { return _flags[CULL]; } + bool isCullFace() const { return !_flags[NO_CULL_FACE]; } bool hasOwnPipeline() const { return _flags[OWN_PIPELINE]; } bool isValid() const { return !_flags[INVALID]; } @@ -178,7 +178,7 @@ inline QDebug operator<<(QDebug debug, const ShapeKey& key) { << "isDepthOnly:" << key.isDepthOnly() << "isDepthBiased:" << key.isDepthBiased() << "isWireFrame:" << key.isWireFrame() - << "isCulled:" << key.isCulled() + << "isCullFace:" << key.isCullFace() << "]"; } } else {