mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-28 14:59:31 -05:00
Code Issues Packages Projects Releases Wiki Activity

added transparency, thickness and color control to the markers

Browse Source
This commit is contained in:
Jonathan Bosson
2017-06-14 14:09:54 -06:00
parent c53bcaac05
commit b1be00a0eb
3 changed files with 40 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/touch/include/TouchMarker.h
+4
View File
@@ -34,6 +34,7 @@
#include <openspace/properties/stringproperty.h>
#include <openspace/properties/scalar/boolproperty.h>
#include <openspace/properties/scalar/floatproperty.h>
#include <openspace/properties/vector/vec3property.h>
#include <glm/glm.hpp>
@@ -69,6 +70,9 @@ class TouchMarker : public properties::PropertyOwner
properties::StringProperty _texturePath;
properties::BoolProperty _visible;
properties::FloatProperty _radiusSize;
properties::FloatProperty _transparency;
properties::FloatProperty _thickness;
properties::Vec3Property _color;
std::unique_ptr<ghoul::opengl::ProgramObject> _shader;
std::unique_ptr<ghoul::opengl::Texture> _texture;