Commit Graph

77 Commits

Author SHA1 Message Date
Syoyo Fujita
672f252195 Fix per-face material. 2015-02-07 00:01:37 +09:00
Syoyo Fujita
6796d61d07 Merge branch 'master' of github.com:syoyo/tinyobjloader 2015-02-02 17:43:28 +09:00
Syoyo Fujita
0a500b77e7 Small update for README. 2015-02-02 17:43:08 +09:00
Syoyo Fujita
5e5095cb8d Merge pull request #26 from maskman113/master
Fixed cmake warning that targets shouldn't be named test.
2015-01-27 11:25:30 +09:00
Maurice Laveaux
41db59cde5 Fixed cmake warning that targets shouldn't be named test. 2015-01-26 17:32:56 +01:00
Syoyo Fujita
fae5b03e7c Update README. 2015-01-17 23:04:15 +09:00
Syoyo Fujita
276c7e151e Update drone.yml
Add Zup conversion in obj_writer.
2015-01-17 22:37:31 +09:00
Syoyo Fujita
4779593e44 Update drone.yml. 2015-01-17 22:30:02 +09:00
Syoyo Fujita
b5352a642b Add drone.yml 2015-01-17 22:27:20 +09:00
Syoyo Fujita
062f7a1b6d Merge branch 'master' of github.com:syoyo/tinyobjloader 2014-11-30 13:00:05 +09:00
Syoyo Fujita
c5ed61f358 Add link to IBLBaker. 2014-11-30 11:59:55 +09:00
Syoyo Fujita
d535310c94 Merge pull request #24 from Ododo/master
Fix bugs in python module.
2014-11-17 16:28:35 -06:00
Syoyo Fujita
9b69811bb6 Merge branch 'master' of https://github.com/Ododo/tinyobjloader 2014-11-17 16:27:50 -06:00
root
aabdad4bc4 changed to switch structure 2014-11-17 22:06:25 +01:00
root
9587ad9aee cleaning code.. 2014-11-16 23:53:21 +01:00
root
93d7232614 fix shapes / adding setup file 2014-11-16 23:39:20 +01:00
Ododo
e5bbda3835 Update howto.py 2014-11-16 21:08:44 +01:00
root
f750f3faeb adding setup.py file 2014-11-16 19:35:18 +01:00
Syoyo Fujita
c1ed13c36c Merge pull request #23 from Ododo/master
Python interface
2014-11-15 11:54:38 +09:00
root
878a6560cd fix makefile 2014-11-14 15:22:50 +01:00
root
80b243092b base of python module 2014-11-14 14:32:20 +01:00
Julian Simioni
b214cfb4b9 Fix unused variable warnings 2014-10-29 18:54:35 -07:00
Syoyo Fujita
b35f4989ad Add link to mallie. 2014-09-29 19:08:46 +09:00
Syoyo Fujita
957fa36e70 typo. 2014-09-14 19:52:44 +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
Syoyo Fujita
8f7712c382 Merge pull request #17 from nyue/master
Added installation steps
2014-07-15 22:42:32 -07:00
Nicholas Yue
6dc2c6916e Added installation steps 2014-07-15 12:10:11 -07:00
Syoyo Fujita
79ac76c767 Add wercker status. 2014-07-11 19:07:45 +09:00
Syoyo Fujita
166677929d Add test run. 2014-07-11 19:05:26 +09:00
Syoyo Fujita
c2b53e59c6 Fix filepath in wercker.yml 2014-07-11 19:01:49 +09:00
Syoyo Fujita
9528a1ef75 Checkout premake4 from orebuildenv. 2014-07-11 18:58:34 +09:00
Syoyo Fujita
c1202c4ba4 Update wercker.yml 2014-07-11 18:45:24 +09:00
Syoyo Fujita
e88dd3d3a0 Validate wercker.yml 2014-07-11 18:41:01 +09:00
Syoyo Fujita
89b3ec9510 Add wercker file. 2014-07-11 18:34:24 +09:00
Mattias Harrysson
f72fb80ac9 fix compiler warnings 2014-06-02 20:52:44 +02:00
Syoyo Fujita
b96ee06bb6 Update README. 2014-05-18 00:50:59 +09:00
Narendra Umate
b45fbe6345 Fixed trim newline bugs. 2014-05-16 13:54:05 -04:00
E J Burns
9b4a9343a1 Fixed ior init. 2014-04-29 15:22:01 +01:00
Syoyo Fujita
69960487a3 Update README. 2014-04-29 22:51:11 +09: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
Syoyo Fujita
c33b0cf6cc Update README. 2014-04-21 19:24:22 +09:00
YarmUI
86b9c625db set default material 2014-04-21 19:14:06 +09:00
anton
2ce2af9d02 add missing includes
Signed-off-by: anton <haglundanton+github@gmail.com>
2014-04-18 17:52:06 +02:00
Syoyo Fujita
6b8e3900c6 Update README. 2014-04-10 16:51:35 +09:00
Matt Pharr
6372ccbef2 Add support for parsing 'illum' and 'd'/'Tr' statements. 2014-04-09 09:46:03 -07:00
Matt Pharr
665c129488 Fix small bug in obj_writer.cc (one too many "%f"s in format string). 2014-04-09 09:45:38 -07:00
Syoyo Fujita
7cd0643181 Update README. 2014-01-27 19:49:02 +09:00