Update tutorial to match latest API of tinyobjloader

Overv · Overv · commit d18d4d906c56 · 2018-10-29T19:53:38.000+01:00
diff --git a/08_Loading_models.md b/08_Loading_models.md
@@ -18,7 +18,7 @@ We will use the [tinyobjloader](https://github.com/syoyo/tinyobjloader) library
 to load vertices and faces from an OBJ file. It's fast and it's easy to
 integrate because it's a single file library like stb_image. Go to the
 repository linked above and download the `tiny_obj_loader.h` file to a folder in
-your library directory.
+your library directory. Make sure to use the version of the file from the `master` branch because the latest official release is outdated.
 
 **Visual Studio**
 
@@ -139,10 +139,10 @@ void loadModel() {
     tinyobj::attrib_t attrib;
     std::vector<tinyobj::shape_t> shapes;
     std::vector<tinyobj::material_t> materials;
-    std::string err;
+    std::string warn, err;
 
-    if (!tinyobj::LoadObj(&attrib, &shapes, &materials, &err, MODEL_PATH.c_str())) {
-        throw std::runtime_error(err);
+    if (!tinyobj::LoadObj(&attrib, &shapes, &materials, &warn, &err, MODEL_PATH.c_str())) {
+        throw std::runtime_error(warn + err);
     }
 }
 ```
@@ -159,7 +159,7 @@ faces. Each face consists of an array of vertices, and each vertex contains the
 indices of the position, normal and texture coordinate attributes. OBJ models
 can also define a material and texture per face, but we will be ignoring those.
 
-The `err` string contains errors and warnings that occurred while loading the
+The `err` string contains errors and the `warn` string contains warnings that occurred while loading the
 file, like a missing material definition. Loading only really failed if the
 `LoadObj` function returns `false`. As mentioned above, faces in OBJ files can
 actually contain an arbitrary number of vertices, whereas our application can
diff --git a/code/27_model_loading.cpp b/code/27_model_loading.cpp
@@ -1003,10 +1003,10 @@ class HelloTriangleApplication {
         tinyobj::attrib_t attrib;
         std::vector<tinyobj::shape_t> shapes;
         std::vector<tinyobj::material_t> materials;
-        std::string err;
+        std::string warn, err;
 
-        if (!tinyobj::LoadObj(&attrib, &shapes, &materials, &err, MODEL_PATH.c_str())) {
-            throw std::runtime_error(err);
+        if (!tinyobj::LoadObj(&attrib, &shapes, &materials, &warn, &err, MODEL_PATH.c_str())) {
+            throw std::runtime_error(warn + err);
         }
 
         std::unordered_map<Vertex, uint32_t> uniqueVertices = {};
diff --git a/code/28_mipmapping.cpp b/code/28_mipmapping.cpp
@@ -1097,10 +1097,10 @@ class HelloTriangleApplication {
         tinyobj::attrib_t attrib;
         std::vector<tinyobj::shape_t> shapes;
         std::vector<tinyobj::material_t> materials;
-        std::string err;
+        std::string warn, err;
 
-        if (!tinyobj::LoadObj(&attrib, &shapes, &materials, &err, MODEL_PATH.c_str())) {
-            throw std::runtime_error(err);
+        if (!tinyobj::LoadObj(&attrib, &shapes, &materials, &warn, &err, MODEL_PATH.c_str())) {
+            throw std::runtime_error(warn + err);
         }
 
         std::unordered_map<Vertex, uint32_t> uniqueVertices = {};
diff --git a/code/29_multisampling.cpp b/code/29_multisampling.cpp
@@ -1156,10 +1156,10 @@ VkSampleCountFlagBits getMaxUsableSampleCount() {
         tinyobj::attrib_t attrib;
         std::vector<tinyobj::shape_t> shapes;
         std::vector<tinyobj::material_t> materials;
-        std::string err;
+        std::string warn, err;
 
-        if (!tinyobj::LoadObj(&attrib, &shapes, &materials, &err, MODEL_PATH.c_str())) {
-            throw std::runtime_error(err);
+        if (!tinyobj::LoadObj(&attrib, &shapes, &materials, &warn, &err, MODEL_PATH.c_str())) {
+            throw std::runtime_error(warn + err);
         }
 
         std::unordered_map<Vertex, uint32_t> uniqueVertices = {};
