benkyd/tinyobjloader
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
543 Commits 18 Branches 15 Tags
40d00fd93544fda974df5792368567b66a226d7c
Commit Graph

543 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Syoyo Fujita
40d00fd935 Merge pull request #195 from Neptilo/master 
Fix crash when reading mtllib command
 2019-01-04 22:13:05 +09:00
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
Syoyo Fujita
e96e994355 Merge pull request #194 from jasjuang/master 
namespace for cmake export
 2019-01-04 12:33:19 +09:00
jasjuang
8f16866c37 namespace for cmake export 2019-01-03 19:26:00 -08:00
Syoyo Fujita
5e668b398a Merge pull request #193 from scpeters/patch-1 
tiny_obj_loader.h: initialize pad_ in constructor
 2018-12-15 01:30:19 +09:00
Steven Peters
df3bb6f8e8 tiny_obj_loader.h: fix order of variables 2018-12-13 10:49:18 -08:00
Steven Peters
546aa09d8d tiny_obj_loader.h: initialize pad_ in constructor 2018-12-11 15:09:56 -08:00
Syoyo Fujita
aa90b5466f Merge pull request #192 from basicNew/ChangeLoopTerminationConstraint 
Change triangulation loop termination constraint
 2018-12-08 17:57:06 +09:00
Andres Fortier
b404f3af67 Change loop termination constraint 2018-12-07 17:06:38 -03:00
Syoyo Fujita
a957ebe002 Fix some coments. 
Bump version 1.4.0
 2018-12-01 13:32:05 +09:00
Syoyo Fujita
d793bfb405 Merge pull request #191 from sinisterchipmunk/initialize_unparsed_texopts 
Properly initialize all texture_option_t's, not just parsed ones
 2018-12-01 13:25:41 +09:00
Colin MacKenzie IV
0ab0146296 Update function declaration 2018-11-30 15:27:38 -05:00
Colin MacKenzie IV
20d122f305 Properly initialize all texture_option_t's, not just parsed ones 2018-11-30 15:14:07 -05:00
Syoyo Fujita
850d0ffdfa Merge pull request #190 from ukabuer/patch-1 
Update README.md
 2018-11-30 21:29:21 +09:00
UKABUER
80058fdcb0 Update README.md 2018-11-30 20:24:14 +08:00
Syoyo Fujita
1a7aea4ac1 Merge pull request #189 from mathue/patch-1 
Fix of important memory leak in Python module
 2018-11-29 01:31:03 +09:00
Martin Thümmel
178ef391c7 Fix of important memory leak in Python module 
Dear all,
As described in the issue https://github.com/syoyo/tinyobjloader/issues/188#issue-385341218 there is a memory leak in the function pyLoadObj(). The reference count for all created Python objects must be decreased after they are fed into the lists and dictionaries. The only  exception from this is the function PyTuple_SetItem() in pyTupleFromfloat3(), which decreases the reference counter of the Python object *tuple automatically by calling this function. In all other cases like PyList_Insert(), the references are only borrowed and not decreased. Therefore, each created Python object will remain in the heap, since there is one reference to it left in the counter.

These facts are explained in https://docs.python.org/2/c-api/intro.html#reference-counts in detail.

Best regards
Martin.
P.S. sorry, that i did not put that much effort into a more readable code and just inserted the Py_DECREF() function at every necessary position.
 2018-11-28 17:16:12 +01:00
Syoyo Fujita
59b4d7ccef Merge pull request #187 from Neptilo/master 
Fix parsing double with negative exponent
 2018-11-06 00:28:10 +09: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