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

Feature/safe apollo (#879)

Browse Source 
* Apollo missions with renderablemodel and spice rotation updates
* Added user control for face culling.
* Added gui property for disabling face culling.
* Changed rotation vector property to handle degrees instead of radians
* Separated apollo globebrowsing
This commit is contained in:
Micah Acinapura
2019-05-20 22:10:23 -04:00
committed by Alexander Bock
parent 70500d9ad2
commit 54d24605cf
22 changed files with 2014 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
modules/base/rendering/renderablemodel.h
View File

@@ -33,6 +33,10 @@
#include <openspace/properties/scalar/floatproperty.h>
#include <ghoul/opengl/uniformcache.h>
#include <memory>
#include <openspace/properties/matrix/dmat4property.h>
#include <openspace/properties/vector/vec3property.h>
namespace ghoul::opengl {
class ProgramObject;
@@ -73,11 +77,14 @@ private:
properties::StringProperty _colorTexturePath;
properties::FloatProperty _ambientIntensity;
properties::FloatProperty _diffuseIntensity;
properties::FloatProperty _specularIntensity;
properties::BoolProperty _performShading;
properties::Mat3Property _modelTransform;
properties::BoolProperty _disableFaceCulling;
properties::DMat4Property _modelTransform;
properties::Vec3Property _rotationVec;
ghoul::opengl::ProgramObject* _program = nullptr;
UniformCache(opacity, nLightSources, lightDirectionsViewSpace, lightIntensities,