545 Commits

Author SHA1 Message Date
Simon Otter
5615af5316 Removed stray parser test file. 2015-03-03 01:39:38 +01:00
Simon Otter
4ea1cf0b77 Implemented a parser and updated tiny_obj_loader.cc to use it unless a define is set. 2015-03-03 01:37:28 +01:00
Joe Hermaszewski
9d7012673e Fix a small typo 2015-02-27 19:58:43 +00:00
Syoyo Fujita
daaec1c9aa Small update. 2015-02-28 01:09:18 +09:00
Syoyo Fujita
28005f9cdf Update copyright year. 2015-02-28 00:47:13 +09:00
Syoyo Fujita
32dcf7d535 Use syoyo/ubu-dev image. 2015-02-27 15:54:04 +09:00
Syoyo Fujita
8a384a057b Update drone.yml 2015-02-27 12:45:44 +09:00
Syoyo Fujita
32414c27b4 Update TODO. 2015-02-27 12:07:02 +09:00
Simon Otter
f020169c26 Created a bunch of tests for the parser, and a spec. 2015-02-23 23:34:16 +01:00
Syoyo Fujita
f0fdaa307d slight change to fixIndex 2015-02-18 12:48:50 +09:00
Syoyo Fujita
743cfcd861 Merge branch 'CoolerExtreme-patch-1' 2015-02-18 12:45:42 +09:00
Syoyo Fujita
285f5b0cfd Merge branch 'patch-1' of https://github.com/CoolerExtreme/tinyobjloader into CoolerExtreme-patch-1
Conflicts:
	tiny_obj_loader.cc
2015-02-18 12:45:34 +09:00
Syoyo Fujita
2cceb53214 Update drone.yml. 2015-02-16 00:47:23 +09:00
Syoyo Fujita
1390f7f707 Fix compilation. 2015-02-15 17:05:57 +09:00
Syoyo Fujita
9979275835 Format source code. 2015-02-15 16:51:38 +09:00
CoolerExtreme
011e1b3ebd Slight typo 2015-02-13 06:37:37 +05:30
CoolerExtreme
f28d2eef88 Fix parseString ? and slight change to fixIndex
function parseString seemed to not increment token after it used strspn to get the length of the whitespace characters at the beginning of token. So strcspn called right after that would return 0 and the created string would be an empty string.

Seems to have been working so far since it gets passed strings that don't begin with whitespace characters.
2015-02-12 23:31:06 +05:30
Syoyo Fujita
a67a60d19f Update README. 2015-02-07 00:04:17 +09:00
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