Make ObjReaderConfig optional when calling ParseFrom***() function.

syoyo · syoyo · commit 17a6941cb340 · 2019-04-15T18:48:37.000+09:00
diff --git a/python/Makefile b/python/Makefile
@@ -1,2 +1,7 @@
 all:
 	python setup.py build
+
+t:
+	python sample.py
+
+.PHONY: t
diff --git a/python/bindings.cc b/python/bindings.cc
@@ -13,11 +13,15 @@ PYBIND11_MODULE(tinyobj, tobj_module)
   tobj_module.doc() = "Python bindings for TinyObjLoader.";
 
   // register struct
+  py::class_<ObjReaderConfig>(tobj_module, "ObjReaderConfig")
+    .def(py::init<>())
+    .def_readwrite("triangulate", &ObjReaderConfig::triangulate);
+
   // py::init<>() for default constructor
   py::class_<ObjReader>(tobj_module, "ObjReader")
     .def(py::init<>())
-    .def("ParseFromFile", &ObjReader::ParseFromFile)
-    .def("ParseFromString", &ObjReader::ParseFromString)
+    .def("ParseFromFile", &ObjReader::ParseFromFile, py::arg("filename"), py::arg("option") = ObjReaderConfig())
+    .def("ParseFromString", &ObjReader::ParseFromString, py::arg("obj_text"), py::arg("mtl_text"), py::arg("option") = ObjReaderConfig())
     .def("Valid", &ObjReader::Valid)
     .def("GetAttrib", &ObjReader::GetAttrib)
     .def("GetShapes", &ObjReader::GetShapes)
@@ -31,16 +35,16 @@ PYBIND11_MODULE(tinyobj, tobj_module)
 
   py::class_<shape_t>(tobj_module, "shape_t")
     .def(py::init<>())
-    .def_readonly("name", &shape_t::name)
-    .def_readonly("mesh", &shape_t::mesh)
-    .def_readonly("lines", &shape_t::lines)
-    .def_readonly("points", &shape_t::points);
+    .def_readwrite("name", &shape_t::name)
+    .def_readwrite("mesh", &shape_t::mesh)
+    .def_readwrite("lines", &shape_t::lines)
+    .def_readwrite("points", &shape_t::points);
 
   py::class_<index_t>(tobj_module, "index_t")
     .def(py::init<>())
-    .def_readonly("vertex_index", &index_t::vertex_index)
-    .def_readonly("normal_index", &index_t::normal_index)
-    .def_readonly("texcoord_index", &index_t::texcoord_index)
+    .def_readwrite("vertex_index", &index_t::vertex_index)
+    .def_readwrite("normal_index", &index_t::normal_index)
+    .def_readwrite("texcoord_index", &index_t::texcoord_index)
     ;
 
   // TODO(syoyo): write more bindings
@@ -57,8 +61,5 @@ PYBIND11_MODULE(tinyobj, tobj_module)
   py::class_<points_t>(tobj_module, "points_t")
     .def(py::init<>());
 
-  py::class_<ObjReaderConfig>(tobj_module, "ObjReaderConfig")
-    .def(py::init<>());
-
 }
 
diff --git a/python/sample.py b/python/sample.py
@@ -3,11 +3,16 @@
 
 filename = "../models/cornell_box.obj";
 
-config = tinyobj.ObjReaderConfig()
 
 reader = tinyobj.ObjReader()
 
-ret = reader.ParseFromFile(filename, config)
+# Load .obj(and .mtl) using default configuration
+ret = reader.ParseFromFile(filename)
+
+# Optionally you can set custom `config`
+# config = tinyobj.ObjReaderConfig()
+# config.triangulate = False
+# ret = reader.ParseFromFile(filename, config)
 
 if ret == False:
     print("Failed to load : ", filename)
diff --git a/tiny_obj_loader.h b/tiny_obj_loader.h
@@ -415,7 +415,7 @@ class ObjReader {
   /// @param[in] filename wavefront .obj filename
   /// @param[in] config Reader configuration
   ///
-  bool ParseFromFile(const std::string &filename, const ObjReaderConfig &config);
+  bool ParseFromFile(const std::string &filename, const ObjReaderConfig &config = ObjReaderConfig());
 
   ///
   /// Parse .obj from a text string.
@@ -426,7 +426,7 @@ class ObjReader {
   /// @param[in] mtl_text wavefront .mtl filename
   /// @param[in] config Reader configuration
   ///
-  bool ParseFromString(const std::string &obj_text, const std::string &mtl_text, const ObjReaderConfig &config);
+  bool ParseFromString(const std::string &obj_text, const std::string &mtl_text, const ObjReaderConfig &config = ObjReaderConfig());
 
   ///
   /// .obj was loaded or parsed correctly.
