Initial support of parsing curve primitive('curv')

Add clang-format style file.

tiny_obj_loader.h

@@ -13,82 +13,100 @@
 namespace tinyobj {
 
 typedef struct {
-  std::string name;
+	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;
+	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;
+	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
+	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;
+	std::vector<float> positions;
+	std::vector<unsigned int> indices;
+} line_t;
+
+typedef struct {
+	std::string name;
+	std::vector<float> positions;			 // control points. xyz
+	std::vector<unsigned int> indices; // index to control point
+	std::vector<float> u_params;
+	std::vector<float> v_params;
+	int degree;
+	int type; // 0: bspline, 1: bezier, 2: cardinal
+} curve_t;
+
+typedef struct {
+	std::string name;
+	mesh_t mesh;
 } shape_t;
 
 class MaterialReader {
 public:
-  MaterialReader() {}
-  virtual ~MaterialReader() {}
+	MaterialReader() {}
+	virtual ~MaterialReader() {}
 
-  virtual std::string operator()(const std::string &matId,
-                                 std::vector<material_t> &materials,
-                                 std::map<std::string, int> &matMap) = 0;
+	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);
+	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;
+	std::string m_mtlBasePath;
 };
 
 /// Loads .obj from a file.
 /// 'shapes' will be filled with parsed shape data
+/// 'curves' will be filled with parsed curve data(NURBS, Bezier, etc)
 /// 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);
+std::string LoadObj(std::vector<shape_t> &shapes,				// [output]
+										std::vector<curve_t> &curves,				// [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);
+std::string LoadObj(std::vector<shape_t> &shapes,				// [output]
+										std::vector<curve_t> &curves,				// [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);
+										std::vector<material_t> &materials, std::istream &inStream);
 }
 
 #endif // _TINY_OBJ_LOADER_H