Merge branch 'normal-texcoord-indices' of github.com:syoyo/tinyobjloader into normal-texcoord-indices

Conflicts:
	tiny_obj_loader.cc

.bintray.in

@@ -1,37 +0,0 @@
-{
-    /* Bintray package information.
-       In case the package already exists on Bintray, only the name, repo and subject
-       fields are mandatory. */
-
-    "package": {
-        "name": "releases", // Bintray package name
-        "repo": "tinyobjloader", // Bintray repository name
-        "subject": "syoyo" // Bintray subject (user or organization)
-    },
-
-    /* Package version information.
-       In case the version already exists on Bintray, only the name fields is mandatory. */
-
-    "version": {
-        "name": "@VERSION@",
-        "desc": "@VERSION@",
-        "released": "@DATE@",
-        "vcs_tag": "@VERSION@",
-        "gpgSign": false
-    },
-
-    /* Configure the files you would like to upload to Bintray and their upload path.
-    You can define one or more groups of patterns.
-    Each group contains three patterns:
-
-    includePattern: Pattern in the form of Ruby regular expression, indicating the path of files to be uploaded to Bintray.
-    excludePattern: Optional. Pattern in the form of Ruby regular expression, indicating the path of files to be removed from the list of files specified by the includePattern.
-    uploadPattern: Upload path on Bintray. The path can contain symbols in the form of $1, $2,... that are replaced with capturing groups defined in the include pattern.
-
-    Note: Regular expressions defined as part of the includePattern property must be wrapped with brackets. */
-
-    "files":
-        [ {"includePattern": "dist/(.*)", "uploadPattern": "$1"} ],
-    "publish": true
-}
-

.clang-format

@@ -1,7 +0,0 @@
----
-BasedOnStyle: LLVM
-IndentWidth: 2
-TabWidth: 2
-UseTab: Never
-BreakBeforeBraces: Attach
-Standard: Cpp03

.travis.yml

@@ -1,85 +0,0 @@
-language: cpp
-sudo: false
-matrix:
-  include:
-  - addons: &1
-      apt:
-        sources:
-        - george-edison55-precise-backports
-        - ubuntu-toolchain-r-test
-        - llvm-toolchain-precise-3.7
-        packages:
-        - cmake
-        - cmake-data
-        - ninja-build
-        - g++-4.9
-        - clang-3.7
-    compiler: clang
-    env: DEPLOY_BUILD=1 COMPILER_VERSION=3.7 BUILD_TYPE=Debug
-  - addons: *1
-    compiler: clang
-    env: COMPILER_VERSION=3.7 BUILD_TYPE=Release
-  - addons: &2
-      apt:
-        sources:
-        - george-edison55-precise-backports
-        - ubuntu-toolchain-r-test
-        packages:
-        - cmake
-        - cmake-data
-        - ninja-build
-        - g++-4.9
-    compiler: gcc
-    env: COMPILER_VERSION=4.9 BUILD_TYPE=Debug
-  - addons: *2
-    compiler: gcc
-    env: COMPILER_VERSION=4.9 BUILD_TYPE=Release
-  - addons: *1
-    compiler: clang
-    env: COMPILER_VERSION=3.7 BUILD_TYPE=Debug CFLAGS="-O0 --coverage" CXXFLAGS="-O0
-      --coverage" REPORT_COVERAGE=1
-before_install:
-- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew upgrade; fi
-- if [ -n "$REPORT_COVERAGE" ]; then pip install --user cpp-coveralls; fi
-script:
-- mkdir build && cd build
-- export CC="${CC}-${COMPILER_VERSION}"
-- export CXX="${CXX}-${COMPILER_VERSION}"
-- ${CC} -v
-- cmake --version
-- cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DTINYOBJLOADER_BUILD_TEST_LOADER=On -G Ninja
-  ..
-- ninja
-- ./test_loader ../cornell_box.obj
-- if [ -n "$REPORT_COVERAGE" ]; then coveralls -b . -r .. -e examples -e tools -e
-  jni -e python -e images -E ".*CompilerId.*" -E ".*feature_tests.*" ; fi
-- cd ..
-- rm -rf dist
-- mkdir dist
-- cp tiny_obj_loader.h dist/
-
-before_deploy:
-  - echo "Creating description file for bintray."
-  - ./tools/travis_postbuild.sh
-
-deploy:
-  - provider: bintray
-    file: ".bintray.json"
-    user: "syoyo"
-    key:
-      secure: W4F1VZcDcVOMe8Ymvo0bHery/JSmVhadl1NgAnGus6o7zVw7ChElKA1ho/NtqUbtoW8o1qUKMJdLQeh786jolocZJEJlns9JZ5FCet6H2b3kITfUa4GR5T11V/ZYwL3SajW8vZ1xu5UrpP5HHgFMYtxb1MFrNLDI60sh0RnyV/qFFBnCJGZPagF/M1mzbJeDml5xK5lShH0r8QpH+7MeQ1J8ungEyJ7UCyr1ao8gY9eq1/05IpHR9vri/d48EXQWHbqtI8EwCc7064oCYQGyYcLsD4yPEokwrdelkCvDquSpJLmbJENfZCc4vZGXsykjnQ8+gltJomBAivQFB9vc06ETEJssMzitbrfEZUrqFwZj/HZM7CYGXfGQWltL828SppCjsuWrgQ/VYXM5UgRpmhlxbqnuyxnYvKZ9EDW4+EnMkOmIl7WSDovp8E/4CZ0ghs+YyFS4SrgeqFCXS8bvxrkDUUPSipHuGBOt02fRnccKzU+3zU6Q5fghyLczz4ZtnOdk+Niz/njyF0SZfPYTUgb3GzAJ8Su6kvWJCAGdedON3n1F/TtybCE2dIdATxaO2uFQbwYjSOCiq209oCJ7MrsQZibRsa5a9YXyjlLkPxwOeVwo8wJyJclqWswIkhdSO8xvTnkwESv4yLzLutEOlBVlQbJzpyuS6vx0yHOYkwc=
-    all_branches: true
-    on:
-      repo: syoyo/tinyobjloader
-      condition: -n "$DEPLOY_BUILD"
-      tags: true
-    skip_cleanup: true
-  - provider: releases
-    api_key:
-      secure: AsXameK4GJn6h6wMmDrKTr7q/o9EI7hX7zWg1W6VaFBQKfkBvOmjJolWimjl6HMoRZ1NpMmK5GDm3zBlTUeABtgVBIyNWgE9vWS39ff6D5iQKcgScFsJkyILt0GikBqbN2pLGQ2t/M1Qh6n1sEIfzqekiCcF5Qvy5yYlYvHtaRGV02QeYAej/xx15/9SMuKTncHhjf63ClYPu8ODid7QUegJUvlQUeXoPsBDbaXMH2uDWoBWF7etX7G2Iob4NE8GX+ZP6dj+Ogi7p4HXThK650mzLL/pUl584EjjY/vePqx0cFhtpiRwvrW8SNPI1aJ1Phwa1enLRUgfS3bnkwQAMw/SCXSK2lnCvkUAXyTgpG03HWrZURj4vhEPXc7qHooO+dsfmi+JanYLaSDyrGpgQznLGjCMnVATimry0KxSufUY8Wt72Wh+nf7N0IgTUCjl32sWnQd/MRZPkxFuaf1h7r9RoH9KZY0yIOV09gABEFCGrOIZA2FcyhC2G26Bc4zyNrfMFpZ2DI76qdcWNdJGkRkpxtH9sGU8JgZu6Em2f1e6+SLgkBsPxbhRk5PwdhA9AXE2p9PmQqhO3jJKusGBZSoHAF7TlwagRY2J01yJxF7ge6zG9U8QuBqs1bB1zdnE34fHWOgs4st3inC+oBDOhvnEg1Nm/qeYVWMBzpwclSg=
-    file: tiny_obj_loader.h
-    all_branches: true
-    on:
-      repo: syoyo/tinyobjloader
-      tags: true
-    skip_cleanup: true

README.md

@@ -1,36 +1,20 @@
 tinyobjloader
 =============
 
