mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-03-10 07:18:46 -05:00
Code Issues Packages Projects Releases Wiki Activity

Enable Screenspace renderable to have a multiplicative color; Add new asset to show a target marker (closes #85); Fix bug with wrong documentation shown in RenderablePlane

Browse Source
This commit is contained in:
Alexander Bock
2021-05-08 18:08:56 +02:00
parent f74bf97513
commit 09e28ff49e
7 changed files with 45 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -104,11 +104,12 @@ protected:
properties::Vec3Property _localRotation;
properties::FloatProperty _scale;
properties::Vec3Property _multiplyColor;
properties::FloatProperty _opacity;
properties::TriggerProperty _delete;
glm::ivec2 _objectSize = glm::ivec2(0);
UniformCache(alpha, modelTransform, viewProj, texture) _uniformCache;
UniformCache(color, alpha, modelTransform, viewProj, texture) _uniformCache;
std::unique_ptr<ghoul::opengl::ProgramObject> _shader;
};