Commit Graph

526 Commits

Author SHA1 Message Date
Neptilo
7712f1bebd Fix crash when reading mtllib command
The code was assuming the mtllib command to be near the beginning of the file, and therefore to always be read by the first thread.
2019-01-04 13:57:34 +01:00
Victor Ripplinger
6f990e2b6c Fix parsing double with negative exponent 2018-11-05 15:17:34 +01:00
Syoyo Fujita
7fb5056a53 Make ParseTextureNameAndOption function public. 2018-10-19 15:29:31 +09:00
Syoyo Fujita
934788785e Show line number for some warning and error message. 2018-10-10 13:33:11 +09:00
Syoyo Fujita
e07a835f02 Separate error message into warning and error. Breaks API, so bump to version 1.3.0 2018-10-10 01:56:07 +09:00
Syoyo Fujita
1cdfd786d8 Add colorspace extension to texture options. Fixes #184 2018-09-14 13:42:27 +09:00
Syoyo Fujita
803b65b8a0 Merge pull request #183 from mlimper/master
Added option to disable default vertex colors
2018-09-01 00:31:29 +09:00
Max Limper
50518a515b added option to disable default vertex colors 2018-08-31 16:59:32 +02:00
Syoyo Fujita
c9b1bccf97 Fix mis-counting of faces when triangulation is enabled. 2018-08-20 15:10:37 +09:00
Syoyo Fujita
1f17833657 Add comments. 2018-08-20 14:24:49 +09:00
Syoyo Fujita
bb58a8f8c3 Revert assertion equation. 2018-08-20 14:19:34 +09:00
Syoyo Fujita
b1f594d682 Merge branch 'master' of github.com:syoyo/tinyobjloader 2018-08-20 14:10:17 +09:00
Syoyo Fujita
02df4943f9 Fix assert equation. 2018-08-20 14:09:56 +09:00
Syoyo Fujita
826a892d0b Merge pull request #181 from vincentdm05/missing-data
Produce an error and return when indices and data dont match.
2018-08-17 16:12:36 +09:00
Vincent de Marignac
68350e2fc7 give respective warnings but allow partially correct data to be returned 2018-08-16 23:34:47 +03:00
Vincent de Marignac
7d20e9b901 use ternary op instead of max from omitted lib 2018-08-16 00:00:22 +03:00
Vincent de Marignac
fdc70abdc6 fix index comparison wrt array size 2018-08-15 23:41:35 +03:00
Vincent de Marignac
8a885e14b8 Produce an error and return when indices and data dont match. 2018-08-15 23:13:00 +03:00
Syoyo Fujita
cd65de860b Merge branch 'master' of github.com:syoyo/tinyobjloader 2018-08-13 17:47:38 +09:00
Syoyo Fujita
4924857fd3 Add note on # of max threads. 2018-08-13 17:47:13 +09:00
Syoyo Fujita
1a7bdc6192 Parse multiple group names. Fixes #146 2018-08-11 15:21:17 +09:00
Syoyo Fujita
fd06fa49e4 Add unit test for parsing 'l'. 2018-07-25 21:42:23 +09:00
Syoyo Fujita
0d68262246 Fix buffer overrun when parsing 'l' line. 2018-07-25 16:24:40 +09:00
Syoyo Fujita
0e950513a3 Merge pull request #178 from ZKing1000/master
Added support for line paths.
2018-07-25 16:02:49 +09:00
Holden Green
a4b115a584 Hopefully fixed compiling error 2018-07-24 23:47:59 -07:00
Syoyo Fujita
bb3e27d4f3 Merge pull request #179 from mlimper/master
Fixed #177
2018-07-09 19:29:07 +09:00
Max Limper
c4e7e65acb fixed #177 (explicit empty mtl base dir given) 2018-07-09 12:21:46 +02:00
Max Limper
eba327b9c0 make tester fail for issue 177 failing (explicit MTL base dir given by API user) 2018-07-09 12:19:33 +02:00
Holden Green
3cbf45a572 Non const 2018-07-04 22:13:39 -07:00
Holden Green
6650dbf397 Used swap in favor of move 2018-07-04 22:10:45 -07:00
Holden Green
7befd59de4 Removed comment 2018-07-04 21:59:56 -07:00
Holden Green
c5b3139653 Fixed comments 2018-07-04 21:46:42 -07:00
Holden Green
adb2309110 Removed print message. 2018-07-04 21:44:09 -07:00
Holden Green
3edca81a75 Added line paths. 2018-07-04 21:21:56 -07:00
Syoyo Fujita
7a88cddefc Add unit test for issue 177. 2018-07-03 18:37:41 +02:00
Syoyo Fujita
d541711a79 Merge pull request #176 from silverweed/master
Ensure mtl_basedir ends with a directory separator
2018-06-02 00:18:54 +09:00
Syoyo Fujita
d1ce2082f6 Remove afl files since it fails to create file on Windows file system. 2018-06-02 00:15:18 +09:00
silverweed
8fd9f6e57b ensure mtl_basedir ends with a directory separator 2018-06-01 12:02:38 +02:00
Syoyo Fujita
24bd8b49ff Merge branch 'master' of github.com:syoyo/tinyobjloader 2018-05-31 16:34:01 +09:00
Syoyo Fujita
4a0e79985d Bump version. 2018-05-31 16:29:14 +09:00
Syoyo Fujita
06f6139d1f Limit # of tags when parsing SubD tag('t'). 2018-05-31 16:25:39 +09:00
Syoyo Fujita
0c8db8ee23 Hardened implementation(fix some seg faults, out-of-bound access) found by fuzzer. 2018-05-31 15:49:56 +09:00
Syoyo Fujita
64d1e3f883 Merge pull request #170 from Neptilo/master
Fix bug that discarded some chunks.
2018-03-27 00:57:19 +09:00
Victor Ripplinger
a39a6b481c Fix bug that discarded some chunks.
The OBJ loader was discarding the first line of a file
or a chunk following one that ends with a newline.
2018-03-26 16:28:13 +02:00
Syoyo Fujita
bce1bb8387 Merge branch 'master' of github.com:syoyo/tinyobjloader 2018-03-26 20:10:55 +09:00
Syoyo Fujita
7fcfafb39a Fix compilation for double precision mode(Fixes #167). 2018-03-26 20:09:56 +09:00
Syoyo Fujita
5eda671225 Merge pull request #169 from LZaw/master
Adapt 1.0.x format
2018-03-10 00:03:35 +09:00
LZaw
f95510b04b Removed multiplication for color_idx_offset 2018-03-09 13:57:18 +01:00
LZaw
94f1dc15b3 Update obj_sticher.cc 2018-03-09 13:48:05 +01:00
LZaw
a4eabf54b1 Adapt 1.0.x datastructure 2018-03-09 13:43:52 +01:00