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

Merge remote-tracking branch 'origin/master' into thesis/2021/skybrowser

Browse Source 
# Conflicts:
#	include/openspace/rendering/screenspacerenderable.h
#	src/rendering/screenspacerenderable.cpp
This commit is contained in:
Ylva Selling
2022-04-08 11:46:09 -04:00
parent 9e86447b85 79eeb45fb7
commit c9bbb4a533
110 changed files with 3755 additions and 81787 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;

2
include/openspace/rendering/renderengine.h
View File

@@ -172,7 +172,7 @@ private:
ghoul::opengl::OpenGLStateCache* _openglStateCache = nullptr;
properties::BoolProperty _showOverlayOnSlaves;
properties::BoolProperty _showOverlayOnClients;
properties::BoolProperty _showLog;
properties::FloatProperty _verticalLogOffset;
properties::BoolProperty _showVersionInfo;

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

@@ -110,6 +110,7 @@ protected:
glm::vec3 cartesianToSpherical(const glm::vec3& cartesian) const;
glm::vec3 sphericalToCartesian(glm::vec3 spherical) const;
glm::vec3 sanitizeSphericalCoordinates(glm::vec3 spherical) const;
float opacity() const;
properties::BoolProperty _enabled;
properties::BoolProperty _usePerspectiveProjection;
@@ -131,6 +132,7 @@ protected:
properties::Vec3Property _multiplyColor;
properties::Vec4Property _backgroundColor;
properties::FloatProperty _opacity;
properties::FloatProperty _fade;
properties::TriggerProperty _delete;
glm::ivec2 _objectSize = glm::ivec2(0);