Merge pull request #2550 from OpenSpace/feature/model-opacity

Feature/model opacity
This commit is contained in:
Malin E
2023-04-13 17:26:22 +02:00
committed by GitHub
45 changed files with 1064 additions and 844 deletions

View File

@@ -66,8 +66,9 @@ public:
Background = 1,
Opaque = 2,
PreDeferredTransparent = 4,
PostDeferredTransparent = 8,
Overlay = 16
Overlay = 8,
PostDeferredTransparent = 16,
Sticker = 32
};
static ghoul::mm_unique_ptr<Renderable> createFromDictionary(
@@ -133,6 +134,7 @@ protected:
SceneGraphNode* parent() const noexcept;
bool automaticallyUpdatesRenderBin() const noexcept;
bool hasOverrideRenderBin() const noexcept;
RenderBin _renderBin = RenderBin::Opaque;
@@ -148,6 +150,7 @@ private:
SceneGraphNode* _parent = nullptr;
const bool _shouldUpdateIfDisabled = false;
bool _automaticallyUpdateRenderBin = true;
bool _hasOverrideRenderBin = false;
// We only want the SceneGraphNode to be able manipulate the parent, so we don't want
// to provide a set method for this. Otherwise, anyone might mess around with our