-[![Join the chat at https://gitter.im/syoyo/tinyobjloader](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/syoyo/tinyobjloader?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
-
-[![Build Status](https://travis-ci.org/syoyo/tinyobjloader.svg)](https://travis-ci.org/syoyo/tinyobjloader)
-
 [![wercker status](https://app.wercker.com/status/495a3bac400212cdacdeb4dd9397bf4f/m "wercker status")](https://app.wercker.com/project/bykey/495a3bac400212cdacdeb4dd9397bf4f)
 
 [![Build status](https://ci.appveyor.com/api/projects/status/tlb421q3t2oyobcn/branch/master?svg=true)](https://ci.appveyor.com/project/syoyo/tinyobjloader/branch/master)
 
-[![Coverage Status](https://coveralls.io/repos/github/syoyo/tinyobjloader/badge.svg?branch=master)](https://coveralls.io/github/syoyo/tinyobjloader?branch=master)
-
 http://syoyo.github.io/tinyobjloader/
 
-Tiny but powerful single file wavefront obj loader written in C++. No dependency except for C++ STL. It can parse 10M over polygons with moderate memory and time.
+Tiny but poweful single file wavefront obj loader written in C++. No dependency except for C++ STL. It can parse 10M over polygons with moderate memory and time.
 
 `tinyobjloader` is good for embedding .obj loader to your (global illumination) renderer ;-)
 
-Notice!
--------
-
-`master` branch will be replaced with `develop` branch in the near future: https://github.com/syoyo/tinyobjloader/tree/develop
-`develop` branch has more better support and clean API interface for loading .obj and also it has optimized multi-threaded parser(probably 10x faster than `master`). If you are new to use `TinyObjLoader`, I highly recommend to use `develop` branch.
-
 
 What's new
 ----------
 
-* Mar 13, 2016 : Introduce `load_flag_t` and flat normal calculation flag! Thanks Vazquinhos!
-* Jan 29, 2016 : Support n-polygon(no triangulation) and OpenSubdiv crease tag! Thanks dboogert!
-* Nov 26, 2015 : Now single-header only!.
-* Nov 08, 2015 : Improved API.
 * Jun 23, 2015 : Various fixes and added more projects using tinyobjloader. Thanks many contributors!
 * Mar 03, 2015 : Replace atof() with hand-written parser for robust reading of numeric value. Thanks skurmedel!
 * Feb 06, 2015 : Fix parsing multi-material object
@@ -57,22 +41,14 @@ Use case
 TinyObjLoader is successfully used in ...
 
 * bullet3 https://github.com/erwincoumans/bullet3
-* pbrt-v2 https://github.com/mmp/pbrt-v2
+* pbrt-v2 https://https://github.com/mmp/pbrt-v2
 * OpenGL game engine development http://swarminglogic.com/jotting/2013_10_gamedev01
 * mallie https://lighttransport.github.io/mallie
 * IBLBaker (Image Based Lighting Baker). http://www.derkreature.com/iblbaker/
 * Stanford CS148 http://web.stanford.edu/class/cs148/assignments/assignment3.pdf
 * Awesome Bump http://awesomebump.besaba.com/about/
 * sdlgl3-wavefront OpenGL .obj viewer https://github.com/chrisliebert/sdlgl3-wavefront
-* pbrt-v3 https://github.com/mmp/pbrt-v3
+* pbrt-v3 https://https://github.com/mmp/pbrt-v3
-* cocos2d-x https://github.com/cocos2d/cocos2d-x/
-* Android Vulkan demo https://github.com/SaschaWillems/Vulkan
-* voxelizer https://github.com/karimnaaji/voxelizer
-* Probulator https://github.com/kayru/Probulator
-* OptiX Prime baking https://github.com/nvpro-samples/optix_prime_baking
-* FireRays SDK https://github.com/GPUOpen-LibrariesAndSDKs/FireRays_SDK
-* parg, tiny C library of various graphics utilities and GL demos https://github.com/prideout/parg
-* Opengl unit of ChronoEngine https://github.com/projectchrono/chrono-opengl
 * Your project here!
 
 Features
@@ -84,13 +60,16 @@ Features
 * Normal
 * Material
   * Unknown material attributes are returned as key-value(value is string) map.
-* Crease tag('t'). This is OpenSubdiv specific(not in wavefront .obj specification)
 
+Notes
+-----
+
+Polygon is converted into triangle.
 
 TODO
 ----
 
-* [ ] Support different indices for vertex/normal/texcoord
+- [ ] Support quad polygon and some tags for OpenSubdiv http://graphics.pixar.com/opensubdiv/
 
 License
 -------
@@ -100,108 +79,59 @@ Licensed under 2 clause BSD.
 Usage
 -----
 
-TinyObjLoader triangulate input .obj by default.
+    std::string inputfile = "cornell_box.obj";
-```c++
+    std::vector<tinyobj::shape_t> shapes;
-#define TINYOBJLOADER_IMPLEMENTATION // define this in only *one* .cc
+    std::vector<tinyobj::material_t> materials;
-#include "tiny_obj_loader.h"
-
-std::string inputfile = "cornell_box.obj";
-std::vector<tinyobj::shape_t> shapes;
-std::vector<tinyobj::material_t> materials;
   
-std::string err;
+    std::string err = tinyobj::LoadObj(shapes, materials, inputfile.c_str());
-bool ret = tinyobj::LoadObj(shapes, materials, err, inputfile.c_str());
   
-if (!err.empty()) { // `err` may contain warning message.
+    if (!err.empty()) {
-  std::cerr << err << std::endl;
+      std::cerr << err << std::endl;
-}
+      exit(1);
-
-if (!ret) {
-  exit(1);
-}
-
-std::cout << "# of shapes    : " << shapes.size() << std::endl;
-std::cout << "# of materials : " << materials.size() << std::endl;
-  
-for (size_t i = 0; i < shapes.size(); i++) {
-  printf("shape[%ld].name = %s\n", i, shapes[i].name.c_str());
-  printf("Size of shape[%ld].indices: %ld\n", i, shapes[i].mesh.indices.size());
-  printf("Size of shape[%ld].material_ids: %ld\n", i, shapes[i].mesh.material_ids.size());
-  assert((shapes[i].mesh.indices.size() % 3) == 0);
-  for (size_t f = 0; f < shapes[i].mesh.indices.size() / 3; f++) {
-    printf("  idx[%ld] = %d, %d, %d. mat_id = %d\n", f, shapes[i].mesh.indices[3*f+0], shapes[i].mesh.indices[3*f+1], shapes[i].mesh.indices[3*f+2], shapes[i].mesh.material_ids[f]);
-  }
-
-  printf("shape[%ld].vertices: %ld\n", i, shapes[i].mesh.positions.size());
-  assert((shapes[i].mesh.positions.size() % 3) == 0);
-  for (size_t v = 0; v < shapes[i].mesh.positions.size() / 3; v++) {
-    printf("  v[%ld] = (%f, %f, %f)\n", v,
-      shapes[i].mesh.positions[3*v+0],
-      shapes[i].mesh.positions[3*v+1],
-      shapes[i].mesh.positions[3*v+2]);
-  }
-}
-
-for (size_t i = 0; i < materials.size(); i++) {
-  printf("material[%ld].name = %s\n", i, materials[i].name.c_str());
-  printf("  material.Ka = (%f, %f ,%f)\n", materials[i].ambient[0], materials[i].ambient[1], materials[i].ambient[2]);
-  printf("  material.Kd = (%f, %f ,%f)\n", materials[i].diffuse[0], materials[i].diffuse[1], materials[i].diffuse[2]);
-  printf("  material.Ks = (%f, %f ,%f)\n", materials[i].specular[0], materials[i].specular[1], materials[i].specular[2]);
-  printf("  material.Tr = (%f, %f ,%f)\n", materials[i].transmittance[0], materials[i].transmittance[1], materials[i].transmittance[2]);
-  printf("  material.Ke = (%f, %f ,%f)\n", materials[i].emission[0], materials[i].emission[1], materials[i].emission[2]);
-  printf("  material.Ns = %f\n", materials[i].shininess);
-  printf("  material.Ni = %f\n", materials[i].ior);
-  printf("  material.dissolve = %f\n", materials[i].dissolve);
-  printf("  material.illum = %d\n", materials[i].illum);
-  printf("  material.map_Ka = %s\n", materials[i].ambient_texname.c_str());
-  printf("  material.map_Kd = %s\n", materials[i].diffuse_texname.c_str());
-  printf("  material.map_Ks = %s\n", materials[i].specular_texname.c_str());
-  printf("  material.map_Ns = %s\n", materials[i].specular_highlight_texname.c_str());
-  std::map<std::string, std::string>::const_iterator it(materials[i].unknown_parameter.begin());
-  std::map<std::string, std::string>::const_iterator itEnd(materials[i].unknown_parameter.end());
-  for (; it != itEnd; it++) {
-    printf("  material.%s = %s\n", it->first.c_str(), it->second.c_str());
-  }
-  printf("\n");
-}
-```
-
-Reading .obj without triangulation. Use `num_vertices[i]` to iterate over faces(indices). `num_vertices[i]` stores the number of vertices for ith face.
-```c++
-#define TINYOBJLOADER_IMPLEMENTATION // define this in only *one* .cc
-#include "tiny_obj_loader.h"
-
-std::string inputfile = "cornell_box.obj";
-std::vector<tinyobj::shape_t> shapes;
-std::vector<tinyobj::material_t> materials;
-  
-std::string err;
-int flags = 1; // see load_flags_t enum for more information.
-bool ret = tinyobj::LoadObj(shapes, materials, err, inputfile.c_str(), flags);
-  
-if (!err.empty()) { // `err` may contain warning message.
-  std::cerr << err << std::endl;
-}
-
-if (!ret) {
-  exit(1);
-}
-
-for (size_t i = 0; i < shapes.size(); i++) {
-
-  size_t indexOffset = 0;
-  for (size_t n = 0; n < shapes[i].mesh.num_vertices.size(); n++) {
-    int ngon = shapes[i].mesh.num_vertices[n];
-    for (size_t f = 0; f < ngon; f++) {
-      unsigned int v = shapes[i].mesh.indices[indexOffset + f];
-      printf("  face[%ld] v[%ld] = (%f, %f, %f)\n", n,
-        shapes[i].mesh.positions[3*v+0],
-        shapes[i].mesh.positions[3*v+1],
-        shapes[i].mesh.positions[3*v+2]);
-      
     }
-    indexOffset += ngon;
-  }
 
-}
+    std::cout << "# of shapes    : " << shapes.size() << std::endl;
-```
+    std::cout << "# of materials : " << materials.size() << std::endl;
+  
+    for (size_t i = 0; i < shapes.size(); i++) {
+      printf("shape[%ld].name = %s\n", i, shapes[i].name.c_str());
+      printf("Size of shape[%ld].indices: %ld\n", i, shapes[i].mesh.indices.size());
+      printf("Size of shape[%ld].material_ids: %ld\n", i, shapes[i].mesh.material_ids.size());
+      assert((shapes[i].mesh.indices.size() % 3) == 0);
+      for (size_t f = 0; f < shapes[i].mesh.indices.size() / 3; f++) {
+        printf("  idx[%ld] = %d, %d, %d. mat_id = %d\n", f, shapes[i].mesh.indices[3*f+0], shapes[i].mesh.indices[3*f+1], shapes[i].mesh.indices[3*f+2], shapes[i].mesh.material_ids[f]);
+      }
+
+      printf("shape[%ld].vertices: %ld\n", i, shapes[i].mesh.positions.size());
+      assert((shapes[i].mesh.positions.size() % 3) == 0);
+      for (size_t v = 0; v < shapes[i].mesh.positions.size() / 3; v++) {
+        printf("  v[%ld] = (%f, %f, %f)\n", v,
+          shapes[i].mesh.positions[3*v+0],
+          shapes[i].mesh.positions[3*v+1],
+          shapes[i].mesh.positions[3*v+2]);
+      }
+    }
+
+    for (size_t i = 0; i < materials.size(); i++) {
+      printf("material[%ld].name = %s\n", i, materials[i].name.c_str());
+      printf("  material.Ka = (%f, %f ,%f)\n", materials[i].ambient[0], materials[i].ambient[1], materials[i].ambient[2]);
+      printf("  material.Kd = (%f, %f ,%f)\n", materials[i].diffuse[0], materials[i].diffuse[1], materials[i].diffuse[2]);
+      printf("  material.Ks = (%f, %f ,%f)\n", materials[i].specular[0], materials[i].specular[1], materials[i].specular[2]);
+      printf("  material.Tr = (%f, %f ,%f)\n", materials[i].transmittance[0], materials[i].transmittance[1], materials[i].transmittance[2]);
+      printf("  material.Ke = (%f, %f ,%f)\n", materials[i].emission[0], materials[i].emission[1], materials[i].emission[2]);
+      printf("  material.Ns = %f\n", materials[i].shininess);
+      printf("  material.Ni = %f\n", materials[i].ior);
+      printf("  material.dissolve = %f\n", materials[i].dissolve);
+      printf("  material.illum = %d\n", materials[i].illum);
+      printf("  material.map_Ka = %s\n", materials[i].ambient_texname.c_str());
+      printf("  material.map_Kd = %s\n", materials[i].diffuse_texname.c_str());
+      printf("  material.map_Ks = %s\n", materials[i].specular_texname.c_str());
+      printf("  material.map_Ns = %s\n", materials[i].normal_texname.c_str());
+      std::map<std::string, std::string>::const_iterator it(materials[i].unknown_parameter.begin());
+      std::map<std::string, std::string>::const_iterator itEnd(materials[i].unknown_parameter.end());
+      for (; it != itEnd; it++) {
+        printf("  material.%s = %s\n", it->first.c_str(), it->second.c_str());
+      }
+      printf("\n");
+    }
+  

build.ninja

@@ -1,16 +0,0 @@
-# build.ninja
-cc     = clang
-cxx    = clang++
-cflags = -Werror -Weverything
-cxxflags = -Werror -Weverything
-
-rule compile
-  command = $cxx $cxxflags -c $in -o $out
-
-rule link
-  command = $cxx $in -o $out
-
-build test.o: compile test.cc
-build test: link test.o
-
-default test

catmark_torus_creases0.obj

@@ -1,101 +0,0 @@
-#
-#   Copyright 2013 Pixar
-#
-#   Licensed under the Apache License, Version 2.0 (the "Apache License")
-#   with the following modification; you may not use this file except in
-#   compliance with the Apache License and the following modification to it:
-#   Section 6. Trademarks. is deleted and replaced with:
-#
-#   6. Trademarks. This License does not grant permission to use the trade
-#      names, trademarks, service marks, or product names of the Licensor
-#      and its affiliates, except as required to comply with Section 4(c) of
-#      the License and to reproduce the content of the NOTICE file.
-#
-#   You may obtain a copy of the Apache License at
-#
-#       http:#www.apache.org/licenses/LICENSE-2.0
-#
-#   Unless required by applicable law or agreed to in writing, software
-#   distributed under the Apache License with the above modification is
-#   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#   KIND, either express or implied. See the Apache License for the specific
-#   language governing permissions and limitations under the Apache License.
-#
-# This file uses centimeters as units for non-parametric coordinates.
-
-v 1.25052 0.517982 0.353553
-v 0.597239 0.247384 0.353553
-v 0.597239 0.247384 -0.353553
-v 1.25052 0.517982 -0.353553
-v 0.517982 1.25052 0.353553
-v 0.247384 0.597239 0.353553
-v 0.247384 0.597239 -0.353553
-v 0.517982 1.25052 -0.353553
-v -0.517982 1.25052 0.353553
-v -0.247384 0.597239 0.353553
-v -0.247384 0.597239 -0.353553
-v -0.517982 1.25052 -0.353553
-v -1.25052 0.517982 0.353553
-v -0.597239 0.247384 0.353553
-v -0.597239 0.247384 -0.353553
-v -1.25052 0.517982 -0.353553
-v -1.25052 -0.517982 0.353553
-v -0.597239 -0.247384 0.353553
-v -0.597239 -0.247384 -0.353553
-v -1.25052 -0.517982 -0.353553
-v -0.517982 -1.25052 0.353553
-v -0.247384 -0.597239 0.353553
-v -0.247384 -0.597239 -0.353553
-v -0.517982 -1.25052 -0.353553
-v 0.517982 -1.25052 0.353553
-v 0.247384 -0.597239 0.353553
-v 0.247384 -0.597239 -0.353553
-v 0.517982 -1.25052 -0.353553
-v 1.25052 -0.517982 0.353553
-v 0.597239 -0.247384 0.353553
-v 0.597239 -0.247384 -0.353553
-v 1.25052 -0.517982 -0.353553
-vt 0 0
-vt 1 0
-vt 1 1
-vt 0 1
-f 5/1/1 6/2/2 2/3/3 1/4/4
-f 6/1/5 7/2/6 3/3/7 2/4/8
-f 7/1/9 8/2/10 4/3/11 3/4/12
-f 8/1/13 5/2/14 1/3/15 4/4/16
-f 9/1/17 10/2/18 6/3/19 5/4/20
-f 10/1/21 11/2/22 7/3/23 6/4/24
-f 11/1/25 12/2/26 8/3/27 7/4/28
-f 12/1/29 9/2/30 5/3/31 8/4/32
-f 13/1/33 14/2/34 10/3/35 9/4/36
-f 14/1/37 15/2/38 11/3/39 10/4/40
-f 15/1/41 16/2/42 12/3/43 11/4/44
-f 16/1/45 13/2/46 9/3/47 12/4/48
-f 17/1/49 18/2/50 14/3/51 13/4/52
-f 18/1/53 19/2/54 15/3/55 14/4/56
-f 19/1/57 20/2/58 16/3/59 15/4/60
-f 20/1/61 17/2/62 13/3/63 16/4/64
-f 21/1/65 22/2/66 18/3/67 17/4/68
-f 22/1/69 23/2/70 19/3/71 18/4/72
-f 23/1/73 24/2/74 20/3/75 19/4/76
-f 24/1/77 21/2/78 17/3/79 20/4/80
-f 25/1/81 26/2/82 22/3/83 21/4/84
-f 26/1/85 27/2/86 23/3/87 22/4/88
-f 27/1/89 28/2/90 24/3/91 23/4/92
-f 28/1/93 25/2/94 21/3/95 24/4/96
-f 29/1/97 30/2/98 26/3/99 25/4/100
-f 30/1/101 31/2/102 27/3/103 26/4/104
-f 31/1/105 32/2/106 28/3/107 27/4/108
-f 32/1/109 29/2/110 25/3/111 28/4/112
-f 1/1/113 2/2/114 30/3/115 29/4/116
-f 2/1/117 3/2/118 31/3/119 30/4/120
-f 3/1/121 4/2/122 32/3/123 31/4/124
-f 4/1/125 1/2/126 29/3/127 32/4/128
-t crease 2/1/0 1 5 4.7
-t crease 2/1/0 5 9 4.7
-t crease 2/1/0 9 13 4.7
-t crease 2/1/0 13 17 4.7
-t crease 2/1/0 17 21 4.7
-t crease 2/1/0 21 25 4.7
-t crease 2/1/0 25 29 4.7
-t crease 2/1/0 29 1 4.7

examples/obj_sticher/obj_sticher.cc

@@ -86,12 +86,9 @@ main(
   for (int i = 0; i < num_objfiles; i++) {
     std::cout << "Loading " << argv[i+1] << " ... " << std::flush;
     
-    std::string err;
+    std::string err = tinyobj::LoadObj(shapes[i], materials[i], argv[i+1]);
-    bool ret = tinyobj::LoadObj(shapes[i], materials[i], err, argv[i+1]);
     if (!err.empty()) {
       std::cerr << err << std::endl;
-    }
-    if (!ret) {
       exit(1);
     }
 

jni/Android.mk

@@ -1,12 +0,0 @@
-# A simple test for the minimal standard C++ library
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := tinyobjloader
-LOCAL_SRC_FILES := ../tiny_obj_loader.cc ../test.cc
-
-LOCAL_C_INCLUDES := ../
-
-include $(BUILD_EXECUTABLE)

jni/Application.mk

@@ -1,2 +0,0 @@
-APP_ABI := all
-APP_STL := stlport_static

jni/Makefile

@@ -1,2 +0,0 @@
-all:
-	ndk-build

jni/README

@@ -1 +0,0 @@
-Just tests compilation with Android NDK r10.

missing_material_file.obj

@@ -1,145 +0,0 @@
-# cornell_box.obj and cornell_box.mtl are grabbed from Intel's embree project.
-# original cornell box data
-  # comment
-
-# empty line including some space
-   
-
-#mtllib no_material.mtl
-
-o floor
-usemtl white
-v 552.8 0.0   0.0
-v 0.0   0.0   0.0
-v 0.0   0.0 559.2
-v 549.6 0.0 559.2
-
-v 130.0 0.0  65.0
-v  82.0 0.0 225.0
-v 240.0 0.0 272.0
-v 290.0 0.0 114.0
-
-v 423.0 0.0 247.0
-v 265.0 0.0 296.0
-v 314.0 0.0 456.0
-v 472.0 0.0 406.0
-
-f 1 2 3 4 
-f 8 7 6 5
-f 12 11 10 9
-
-o light
-usemtl light
-v 343.0 548.0 227.0
-v 343.0 548.0 332.0
-v 213.0 548.0 332.0
-v 213.0 548.0 227.0
-f -4 -3 -2 -1
-
-o ceiling
-usemtl white
-v 556.0 548.8 0.0
-v 556.0 548.8 559.2
-v 0.0 548.8 559.2
-v 0.0 548.8 0.0
-f -4 -3 -2 -1
-
-o back_wall
-usemtl white
-v 549.6   0.0 559.2
-v 0.0   0.0 559.2
-v 0.0 548.8 559.2
-v 556.0 548.8 559.2
-f -4 -3 -2 -1
-
-o front_wall
-usemtl blue
-v 549.6   0.0 0
-v 0.0   0.0 0
-v 0.0 548.8 0
-v 556.0 548.8 0
-#f -1 -2 -3 -4
-
-o green_wall
-usemtl green
-v    0.0   0.0 559.2
-v    0.0   0.0   0.0
-v    0.0 548.8   0.0
-v    0.0 548.8 559.2
-f -4 -3 -2 -1
-
-o red_wall
-usemtl red
-v    552.8   0.0   0.0
-v    549.6   0.0 559.2
-v    556.0 548.8 559.2
-v    556.0 548.8   0.0
-f -4 -3 -2 -1
-
-o short_block
-usemtl white
-
-v    130.0 165.0  65.0
-v     82.0 165.0 225.0
-v    240.0 165.0 272.0
-v    290.0 165.0 114.0
-f -4 -3 -2 -1
-
-v    290.0   0.0 114.0
-v    290.0 165.0 114.0
-v    240.0 165.0 272.0
-v    240.0   0.0 272.0
-f -4 -3 -2 -1
-
-v    130.0   0.0  65.0
-v    130.0 165.0  65.0
-v    290.0 165.0 114.0
-v    290.0   0.0 114.0
-f -4 -3 -2 -1
-
-v     82.0   0.0 225.0
-v     82.0 165.0 225.0
-v    130.0 165.0  65.0
-v    130.0   0.0  65.0
-f -4 -3 -2 -1
-
-v    240.0   0.0 272.0
-v    240.0 165.0 272.0
-v     82.0 165.0 225.0
-v     82.0   0.0 225.0
-f -4 -3 -2 -1
-
-o tall_block
-usemtl white
-
-v    423.0 330.0 247.0
-v    265.0 330.0 296.0
-v    314.0 330.0 456.0
-v    472.0 330.0 406.0
-f -4 -3 -2 -1
-
-usemtl white
-v    423.0   0.0 247.0
-v    423.0 330.0 247.0
-v    472.0 330.0 406.0
-v    472.0   0.0 406.0
-f -4 -3 -2 -1
-
-v    472.0   0.0 406.0
-v    472.0 330.0 406.0
-v    314.0 330.0 456.0
-v    314.0   0.0 456.0
-f -4 -3 -2 -1
-
-v    314.0   0.0 456.0
-v    314.0 330.0 456.0
-v    265.0 330.0 296.0
-v    265.0   0.0 296.0
-f -4 -3 -2 -1
-
-v    265.0   0.0 296.0
-v    265.0 330.0 296.0
-v    423.0 330.0 247.0
-v    423.0   0.0 247.0
-f -4 -3 -2 -1
-

models/usemtl-issue-68.mtl

@@ -1,9 +0,0 @@
-newmtl Material.001
-Ka 0 0 0
-Kd 0 0 0
-Ks 0 0 0
-
-newmtl Material.003
-Ka 0 0 0
-Kd 1 1 1
-Ks 0 0 0

models/usemtl-issue-68.obj

@@ -1,817 +0,0 @@
-# https://github.com/syoyo/tinyobjloader/issues/68
-# Blender v2.73 (sub 0) OBJ File: 'enemy.blend'
-# www.blender.org
-mtllib usemtl-issue-68.mtl
-o Cube
-v 1.864151 -1.219172 -5.532511
-v 0.575869 -0.666304 5.896140
-v 0.940448 1.000000 -1.971128
-v 1.620345 1.000000 -5.815706
-v 1.864152 1.000000 -6.334323
-v 0.575869 -0.129842 5.896143
-v 5.440438 -1.462153 -5.818601
-v 4.896782 -1.462153 -2.744413
-v 1.000825 -0.677484 1.899605
-v 5.440438 -1.246362 -5.818600
-v 1.000825 0.852342 1.899608
-v 4.896782 -1.246362 -2.744412
-v 1.160660 -0.450871 -2.356325
-v 1.704316 -0.450871 -5.430513
-v 1.000825 -0.351920 -1.293797
-v 1.000825 1.000000 -1.293794
-v 1.160660 -0.877888 -2.356326
-v 1.704316 -0.877888 -5.430514
-v 1.000825 -1.219172 -1.452514
-v 1.000825 1.000000 -1.452511
-v 1.000825 -0.351920 1.759410
-v 1.000825 1.000000 1.759413
-v 9.097919 1.221145 -6.212147
-v 8.356775 1.221145 -2.021231
-v 1.864151 -0.109586 -6.334325
-v 0.575869 -0.398073 5.896141
-v 9.097919 0.943958 -6.212148
-v 8.356775 0.943958 -2.021233
-v 1.061916 0.113661 -1.797961
-v 1.000825 0.161258 1.899606
-v 1.000825 0.324040 -1.293795
-v 1.803060 0.113661 -5.988876
-v 1.000825 -0.109586 -1.452513
-v 1.061916 0.776753 -1.797960
-v 1.803061 0.776753 -5.988875
-v 1.000825 0.324040 1.759412
-v 0.000825 -1.219172 -5.532512
-v 0.000825 -0.666304 5.896139
-v 0.000826 1.000000 -6.334325
-v 0.000825 -0.129842 5.896140
-v 0.000825 0.852342 1.899606
-v 0.000825 -0.677484 1.899604
-v 0.000825 -0.351920 -1.293797
-v 0.000825 1.000000 -1.293796
-v 0.000825 1.000000 -1.452513
-v 0.000825 -1.219172 -1.452515
-v 0.000825 -0.351920 1.759409
-v 0.000825 1.000000 1.759411
-v 0.000826 -0.109586 -6.334326
-v 0.000825 -0.398073 5.896140
-v 0.152918 1.000000 -5.815708
-v 0.152917 1.000000 -1.971130
-v 0.940448 1.168419 -1.971128
-v 1.620345 1.168419 -5.815706
-v 0.152918 1.168419 -5.815708
-v 0.152917 1.168419 -1.971130
-v 0.921118 1.091883 -1.050430
-v 0.921118 1.091883 1.516050
-v 0.080533 1.091883 -1.050432
-v 0.080533 1.091883 1.516048
-v 0.613003 -0.553430 5.546911
-v 0.963691 -0.559956 2.248834
-v 0.613003 -0.396857 5.546912
-v 0.963691 -0.070362 2.248835
-v 1.499370 -0.994317 3.966028
-v 1.850058 -0.997914 0.667950
-v 1.499370 -0.908021 3.966029
-v 1.850058 -0.728071 0.667951
-v 1.601022 0.760960 -6.334324
-v 1.601021 0.129454 -6.334325
-v 0.263955 0.760960 -6.334325
-v 0.263955 0.129454 -6.334325
-v 1.334809 0.760960 -7.515329
-v 1.334809 0.129455 -7.515330
-v 0.530168 0.760960 -7.515330
-v 0.530168 0.129455 -7.515330
-v 1.192720 0.649445 -7.515329
-v 1.192720 0.240971 -7.515330
-v 0.672258 0.649445 -7.515330
-v 0.672258 0.240971 -7.515330
-v 1.192719 0.649444 -6.524630
-v 1.192719 0.240970 -6.524631
-v 0.672257 0.649444 -6.524631
-v 0.672257 0.240970 -6.524631
-v 3.851026 0.431116 -1.883326
-v 3.851026 0.946662 -1.883325
-v 4.592170 0.946662 -6.074241
-v 4.592169 0.431116 -6.074242
-v 4.995714 0.561404 -1.918362
-v 4.995714 1.016394 -1.918360
-v 5.736857 1.016394 -6.109276
-v 5.736857 0.561404 -6.109277
-v 3.975454 0.471731 -2.162156
-v 3.975454 0.919244 -2.162155
-v 4.618796 0.919244 -5.800034
-v 4.618795 0.471730 -5.800035
-v 4.969088 0.584825 -2.192568
-v 4.969088 0.979775 -2.192567
-v 5.612430 0.979775 -5.830446
-v 5.612429 0.584825 -5.830447
-v 0.864214 -0.673890 3.184381
-v 0.864213 0.489129 3.184384
-v 0.864213 -0.018552 3.184383
-v 0.000825 0.489129 3.184382
-v 0.000825 -0.673890 3.184381
-v 0.850955 -0.557858 3.309075
-v 0.850955 -0.175321 3.309076
-v 1.737321 -0.996758 1.728192
-v 1.737321 -0.785920 1.728193
-v -1.864151 -1.219172 -5.532511
-v -0.575869 -0.666304 5.896140
-v -0.940448 1.000000 -1.971128
-v -1.620345 1.000000 -5.815706
-v -1.864152 1.000000 -6.334323
-v -0.575869 -0.129842 5.896143
-v -5.440438 -1.462153 -5.818601
-v -4.896782 -1.462153 -2.744413
-v -1.000825 -0.677484 1.899605
-v -5.440438 -1.246362 -5.818600
-v -1.000825 0.852342 1.899608
-v -4.896782 -1.246362 -2.744412
-v -1.160660 -0.450871 -2.356325
-v -1.704316 -0.450871 -5.430513
-v -1.000825 -0.351920 -1.293797
-v -1.000825 1.000000 -1.293794
-v -1.160660 -0.877888 -2.356326
-v -1.704316 -0.877888 -5.430514
-v -1.000825 -1.219172 -1.452514
-v -1.000825 1.000000 -1.452511
-v -1.000825 -0.351920 1.759410
-v -1.000825 1.000000 1.759413
-v -9.097919 1.221145 -6.212147
-v -8.356775 1.221145 -2.021231
-v -1.864151 -0.109586 -6.334325
-v -0.575869 -0.398073 5.896141
-v -9.097919 0.943958 -6.212148
-v -8.356775 0.943958 -2.021233
-v -1.061916 0.113661 -1.797961
-v -1.000825 0.161258 1.899606
-v -1.000825 0.324040 -1.293795
-v -1.803060 0.113661 -5.988876
-v -1.000825 -0.109586 -1.452513
-v -1.061916 0.776753 -1.797960
-v -1.803061 0.776753 -5.988875
-v -1.000825 0.324040 1.759412
-v -0.000825 -1.219172 -5.532512
-v -0.000825 -0.666304 5.896139
-v -0.000826 1.000000 -6.334325
-v -0.000825 -0.129842 5.896140
-v -0.000825 0.852342 1.899606
-v -0.000825 -0.677484 1.899604
-v -0.000825 -0.351920 -1.293797
-v -0.000825 1.000000 -1.293796
-v -0.000825 1.000000 -1.452513
-v -0.000825 -1.219172 -1.452515
-v -0.000825 -0.351920 1.759409
-v -0.000825 1.000000 1.759411
-v -0.000826 -0.109586 -6.334326
-v -0.000825 -0.398073 5.896140
-v -0.152918 1.000000 -5.815708
-v -0.152917 1.000000 -1.971130
-v -0.940448 1.168419 -1.971128
-v -1.620345 1.168419 -5.815706
-v -0.152918 1.168419 -5.815708
-v -0.152917 1.168419 -1.971130
-v -0.921118 1.091883 -1.050430
-v -0.921118 1.091883 1.516050
-v -0.080533 1.091883 -1.050432
-v -0.080533 1.091883 1.516048
-v -0.613003 -0.553430 5.546911
-v -0.963691 -0.559956 2.248834
-v -0.613003 -0.396857 5.546912
-v -0.963691 -0.070362 2.248835
-v -1.499370 -0.994317 3.966028
-v -1.850058 -0.997914 0.667950
-v -1.499370 -0.908021 3.966029
-v -1.850058 -0.728071 0.667951
-v -1.601022 0.760960 -6.334324
-v -1.601021 0.129454 -6.334325
-v -0.263955 0.760960 -6.334325
-v -0.263955 0.129454 -6.334325
-v -1.334809 0.760960 -7.515329
-v -1.334809 0.129455 -7.515330
-v -0.530168 0.760960 -7.515330
-v -0.530168 0.129455 -7.515330
-v -1.192720 0.649445 -7.515329
-v -1.192720 0.240971 -7.515330
-v -0.672258 0.649445 -7.515330
-v -0.672258 0.240971 -7.515330
-v -1.192719 0.649444 -6.524630
-v -1.192719 0.240970 -6.524631
-v -0.672257 0.649444 -6.524631
-v -0.672257 0.240970 -6.524631
-v -3.851026 0.431116 -1.883326
-v -3.851026 0.946662 -1.883325
-v -4.592170 0.946662 -6.074241
-v -4.592169 0.431116 -6.074242
-v -4.995714 0.561404 -1.918362
-v -4.995714 1.016394 -1.918360
-v -5.736857 1.016394 -6.109276
-v -5.736857 0.561404 -6.109277
-v -3.975454 0.471731 -2.162156
-v -3.975454 0.919244 -2.162155
-v -4.618796 0.919244 -5.800034
-v -4.618795 0.471730 -5.800035
-v -4.969088 0.584825 -2.192568
-v -4.969088 0.979775 -2.192567
-v -5.612430 0.979775 -5.830446
-v -5.612429 0.584825 -5.830447
-v -0.864214 -0.673890 3.184381
-v -0.864213 0.489129 3.184384
-v -0.864213 -0.018552 3.184383
-v -0.000825 0.489129 3.184382
-v -0.000825 -0.673890 3.184381
-v -0.850955 -0.557858 3.309075
-v -0.850955 -0.175321 3.309076
-v -1.737321 -0.996758 1.728192
-v -1.737321 -0.785920 1.728193
-vt 0.135351 -0.558072
-vt 0.003035 -0.363507
-vt 0.092282 -0.976844
-vt -0.081322 0.947351
-vt 0.100058 1.958891
-vt 0.050091 1.852185
-vt -0.092752 1.055565
-vt -0.251711 1.059474
-vt 0.075587 0.041384
-vt -0.086008 0.279003
-vt -0.086212 0.249830
-vt -0.276044 1.968137
-vt -0.246101 1.859467
-vt 0.009828 1.911388
-vt -0.133014 1.114769
-vt 0.413322 1.261595
-vt 0.299103 0.624605
-vt 1.243955 0.407183
-vt 0.515404 1.111487
-vt 1.358173 1.044173
-vt -0.081553 0.914324
-vt 0.080042 0.676706
-vt 0.401185 0.474498
-vt 1.295541 0.331328
-vt 0.365315 1.568841
-vt 0.299111 1.575740
-vt 0.143401 0.707357
-vt 0.629403 1.011947
-vt 0.449192 0.167251
-vt 1.409760 0.968317
-vt 0.986264 1.738667
-vt 1.573373 1.877873
-vt 1.417663 1.009490
-vt 0.237182 -0.196235
-vt 0.721785 1.030226
-vt 0.830554 0.870285
-vt 0.877494 1.898608
-vt 1.351399 1.106930
-vt 0.183935 0.557301
-vt 1.507109 1.975312
-vt 0.241636 0.439088
-vt 0.114297 -0.045011
-vt 0.140593 1.808834
-vt -0.015118 0.940452
-vt 0.156405 -1.071134
-vt 0.164119 -0.998223
-vt 0.040336 -1.068281
-vt 0.104459 -1.162571
-vt -0.165787 1.882802
-vt -0.014821 1.660811
-vt -0.287852 0.283965
-vt -0.293374 0.366508
-vt -0.289630 0.900550
-vt 0.035337 -0.191272
-vt 0.247348 0.172213
-vt 0.253300 1.021193
-vt -0.283166 0.952313
-vt -0.283398 0.919286
-vt 0.039792 0.444050
-vt 0.314806 -0.339851
-vt 0.112962 -0.334889
-vt -0.288056 0.254793
-vt -0.023788 -0.973990
-vt -0.155922 -0.359599
-vt 0.220528 -1.165425
-vt 0.108710 -0.748730
-vt -0.286364 1.918670
-vt -0.291973 1.118678
-vt -0.119962 0.896379
-vt -0.123707 0.362337
-vt 0.162891 -0.598569
-vt 0.467532 -0.853353
-vt 0.201549 -1.053262
-vt 0.161663 -0.198915
-vt 0.267667 -0.752638
-vt 0.278705 -0.371021
-vt 0.526390 -0.542053
-vt 0.483821 -0.479457
-vt 0.488162 -0.883689
-vt 0.500110 -0.105561
-vt 0.564618 -0.200418
-vt -0.110331 2.127229
-vt 0.040636 1.905238
-vt -0.010786 1.578087
-vt 0.104092 1.876168
-vt 0.255058 1.654176
-vt -0.054992 2.087323
-vt 0.203048 1.901245
-vt 0.052081 2.123235
-vt 0.042658 1.943733
-vt -0.056437 1.881175
-vt 0.147710 1.941151
-vt 0.050060 2.084741
-vt 0.146264 1.735002
-vt 0.041212 1.737584
-vt 0.048615 1.878591
-vt 0.663065 1.872485
-vt 0.786311 1.691257
-vt 0.507355 1.004102
-vt 0.630601 0.822874
-vt 0.955144 1.689498
-vt 0.860727 1.828333
-vt 0.725565 1.074543
-vt 0.819981 0.935708
-vt 0.674594 1.805657
-vt 0.539432 1.051867
-vt 0.646413 0.894554
-vt 0.781576 1.648344
-vt 0.240127 -0.712141
-vn 0.994400 0.000000 0.105700
-vn 0.000000 1.000000 0.000000
-vn 1.000000 0.000000 0.000000
-vn 0.984700 0.000000 0.174100
-vn 0.211800 0.976600 0.037500
-vn -0.103300 0.000000 -0.994600
-vn 0.103300 -0.000000 0.994600
-vn 0.911400 0.378700 0.161200
-vn -0.157300 -0.987200 -0.027800
-vn 0.113700 -0.993300 0.020100
-vn 0.030600 -0.000000 0.999500
-vn -0.061100 0.998100 -0.010800
-vn -0.030600 0.000000 -0.999500
-vn -0.000000 -0.000000 1.000000
-vn 0.000000 0.000000 -1.000000
-vn -0.755400 0.655300 0.000000
-vn 0.000000 -1.000000 0.000000
-vn -0.000000 -0.180000 0.983700
-vn 0.000000 -0.395500 -0.918500
-vn -0.000000 0.688500 0.725200
-vn 0.000000 -0.585700 -0.810500
-vn -0.000000 0.974900 0.222500
-vn -0.000000 -1.000000 0.002800
-vn -1.000000 0.000000 -0.000000
-vn -0.000000 0.935500 0.353200
-vn 0.755400 0.655300 0.000000
-vn 0.000000 0.935500 -0.353200
-vn 0.673800 0.724900 0.143400
-vn 0.872300 -0.000000 0.489100
-vn -0.872300 0.000000 -0.489100
-vn -0.518300 -0.853500 -0.054200
-vn -0.975500 0.000000 -0.219900
-vn 0.975500 0.000000 -0.219900
-vn -0.913200 0.000000 -0.407500
-vn -0.436900 0.896200 -0.077300
-vn -0.995300 -0.000000 0.096600
-vn -0.297300 -0.953400 -0.052600
-vn 0.473900 -0.876600 0.083800
-vn 0.913200 0.000000 0.407500
-vn 0.342200 0.937700 0.060500
-vn 0.995300 -0.000000 -0.096600
-vn -0.519200 -0.853000 -0.054300
-vn 0.722400 0.676400 0.143800
-vn -0.994400 0.000000 0.105700
-vn -0.984700 0.000000 0.174100
-vn -0.211800 0.976600 0.037500
-vn 0.103300 0.000000 -0.994600
-vn -0.103300 -0.000000 0.994600
-vn -0.911400 0.378700 0.161200
-vn 0.157300 -0.987200 -0.027800
-vn -0.113700 -0.993300 0.020100
-vn -0.030600 -0.000000 0.999500
-vn 0.061100 0.998100 -0.010800
-vn 0.030600 0.000000 -0.999500
-vn -0.691900 0.713200 0.112500
-vn -0.872300 -0.000000 0.489100
-vn 0.872300 0.000000 -0.489100
-vn 0.518300 -0.853500 -0.054200
-vn 0.913200 0.000000 -0.407500
-vn 0.436900 0.896200 -0.077300
-vn 0.995300 0.000000 0.096600
-vn 0.297300 -0.953300 -0.052600
-vn -0.473900 -0.876600 0.083800
-vn -0.913200 -0.000000 0.407500
-vn -0.342200 0.937700 0.060500
-vn -0.995300 -0.000000 -0.096600
-vn 0.519200 -0.853000 -0.054300
-vn -0.714800 0.690100 0.113700
-vn 0.974400 0.089700 0.206200
-vn 0.870400 0.288400 0.399100
-vn 0.691900 0.713200 0.112500
-vn -0.518000 -0.853700 -0.053400
-vn -0.519700 -0.852700 -0.053600
-vn 0.714800 0.690100 0.113700
-vn -0.974400 0.089700 0.206200
-vn -0.870400 0.288400 0.399100
-vn -0.673800 0.724900 0.143400
-vn 0.518000 -0.853700 -0.053400
-vn 0.297300 -0.953400 -0.052600
-vn 0.519700 -0.852700 -0.053600
-vn -0.722400 0.676400 0.143800
-vn -0.000000 0.962300 0.272000
-usemtl Material.001
-s off
-f 103/1/1 102/2/1 6/3/1
-f 20/4/2 5/5/2 4/6/2
-f 20/4/2 3/7/2 52/8/2
-f 36/9/3 22/10/3 11/11/3
-f 39/12/2 51/13/2 4/6/2
-f 4/6/4 54/14/4 53/15/4
-f 14/16/5 13/17/5 12/18/5
-f 18/19/6 14/16/6 10/20/6
-f 20/4/3 16/21/3 31/22/3
-f 17/23/7 8/24/7 12/18/7
-f 25/25/4 32/26/4 29/27/4
-f 10/20/4 12/18/4 8/24/4
-f 1/28/8 18/19/8 17/23/8
-f 19/29/4 17/23/4 13/17/4
-f 25/25/4 14/16/4 18/19/4
-f 18/19/9 7/30/9 8/24/9
-f 92/31/10 27/32/10 28/33/10
-f 16/21/3 22/10/3 36/9/3
-f 31/22/3 36/9/3 21/34/3
-f 90/35/11 89/36/11 28/33/11
-f 91/37/12 90/35/12 24/38/12
-f 33/39/4 13/17/4 14/16/4
-f 23/40/4 24/38/4 28/33/4
-f 33/39/3 31/22/3 15/41/3
-f 21/34/3 36/9/3 30/42/3
-f 5/5/4 35/43/4 32/26/4
-f 5/5/4 20/4/4 34/44/4
-f 33/39/4 29/27/4 34/44/4
-f 91/37/13 23/40/13 27/32/13
-f 103/1/1 26/45/1 63/46/1
-f 26/45/14 50/47/14 38/48/14
-f 39/12/15 71/49/15 72/50/15
-f 48/51/16 60/52/16 59/53/16
-f 15/41/17 21/34/17 47/54/17
-f 19/29/17 46/55/17 37/56/17
-f 39/12/2 45/57/2 52/8/2
-f 20/4/2 45/57/2 44/58/2
-f 19/29/18 15/41/18 43/59/18
-f 9/60/19 42/61/19 47/54/19
-f 22/10/20 48/51/20 41/62/20
-f 25/25/21 1/28/21 37/56/21
-f 6/3/14 40/63/14 50/47/14
-f 104/64/22 40/63/22 6/3/22
-f 2/65/23 38/48/23 105/66/23
-f 55/67/2 56/68/2 53/15/2
-f 3/7/14 53/15/14 56/68/14
-f 51/13/15 55/67/15 54/14/15
-f 52/8/24 56/68/24 55/67/24
-f 57/69/2 59/53/2 60/52/2
-f 48/51/25 22/10/25 58/70/25
-f 16/21/26 57/69/26 58/70/26
-f 16/21/27 44/58/27 59/53/27
-f 107/71/28 63/46/28 67/72/28
-f 26/45/1 2/65/1 61/73/1
-f 9/60/1 30/42/1 64/74/1
-f 101/75/1 9/60/1 62/76/1
-f 108/77/1 109/78/1 67/72/1
-f 61/73/29 65/79/29 67/72/29
-f 62/76/30 64/74/30 68/80/30
-f 62/76/31 66/81/31 108/77/31
-f 71/49/32 75/82/32 76/83/32
-f 25/25/15 49/84/15 72/50/15
-f 5/5/15 69/85/15 71/49/15
-f 25/25/15 70/86/15 69/85/15
-f 76/83/15 75/82/15 79/87/15
-f 72/50/17 76/83/17 74/88/17
-f 71/49/2 69/85/2 73/89/2
-f 70/86/33 74/88/33 73/89/33
-f 80/90/3 79/87/3 83/91/3
-f 76/83/15 80/90/15 78/92/15
-f 75/82/15 73/89/15 77/93/15
-f 74/88/15 78/92/15 77/93/15
-f 82/94/15 84/95/15 83/91/15
-f 80/90/2 84/95/2 82/94/2
-f 77/93/17 81/96/17 83/91/17
-f 77/93/24 78/92/24 82/94/24
-f 35/43/13 87/97/13 88/98/13
-f 35/43/12 34/44/12 86/99/12
-f 34/44/11 29/27/11 85/100/11
-f 32/26/10 88/98/10 85/100/10
-f 92/31/34 100/101/34 99/102/34
-f 90/35/35 91/37/35 99/102/35
-f 89/36/36 90/35/36 98/103/36
-f 89/36/37 97/104/37 100/101/37
-f 95/105/13 99/102/13 100/101/13
-f 95/105/12 94/106/12 98/103/12
-f 94/106/11 93/107/11 97/104/11
-f 96/108/10 100/101/10 97/104/10
-f 88/98/38 96/108/38 93/107/38
-f 86/99/39 85/100/39 93/107/39
-f 87/97/40 86/99/40 94/106/40
-f 87/97/41 95/105/41 96/108/41
-f 106/109/42 108/77/42 65/79/42
-f 66/81/1 68/80/1 109/78/1
-f 101/75/1 106/109/1 61/73/1
-f 64/74/43 107/71/43 109/78/43
-f 101/75/23 105/66/23 42/61/23
-f 103/1/1 107/71/1 64/74/1
-f 30/42/1 11/11/1 102/2/1
-f 212/1/44 135/45/44 115/3/44
-f 129/4/2 112/7/2 113/6/2
-f 161/8/2 112/7/2 129/4/2
-f 145/9/24 139/42/24 120/11/24
-f 113/6/2 160/13/2 148/12/2
-f 162/15/45 163/14/45 113/6/45
-f 123/16/46 119/20/46 121/18/46
-f 127/19/47 116/30/47 119/20/47
-f 140/22/24 125/21/24 129/4/24
-f 121/18/48 117/24/48 126/23/48
-f 138/27/45 141/26/45 134/25/45
-f 117/24/45 121/18/45 119/20/45
-f 126/23/49 127/19/49 110/28/49
-f 122/17/45 126/23/45 128/29/45
-f 127/19/45 123/16/45 134/25/45
-f 117/24/50 116/30/50 127/19/50
-f 137/33/51 136/32/51 201/31/51
-f 145/9/24 131/10/24 125/21/24
-f 130/34/24 145/9/24 140/22/24
-f 199/35/52 133/38/52 137/33/52
-f 200/37/53 132/40/53 133/38/53
-f 123/16/45 122/17/45 142/39/45
-f 137/33/45 133/38/45 132/40/45
-f 124/41/24 140/22/24 142/39/24
-f 130/34/24 118/60/24 139/42/24
-f 141/26/45 144/43/45 114/5/45
-f 114/5/45 144/43/45 143/44/45
-f 143/44/45 138/27/45 142/39/45
-f 136/32/54 132/40/54 200/37/54
-f 212/1/44 216/71/44 172/46/44
-f 147/48/14 159/47/14 135/45/14
-f 181/50/15 180/49/15 148/12/15
-f 168/53/26 169/52/26 157/51/26
-f 124/41/17 152/59/17 156/54/17
-f 146/56/17 155/55/17 128/29/17
-f 148/12/2 160/13/2 161/8/2
-f 129/4/2 125/21/2 153/58/2
-f 155/55/18 152/59/18 124/41/18
-f 130/34/19 156/54/19 151/61/19
-f 131/10/20 120/11/20 150/62/20
-f 134/25/21 158/84/21 146/56/21
-f 159/47/14 149/63/14 115/3/14
-f 115/3/22 149/63/22 213/64/22
-f 214/66/23 147/48/23 111/65/23
-f 162/15/2 165/68/2 164/67/2
-f 165/68/14 162/15/14 112/7/14
-f 163/14/15 164/67/15 160/13/15
-f 164/67/3 165/68/3 161/8/3
-f 166/69/2 167/70/2 169/52/2
-f 157/51/25 169/52/25 167/70/25
-f 167/70/16 166/69/16 125/21/16
-f 125/21/27 166/69/27 168/53/27
-f 216/71/55 218/78/55 176/72/55
-f 135/45/44 172/46/44 170/73/44
-f 118/60/44 171/76/44 173/74/44
-f 210/75/44 215/109/44 171/76/44
-f 217/77/44 174/79/44 176/72/44
-f 176/72/56 174/79/56 170/73/56
-f 171/76/57 175/81/57 177/80/57
-f 217/77/58 175/81/58 171/76/58
-f 185/83/33 184/82/33 180/49/33
-f 134/25/15 179/86/15 181/50/15
-f 180/49/15 178/85/15 114/5/15
-f 178/85/15 179/86/15 134/25/15
-f 189/90/15 188/87/15 184/82/15
-f 183/88/17 185/83/17 181/50/17
-f 180/49/2 184/82/2 182/89/2
-f 182/89/32 183/88/32 179/86/32
-f 189/90/24 193/95/24 192/91/24
-f 187/92/15 189/90/15 185/83/15
-f 184/82/15 188/87/15 186/93/15
-f 186/93/15 187/92/15 183/88/15
-f 192/91/15 193/95/15 191/94/15
-f 191/94/2 193/95/2 189/90/2
-f 192/91/17 190/96/17 186/93/17
-f 186/93/3 190/96/3 191/94/3
-f 197/98/54 196/97/54 144/43/54
-f 144/43/53 196/97/53 195/99/53
-f 143/44/52 195/99/52 194/100/52
-f 194/100/51 197/98/51 141/26/51
-f 208/102/59 209/101/59 201/31/59
-f 199/35/60 207/103/60 208/102/60
-f 198/36/61 206/104/61 207/103/61
-f 209/101/62 206/104/62 198/36/62
-f 209/101/54 208/102/54 204/105/54
-f 204/105/53 208/102/53 207/103/53
-f 203/106/52 207/103/52 206/104/52
-f 206/104/51 209/101/51 205/108/51
-f 202/107/63 205/108/63 197/98/63
-f 195/99/64 203/106/64 202/107/64
-f 196/97/65 204/105/65 203/106/65
-f 205/108/66 204/105/66 196/97/66
-f 174/79/67 217/77/67 215/109/67
-f 175/81/44 217/77/44 218/78/44
-f 170/73/44 215/109/44 210/75/44
-f 173/74/68 177/80/68 218/78/68
-f 151/61/23 214/66/23 210/75/23
-f 173/74/44 216/71/44 212/1/44
-f 139/42/44 212/1/44 211/2/44
-f 26/45/1 103/1/1 6/3/1
-f 3/7/2 20/4/2 4/6/2
-f 45/57/2 20/4/2 52/8/2
-f 30/42/3 36/9/3 11/11/3
-f 5/5/2 39/12/2 4/6/2
-f 3/7/4 4/6/4 53/15/4
-f 10/20/5 14/16/5 12/18/5
-f 7/30/6 18/19/6 10/20/6
-f 33/39/3 20/4/3 31/22/3
-f 13/17/7 17/23/7 12/18/7
-f 33/39/4 25/25/4 29/27/4
-f 7/30/4 10/20/4 8/24/4
-f 19/29/69 1/28/69 17/23/69
-f 33/39/4 19/29/4 13/17/4
-f 1/28/70 25/25/70 18/19/70
-f 17/23/9 18/19/9 8/24/9
-f 89/36/10 92/31/10 28/33/10
-f 31/22/3 16/21/3 36/9/3
-f 15/41/3 31/22/3 21/34/3
-f 24/38/11 90/35/11 28/33/11
-f 23/40/12 91/37/12 24/38/12
-f 25/25/4 33/39/4 14/16/4
-f 27/32/4 23/40/4 28/33/4
-f 19/29/3 33/39/3 15/41/3
-f 9/60/3 21/34/3 30/42/3
-f 25/25/4 5/5/4 32/26/4
-f 35/43/4 5/5/4 34/44/4
-f 20/4/4 33/39/4 34/44/4
-f 92/31/13 91/37/13 27/32/13
-f 107/71/1 103/1/1 63/46/1
-f 2/65/14 26/45/14 38/48/14
-f 49/84/15 39/12/15 72/50/15
-f 44/58/16 48/51/16 59/53/16
-f 43/59/17 15/41/17 47/54/17
-f 1/28/17 19/29/17 37/56/17
-f 51/13/2 39/12/2 52/8/2
-f 16/21/2 20/4/2 44/58/2
-f 46/55/18 19/29/18 43/59/18
-f 21/34/19 9/60/19 47/54/19
-f 11/11/20 22/10/20 41/62/20
-f 49/84/21 25/25/21 37/56/21
-f 26/45/14 6/3/14 50/47/14
-f 102/2/22 104/64/22 6/3/22
-f 101/75/23 2/65/23 105/66/23
-f 54/14/2 55/67/2 53/15/2
-f 52/8/14 3/7/14 56/68/14
-f 4/6/15 51/13/15 54/14/15
-f 51/13/24 52/8/24 55/67/24
-f 58/70/2 57/69/2 60/52/2
-f 60/52/25 48/51/25 58/70/25
-f 22/10/26 16/21/26 58/70/26
-f 57/69/27 16/21/27 59/53/27
-f 109/78/71 107/71/71 67/72/71
-f 63/46/1 26/45/1 61/73/1
-f 62/76/1 9/60/1 64/74/1
-f 106/109/1 101/75/1 62/76/1
-f 65/79/1 108/77/1 67/72/1
-f 63/46/29 61/73/29 67/72/29
-f 66/81/30 62/76/30 68/80/30
-f 106/109/72 62/76/72 108/77/72
-f 72/50/32 71/49/32 76/83/32
-f 70/86/15 25/25/15 72/50/15
-f 39/12/15 5/5/15 71/49/15
-f 5/5/15 25/25/15 69/85/15
-f 80/90/15 76/83/15 79/87/15
-f 70/86/17 72/50/17 74/88/17
-f 75/82/2 71/49/2 73/89/2
-f 69/85/33 70/86/33 73/89/33
-f 84/95/3 80/90/3 83/91/3
-f 74/88/15 76/83/15 78/92/15
-f 79/87/15 75/82/15 77/93/15
-f 73/89/15 74/88/15 77/93/15
-f 81/96/15 82/94/15 83/91/15
-f 78/92/2 80/90/2 82/94/2
-f 79/87/17 77/93/17 83/91/17
-f 81/96/24 77/93/24 82/94/24
-f 32/26/13 35/43/13 88/98/13
-f 87/97/12 35/43/12 86/99/12
-f 86/99/11 34/44/11 85/100/11
-f 29/27/10 32/26/10 85/100/10
-f 91/37/34 92/31/34 99/102/34
-f 98/103/35 90/35/35 99/102/35
-f 97/104/36 89/36/36 98/103/36
-f 92/31/37 89/36/37 100/101/37
-f 96/108/13 95/105/13 100/101/13
-f 99/102/12 95/105/12 98/103/12
-f 98/103/11 94/106/11 97/104/11
-f 93/107/10 96/108/10 97/104/10
-f 85/100/38 88/98/38 93/107/38
-f 94/106/39 86/99/39 93/107/39
-f 95/105/40 87/97/40 94/106/40
-f 88/98/41 87/97/41 96/108/41
-f 61/73/73 106/109/73 65/79/73
-f 108/77/1 66/81/1 109/78/1
-f 2/65/1 101/75/1 61/73/1
-f 68/80/74 64/74/74 109/78/74
-f 9/60/23 101/75/23 42/61/23
-f 30/42/1 103/1/1 64/74/1
-f 103/1/1 30/42/1 102/2/1
-f 211/2/44 212/1/44 115/3/44
-f 114/5/2 129/4/2 113/6/2
-f 154/57/2 161/8/2 129/4/2
-f 131/10/24 145/9/24 120/11/24
-f 114/5/2 113/6/2 148/12/2
-f 112/7/45 162/15/45 113/6/45
-f 122/17/46 123/16/46 121/18/46
-f 123/16/47 127/19/47 119/20/47
-f 142/39/24 140/22/24 129/4/24
-f 122/17/48 121/18/48 126/23/48
-f 142/39/45 138/27/45 134/25/45
-f 116/30/45 117/24/45 119/20/45
-f 128/29/75 126/23/75 110/28/75
-f 142/39/45 122/17/45 128/29/45
-f 110/28/76 127/19/76 134/25/76
-f 126/23/50 117/24/50 127/19/50
-f 198/36/51 137/33/51 201/31/51
-f 140/22/24 145/9/24 125/21/24
-f 124/41/24 130/34/24 140/22/24
-f 198/36/52 199/35/52 137/33/52
-f 199/35/53 200/37/53 133/38/53
-f 134/25/45 123/16/45 142/39/45
-f 136/32/45 137/33/45 132/40/45
-f 128/29/24 124/41/24 142/39/24
-f 145/9/24 130/34/24 139/42/24
-f 134/25/45 141/26/45 114/5/45
-f 129/4/45 114/5/45 143/44/45
-f 129/4/45 143/44/45 142/39/45
-f 201/31/54 136/32/54 200/37/54
-f 135/45/44 212/1/44 172/46/44
-f 111/65/14 147/48/14 135/45/14
-f 158/84/15 181/50/15 148/12/15
-f 153/58/26 168/53/26 157/51/26
-f 130/34/17 124/41/17 156/54/17
-f 110/28/17 146/56/17 128/29/17
-f 154/57/2 148/12/2 161/8/2
-f 154/57/2 129/4/2 153/58/2
-f 128/29/18 155/55/18 124/41/18
-f 118/60/19 130/34/19 151/61/19
-f 157/51/20 131/10/20 150/62/20
-f 110/28/21 134/25/21 146/56/21
-f 135/45/14 159/47/14 115/3/14
-f 211/2/22 115/3/22 213/64/22
-f 210/75/23 214/66/23 111/65/23
-f 163/14/2 162/15/2 164/67/2
-f 161/8/14 165/68/14 112/7/14
-f 113/6/15 163/14/15 160/13/15
-f 160/13/3 164/67/3 161/8/3
-f 168/53/2 166/69/2 169/52/2
-f 131/10/25 157/51/25 167/70/25
-f 131/10/16 167/70/16 125/21/16
-f 153/58/27 125/21/27 168/53/27
-f 172/46/77 216/71/77 176/72/77
-f 111/65/44 135/45/44 170/73/44
-f 139/42/44 118/60/44 173/74/44
-f 118/60/44 210/75/44 171/76/44
-f 218/78/44 217/77/44 176/72/44
-f 172/46/56 176/72/56 170/73/56
-f 173/74/57 171/76/57 177/80/57
-f 215/109/78 217/77/78 171/76/78
-f 181/50/33 185/83/33 180/49/33
-f 158/84/15 134/25/15 181/50/15
-f 148/12/15 180/49/15 114/5/15
-f 114/5/15 178/85/15 134/25/15
-f 185/83/15 189/90/15 184/82/15
-f 179/86/17 183/88/17 181/50/17
-f 178/85/2 180/49/2 182/89/2
-f 178/85/32 182/89/32 179/86/32
-f 188/87/24 189/90/24 192/91/24
-f 183/88/15 187/92/15 185/83/15
-f 182/89/15 184/82/15 186/93/15
-f 182/89/15 186/93/15 183/88/15
-f 190/96/15 192/91/15 191/94/15
-f 187/92/2 191/94/2 189/90/2
-f 188/87/17 192/91/17 186/93/17
-f 187/92/3 186/93/3 191/94/3
-f 141/26/54 197/98/54 144/43/54
-f 143/44/53 144/43/53 195/99/53
-f 138/27/52 143/44/52 194/100/52
-f 138/27/51 194/100/51 141/26/51
-f 200/37/59 208/102/59 201/31/59
-f 200/37/60 199/35/60 208/102/60
-f 199/35/61 198/36/61 207/103/61
-f 201/31/79 209/101/79 198/36/79
-f 205/108/54 209/101/54 204/105/54
-f 203/106/53 204/105/53 207/103/53
-f 202/107/52 203/106/52 206/104/52
-f 202/107/51 206/104/51 205/108/51
-f 194/100/63 202/107/63 197/98/63
-f 194/100/64 195/99/64 202/107/64
-f 195/99/65 196/97/65 203/106/65
-f 197/98/66 205/108/66 196/97/66
-f 170/73/80 174/79/80 215/109/80
-f 177/80/44 175/81/44 218/78/44
-f 111/65/44 170/73/44 210/75/44
-f 216/71/81 173/74/81 218/78/81
-f 118/60/23 151/61/23 210/75/23
-f 139/42/44 173/74/44 212/1/44
-f 120/11/44 139/42/44 211/2/44
-usemtl Material.003
-f 41/62/82 104/64/82 102/2/82
-f 211/2/82 213/64/82 150/62/82
-f 11/11/82 41/62/82 102/2/82
-f 120/11/82 211/2/82 150/62/82

no_material.obj

@@ -1,133 +0,0 @@
-# cornell_box.obj and cornell_box.mtl are grabbed from Intel's embree project.
-# original cornell box data
-  # comment
-
-# empty line including some space
-   
-
-o floor
-v 552.8 0.0   0.0
-v 0.0   0.0   0.0
-v 0.0   0.0 559.2
-v 549.6 0.0 559.2
-
-v 130.0 0.0  65.0
-v  82.0 0.0 225.0
-v 240.0 0.0 272.0
-v 290.0 0.0 114.0
-
-v 423.0 0.0 247.0
-v 265.0 0.0 296.0
-v 314.0 0.0 456.0
-v 472.0 0.0 406.0
-
-f 1 2 3 4 
-f 8 7 6 5
-f 12 11 10 9
-
-o light
-v 343.0 548.0 227.0
-v 343.0 548.0 332.0
-v 213.0 548.0 332.0
-v 213.0 548.0 227.0
-f -4 -3 -2 -1
-
-o ceiling
-v 556.0 548.8 0.0
-v 556.0 548.8 559.2
-v 0.0 548.8 559.2
-v 0.0 548.8 0.0
-f -4 -3 -2 -1
-
-o back_wall
-v 549.6   0.0 559.2
-v 0.0   0.0 559.2
-v 0.0 548.8 559.2
-v 556.0 548.8 559.2
-f -4 -3 -2 -1
-
-o front_wall
-v 549.6   0.0 0
-v 0.0   0.0 0
-v 0.0 548.8 0
-v 556.0 548.8 0
-#f -1 -2 -3 -4
-
-o green_wall
-v    0.0   0.0 559.2
-v    0.0   0.0   0.0
-v    0.0 548.8   0.0
-v    0.0 548.8 559.2
-f -4 -3 -2 -1
-
-o red_wall
-v    552.8   0.0   0.0
-v    549.6   0.0 559.2
-v    556.0 548.8 559.2
-v    556.0 548.8   0.0
-f -4 -3 -2 -1
-
-o short_block
-
-v    130.0 165.0  65.0
-v     82.0 165.0 225.0
-v    240.0 165.0 272.0
-v    290.0 165.0 114.0
-f -4 -3 -2 -1
-
-v    290.0   0.0 114.0
-v    290.0 165.0 114.0
-v    240.0 165.0 272.0
-v    240.0   0.0 272.0
-f -4 -3 -2 -1
-
-v    130.0   0.0  65.0
-v    130.0 165.0  65.0
-v    290.0 165.0 114.0
-v    290.0   0.0 114.0
-f -4 -3 -2 -1
-
-v     82.0   0.0 225.0
-v     82.0 165.0 225.0
-v    130.0 165.0  65.0
-v    130.0   0.0  65.0
-f -4 -3 -2 -1
-
-v    240.0   0.0 272.0
-v    240.0 165.0 272.0
-v     82.0 165.0 225.0
-v     82.0   0.0 225.0
-f -4 -3 -2 -1
-
-o tall_block
-
-v    423.0 330.0 247.0
-v    265.0 330.0 296.0
-v    314.0 330.0 456.0
-v    472.0 330.0 406.0
-f -4 -3 -2 -1
-
-v    423.0   0.0 247.0
-v    423.0 330.0 247.0
-v    472.0 330.0 406.0
-v    472.0   0.0 406.0
-f -4 -3 -2 -1
-
-v    472.0   0.0 406.0
-v    472.0 330.0 406.0
-v    314.0 330.0 456.0
-v    314.0   0.0 456.0
-f -4 -3 -2 -1
-
-v    314.0   0.0 456.0
-v    314.0 330.0 456.0
-v    265.0 330.0 296.0
-v    265.0   0.0 296.0
-f -4 -3 -2 -1
-
-v    265.0   0.0 296.0
-v    265.0 330.0 296.0
-v    423.0 330.0 247.0
-v    423.0   0.0 247.0
-f -4 -3 -2 -1
-

premake4.lua

@@ -1,3 +1,7 @@
+lib_sources = {
+   "tiny_obj_loader.cc"
+}
+
 sources = {
    "test.cc",
    }
@@ -7,7 +11,7 @@ solution "TinyObjLoaderSolution"
    configurations { "Release", "Debug" }
 
    if (os.is("windows")) then
-      platforms { "x32", "x64" }
+      platforms { "x64", "x32" }
    else
       platforms { "native", "x32", "x64" }
    end
@@ -16,7 +20,7 @@ solution "TinyObjLoaderSolution"
    project "tinyobjloader"
       kind "ConsoleApp"
       language "C++"
-      files { sources }
+      files { lib_sources, sources }
 
       configuration "Debug"
          defines { "DEBUG" } -- -DDEBUG

python/cornell_box_multimaterial_output.json

@@ -1,581 +0,0 @@
-{
-    "shapes": {
-        "back_wall": {
-            "material_ids": [
-                0.0,
-                0.0
-            ],
-            "normals": [],
-            "positions": [
-                549.5999755859375,
-                0.0,
-                559.2000122070312,
-                0.0,
-                0.0,
-                559.2000122070312,
-                0.0,
-                548.7999877929688,
-                559.2000122070312,
-                556.0,
-                548.7999877929688,
-                559.2000122070312
-            ],
-            "indicies": [
-                0.0,
-                1.0,
-                2.0,
-                0.0,
-                2.0,
-                3.0
-            ],
-            "texcoords": []
-        },
-        "floor": {
-            "material_ids": [
-                0.0,
-                0.0,
-                0.0,
-                0.0,
-                0.0,
-                0.0
-            ],
-            "normals": [],
-            "positions": [
-                552.7999877929688,
-                0.0,
-                0.0,
-                0.0,
-                0.0,
-                0.0,
-                0.0,
-                0.0,
-                559.2000122070312,
-                549.5999755859375,
-                0.0,
-                559.2000122070312,
-                290.0,
-                0.0,
-                114.0,
-                240.0,
-                0.0,
-                272.0,
-                82.0,
-                0.0,
-                225.0,
-                130.0,
-                0.0,
-                65.0,
-                472.0,
-                0.0,
-                406.0,
-                314.0,
-                0.0,
-                456.0,
-                265.0,
-                0.0,
-                296.0,
-                423.0,
-                0.0,
-                247.0
-            ],
-            "indicies": [
-                0.0,
-                1.0,
-                2.0,
-                0.0,
-                2.0,
-                3.0,
-                4.0,
-                5.0,
-                6.0,
-                4.0,
-                6.0,
-                7.0,
-                8.0,
-                9.0,
-                10.0,
-                8.0,
-                10.0,
-                11.0
-            ],
-            "texcoords": []
-        },
-        "red_wall": {
-            "material_ids": [
-                1.0,
-                1.0
-            ],
-            "normals": [],
-            "positions": [
-                552.7999877929688,
-                0.0,
-                0.0,
-                549.5999755859375,
-                0.0,
-                559.2000122070312,
-                556.0,
-                548.7999877929688,
-                559.2000122070312,
-                556.0,
-                548.7999877929688,
-                0.0
-            ],
-            "indicies": [
-                0.0,
-                1.0,
-                2.0,
-                0.0,
-                2.0,
-                3.0
-            ],
-            "texcoords": []
-        },
-        "light": {
-            "material_ids": [
-                4.0,
-                4.0
-            ],
-            "normals": [],
-            "positions": [
-                343.0,
-                548.0,
-                227.0,
-                343.0,
-                548.0,
-                332.0,
-                213.0,
-                548.0,
-                332.0,
-                213.0,
-                548.0,
-                227.0
-            ],
-            "indicies": [
-                0.0,
-                1.0,
-                2.0,
-                0.0,
-                2.0,
-                3.0
-            ],
-            "texcoords": []
-        },
-        "tall_block": {
-            "material_ids": [
-                2.0,
-                2.0,
-                2.0,
-                2.0
-            ],
-            "normals": [],
-            "positions": [
-                314.0,
-                0.0,
-                456.0,
-                314.0,
-                330.0,
-                456.0,
-                265.0,
-                330.0,
-                296.0,
-                265.0,
-                0.0,
-                296.0,
-                265.0,
-                0.0,
-                296.0,
-                265.0,
-                330.0,
-                296.0,
-                423.0,
-                330.0,
-                247.0,
-                423.0,
-                0.0,
-                247.0
-            ],
-            "indicies": [
-                0.0,
-                1.0,
-                2.0,
-                0.0,
-                2.0,
-                3.0,
-                4.0,
-                5.0,
-                6.0,
-                4.0,
-                6.0,
-                7.0
-            ],
-            "texcoords": []
-        },
-        "short_block": {
-            "material_ids": [
-                0.0,
-                0.0,
-                0.0,
-                0.0,
-                0.0,
-                0.0,
-                0.0,
-                0.0,
-                0.0,
-                0.0
-            ],
-            "normals": [],
-            "positions": [
-                130.0,
-                165.0,
-                65.0,
-                82.0,
-                165.0,
-                225.0,
-                240.0,
-                165.0,
-                272.0,
-                290.0,
-                165.0,
-                114.0,
-                290.0,
-                0.0,
-                114.0,
-                290.0,
-                165.0,
-                114.0,
-                240.0,
-                165.0,
-                272.0,
-                240.0,
-                0.0,
-                272.0,
-                130.0,
-                0.0,
-                65.0,
-                130.0,
-                165.0,
-                65.0,
-                290.0,
-                165.0,
-                114.0,
-                290.0,
-                0.0,
-                114.0,
-                82.0,
-                0.0,
-                225.0,
-                82.0,
-                165.0,
-                225.0,
-                130.0,
-                165.0,
-                65.0,
-                130.0,
-                0.0,
-                65.0,
-                240.0,
-                0.0,
-                272.0,
-                240.0,
-                165.0,
-                272.0,
-                82.0,
-                165.0,
-                225.0,
-                82.0,
-                0.0,
-                225.0
-            ],
-            "indicies": [
-                0.0,
-                1.0,
-                2.0,
-                0.0,
-                2.0,
-                3.0,
-                4.0,
-                5.0,
-                6.0,
-                4.0,
-                6.0,
-                7.0,
-                8.0,
-                9.0,
-                10.0,
-                8.0,
-                10.0,
-                11.0,
-                12.0,
-                13.0,
-                14.0,
-                12.0,
-                14.0,
-                15.0,
-                16.0,
-                17.0,
-                18.0,
-                16.0,
-                18.0,
-                19.0
-            ],
-            "texcoords": []
-        },
-        "green_wall": {
-            "material_ids": [
-                2.0,
-                2.0
-            ],
-            "normals": [],
-            "positions": [
-                0.0,
-                0.0,
-                559.2000122070312,
-                0.0,
-                0.0,
-                0.0,
-                0.0,
-                548.7999877929688,
-                0.0,
-                0.0,
-                548.7999877929688,
-                559.2000122070312
-            ],
-            "indicies": [
-                0.0,
-                1.0,
-                2.0,
-                0.0,
-                2.0,
-                3.0
-            ],
-            "texcoords": []
-        },
-        "ceiling": {
-            "material_ids": [
-                0.0,
-                0.0
-            ],
-            "normals": [],
-            "positions": [
-                556.0,
-                548.7999877929688,
-                0.0,
-                556.0,
-                548.7999877929688,
-                559.2000122070312,
-                0.0,
-                548.7999877929688,
-                559.2000122070312,
-                0.0,
-                548.7999877929688,
-                0.0
-            ],
-            "indicies": [
-                0.0,
-                1.0,
-                2.0,
-                0.0,
-                2.0,
-                3.0
-            ],
-            "texcoords": []
-        }
-    },
-    "materials": {
-        "blue": {
-            "diffuse_texname": "",
-            "ambient_texname": "",
-            "illum": 0,
-            "displacement_texname": "",
-            "alpha_texname": "",
-            "emission": [
-                0.0,
-                0.0,
-                0.0
-            ],
-            "transmittance": [
-                0.0,
-                0.0,
-                0.0
-            ],
-            "ambient": [
-                0.0,
-                0.0,
-                0.0
-            ],
-            "bump_texname": "",
-            "diffuse": [
-                0.0,
-                0.0,
-                1.0
-            ],
-            "shininess": 1.0,
-            "specular_highlight_texname": "",
-            "unknown_parameter": {},
-            "ior": 1.0,
-            "dissolve": 1.0,
-            "specular": [
-                0.0,
-                0.0,
-                0.0
-            ],
-            "specular_texname": ""
-        },
-        "white": {
-            "diffuse_texname": "",
-            "ambient_texname": "",
-            "illum": 0,
-            "displacement_texname": "",
-            "alpha_texname": "",
-            "emission": [
-                0.0,
-                0.0,
-                0.0
-            ],
-            "transmittance": [
-                0.0,
-                0.0,
-                0.0
-            ],
-            "ambient": [
-                0.0,
-                0.0,
-                0.0
-            ],
-            "bump_texname": "",
-            "diffuse": [
-                1.0,
-                1.0,
-                1.0
-            ],
-            "shininess": 1.0,
-            "specular_highlight_texname": "",
-            "unknown_parameter": {},
-            "ior": 1.0,
-            "dissolve": 1.0,
-            "specular": [
-                0.0,
-                0.0,
-                0.0
-            ],
-            "specular_texname": ""
-        },
-        "red": {
-            "diffuse_texname": "",
-            "ambient_texname": "",
-            "illum": 0,
-            "displacement_texname": "",
-            "alpha_texname": "",
-            "emission": [
-                0.0,
-                0.0,
-                0.0
-            ],
-            "transmittance": [
-                0.0,
-                0.0,
-                0.0
-            ],
-            "ambient": [
-                0.0,
-                0.0,
-                0.0
-            ],
-            "bump_texname": "",
-            "diffuse": [
-                1.0,
-                0.0,
-                0.0
-            ],
-            "shininess": 1.0,
-            "specular_highlight_texname": "",
-            "unknown_parameter": {},
-            "ior": 1.0,
-            "dissolve": 1.0,
-            "specular": [
-                0.0,
-                0.0,
-                0.0
-            ],
-            "specular_texname": ""
-        },
-        "light": {
-            "diffuse_texname": "",
-            "ambient_texname": "",
-            "illum": 0,
-            "displacement_texname": "",
-            "alpha_texname": "",
-            "emission": [
-                0.0,
-                0.0,
-                0.0
-            ],
-            "transmittance": [
-                0.0,
-                0.0,
-                0.0
-            ],
-            "ambient": [
-                20.0,
-                20.0,
-                20.0
-            ],
-            "bump_texname": "",
-            "diffuse": [
-                1.0,
-                1.0,
-                1.0
-            ],
-            "shininess": 1.0,
-            "specular_highlight_texname": "",
-            "unknown_parameter": {},
-            "ior": 1.0,
-            "dissolve": 1.0,
-            "specular": [
-                0.0,
-                0.0,
-                0.0
-            ],
-            "specular_texname": ""
-        },
-        "green": {
-            "diffuse_texname": "",
-            "ambient_texname": "",
-            "illum": 0,
-            "displacement_texname": "",
-            "alpha_texname": "",
-            "emission": [
-                0.0,
-                0.0,
-                0.0
-            ],
-            "transmittance": [
-                0.0,
-                0.0,
-                0.0
-            ],
-            "ambient": [
-                0.0,
-                0.0,
-                0.0
-            ],
-            "bump_texname": "",
-            "diffuse": [
-                0.0,
-                1.0,
-                0.0
-            ],
-            "shininess": 1.0,
-            "specular_highlight_texname": "",
-            "unknown_parameter": {},
-            "ior": 1.0,
-            "dissolve": 1.0,
-            "specular": [
-                0.0,
-                0.0,
-                0.0
-            ],
-            "specular_texname": ""
-        }
-    }
-}

python/cornell_box_output.json

@@ -0,0 +1,601 @@
+{
+    "shapes": {
+        "ceiling": {
+            "texcoords": [], 
+            "positions": [
+                556.0, 
+                548.7999877929688, 
+                0.0, 
+                556.0, 
+                548.7999877929688, 
+                559.2000122070312, 
+                0.0, 
+                548.7999877929688, 
+                559.2000122070312, 
+                0.0, 
+                548.7999877929688, 
+                0.0
+            ], 
+            "indicies": [
+                0.0, 
+                1.0, 
+                2.0, 
+                0.0, 
+                2.0, 
+                3.0
+            ], 
+            "material_ids": [
+                0.0, 
+                0.0
+            ], 
+            "normals": []
+        }, 
+        "floor": {
+            "texcoords": [], 
+            "positions": [
+                552.7999877929688, 
+                0.0, 
+                0.0, 
+                0.0, 
+                0.0, 
+                0.0, 
+                0.0, 
+                0.0, 
+                559.2000122070312, 
+                549.5999755859375, 
+                0.0, 
+                559.2000122070312, 
+                290.0, 
+                0.0, 
+                114.0, 
+                240.0, 
+                0.0, 
+                272.0, 
+                82.0, 
+                0.0, 
+                225.0, 
+                130.0, 
+                0.0, 
+                65.0, 
+                472.0, 
+                0.0, 
+                406.0, 
+                314.0, 
+                0.0, 
+                456.0, 
+                265.0, 
+                0.0, 
+                296.0, 
+                423.0, 
+                0.0, 
+                247.0
+            ], 
+            "indicies": [
+                0.0, 
+                1.0, 
+                2.0, 
+                0.0, 
+                2.0, 
+                3.0, 
+                4.0, 
+                5.0, 
+                6.0, 
+                4.0, 
+                6.0, 
+                7.0, 
+                8.0, 
+                9.0, 
+                10.0, 
+                8.0, 
+                10.0, 
+                11.0
+            ], 
+            "material_ids": [
+                0.0, 
+                0.0, 
+                0.0, 
+                0.0, 
+                0.0, 
+                0.0
+            ], 
+            "normals": []
+        }, 
+        "light": {
+            "texcoords": [], 
+            "positions": [
+                343.0, 
+                548.0, 
+                227.0, 
+                343.0, 
+                548.0, 
+                332.0, 
+                213.0, 
+                548.0, 
+                332.0, 
+                213.0, 
+                548.0, 
+                227.0
+            ], 
+            "indicies": [
+                0.0, 
+                1.0, 
+                2.0, 
+                0.0, 
+                2.0, 
+                3.0
+            ], 
+            "material_ids": [
+                4.0, 
+                4.0
+            ], 
+            "normals": []
+        }, 
+        "green_wall": {
+            "texcoords": [], 
+            "positions": [
+                0.0, 
+                0.0, 
+                559.2000122070312, 
+                0.0, 
+                0.0, 
+                0.0, 
+                0.0, 
+                548.7999877929688, 
+                0.0, 
+                0.0, 
+                548.7999877929688, 
+                559.2000122070312
+            ], 
+            "indicies": [
+                0.0, 
+                1.0, 
+                2.0, 
+                0.0, 
+                2.0, 
+                3.0
+            ], 
+            "material_ids": [
+                2.0, 
+                2.0
+            ], 
+            "normals": []
+        }, 
+        "back_wall": {
+            "texcoords": [], 
+            "positions": [
+                549.5999755859375, 
+                0.0, 
+                559.2000122070312, 
+                0.0, 
+                0.0, 
+                559.2000122070312, 
+                0.0, 
+                548.7999877929688, 
+                559.2000122070312, 
+                556.0, 
+                548.7999877929688, 
+                559.2000122070312
+            ], 
+            "indicies": [
+                0.0, 
+                1.0, 
+                2.0, 
+                0.0, 
+                2.0, 
+                3.0
+            ], 
+            "material_ids": [
+                0.0, 
+                0.0
+            ], 
+            "normals": []
+        }, 
+        "short_block": {
+            "texcoords": [], 
+            "positions": [
+                130.0, 
+                165.0, 
+                65.0, 
+                82.0, 
+                165.0, 
+                225.0, 
+                240.0, 
+                165.0, 
+                272.0, 
+                290.0, 
+                165.0, 
+                114.0, 
+                290.0, 
+                0.0, 
+                114.0, 
+                290.0, 
+                165.0, 
+                114.0, 
+                240.0, 
+                165.0, 
+                272.0, 
+                240.0, 
+                0.0, 
+                272.0, 
+                130.0, 
+                0.0, 
+                65.0, 
+                130.0, 
+                165.0, 
+                65.0, 
+                290.0, 
+                165.0, 
+                114.0, 
+                290.0, 
+                0.0, 
+                114.0, 
+                82.0, 
+                0.0, 
+                225.0, 
+                82.0, 
+                165.0, 
+                225.0, 
+                130.0, 
+                165.0, 
+                65.0, 
+                130.0, 
+                0.0, 
+                65.0, 
+                240.0, 
+                0.0, 
+                272.0, 
+                240.0, 
+                165.0, 
+                272.0, 
+                82.0, 
+                165.0, 
+                225.0, 
+                82.0, 
+                0.0, 
+                225.0
+            ], 
+            "indicies": [
+                0.0, 
+                1.0, 
+                2.0, 
+                0.0, 
+                2.0, 
+                3.0, 
+                4.0, 
+                5.0, 
+                6.0, 
+                4.0, 
+                6.0, 
+                7.0, 
+                8.0, 
+                9.0, 
+                10.0, 
+                8.0, 
+                10.0, 
+                11.0, 
+                12.0, 
+                13.0, 
+                14.0, 
+                12.0, 
+                14.0, 
+                15.0, 
+                16.0, 
+                17.0, 
+                18.0, 
+                16.0, 
+                18.0, 
+                19.0
+            ], 
+            "material_ids": [
+                0.0, 
+                0.0, 
+                0.0, 
+                0.0, 
+                0.0, 
+                0.0, 
+                0.0, 
+                0.0, 
+                0.0, 
+                0.0
+            ], 
+            "normals": []
+        }, 
+        "tall_block": {
+            "texcoords": [], 
+            "positions": [
+                423.0, 
+                0.0, 
+                247.0, 
+                423.0, 
+                330.0, 
+                247.0, 
+                472.0, 
+                330.0, 
+                406.0, 
+                472.0, 
+                0.0, 
+                406.0, 
+                472.0, 
+                0.0, 
+                406.0, 
+                472.0, 
+                330.0, 
+                406.0, 
+                314.0, 
+                330.0, 
+                456.0, 
+                314.0, 
+                0.0, 
+                456.0, 
+                314.0, 
+                0.0, 
+                456.0, 
+                314.0, 
+                330.0, 
+                456.0, 
+                265.0, 
+                330.0, 
+                296.0, 
+                265.0, 
+                0.0, 
+                296.0, 
+                265.0, 
+                0.0, 
+                296.0, 
+                265.0, 
+                330.0, 
+                296.0, 
+                423.0, 
+                330.0, 
+                247.0, 
+                423.0, 
+                0.0, 
+                247.0
+            ], 
+            "indicies": [
+                0.0, 
+                1.0, 
+                2.0, 
+                0.0, 
+                2.0, 
+                3.0, 
+                4.0, 
+                5.0, 
+                6.0, 
+                4.0, 
+                6.0, 
+                7.0, 
+                8.0, 
+                9.0, 
+                10.0, 
+                8.0, 
+                10.0, 
+                11.0, 
+                12.0, 
+                13.0, 
+                14.0, 
+                12.0, 
+                14.0, 
+                15.0
+            ], 
+            "material_ids": [
+                0.0, 
+                0.0, 
+                0.0, 
+                0.0, 
+                0.0, 
+                0.0, 
+                0.0, 
+                0.0
+            ], 
+            "normals": []
+        }, 
+        "red_wall": {
+            "texcoords": [], 
+            "positions": [
+                552.7999877929688, 
+                0.0, 
+                0.0, 
+                549.5999755859375, 
+                0.0, 
+                559.2000122070312, 
+                556.0, 
+                548.7999877929688, 
+                559.2000122070312, 
+                556.0, 
+                548.7999877929688, 
+                0.0
+            ], 
+            "indicies": [
+                0.0, 
+                1.0, 
+                2.0, 
+                0.0, 
+                2.0, 
+                3.0
+            ], 
+            "material_ids": [
+                1.0, 
+                1.0
+            ], 
+            "normals": []
+        }
+    }, 
+    "materials": {
+        "blue": {
+            "transmittance": [
+                0.0, 
+                0.0, 
+                0.0
+            ], 
+            "illum": 0, 
+            "emission": [
+                0.0, 
+                0.0, 
+                0.0
+            ], 
+            "diffuse_texname": "", 
+            "ambient_texname": "", 
+            "normal_texname": "", 
+            "shininess": 1.0, 
+            "ior": 1.0, 
+            "specular": [
+                0.0, 
+                0.0, 
+                0.0
+            ], 
+            "specular_texname": "", 
+            "diffuse": [
+                0.0, 
+                0.0, 
+                1.0
+            ], 
+            "ambient": [
+                0.0, 
+                0.0, 
+                0.0
+            ], 
+            "dissolve": 1.0
+        }, 
+        "light": {
+            "transmittance": [
+                0.0, 
+                0.0, 
+                0.0
+            ], 
+            "illum": 0, 
+            "emission": [
+                0.0, 
+                0.0, 
+                0.0
+            ], 
+            "diffuse_texname": "", 
+            "ambient_texname": "", 
+            "normal_texname": "", 
+            "shininess": 1.0, 
+            "ior": 1.0, 
+            "specular": [
+                0.0, 
+                0.0, 
+                0.0
+            ], 
+            "specular_texname": "", 
+            "diffuse": [
+                1.0, 
+                1.0, 
+                1.0
+            ], 
+            "ambient": [
+                20.0, 
+                20.0, 
+                20.0
+            ], 
+            "dissolve": 1.0
+        }, 
+        "white": {
+            "transmittance": [
+                0.0, 
+                0.0, 
+                0.0
+            ], 
+            "illum": 0, 
+            "emission": [
+                0.0, 
+                0.0, 
+                0.0
+            ], 
+            "diffuse_texname": "", 
+            "ambient_texname": "", 
+            "normal_texname": "", 
+            "shininess": 1.0, 
+            "ior": 1.0, 
+            "specular": [
+                0.0, 
+                0.0, 
+                0.0
+            ], 
+            "specular_texname": "", 
+            "diffuse": [
+                1.0, 
+                1.0, 
+                1.0
+            ], 
+            "ambient": [
+                0.0, 
+                0.0, 
+                0.0
+            ], 
+            "dissolve": 1.0
+        }, 
+        "green": {
+            "transmittance": [
+                0.0, 
+                0.0, 
+                0.0
+            ], 
+            "illum": 0, 
+            "emission": [
+                0.0, 
+                0.0, 
+                0.0
+            ], 
+            "diffuse_texname": "", 
+            "ambient_texname": "", 
+            "normal_texname": "", 
+            "shininess": 1.0, 
+            "ior": 1.0, 
+            "specular": [
+                0.0, 
+                0.0, 
+                0.0
+            ], 
+            "specular_texname": "", 
+            "diffuse": [
+                0.0, 
+                1.0, 
+                0.0
+            ], 
+            "ambient": [
+                0.0, 
+                0.0, 
+                0.0
+            ], 
+            "dissolve": 1.0
+        }, 
+        "red": {
+            "transmittance": [
+                0.0, 
+                0.0, 
+                0.0
+            ], 
+            "illum": 0, 
+            "emission": [
+                0.0, 
+                0.0, 
+                0.0
+            ], 
+            "diffuse_texname": "", 
+            "ambient_texname": "", 
+            "normal_texname": "", 
+            "shininess": 1.0, 
+            "ior": 1.0, 
+            "specular": [
+                0.0, 
+                0.0, 
+                0.0
+            ], 
+            "specular_texname": "", 
+            "diffuse": [
+                1.0, 
+                0.0, 
+                0.0
+            ], 
+            "ambient": [
+                0.0, 
+                0.0, 
+                0.0
+            ], 
+            "dissolve": 1.0
+        }
+    }
+}

python/howto.py

@@ -1,9 +1,11 @@
 import tinyobjloader as tol
 import json
 
-model = tol.LoadObj("cornell_box_multimaterial.obj")
+model = tol.LoadObj("cornell_box.obj")
 
 #print(model["shapes"], model["materials"])
 print( json.dumps(model, indent=4) )
 
 #see cornell_box_output.json
+
+

python/main.cpp

@@ -31,7 +31,7 @@ extern "C"
 static PyObject*
 pyLoadObj(PyObject* self, PyObject* args)
 {
-    PyObject *rtndict, *pyshapes, *pymaterials,
+    PyObject *rtndict, *pyshapes, *pymaterials, 
              *current, *meshobj;
 
     char const* filename;
@@ -44,8 +44,7 @@ pyLoadObj(PyObject* self, PyObject* args)
     if(!PyArg_ParseTuple(args, "s", &filename))
         return NULL;
 
-    std::string err;
+    tinyobj::LoadObj(shapes, materials, filename);
-    tinyobj::LoadObj(shapes, materials, err, filename);
 
     pyshapes = PyDict_New();
     pymaterials = PyDict_New();
@@ -63,7 +62,7 @@ pyLoadObj(PyObject* self, PyObject* args)
 
            switch(i) {
 
-           case 0:
+           case 0: 
                 current_name = "positions";
                 vect = vectd(cm.positions.begin(), cm.positions.end()); break;
            case 1:
@@ -78,9 +77,9 @@ pyLoadObj(PyObject* self, PyObject* args)
            case 4:
                 current_name = "material_ids";
                 vect = vectd(cm.material_ids.begin(), cm.material_ids.end()); break;
-
+            
             }
-
+           
            for (vectd::iterator it = vect.begin() ;
                 it != vect.end(); it++)
             {
@@ -88,7 +87,7 @@ pyLoadObj(PyObject* self, PyObject* args)
             }
 
             PyDict_SetItemString(meshobj, current_name, current);
-
+            
          }
 
          PyDict_SetItemString(pyshapes, (*shape).name.c_str(), meshobj);
@@ -98,13 +97,6 @@ pyLoadObj(PyObject* self, PyObject* args)
          mat != materials.end(); mat++)
     {
         PyObject *matobj = PyDict_New();
-        PyObject *unknown_parameter = PyDict_New();
-
-        for (std::map<std::string, std::string>::iterator p = (*mat).unknown_parameter.begin() ;
-          p != (*mat).unknown_parameter.end(); ++p)
-        {
-            PyDict_SetItemString(unknown_parameter, p->first.c_str(), PyUnicode_FromString(p->second.c_str()));
-        }
 
         PyDict_SetItemString(matobj, "shininess",  PyFloat_FromDouble((*mat).shininess));
         PyDict_SetItemString(matobj, "ior",  PyFloat_FromDouble((*mat).ior));
@@ -113,16 +105,12 @@ pyLoadObj(PyObject* self, PyObject* args)
         PyDict_SetItemString(matobj, "ambient_texname", PyUnicode_FromString((*mat).ambient_texname.c_str()));
         PyDict_SetItemString(matobj, "diffuse_texname", PyUnicode_FromString((*mat).diffuse_texname.c_str()));
         PyDict_SetItemString(matobj, "specular_texname", PyUnicode_FromString((*mat).specular_texname.c_str()));
-        PyDict_SetItemString(matobj, "specular_highlight_texname", PyUnicode_FromString((*mat).specular_highlight_texname.c_str()));
+        PyDict_SetItemString(matobj, "normal_texname", PyUnicode_FromString((*mat).normal_texname.c_str()));
-        PyDict_SetItemString(matobj, "bump_texname", PyUnicode_FromString((*mat).bump_texname.c_str()));
-        PyDict_SetItemString(matobj, "displacement_texname", PyUnicode_FromString((*mat).displacement_texname.c_str()));
-        PyDict_SetItemString(matobj, "alpha_texname", PyUnicode_FromString((*mat).alpha_texname.c_str()));
         PyDict_SetItemString(matobj, "ambient", pyTupleFromfloat3((*mat).ambient));
         PyDict_SetItemString(matobj, "diffuse", pyTupleFromfloat3((*mat).diffuse));
         PyDict_SetItemString(matobj, "specular", pyTupleFromfloat3((*mat).specular));
         PyDict_SetItemString(matobj, "transmittance", pyTupleFromfloat3((*mat).transmittance));
         PyDict_SetItemString(matobj, "emission", pyTupleFromfloat3((*mat).emission));
-        PyDict_SetItemString(matobj, "unknown_parameter", unknown_parameter);
 
         PyDict_SetItemString(pymaterials, (*mat).name.c_str(), matobj);
     }

python/pyTOL.cbp.mak

@@ -0,0 +1,96 @@
+#------------------------------------------------------------------------------#
+# This makefile was generated by 'cbp2make' tool rev.147                       #
+#------------------------------------------------------------------------------#
+
+
+WORKDIR = `pwd`
+
+CC = gcc
+CXX = g++
+AR = ar
+LD = g++
+WINDRES = windres
+
+INC = 
+CFLAGS = -Wall -fexceptions `python3-config --cflags`
+RESINC = 
+LIBDIR = 
+LIB = 
+LDFLAGS = `python3-config --ldflags`
+
+INC_DEBUG = $(INC)
+CFLAGS_DEBUG = $(CFLAGS) -g
+RESINC_DEBUG = $(RESINC)
+RCFLAGS_DEBUG = $(RCFLAGS)
+LIBDIR_DEBUG = $(LIBDIR)
+LIB_DEBUG = $(LIB)
+LDFLAGS_DEBUG = $(LDFLAGS)
+OBJDIR_DEBUG = obj/Debug
+DEP_DEBUG = 
+OUT_DEBUG = bin/Debug/tinyobjloader.so
+
+INC_RELEASE = $(INC)
+CFLAGS_RELEASE = $(CFLAGS) -O2
+RESINC_RELEASE = $(RESINC)
+RCFLAGS_RELEASE = $(RCFLAGS)
+LIBDIR_RELEASE = $(LIBDIR)
+LIB_RELEASE = $(LIB)
+LDFLAGS_RELEASE = $(LDFLAGS) -s
+OBJDIR_RELEASE = obj/Release
+DEP_RELEASE = 
+OUT_RELEASE = bin/Release/tinyobjloader.so
+
+OBJ_DEBUG = $(OBJDIR_DEBUG)/main.o $(OBJDIR_DEBUG)/tiny_obj_loader.o
+
+OBJ_RELEASE = $(OBJDIR_RELEASE)/main.o $(OBJDIR_RELEASE)/tiny_obj_loader.o
+
+all: debug release
+
+clean: clean_debug clean_release
+
+before_debug: 
+	test -d bin/Debug || mkdir -p bin/Debug
+	test -d $(OBJDIR_DEBUG) || mkdir -p $(OBJDIR_DEBUG)
+
+after_debug: 
+
+debug: before_debug out_debug after_debug
+
+out_debug: before_debug $(OBJ_DEBUG) $(DEP_DEBUG)
+	$(LD) -shared $(LIBDIR_DEBUG) $(OBJ_DEBUG)  -o $(OUT_DEBUG) $(LDFLAGS_DEBUG) $(LIB_DEBUG)
+
+$(OBJDIR_DEBUG)/main.o: main.cpp
+	$(CXX) $(CFLAGS_DEBUG) $(INC_DEBUG) -c main.cpp -o $(OBJDIR_DEBUG)/main.o
+
+$(OBJDIR_DEBUG)/tiny_obj_loader.o: ../tiny_obj_loader.cc
+	$(CC) $(CFLAGS_DEBUG) $(INC_DEBUG) -c ../tiny_obj_loader.cc -o $(OBJDIR_DEBUG)/tiny_obj_loader.o
+
+clean_debug: 
+	rm -f $(OBJ_DEBUG) $(OUT_DEBUG)
+	rm -rf bin/Debug
+	rm -rf $(OBJDIR_DEBUG)
+
+before_release: 
+	test -d bin/Release || mkdir -p bin/Release
+	test -d $(OBJDIR_RELEASE) || mkdir -p $(OBJDIR_RELEASE)
+
+after_release: 
+
+release: before_release out_release after_release
+
+out_release: before_release $(OBJ_RELEASE) $(DEP_RELEASE)
+	$(LD) -shared $(LIBDIR_RELEASE) $(OBJ_RELEASE)  -o $(OUT_RELEASE) $(LDFLAGS_RELEASE) $(LIB_RELEASE)
+
+$(OBJDIR_RELEASE)/main.o: main.cpp
+	$(CXX) $(CFLAGS_RELEASE) $(INC_RELEASE) -c main.cpp -o $(OBJDIR_RELEASE)/main.o
+
+$(OBJDIR_RELEASE)/tiny_obj_loader.o: ../tiny_obj_loader.cc
+	$(CC) $(CFLAGS_RELEASE) $(INC_RELEASE) -c ../tiny_obj_loader.cc -o $(OBJDIR_RELEASE)/tiny_obj_loader.o
+
+clean_release: 
+	rm -f $(OBJ_RELEASE) $(OUT_RELEASE)
+	rm -rf bin/Release
+	rm -rf $(OBJDIR_RELEASE)
+
+.PHONY: before_debug after_debug clean_debug before_release after_release clean_release
+

test-nan.obj

@@ -1,145 +0,0 @@
-# cornell_box.obj and cornell_box.mtl are grabbed from Intel's embree project.
-# original cornell box data
-  # comment
-
-# empty line including some space
-   
-
-mtllib cornell_box.mtl
-
-o floor
-usemtl white
-v nan -nan nan
-v inf -inf inf
-v 1.#IND -1.#IND 1.#IND
-v 1.#INF -1.#INF 1.#INF
-
-v 130.0 0.0  65.0
-v  82.0 0.0 225.0
-v 240.0 0.0 272.0
-v 290.0 0.0 114.0
-
-v 423.0 0.0 247.0
-v 265.0 0.0 296.0
-v 314.0 0.0 456.0
-v 472.0 0.0 406.0
-
-f 1 2 3 4 
-f 8 7 6 5
-f 12 11 10 9
-
-o light
-usemtl light
-v 343.0 548.0 227.0
-v 343.0 548.0 332.0
-v 213.0 548.0 332.0
-v 213.0 548.0 227.0
-f -4 -3 -2 -1
-
-o ceiling
-usemtl white
-v 556.0 548.8 0.0
-v 556.0 548.8 559.2
-v 0.0 548.8 559.2
-v 0.0 548.8 0.0
-f -4 -3 -2 -1
-
-o back_wall
-usemtl white
-v 549.6   0.0 559.2
-v 0.0   0.0 559.2
-v 0.0 548.8 559.2
-v 556.0 548.8 559.2
-f -4 -3 -2 -1
-
-o front_wall
-usemtl blue
-v 549.6   0.0 0
-v 0.0   0.0 0
-v 0.0 548.8 0
-v 556.0 548.8 0
-#f -1 -2 -3 -4
-
-o green_wall
-usemtl green
-v    0.0   0.0 559.2
-v    0.0   0.0   0.0
-v    0.0 548.8   0.0
-v    0.0 548.8 559.2
-f -4 -3 -2 -1
-
-o red_wall
-usemtl red
-v    552.8   0.0   0.0
-v    549.6   0.0 559.2
-v    556.0 548.8 559.2
-v    556.0 548.8   0.0
-f -4 -3 -2 -1
-
-o short_block
-usemtl white
-
-v    130.0 165.0  65.0
-v     82.0 165.0 225.0
-v    240.0 165.0 272.0
-v    290.0 165.0 114.0
-f -4 -3 -2 -1
-
-v    290.0   0.0 114.0
-v    290.0 165.0 114.0
-v    240.0 165.0 272.0
-v    240.0   0.0 272.0
-f -4 -3 -2 -1
-
-v    130.0   0.0  65.0
-v    130.0 165.0  65.0
-v    290.0 165.0 114.0
-v    290.0   0.0 114.0
-f -4 -3 -2 -1
-
-v     82.0   0.0 225.0
-v     82.0 165.0 225.0
-v    130.0 165.0  65.0
-v    130.0   0.0  65.0
-f -4 -3 -2 -1
-
-v    240.0   0.0 272.0
-v    240.0 165.0 272.0
-v     82.0 165.0 225.0
-v     82.0   0.0 225.0
-f -4 -3 -2 -1
-
-o tall_block
-usemtl white
-
-v    423.0 330.0 247.0
-v    265.0 330.0 296.0
-v    314.0 330.0 456.0
-v    472.0 330.0 406.0
-f -4 -3 -2 -1
-
-usemtl white
-v    423.0   0.0 247.0
-v    423.0 330.0 247.0
-v    472.0 330.0 406.0
-v    472.0   0.0 406.0
-f -4 -3 -2 -1
-
-v    472.0   0.0 406.0
-v    472.0 330.0 406.0
-v    314.0 330.0 456.0
-v    314.0   0.0 456.0
-f -4 -3 -2 -1
-
-v    314.0   0.0 456.0
-v    314.0 330.0 456.0
-v    265.0 330.0 296.0
-v    265.0   0.0 296.0
-f -4 -3 -2 -1
-
-v    265.0   0.0 296.0
-v    265.0 330.0 296.0
-v    423.0 330.0 247.0
-v    423.0   0.0 247.0
-f -4 -3 -2 -1
-

test.cc

@@ -1,4 +1,3 @@
-#define TINYOBJLOADER_IMPLEMENTATION
 #include "tiny_obj_loader.h"
 
 #include <cstdio>
@@ -8,91 +7,7 @@
 #include <sstream>
 #include <fstream>
 
-#ifdef _WIN32
+static void PrintInfo(const std::vector<tinyobj::shape_t>& shapes, const std::vector<tinyobj::material_t>& materials)
-#ifdef __cplusplus
-extern "C" {
-#endif
-#include <windows.h>
-#include <mmsystem.h>
-#ifdef __cplusplus
-}
-#endif
-#pragma comment(lib, "winmm.lib")
-#else
-#if defined(__unix__) || defined(__APPLE__)
-#include <sys/time.h>
-#else
-#include <ctime>
-#endif
-#endif
-
-// not thread-safe 
-class timerutil {
-public:
-#ifdef _WIN32
-  typedef DWORD time_t;
-
-  timerutil() { ::timeBeginPeriod(1); }
-  ~timerutil() { ::timeEndPeriod(1); }
-
-  void start() { t_[0] = ::timeGetTime(); }
-  void end() { t_[1] = ::timeGetTime(); }
-
-  time_t sec() { return (time_t)((t_[1] - t_[0]) / 1000); }
-  time_t msec() { return (time_t)((t_[1] - t_[0])); }
-  time_t usec() { return (time_t)((t_[1] - t_[0]) * 1000); }
-  time_t current() { return ::timeGetTime(); }
-
-#else
-#if defined(__unix__) || defined(__APPLE__)
-  typedef unsigned long int time_t;
-
-  void start() { gettimeofday(tv + 0, &tz); }
-  void end() { gettimeofday(tv + 1, &tz); }
-
-  time_t sec() { return (time_t)(tv[1].tv_sec - tv[0].tv_sec); }
-  time_t msec() {
-    return this->sec() * 1000 +
-           (time_t)((tv[1].tv_usec - tv[0].tv_usec) / 1000);
-  }
-  time_t usec() {
-    return this->sec() * 1000000 + (time_t)(tv[1].tv_usec - tv[0].tv_usec);
-  }
-  time_t current() {
-    struct timeval t;
-    gettimeofday(&t, NULL);
-    return (time_t)(t.tv_sec * 1000 + t.tv_usec);
-  }
-
-#else // C timer
-  // using namespace std;
-  typedef clock_t time_t;
-
-  void start() { t_[0] = clock(); }
-  void end() { t_[1] = clock(); }
-
-  time_t sec() { return (time_t)((t_[1] - t_[0]) / CLOCKS_PER_SEC); }
-  time_t msec() { return (time_t)((t_[1] - t_[0]) * 1000 / CLOCKS_PER_SEC); }
-  time_t usec() { return (time_t)((t_[1] - t_[0]) * 1000000 / CLOCKS_PER_SEC); }
-  time_t current() { return (time_t)clock(); }
-
-#endif
-#endif
-
-private:
-#ifdef _WIN32
-  DWORD t_[2];
-#else
-#if defined(__unix__) || defined(__APPLE__)
-  struct timeval tv[2];
-  struct timezone tz;
-#else
-  time_t t_[2];
-#endif
-#endif
-};
-
-static void PrintInfo(const std::vector<tinyobj::shape_t>& shapes, const std::vector<tinyobj::material_t>& materials, bool triangulate = true)
 {
   std::cout << "# of shapes    : " << shapes.size() << std::endl;
   std::cout << "# of materials : " << materials.size() << std::endl;
@@ -100,32 +15,12 @@ static void PrintInfo(const std::vector<tinyobj::shape_t>& shapes, const std::ve
   for (size_t i = 0; i < shapes.size(); i++) {
     printf("shape[%ld].name = %s\n", i, shapes[i].name.c_str());
     printf("Size of shape[%ld].indices: %ld\n", i, shapes[i].mesh.indices.size());
-
+    printf("Size of shape[%ld].normal_indices: %ld\n", i, shapes[i].mesh.normal_indices.size());
-    if (triangulate)
+    printf("Size of shape[%ld].texcoord_indices: %ld\n", i, shapes[i].mesh.texcoord_indices.size());
-    {
+    printf("Size of shape[%ld].material_ids: %ld\n", i, shapes[i].mesh.material_ids.size());
-        printf("Size of shape[%ld].material_ids: %ld\n", i, shapes[i].mesh.material_ids.size());
+    assert((shapes[i].mesh.indices.size() % 3) == 0);
-        assert((shapes[i].mesh.indices.size() % 3) == 0);
+    for (size_t f = 0; f < shapes[i].mesh.indices.size() / 3; f++) {
-        for (size_t f = 0; f < shapes[i].mesh.indices.size() / 3; f++) {
+      printf("  idx[%ld] = %d, %d, %d. mat_id = %d\n", f, shapes[i].mesh.indices[3*f+0], shapes[i].mesh.indices[3*f+1], shapes[i].mesh.indices[3*f+2], shapes[i].mesh.material_ids[f]);
-          printf("  idx[%ld] = %d, %d, %d. mat_id = %d\n", f, shapes[i].mesh.indices[3*f+0], shapes[i].mesh.indices[3*f+1], shapes[i].mesh.indices[3*f+2], shapes[i].mesh.material_ids[f]);
-        }
-    } else {
-      for (size_t f = 0; f < shapes[i].mesh.indices.size(); f++) {
-        printf("  idx[%ld] = %d\n", f, shapes[i].mesh.indices[f]);
-      }
-
-      printf("Size of shape[%ld].material_ids: %ld\n", i, shapes[i].mesh.material_ids.size());
-      assert(shapes[i].mesh.material_ids.size() == shapes[i].mesh.num_vertices.size());
-      for (size_t m = 0; m < shapes[i].mesh.material_ids.size(); m++) {
-        printf("  material_id[%ld] = %d\n", m,
-          shapes[i].mesh.material_ids[m]);
-      }
-
-    }
-
-    printf("shape[%ld].num_faces: %ld\n", i, shapes[i].mesh.num_vertices.size());
-    for (size_t v = 0; v < shapes[i].mesh.num_vertices.size(); v++) {
-      printf("  num_vertices[%ld] = %ld\n", v,
-        static_cast<long>(shapes[i].mesh.num_vertices[v]));
     }
 
     printf("shape[%ld].vertices: %ld\n", i, shapes[i].mesh.positions.size());
@@ -136,44 +31,6 @@ static void PrintInfo(const std::vector<tinyobj::shape_t>& shapes, const std::ve
         shapes[i].mesh.positions[3*v+1],
         shapes[i].mesh.positions[3*v+2]);
     }
-
-    printf("shape[%ld].num_tags: %ld\n", i, shapes[i].mesh.tags.size());
-    for (size_t t = 0; t < shapes[i].mesh.tags.size(); t++) {
-      printf("  tag[%ld] = %s ", t, shapes[i].mesh.tags[t].name.c_str());
-      printf(" ints: [");
-      for (size_t j = 0; j < shapes[i].mesh.tags[t].intValues.size(); ++j)
-      {
-          printf("%ld", static_cast<long>(shapes[i].mesh.tags[t].intValues[j]));
-          if (j < (shapes[i].mesh.tags[t].intValues.size()-1))
-          {
-              printf(", ");
-          }
-      }
-      printf("]");
-
-      printf(" floats: [");
-      for (size_t j = 0; j < shapes[i].mesh.tags[t].floatValues.size(); ++j)
-      {
-          printf("%f", shapes[i].mesh.tags[t].floatValues[j]);
-          if (j < (shapes[i].mesh.tags[t].floatValues.size()-1))
-          {
-              printf(", ");
-          }
-      }
-      printf("]");
-
-      printf(" strings: [");
-      for (size_t j = 0; j < shapes[i].mesh.tags[t].stringValues.size(); ++j)
-      {
-          printf("%s", shapes[i].mesh.tags[t].stringValues[j].c_str());
-          if (j < (shapes[i].mesh.tags[t].stringValues.size()-1))
-          {
-              printf(", ");
-          }
-      }
-      printf("]");
-      printf("\n");
-    }
   }
 
   for (size_t i = 0; i < materials.size(); i++) {
@@ -190,13 +47,9 @@ static void PrintInfo(const std::vector<tinyobj::shape_t>& shapes, const std::ve
     printf("  material.map_Ka = %s\n", materials[i].ambient_texname.c_str());
     printf("  material.map_Kd = %s\n", materials[i].diffuse_texname.c_str());
     printf("  material.map_Ks = %s\n", materials[i].specular_texname.c_str());
-    printf("  material.map_Ns = %s\n", materials[i].specular_highlight_texname.c_str());
+    printf("  material.map_Ns = %s\n", materials[i].normal_texname.c_str());
-    printf("  material.map_bump = %s\n", materials[i].bump_texname.c_str());
-    printf("  material.map_d = %s\n", materials[i].alpha_texname.c_str());
-    printf("  material.disp = %s\n", materials[i].displacement_texname.c_str());
     std::map<std::string, std::string>::const_iterator it(materials[i].unknown_parameter.begin());
     std::map<std::string, std::string>::const_iterator itEnd(materials[i].unknown_parameter.end());
-
     for (; it != itEnd; it++) {
       printf("  material.%s = %s\n", it->first.c_str(), it->second.c_str());
     }
@@ -207,33 +60,20 @@ static void PrintInfo(const std::vector<tinyobj::shape_t>& shapes, const std::ve
 static bool
 TestLoadObj(
   const char* filename,
-  const char* basepath = NULL,
+  const char* basepath = NULL)
-  unsigned int flags = 1 )
 {
   std::cout << "Loading " << filename << std::endl;
 
   std::vector<tinyobj::shape_t> shapes;
   std::vector<tinyobj::material_t> materials;
-
+  std::string err = tinyobj::LoadObj(shapes, materials, filename, basepath);
-  timerutil t;
-  t.start();
-  std::string err;
-  bool ret = tinyobj::LoadObj(shapes, materials, err, filename, basepath, flags);
-  t.end();
 
   if (!err.empty()) {
     std::cerr << err << std::endl;
-  }
-
-  if (!ret) {
-    printf("Failed to load/parse .obj.\n");
     return false;
   }
 
-  printf("Parse time: %lu [msecs]\n", t.msec());
+  PrintInfo(shapes, materials);
-
-  bool triangulate( ( flags & tinyobj::triangulation ) == tinyobj::triangulation );
-  PrintInfo(shapes, materials, triangulate );
 
   return true;
 }
@@ -245,7 +85,7 @@ TestStreamLoadObj()
   std::cout << "Stream Loading " << std::endl;
 
   std::stringstream objStream;
-  objStream
+  objStream 
     << "mtllib cube.mtl\n"
     "\n"
     "v 0.000000 2.000000 2.000000\n"
@@ -278,7 +118,7 @@ TestStreamLoadObj()
     "f 2 6 7 3\n"
     "# 6 elements";
 
-std::string matStream(
+std::string matStream( 
     "newmtl white\n"
     "Ka 0 0 0\n"
     "Kd 1 1 1\n"
@@ -311,33 +151,25 @@ std::string matStream(
         public:
             MaterialStringStreamReader(const std::string& matSStream): m_matSStream(matSStream) {}
             virtual ~MaterialStringStreamReader() {}
-            virtual bool operator() (
+            virtual std::string operator() (
               const std::string& matId,
               std::vector<material_t>& materials,
-              std::map<std::string, int>& matMap,
+              std::map<std::string, int>& matMap)
-              std::string& err)
             {
-                (void)matId;
+                return LoadMtl(matMap, materials, m_matSStream);
-                (void)err;
-                LoadMtl(matMap, materials, m_matSStream);
-                return true;
             }
 
         private:
             std::stringstream m_matSStream;
-    };
+    };  
 
   MaterialStringStreamReader matSSReader(matStream);
   std::vector<tinyobj::shape_t> shapes;
   std::vector<tinyobj::material_t> materials;
-  std::string err;
+  std::string err = tinyobj::LoadObj(shapes, materials, objStream, matSSReader);    
-  bool ret = tinyobj::LoadObj(shapes, materials, err, objStream, matSSReader);    
   
   if (!err.empty()) {
     std::cerr << err << std::endl;
-  }
-
-  if (!ret) {
     return false;
   }
 
@@ -351,6 +183,7 @@ main(
   int argc,
   char **argv)
 {
+
   if (argc > 1) {
     const char* basepath = NULL;
     if (argc > 2) {
@@ -361,8 +194,7 @@ main(
     //assert(true == TestLoadObj("cornell_box.obj"));
     //assert(true == TestLoadObj("cube.obj"));
     assert(true == TestStreamLoadObj());
-    assert(true == TestLoadObj("catmark_torus_creases0.obj", NULL,  0));
   }
-
+  
   return 0;
 }

tiny_obj_loader.cc

@@ -1,2 +1,888 @@
-#define TINYOBJLOADER_IMPLEMENTATION
+//
+// Copyright 2012-2015, Syoyo Fujita.
+//
+// Licensed under 2-clause BSD liecense.
+//
+
+//
+// version 0.9.12: Fix groups being ignored if they have 'usemtl' just before 'g' (#44)
+// version 0.9.11: Invert `Tr` parameter(#43)
+// version 0.9.10: Fix seg fault on windows.
+// version 0.9.9 : Replace atof() with custom parser.
+// version 0.9.8 : Fix multi-materials(per-face material ID).
+// version 0.9.7 : Support multi-materials(per-face material ID) per
+// object/group.
+// version 0.9.6 : Support Ni(index of refraction) mtl parameter.
+//                 Parse transmittance material parameter correctly.
+// version 0.9.5 : Parse multiple group name.
+//                 Add support of specifying the base path to load material file.
+// version 0.9.4 : Initial suupport of group tag(g)
+// version 0.9.3 : Fix parsing triple 'x/y/z'
+// version 0.9.2 : Add more .mtl load support
+// version 0.9.1 : Add initial .mtl load support
+// version 0.9.0 : Initial
+//
+
+#include <cstdlib>
+#include <cstring>
+#include <cassert>
+#include <cmath>
+#include <cstddef>
+
+#include <string>
+#include <vector>
+#include <map>
+#include <fstream>
+#include <sstream>
+
 #include "tiny_obj_loader.h"
+
+namespace tinyobj {
+
+#define TINYOBJ_SSCANF_BUFFER_SIZE  (4096)
+
+struct vertex_index {
+  int v_idx, vt_idx, vn_idx;
+  vertex_index(){};
+  vertex_index(int idx) : v_idx(idx), vt_idx(idx), vn_idx(idx){};
+  vertex_index(int vidx, int vtidx, int vnidx)
+      : v_idx(vidx), vt_idx(vtidx), vn_idx(vnidx){};
+};
+// for std::map
+static inline bool operator<(const vertex_index &a, const vertex_index &b) {
+  if (a.v_idx != b.v_idx)
+    return (a.v_idx < b.v_idx);
+  if (a.vn_idx != b.vn_idx)
+    return (a.vn_idx < b.vn_idx);
+  if (a.vt_idx != b.vt_idx)
+    return (a.vt_idx < b.vt_idx);
+
+  return false;
+}
+
+struct obj_shape {
+  std::vector<float> v;
+  std::vector<float> vn;
+  std::vector<float> vt;
+};
+
+static inline bool isSpace(const char c) { return (c == ' ') || (c == '\t'); }
+
+static inline bool isNewLine(const char c) {
+  return (c == '\r') || (c == '\n') || (c == '\0');
+}
+
+// Make index zero-base, and also support relative index.
+static inline int fixIndex(int idx, int n) {
+  if (idx > 0) return idx - 1;
+  if (idx == 0) return 0;
+  return n + idx; // negative value = relative
+}
+
+static inline std::string parseString(const char *&token) {
+  std::string s;
+  token += strspn(token, " \t");
+  size_t e = strcspn(token, " \t\r");
+  s = std::string(token, &token[e]);
+  token += e;
+  return s;
+}
+
+static inline int parseInt(const char *&token) {
+  token += strspn(token, " \t");
+  int i = atoi(token);
+  token += strcspn(token, " \t\r");
+  return i;
+}
+
+
+// Tries to parse a floating point number located at s.
+//
+// s_end should be a location in the string where reading should absolutely
+// stop. For example at the end of the string, to prevent buffer overflows.
+//
+// Parses the following EBNF grammar:
+//   sign    = "+" | "-" ;
+//   END     = ? anything not in digit ?
+//   digit   = "0" | "1" | "2" | "3" | "4" | "5" | "6" | "7" | "8" | "9" ;
+//   integer = [sign] , digit , {digit} ;
+//   decimal = integer , ["." , integer] ;
+//   float   = ( decimal , END ) | ( decimal , ("E" | "e") , integer , END ) ;
+//
+//  Valid strings are for example:
+//   -0	 +3.1417e+2  -0.0E-3  1.0324  -1.41   11e2
+//
+// If the parsing is a success, result is set to the parsed value and true 
+// is returned.
+//
+// The function is greedy and will parse until any of the following happens:
+//  - a non-conforming character is encountered.
+//  - s_end is reached.
+//
+// The following situations triggers a failure:
+//  - s >= s_end.
+//  - parse failure.
+// 
+static bool tryParseDouble(const char *s, const char *s_end, double *result)
+{
+	if (s >= s_end)
+	{
+		return false;
+	}
+
+	double mantissa = 0.0;
+	// This exponent is base 2 rather than 10.
+	// However the exponent we parse is supposed to be one of ten,
+	// thus we must take care to convert the exponent/and or the 
+	// mantissa to a * 2^E, where a is the mantissa and E is the
+	// exponent.
+	// To get the final double we will use ldexp, it requires the
+	// exponent to be in base 2.
+	int exponent = 0;
+
+	// NOTE: THESE MUST BE DECLARED HERE SINCE WE ARE NOT ALLOWED
+	// TO JUMP OVER DEFINITIONS.
+	char sign = '+';
+	char exp_sign = '+';
+	char const *curr = s;
+
+	// How many characters were read in a loop. 
+	int read = 0;
+	// Tells whether a loop terminated due to reaching s_end.
+	bool end_not_reached = false;
+
+	/*
+		BEGIN PARSING.
+	*/
+
+	// Find out what sign we've got.
+	if (*curr == '+' || *curr == '-')
+	{
+		sign = *curr;
+		curr++;
+	}
+	else if (isdigit(*curr)) { /* Pass through. */ }
+	else
+	{
+		goto fail;
+	}
+
+	// Read the integer part.
+	while ((end_not_reached = (curr != s_end)) && isdigit(*curr))
+	{
+		mantissa *= 10;
+		mantissa += static_cast<int>(*curr - 0x30);
+		curr++;	read++;
+	}
+
+	// We must make sure we actually got something.
+	if (read == 0)
+		goto fail;
+	// We allow numbers of form "#", "###" etc.
+	if (!end_not_reached)
+		goto assemble;
+
+	// Read the decimal part.
+	if (*curr == '.')
+	{
+		curr++;
+		read = 1;
+		while ((end_not_reached = (curr != s_end)) && isdigit(*curr))
+		{
+			// NOTE: Don't use powf here, it will absolutely murder precision.
+			mantissa += static_cast<int>(*curr - 0x30) * pow(10.0, -read);
+			read++; curr++;
+		}
+	}
+	else if (*curr == 'e' || *curr == 'E') {}
+	else
+	{
+		goto assemble;
+	}
+
+	if (!end_not_reached)
+		goto assemble;
+
+	// Read the exponent part.
+	if (*curr == 'e' || *curr == 'E')
+	{
+		curr++;
+		// Figure out if a sign is present and if it is.
+		if ((end_not_reached = (curr != s_end)) && (*curr == '+' || *curr == '-'))
+		{
+			exp_sign = *curr;
+			curr++;
+		}
+		else if (isdigit(*curr)) { /* Pass through. */ }
+		else
+		{
+			// Empty E is not allowed.
+			goto fail;
+		}
+
+		read = 0;
+		while ((end_not_reached = (curr != s_end)) && isdigit(*curr))
+		{
+			exponent *= 10;
+			exponent += static_cast<int>(*curr - 0x30);
+			curr++;	read++;
+		}
+		exponent *= (exp_sign == '+'? 1 : -1);
+		if (read == 0)
+			goto fail;
+	}
+
+assemble:
+	*result = (sign == '+'? 1 : -1) * ldexp(mantissa * pow(5.0, exponent), exponent);
+	return true;
+fail:
+	return false;
+}
+static inline float parseFloat(const char *&token) {
+  token += strspn(token, " \t");
+#ifdef TINY_OBJ_LOADER_OLD_FLOAT_PARSER
+  float f = (float)atof(token);
+  token += strcspn(token, " \t\r");
+#else
+  const char *end = token + strcspn(token, " \t\r");
+  double val = 0.0;
+  tryParseDouble(token, end, &val);
+  float f = static_cast<float>(val);
+  token = end;
+#endif
+  return f;
+}
+
+
+static inline void parseFloat2(float &x, float &y, const char *&token) {
+  x = parseFloat(token);
+  y = parseFloat(token);
+}
+
+static inline void parseFloat3(float &x, float &y, float &z,
+                               const char *&token) {
+  x = parseFloat(token);
+  y = parseFloat(token);
+  z = parseFloat(token);
+}
+
+// Parse triples: i, i/j/k, i//k, i/j
+static vertex_index parseTriple(const char *&token, int vsize, int vnsize,
+                                int vtsize) {
+  vertex_index vi(-1);
+
+  vi.v_idx = fixIndex(atoi(token), vsize);
+  token += strcspn(token, "/ \t\r");
+  if (token[0] != '/') {
+    return vi;
+  }
+  token++;
+
+  // i//k
+  if (token[0] == '/') {
+    token++;
+    vi.vn_idx = fixIndex(atoi(token), vnsize);
+    token += strcspn(token, "/ \t\r");
+    return vi;
+  }
+
+  // i/j/k or i/j
+  vi.vt_idx = fixIndex(atoi(token), vtsize);
+  token += strcspn(token, "/ \t\r");
+  if (token[0] != '/') {
+    return vi;
+  }
+
+  // i/j/k
+  token++; // skip '/'
+  vi.vn_idx = fixIndex(atoi(token), vnsize);
+  token += strcspn(token, "/ \t\r");
+  return vi;
+}
+
+static vertex_index
+updateVertex(std::map<vertex_index, vertex_index> &vertexCache,
+             std::vector<float> &positions, std::vector<float> &normals,
+             std::vector<float> &texcoords,
+             const std::vector<float> &in_positions,
+             const std::vector<float> &in_normals,
+             const std::vector<float> &in_texcoords, const vertex_index &i) {
+  const std::map<vertex_index, vertex_index>::iterator it = vertexCache.find(i);
+
+  if (it != vertexCache.end()) {
+    // found cache
+    return it->second;
+  }
+
+  assert(in_positions.size() > (unsigned int)(3 * i.v_idx + 2));
+
+  positions.push_back(in_positions[3 * i.v_idx + 0]);
+  positions.push_back(in_positions[3 * i.v_idx + 1]);
+  positions.push_back(in_positions[3 * i.v_idx + 2]);
+
+  if (i.vn_idx >= 0) {
+    normals.push_back(in_normals[3 * i.vn_idx + 0]);
+    normals.push_back(in_normals[3 * i.vn_idx + 1]);
+    normals.push_back(in_normals[3 * i.vn_idx + 2]);
+  }
+
+  if (i.vt_idx >= 0) {
+    texcoords.push_back(in_texcoords[2 * i.vt_idx + 0]);
+    texcoords.push_back(in_texcoords[2 * i.vt_idx + 1]);
+  }
+
+  unsigned int v_idx = static_cast<unsigned int>(positions.size() / 3 - 1);
+  unsigned int vn_idx = static_cast<unsigned int>(normals.size() / 3 - 1);
+  unsigned int vt_idx = static_cast<unsigned int>(texcoords.size() / 2 - 1);
+  vertexCache[i].v_idx = v_idx;
+  vertexCache[i].vn_idx = vn_idx;
+  vertexCache[i].vt_idx = vt_idx;
+
+  return vertexCache[i];
+}
+
+void InitMaterial(material_t &material) {
+  material.name = "";
+  material.ambient_texname = "";
+  material.diffuse_texname = "";
+  material.specular_texname = "";
+  material.normal_texname = "";
+  for (int i = 0; i < 3; i++) {
+    material.ambient[i] = 0.f;
+    material.diffuse[i] = 0.f;
+    material.specular[i] = 0.f;
+    material.transmittance[i] = 0.f;
+    material.emission[i] = 0.f;
+  }
+  material.illum = 0;
+  material.dissolve = 1.f;
+  material.shininess = 1.f;
+  material.ior = 1.f;
+  material.unknown_parameter.clear();
+}
+
+static bool exportFaceGroupToShape(
+    shape_t &shape, std::map<vertex_index, vertex_index> vertexCache,
+    const std::vector<float> &in_positions,
+    const std::vector<float> &in_normals,
+    const std::vector<float> &in_texcoords,
+    const std::vector<std::vector<vertex_index> > &faceGroup,
+    const int material_id, const std::string &name, bool clearCache) {
+  if (faceGroup.empty()) {
+    return false;
+  }
+
+  // Flatten vertices and indices
+  for (size_t i = 0; i < faceGroup.size(); i++) {
+    const std::vector<vertex_index> &face = faceGroup[i];
+
+    vertex_index i0 = face[0];
+    vertex_index i1(-1);
+    vertex_index i2 = face[1];
+
+    size_t npolys = face.size();
+
+    // Polygon -> triangle fan conversion
+    for (size_t k = 2; k < npolys; k++) {
+      i1 = i2;
+      i2 = face[k];
+
+      vertex_index vi0 = updateVertex(
+          vertexCache, shape.mesh.positions, shape.mesh.normals,
+          shape.mesh.texcoords, in_positions, in_normals, in_texcoords, i0);
+      vertex_index vi1 = updateVertex(
+          vertexCache, shape.mesh.positions, shape.mesh.normals,
+          shape.mesh.texcoords, in_positions, in_normals, in_texcoords, i1);
+      vertex_index vi2 = updateVertex(
+          vertexCache, shape.mesh.positions, shape.mesh.normals,
+          shape.mesh.texcoords, in_positions, in_normals, in_texcoords, i2);
+
+      shape.mesh.indices.push_back(vi0.v_idx);
+      shape.mesh.indices.push_back(vi1.v_idx);
+      shape.mesh.indices.push_back(vi2.v_idx);
+
+      shape.mesh.normal_indices.push_back(vi0.vn_idx);
+      shape.mesh.normal_indices.push_back(vi1.vn_idx);
+      shape.mesh.normal_indices.push_back(vi2.vn_idx);
+
+      shape.mesh.texcoord_indices.push_back(vi0.vt_idx);
+      shape.mesh.texcoord_indices.push_back(vi1.vt_idx);
+      shape.mesh.texcoord_indices.push_back(vi2.vt_idx);
+
+      shape.mesh.material_ids.push_back(material_id);
+    }
+  }
+
+  shape.name = name;
+
+  if (clearCache)
+    vertexCache.clear();
+
+  return true;
+}
+
+std::string LoadMtl(std::map<std::string, int> &material_map,
+                    std::vector<material_t> &materials,
+                    std::istream &inStream) {
+  std::stringstream err;
+
+  material_t material;
+
+  int maxchars = 8192;             // Alloc enough size.
+  std::vector<char> buf(maxchars); // Alloc enough size.
+  while (inStream.peek() != -1) {
+    inStream.getline(&buf[0], maxchars);
+
+    std::string linebuf(&buf[0]);
+
+    // Trim newline '\r\n' or '\n'
+    if (linebuf.size() > 0) {
+      if (linebuf[linebuf.size() - 1] == '\n')
+        linebuf.erase(linebuf.size() - 1);
+    }
+    if (linebuf.size() > 0) {
+      if (linebuf[linebuf.size() - 1] == '\r')
+        linebuf.erase(linebuf.size() - 1);
+    }
+
+    // Skip if empty line.
+    if (linebuf.empty()) {
+      continue;
+    }
+
+    // Skip leading space.
+    const char *token = linebuf.c_str();
+    token += strspn(token, " \t");
+
+    assert(token);
+    if (token[0] == '\0')
+      continue; // empty line
+
+    if (token[0] == '#')
+      continue; // comment line
+
+    // new mtl
+    if ((0 == strncmp(token, "newmtl", 6)) && isSpace((token[6]))) {
+      // flush previous material.
+      if (!material.name.empty()) {
+        material_map.insert(
+            std::pair<std::string, int>(material.name, static_cast<int>(materials.size())));
+        materials.push_back(material);
+      }
+
+      // initial temporary material
+      InitMaterial(material);
+
+      // set new mtl name
+      char namebuf[TINYOBJ_SSCANF_BUFFER_SIZE];
+      token += 7;
+#ifdef _MSC_VER
+      sscanf_s(token, "%s", namebuf, _countof(namebuf));
+#else
+      sscanf(token, "%s", namebuf);
+#endif
+      material.name = namebuf;
+      continue;
+    }
+
+    // ambient
+    if (token[0] == 'K' && token[1] == 'a' && isSpace((token[2]))) {
+      token += 2;
+      float r, g, b;
+      parseFloat3(r, g, b, token);
+      material.ambient[0] = r;
+      material.ambient[1] = g;
+      material.ambient[2] = b;
+      continue;
+    }
+
+    // diffuse
+    if (token[0] == 'K' && token[1] == 'd' && isSpace((token[2]))) {
+      token += 2;
+      float r, g, b;
+      parseFloat3(r, g, b, token);
+      material.diffuse[0] = r;
+      material.diffuse[1] = g;
+      material.diffuse[2] = b;
+      continue;
+    }
+
+    // specular
+    if (token[0] == 'K' && token[1] == 's' && isSpace((token[2]))) {
+      token += 2;
+      float r, g, b;
+      parseFloat3(r, g, b, token);
+      material.specular[0] = r;
+      material.specular[1] = g;
+      material.specular[2] = b;
+      continue;
+    }
+
+    // transmittance
+    if (token[0] == 'K' && token[1] == 't' && isSpace((token[2]))) {
+      token += 2;
+      float r, g, b;
+      parseFloat3(r, g, b, token);
+      material.transmittance[0] = r;
+      material.transmittance[1] = g;
+      material.transmittance[2] = b;
+      continue;
+    }
+
+    // ior(index of refraction)
+    if (token[0] == 'N' && token[1] == 'i' && isSpace((token[2]))) {
+      token += 2;
+      material.ior = parseFloat(token);
+      continue;
+    }
+
+    // emission
+    if (token[0] == 'K' && token[1] == 'e' && isSpace(token[2])) {
+      token += 2;
+      float r, g, b;
+      parseFloat3(r, g, b, token);
+      material.emission[0] = r;
+      material.emission[1] = g;
+      material.emission[2] = b;
+      continue;
+    }
+
+    // shininess
+    if (token[0] == 'N' && token[1] == 's' && isSpace(token[2])) {
+      token += 2;
+      material.shininess = parseFloat(token);
+      continue;
+    }
+
+    // illum model
+    if (0 == strncmp(token, "illum", 5) && isSpace(token[5])) {
+      token += 6;
+      material.illum = parseInt(token);
+      continue;
+    }
+
+    // dissolve
+    if ((token[0] == 'd' && isSpace(token[1]))) {
+      token += 1;
+      material.dissolve = parseFloat(token);
+      continue;
+    }
+    if (token[0] == 'T' && token[1] == 'r' && isSpace(token[2])) {
+      token += 2;
+      // Invert value of Tr(assume Tr is in range [0, 1])
+      material.dissolve = 1.0 - parseFloat(token);
+      continue;
+    }
+
+    // ambient texture
+    if ((0 == strncmp(token, "map_Ka", 6)) && isSpace(token[6])) {
+      token += 7;
+      material.ambient_texname = token;
+      continue;
+    }
+
+    // diffuse texture
+    if ((0 == strncmp(token, "map_Kd", 6)) && isSpace(token[6])) {
+      token += 7;
+      material.diffuse_texname = token;
+      continue;
+    }
+
+    // specular texture
+    if ((0 == strncmp(token, "map_Ks", 6)) && isSpace(token[6])) {
+      token += 7;
+      material.specular_texname = token;
+      continue;
+    }
+
+    // normal texture
+    if ((0 == strncmp(token, "map_Ns", 6)) && isSpace(token[6])) {
+      token += 7;
+      material.normal_texname = token;
+      continue;
+    }
+
+    // unknown parameter
+    const char *_space = strchr(token, ' ');
+    if (!_space) {
+      _space = strchr(token, '\t');
+    }
+    if (_space) {
+      std::ptrdiff_t len = _space - token;
+      std::string key(token, len);
+      std::string value = _space + 1;
+      material.unknown_parameter.insert(
+          std::pair<std::string, std::string>(key, value));
+    }
+  }
+  // flush last material.
+  material_map.insert(
+      std::pair<std::string, int>(material.name, static_cast<int>(materials.size())));
+  materials.push_back(material);
+
+  return err.str();
+}
+
+std::string MaterialFileReader::operator()(const std::string &matId,
+                                           std::vector<material_t> &materials,
+                                           std::map<std::string, int> &matMap) {
+  std::string filepath;
+
+  if (!m_mtlBasePath.empty()) {
+    filepath = std::string(m_mtlBasePath) + matId;
+  } else {
+    filepath = matId;
+  }
+
+  std::ifstream matIStream(filepath.c_str());
+  return LoadMtl(matMap, materials, matIStream);
+}
+
+std::string LoadObj(std::vector<shape_t> &shapes,
+                    std::vector<material_t> &materials, // [output]
+                    const char *filename, const char *mtl_basepath) {
+
+  shapes.clear();
+
+  std::stringstream err;
+
+  std::ifstream ifs(filename);
+  if (!ifs) {
+    err << "Cannot open file [" << filename << "]" << std::endl;
+    return err.str();
+  }
+
+  std::string basePath;
+  if (mtl_basepath) {
+    basePath = mtl_basepath;
+  }
+  MaterialFileReader matFileReader(basePath);
+
+  return LoadObj(shapes, materials, ifs, matFileReader);
+}
+
+std::string LoadObj(std::vector<shape_t> &shapes,
+                    std::vector<material_t> &materials, // [output]
+                    std::istream &inStream, MaterialReader &readMatFn) {
+  std::stringstream err;
+
+  std::vector<float> v;
+  std::vector<float> vn;
+  std::vector<float> vt;
+  std::vector<std::vector<vertex_index> > faceGroup;
+  std::string name;
+
+  // material
+  std::map<std::string, int> material_map;
+  std::map<vertex_index, vertex_index> vertexCache;
+  int material = -1;
+
+  shape_t shape;
+
+  int maxchars = 8192;             // Alloc enough size.
+  std::vector<char> buf(maxchars); // Alloc enough size.
+  while (inStream.peek() != -1) {
+    inStream.getline(&buf[0], maxchars);
+
+    std::string linebuf(&buf[0]);
+
+    // Trim newline '\r\n' or '\n'
+    if (linebuf.size() > 0) {
+      if (linebuf[linebuf.size() - 1] == '\n')
+        linebuf.erase(linebuf.size() - 1);
+    }
+    if (linebuf.size() > 0) {
+      if (linebuf[linebuf.size() - 1] == '\r')
+        linebuf.erase(linebuf.size() - 1);
+    }
+
+    // Skip if empty line.
+    if (linebuf.empty()) {
+      continue;
+    }
+
+    // Skip leading space.
+    const char *token = linebuf.c_str();
+    token += strspn(token, " \t");
+
+    assert(token);
+    if (token[0] == '\0')
+      continue; // empty line
+
+    if (token[0] == '#')
+      continue; // comment line
+
+    // vertex
+    if (token[0] == 'v' && isSpace((token[1]))) {
+      token += 2;
+      float x, y, z;
+      parseFloat3(x, y, z, token);
+      v.push_back(x);
+      v.push_back(y);
+      v.push_back(z);
+      continue;
+    }
+
+    // normal
+    if (token[0] == 'v' && token[1] == 'n' && isSpace((token[2]))) {
+      token += 3;
+      float x, y, z;
+      parseFloat3(x, y, z, token);
+      vn.push_back(x);
+      vn.push_back(y);
+      vn.push_back(z);
+      continue;
+    }
+
+    // texcoord
+    if (token[0] == 'v' && token[1] == 't' && isSpace((token[2]))) {
+      token += 3;
+      float x, y;
+      parseFloat2(x, y, token);
+      vt.push_back(x);
+      vt.push_back(y);
+      continue;
+    }
+
+    // face
+    if (token[0] == 'f' && isSpace((token[1]))) {
+      token += 2;
+      token += strspn(token, " \t");
+
+      std::vector<vertex_index> face;
+      while (!isNewLine(token[0])) {
+        vertex_index vi =
+            parseTriple(token, static_cast<int>(v.size() / 3), static_cast<int>(vn.size() / 3), static_cast<int>(vt.size() / 2));
+        face.push_back(vi);
+        size_t n = strspn(token, " \t\r");
+        token += n;
+      }
+
+      faceGroup.push_back(face);
+
+      continue;
+    }
+
+    // use mtl
+    if ((0 == strncmp(token, "usemtl", 6)) && isSpace((token[6]))) {
+
+      char namebuf[TINYOBJ_SSCANF_BUFFER_SIZE];
+      token += 7;
+#ifdef _MSC_VER
+      sscanf_s(token, "%s", namebuf, _countof(namebuf));
+#else
+      sscanf(token, "%s", namebuf);
+#endif
+
+      // Create face group per material.
+      bool ret = exportFaceGroupToShape(shape, vertexCache, v, vn, vt,
+                                        faceGroup, material, name, true);
+      if (ret) {
+          shapes.push_back(shape);
+      }
+      shape = shape_t();
+      faceGroup.clear();
+
+      if (material_map.find(namebuf) != material_map.end()) {
+        material = material_map[namebuf];
+      } else {
+        // { error!! material not found }
+        material = -1;
+      }
+
+      continue;
+    }
+
+    // load mtl
+    if ((0 == strncmp(token, "mtllib", 6)) && isSpace((token[6]))) {
+      char namebuf[TINYOBJ_SSCANF_BUFFER_SIZE];
+      token += 7;
+#ifdef _MSC_VER
+      sscanf_s(token, "%s", namebuf, _countof(namebuf));
+#else
+      sscanf(token, "%s", namebuf);
+#endif
+
+      std::string err_mtl = readMatFn(namebuf, materials, material_map);
+      if (!err_mtl.empty()) {
+        faceGroup.clear(); // for safety
+        return err_mtl;
+      }
+
+      continue;
+    }
+
+    // group name
+    if (token[0] == 'g' && isSpace((token[1]))) {
+
+      // flush previous face group.
+      bool ret = exportFaceGroupToShape(shape, vertexCache, v, vn, vt,
+                                        faceGroup, material, name, true);
+      if (ret) {
+        shapes.push_back(shape);
+      }
+
+      shape = shape_t();
+
+      // material = -1;
+      faceGroup.clear();
+
+      std::vector<std::string> names;
+      while (!isNewLine(token[0])) {
+        std::string str = parseString(token);
+        names.push_back(str);
+        token += strspn(token, " \t\r"); // skip tag
+      }
+
+      assert(names.size() > 0);
+
+      // names[0] must be 'g', so skip the 0th element.
+      if (names.size() > 1) {
+        name = names[1];
+      } else {
+        name = "";
+      }
+
+      continue;
+    }
+
+    // object name
+    if (token[0] == 'o' && isSpace((token[1]))) {
+
+      // flush previous face group.
+      bool ret = exportFaceGroupToShape(shape, vertexCache, v, vn, vt,
+                                        faceGroup, material, name, true);
+      if (ret) {
+        shapes.push_back(shape);
+      }
+
+      // material = -1;
+      faceGroup.clear();
+      shape = shape_t();
+
+      // @todo { multiple object name? }
+      char namebuf[TINYOBJ_SSCANF_BUFFER_SIZE];
+      token += 2;
+#ifdef _MSC_VER
+      sscanf_s(token, "%s", namebuf, _countof(namebuf));
+#else
+      sscanf(token, "%s", namebuf);
+#endif
+      name = std::string(namebuf);
+
+      continue;
+    }
+
+    // Ignore unknown command.
+  }
+
+  bool ret = exportFaceGroupToShape(shape, vertexCache, v, vn, vt, faceGroup,
+                                    material, name, true);
+  if (ret) {
+    shapes.push_back(shape);
+  }
+  faceGroup.clear(); // for safety
+
+  return err.str();
+}
+}

tools/travis_postbuild.sh

@@ -1,12 +0,0 @@
-#!/bin/bash
-
-DATEVAL=`date +%Y-%m-%d`
-VERSIONVAL=master
-
-# Use tag as version
-if [ $TRAVIS_TAG ]; then
-  VERSIONVAL=$TRAVIS_TAG
-fi
-
-sed -e s%@DATE@%${DATEVAL}% .bintray.in > .bintray.tmp
-sed -e s%@VERSION@%${VERSIONVAL}% .bintray.tmp > .bintray.json