updates to the imagesequencing & renderableplanet projection classes mainly

This commit is contained in:
Michal Marcinkowski
2015-03-24 12:31:03 -04:00
parent 5b829dea58
commit cae39f2788
19 changed files with 748 additions and 169 deletions
@@ -57,8 +57,12 @@ protected:
private:
properties::StringProperty _colorTexturePath;
properties::StringProperty _bumpTexturePath;
ghoul::opengl::ProgramObject* _programObject;
ghoul::opengl::Texture* _texture;
ghoul::opengl::Texture* _bumpMap;
modelgeometry::ModelGeometry* _geometry;
@@ -67,10 +71,13 @@ private:
std::string _source;
std::string _destination;
psc _sunPosition;
properties::BoolProperty _performShading;
properties::BoolProperty _performFade;
properties::FloatProperty _fading;
};
} // namespace openspace