mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-06 03:29:44 -06:00
Code Issues Packages Projects Releases Wiki Activity

Add a hidden "Fade" property that modifies the effective opacity to enable other functionality (closes #1970)

Browse Source
This commit is contained in:
Alexander Bock
2022-04-05 23:53:33 +02:00
parent 73292ee54c
commit 02adcf570e
32 changed files with 79 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/openspace/rendering/renderable.h
View File

@@ -105,6 +105,7 @@ public:
protected:
properties::BoolProperty _enabled;
properties::FloatProperty _opacity;
properties::FloatProperty _fade;
properties::StringProperty _renderableType;
void setBoundingSphere(double boundingSphere);
@@ -113,6 +114,9 @@ protected:
void setRenderBinFromOpacity();
void registerUpdateRenderBinFromOpacity();
/// Returns the full opacity constructed from the _opactiy and _fade property values
float opacity() const;
double _boundingSphere = 0.0;
double _interactionSphere = 0.0;
SceneGraphNode* _parent = nullptr;

3
include/openspace/rendering/screenspacerenderable.h
View File

@@ -88,6 +88,8 @@ protected:
virtual void bindTexture() = 0;
virtual void unbindTexture();
float opacity() const;
properties::BoolProperty _enabled;
properties::BoolProperty _usePerspectiveProjection;
properties::BoolProperty _useRadiusAzimuthElevation;
@@ -108,6 +110,7 @@ protected:
properties::Vec3Property _multiplyColor;
properties::Vec4Property _backgroundColor;
properties::FloatProperty _opacity;
properties::FloatProperty _fade;
properties::TriggerProperty _delete;
glm::ivec2 _objectSize = glm::ivec2(0);