mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-04 10:40:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

Add border to screenspace renderables

Browse Source
This commit is contained in:
Ylva Selling
2023-06-15 15:42:32 -04:00
parent 475f3c63c2
commit 0b20affc5d
6 changed files with 60 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -129,6 +129,10 @@ protected:
// Local rotation (roll, pitch, yaw)
properties::Vec3Property _localRotation;
// Border
properties::FloatProperty _borderWidth;
properties::Vec3Property _borderColor;
properties::FloatProperty _scale;
properties::FloatProperty _gamma;
properties::Vec3Property _multiplyColor;
@@ -136,7 +140,8 @@ protected:
properties::TriggerProperty _delete;
glm::ivec2 _objectSize = glm::ivec2(0);
UniformCache(color, opacity, mvp, texture, backgroundColor, gamma) _uniformCache;
UniformCache(color, opacity, mvp, texture, backgroundColor, gamma,
borderColor, borderWidth) _uniformCache;
std::unique_ptr<ghoul::opengl::ProgramObject> _shader;
};