changing obj loader to tinyobj

include/openspace/rendering/model/renderablemodel.h

@@ -69,6 +69,8 @@ private:
 
 	std::string _source;
 	std::string _destination;
+
+	properties::BoolProperty _performShading;
 };
 
 }  // namespace openspace

include/openspace/rendering/model/wavefrontgeometry.h

@@ -26,6 +26,7 @@
 #define __WAVEFRONTOBJECT_H__
 
 #include <openspace/rendering/model/modelgeometry.h>
+#include <openspace/util/tiny_obj_loader.h>
 
 namespace openspace {
 
@@ -51,15 +52,20 @@ public:
 		//GLubyte padding[4]; // Pads the struct out to 64 bytes for performance increase
 	} Vertex;
     
-
+	std::vector<tinyobj::shape_t> shapes;
+	std::vector<tinyobj::material_t> materials;
 protected:
 	void loadObj(const char *filename);
 private:
     void createSphere();
 	
-	GLuint _vaoID = 6;
-	GLuint _vBufferID = 7;
-	GLuint _iBufferID = 8;
+	GLuint _vaoID;
+	GLuint _vBufferID;
+	GLuint _iBufferID;
+
+	GLuint _tBufferID;
+	unsigned int _tsize;
+	float* _tarray;
 
 	unsigned int _isize;
 	unsigned int _vsize;

include/openspace/util/tiny_obj_loader.h

@@ -0,0 +1,94 @@
+//
+// Copyright 2012-2013, Syoyo Fujita.
+//
+// Licensed under 2-clause BSD liecense.
+//
+#ifndef _TINY_OBJ_LOADER_H
+#define _TINY_OBJ_LOADER_H
+
+#include <string>
+#include <vector>
+#include <map>
+
+namespace tinyobj {
+
+typedef struct {
+  std::string name;
+
+  float ambient[3];
+  float diffuse[3];
+  float specular[3];
+  float transmittance[3];
+  float emission[3];
+  float shininess;
+  float ior;      // index of refraction
+  float dissolve; // 1 == opaque; 0 == fully transparent
+  // illumination model (see http://www.fileformat.info/format/material/)
+  int illum;
+
+  std::string ambient_texname;
+  std::string diffuse_texname;
+  std::string specular_texname;
+  std::string normal_texname;
+  std::map<std::string, std::string> unknown_parameter;
+} material_t;
+
+typedef struct {
+  std::vector<float> positions;
+  std::vector<float> normals;
+  std::vector<float> texcoords;
+  std::vector<unsigned int> indices;
+  std::vector<int> material_ids; // per-mesh material ID
+} mesh_t;
+
+typedef struct {
+  std::string name;
+  mesh_t mesh;
+} shape_t;
+
+class MaterialReader {
+public:
+  MaterialReader() {}
+  virtual ~MaterialReader() {}
+
+  virtual std::string operator()(const std::string &matId,
+                                 std::vector<material_t> &materials,
+                                 std::map<std::string, int> &matMap) = 0;
+};
+
+class MaterialFileReader : public MaterialReader {
+public:
+  MaterialFileReader(const std::string &mtl_basepath)
+      : m_mtlBasePath(mtl_basepath) {}
+  virtual ~MaterialFileReader() {}
+  virtual std::string operator()(const std::string &matId,
+                                 std::vector<material_t> &materials,
+                                 std::map<std::string, int> &matMap);
+
+private:
+  std::string m_mtlBasePath;
+};
+
+/// Loads .obj from a file.
+/// 'shapes' will be filled with parsed shape data
+/// The function returns error string.
+/// Returns empty string when loading .obj success.
+/// 'mtl_basepath' is optional, and used for base path for .mtl file.
+std::string LoadObj(std::vector<shape_t> &shapes,       // [output]
+                    std::vector<material_t> &materials, // [output]
+                    const char *filename, const char *mtl_basepath = NULL);
+
+/// Loads object from a std::istream, uses GetMtlIStreamFn to retrieve
+/// std::istream for materials.
+/// Returns empty string when loading .obj success.
+std::string LoadObj(std::vector<shape_t> &shapes,       // [output]
+                    std::vector<material_t> &materials, // [output]
+                    std::istream &inStream, MaterialReader &readMatFn);
+
+/// Loads materials into std::map
+/// Returns an empty string if successful
+std::string LoadMtl(std::map<std::string, int> &material_map,
+                    std::vector<material_t> &materials, std::istream &inStream);
+}
+
+#endif // _TINY_OBJ_LOADER_H