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

Feature/Science on the Sphere (#1863)

Browse Source 
Add all available Science-on-a-Sphere datasets from their public FTP as assets.  Many of the datasets include large files that are downloaded the first time the asset is loaded
This commit is contained in:
Alexander Bock
2022-02-10 13:53:30 +01:00
committed by GitHub
parent a7841ce405
commit 0e49606706
248 changed files with 16683 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/openspace/rendering/screenspacerenderable.h
+3 -1
View File
@@ -31,6 +31,7 @@
#include <openspace/properties/scalar/boolproperty.h>
#include <openspace/properties/scalar/floatproperty.h>
#include <openspace/properties/vector/vec3property.h>
#include <openspace/properties/vector/vec4property.h>
#include <ghoul/opengl/ghoul_gl.h>
#include <ghoul/opengl/uniformcache.h>
#include <memory>
@@ -105,11 +106,12 @@ protected:
properties::FloatProperty _scale;
properties::Vec3Property _multiplyColor;
properties::Vec4Property _backgroundColor;
properties::FloatProperty _opacity;
properties::TriggerProperty _delete;
glm::ivec2 _objectSize = glm::ivec2(0);
UniformCache(color, opacity, mvp, texture) _uniformCache;
UniformCache(color, opacity, mvp, texture, backgroundColor) _uniformCache;
std::unique_ptr<ghoul::opengl::ProgramObject> _shader;
};