Commit Graph

19 Commits

Author SHA1 Message Date
Syoyo Fujita
9f24c7c38e Merge branch 'master' of https://github.com/dboogert/tinyobjloader into dboogert-master
Conflicts:
	test.cc
	tiny_obj_loader.cc
	tiny_obj_loader.h
2016-01-29 19:49:07 +09:00
dboogert
2fcdd32bc3 subd support: n-sided polygons & pixar crease tags
+ optional parameter to triangulate polygons to maintain compatibility
+ added create tag test & example subd crease tag file from OpenSubD source code
2016-01-28 18:34:08 +00:00
Syoyo Fujita
783b8c4886 Suppress clang compiler warnings. 2015-12-05 12:34:28 +09:00
Syoyo Fujita
353d527fe8 Add Cocos2d-x.
Make tinyobjloader header-only.
2015-11-26 14:10:32 +09:00
Syoyo Fujita
e7e7eed616 Change API and handle no-mtl-file case correctly. Fixes #58. 2015-11-07 23:08:39 +09:00
Syoyo Fujita
7f2092b29f Support specular highlight, bump, displacement and alpha texture(Remove non-standard "normal map"). Fixes #53. 2015-09-01 20:20:10 +09:00
Syoyo Fujita
28005f9cdf Update copyright year. 2015-02-28 00:47:13 +09:00
Syoyo Fujita
9979275835 Format source code. 2015-02-15 16:51:38 +09:00
Syoyo Fujita
e4d4c65a17 Fix material ID assignment.
Fix build of example/obj_sticher.
2014-09-14 19:51:24 +09:00
Syoyo Fujita
cbba0a807e Initial support of multi-materials per group.
Introduce material_id attribute per face.
2014-09-13 23:49:25 +09:00
Mykhailo Parfeniuk
33cd9a4768 Added multiple materials per shape/object 2014-09-07 14:19:22 +03:00
Mattias Harrysson
f72fb80ac9 fix compiler warnings 2014-06-02 20:52:44 +02:00
E J Burns
b89a46c417 Code Modified to remove use of C++11 features.
Tested compilation with VS2012, clang++ 3.4 and g++.
2014-04-29 13:36:09 +01:00
E J Burns
08ff49d2d0 Added a LoadObj function that reads from a std::istream.
+ Added a LoadObj function that reads from a std::istream.  This should allow
   more generic usage and possibly make testing a little easier.
   o This LoadObj accepts a function that returns a
     std::unique_ptr<std::istream> for a material.
 + Modified LoadMtl to read from a std::istream to allow more generic
   usage.
 + Modified test.cc to check that the changes work as expected and nothing was
   broken.

Tests:
 + Compiled test.cc, checked diff of output against pre change output.
   Same output where expected.
2014-04-28 20:26:03 +01:00
Matt Pharr
6372ccbef2 Add support for parsing 'illum' and 'd'/'Tr' statements. 2014-04-09 09:46:03 -07:00
Syoyo Fujita
1544f0c865 Parse ior and transmittance of material parameter.
Add .obj sticher example.
2013-09-11 13:03:24 +09:00
Syoyo Fujita
5284dcb19f Parse multiple group name. Not yet finished fully though. 2013-06-29 13:00:22 +09:00
YarmUI
d62fdaf89d update .mtl loader (Ke, Ns, map_Ka, map_Kd, map_Ks, map_Ns) 2012-08-21 18:35:37 +09:00
Syoyo Fujita
cf78dd845b Initial commit. 2012-08-19 14:36:48 +09:00