mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-05-01 08:19:51 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into feature/model-opacity

Browse Source 
* Solve conflict in framebufferrenderer.cpp
This commit is contained in:
Malin E
2023-03-14 13:59:37 +01:00
parent 3cd2cfac93 5fec405b70
commit ee4eb081a0
327 changed files with 5040 additions and 3203 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/openspace/rendering/renderable.h
+9 -2
View File
@@ -83,8 +83,9 @@ public:
std::string_view typeAsString() const;
virtual void render(const RenderData& data, RendererTasks& rendererTask);
virtual void update(const UpdateData& data);
virtual void render(const RenderData& data, RendererTasks& rendererTask);
virtual void renderSecondary(const RenderData& data, RendererTasks& rendererTask);
// The 'surface' in this case is the interaction sphere of this renderable. In some
// cases (i.e., planets) this corresponds directly to the physical surface, but in
@@ -98,7 +99,9 @@ public:
RenderBin renderBin() const;
void setRenderBin(RenderBin bin);
bool matchesRenderBinMask(int binMask);
bool matchesRenderBinMask(int binMask) const noexcept;
bool matchesSecondaryRenderBin(int binMask) const noexcept;
void setFade(float fade);
@@ -130,6 +133,10 @@ protected:
bool _shouldUpdateIfDisabled = false;
RenderBin _renderBin = RenderBin::Opaque;
// An optional renderbin that renderables can use for certain components, in cases
// where all parts of the renderable should not be rendered in the same bin
std::optional<RenderBin> _secondaryRenderBin;
private:
// 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