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

finish merge + manual time offset property

Browse Source
This commit is contained in:
ElonOlsson
2021-05-12 15:37:22 -04:00
parent a5e577eb54 9166abab45
commit 9d1ece1163
965 changed files with 69303 additions and 52573 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/base/rendering/renderableplane.h
+2
View File
@@ -31,6 +31,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 <ghoul/opengl/ghoul_gl.h>
namespace ghoul::filesystem { class File; }
@@ -76,6 +77,7 @@ private:
properties::BoolProperty _billboard;
properties::BoolProperty _mirrorBackside;
properties::FloatProperty _size;
properties::Vec3Property _multiplyColor;
ghoul::opengl::ProgramObject* _shader = nullptr;