intermediate commit.

This commit is contained in:
michal
2014-11-12 12:28:16 -05:00
parent 0803b1cacf
commit d6d7f1ffe7
10 changed files with 83 additions and 59 deletions
@@ -67,7 +67,6 @@ private:
std::string _source;
std::string _destination;
};
} // namespace openspace
+3 -1
View File
@@ -29,6 +29,7 @@
#include <openspace/rendering/renderable.h>
#include <openspace/properties/stringproperty.h>
#include <openspace/query/query.h>
// ghoul includes
#include <ghoul/opengl/programobject.h>
@@ -50,7 +51,8 @@ public:
properties::StringProperty _colorTexturePath;
ghoul::opengl::ProgramObject* _programObject;
ghoul::opengl::Texture* _texture;
openspace::SceneGraphNode* _targetNode;
void loadTexture();
void allocateData();
psc orthogonalProjection(glm::dvec3 camvec);