adding objloader

include/openspace/rendering/renderablewavefrontobject.h

@@ -0,0 +1,72 @@
+/*****************************************************************************************
+*                                                                                       *
+* OpenSpace                                                                             *
+*                                                                                       *
+* Copyright (c) 2014                                                                    *
+*                                                                                       *
+* Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
+* software and associated documentation files (the "Software"), to deal in the Software *
+* without restriction, including without limitation the rights to use, copy, modify,    *
+* merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
+* permit persons to whom the Software is furnished to do so, subject to the following   *
+* conditions:                                                                           *
+*                                                                                       *
+* The above copyright notice and this permission notice shall be included in all copies *
+* or substantial portions of the Software.                                              *
+*                                                                                       *
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
+* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
+* PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
+* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
+* CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
+* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
+****************************************************************************************/
+
+#ifndef __RENDERABLEWAVEFRONTOBJECT_H__
+#define __RENDERABLEWAVEFRONTOBJECT_H__
+
+// open space includes
+#include <openspace/rendering/renderable.h>
+
+#include <openspace/properties/stringproperty.h>
+#include <openspace/util/updatestructures.h>
+
+// ghoul includes
+#include <ghoul/opengl/programobject.h>
+#include <ghoul/opengl/texture.h>
+
+namespace openspace {
+
+namespace planetgeometry {
+class PlanetGeometry; // for now - this HAS to change!!! REMMBER MICHAL
+}
+
+class RenderableWavefrontObject : public Renderable {
+public:
+	RenderableWavefrontObject(const ghoul::Dictionary& dictionary);
+	~RenderableWavefrontObject();
+
+    bool initialize() override;
+    bool deinitialize() override;
+
+	void render(const RenderData& data) override;
+    void update(const UpdateData& data) override;
+
+protected:
+    void loadTexture();
+
+private:
+    properties::StringProperty _colorTexturePath;
+
+    ghoul::opengl::ProgramObject* _programObject; // remember to add shaders!
+    ghoul::opengl::Texture* _texture;
+    planetgeometry::PlanetGeometry* _geometry; // < -- change
+
+	glm::dmat3 _stateMatrix; // might need this
+
+	std::string _target;
+};
+
+}  // namespace openspace
+
+#endif  // __RENDERABLEWAVEFRONTOBJECT_H__

include/openspace/util/constants.h

@@ -62,6 +62,15 @@ namespace renderableplanet {
 	const std::string keyFrame = "Frame";
 } // namespace renderableplanet
 
+namespace planetgeometry {
+	const std::string keyType = "Type";
+} // namespace planetgeometry
+
+namespace renderablewavefrontobject {
+	const std::string keyGeometry = "Geometry";
+	const std::string keyFrame = "Frame";
+} // namespace renderableplanet
+
 namespace renderablestars {
 	const std::string keySpeckFile = "SpeckFile";
 	const std::string keyPathModule = "ModulePath";
@@ -77,10 +86,6 @@ namespace renderablevolumegl {
 	const std::string keyTransferFunctionName = "TransferFunctionName";
 } // namespace renderablevolumegl
 
-namespace planetgeometry {
-    const std::string keyType = "Type";
-} // namespace planetgeometry
-
 namespace renderablesphericalgrid {
 	const std::string gridType = "GridType";
 	const std::string gridColor = "GridColor";