benkyd/tinyobjloader
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
280 Commits 18 Branches 15 Tags
1983e889dcaf96fdf5945bd2b2f7e029c3036600
Commit Graph

280 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Syoyo Fujita
e867685194 Merge pull request #55 from Ododo/master 
update
 2015-10-21 12:50:58 +09:00
Olivier
fcad68bf2d update 2015-10-21 03:23:06 +02:00
Syoyo Fujita
475bc83ef3 Fix wrong texname assignment for map_d. 2015-09-02 18:55:34 +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
d299576eac Merge pull request #51 from nguillemot/master 
fix sscanf_s buffer size type
 2015-08-09 11:16:51 +09:00
Nicolas Guillemot
191a7dfdc8 fix sscanf_s buffer size type 
Uses of sscanf_s give the following warnings in 64-bit builds:

    tiny_obj_loader.cc(471): warning C4477: 'sscanf_s' : format string '%s' requires an argument of type 'int', but variadic argument 2 has type 'unsigned __int64'
    tiny_obj_loader.cc(471): note: this argument is used as a buffer size

This was fixed by casting the uses of _countof(namebuf) to unsigned, since the MSDN documentation for sscanf_s specifies that "The size parameter is of type **unsigned**, not **size_t**." (https://msdn.microsoft.com/en-us/library/t6z7bya3.aspx)
This silences the warnings.
 2015-08-08 16:20:57 -07:00
Syoyo Fujita
870ead273e Initial support of tinyobjloader on Android NDK platform(NDK r10 confirmed to be able to compile). 2015-08-04 14:27:40 +09:00
Syoyo Fujita
aa07206fc1 Suppress double -> float conversion warning. Fixes #50 2015-07-24 11:46:30 +09:00
Syoyo Fujita
8329bdd135 Merge pull request #48 from gitter-badger/gitter-badge 
Add a Gitter chat badge to README.md
 2015-07-17 01:14:43 +09:00
The Gitter Badger
def9fe7f16 Added Gitter badge 2015-07-16 16:02:50 +00:00
Syoyo Fujita
82ae20b833 +1 version num. 2015-06-25 20:32:46 +09:00
Syoyo Fujita
164c152216 Initialized a material. 
Add warning message to `err` when material file not found.
 2015-06-25 20:24:24 +09:00
Syoyo Fujita
3058419d7d Update README. Add bugfix notes. 2015-06-23 16:18:29 +09:00
Syoyo Fujita
6727aeaca1 Merge pull request #44 from obviousengineering/oe 
Fix groups being ignored if they have 'usemtl' just before 'g'
 2015-06-23 16:14:59 +09:00
Ricardo Sánchez-Sáez
fb361547e5 Fix groups being ignored if they have 'usemtl' just before 'g' 2015-06-22 16:14:16 +01:00
Syoyo Fujita
805bd814fa Invert 'Tr'. Fixes #43. 2015-06-20 19:41:41 +09:00
Syoyo Fujita
1adfc794ae Fix sscanf_s seg fault on windows. Fixes #41 2015-06-09 23:49:52 +09:00
Syoyo Fujita
a2851fdf17 Add more links to project using tinyobjloader. 2015-06-08 14:18:35 +09:00
Syoyo Fujita
4e9e812b09 Add Appveyor batch. 2015-06-04 00:06:56 +09:00
Syoyo Fujita
b963227246 Merge branch 'master' of github.com:syoyo/tinyobjloader 2015-06-04 00:02:17 +09:00
Syoyo Fujita
a7759a740a Add Appveyor settings. 2015-06-04 00:01:51 +09:00
Syoyo Fujita
2c005ddad1 Merge pull request #40 from MutterOberin/master 
Changed pow function to use double overload
 2015-06-02 17:46:38 +09:00
MutterOberin
42d6bfbafb Changed pow function to use double overload 2015-06-01 16:39:36 +02:00
Syoyo Fujita
59acd32d0a Merge pull request #38 from OpenSpace/master 
Fix compile warnings under VS 2013 /W4 warning level
 2015-05-24 22:19:13 +09:00
Alexander Bock
0aab63eb20 Fixing ptrdiff_t compile error 2015-05-23 22:15:23 +02:00
Alexander Bock
49e82e2e00 Fix compile warnings under VS 2013 /W4 warning level 2015-05-23 22:13:00 +02:00
Syoyo Fujita
7a3e607898 Merge pull request #37 from OpenSpace/master 
Add CMake options
 2015-05-22 13:37:23 +09:00
Alexander Bock
d828e7521d Add CMake options to toggle the TestLoader application and OBJ Sticher application so that including the project has a smaller footprint 2015-05-21 22:22:59 +02:00
Syoyo Fujita
911f0dd636 Merge pull request #36 from Twinklebear/master 
Add support for referencing multiple mtllibs
 2015-05-02 15:27:52 +09:00
Will Usher
527000abd6 Add support for referencing multiple mtllibs 2015-05-01 17:32:25 -06:00
Syoyo Fujita
ba5fde9fd5 Remove #28 TODO. 2015-03-03 13:22:56 +09:00
Syoyo Fujita
8b8435d436 Merge branch 'skurmedel-master' 2015-03-03 13:17:28 +09:00
Syoyo Fujita
8d300917a3 Update README. 
Bump version 0.9.9.
 2015-03-03 13:16:56 +09:00
Syoyo Fujita
79af31df5a Merge branch 'master' of https://github.com/skurmedel/tinyobjloader into skurmedel-master 2015-03-03 12:16:38 +09:00
Syoyo Fujita
e8ed70b15f Merge pull request #33 from expipiplus1/fix-typo 
Fix a small typo
 2015-03-03 12:13:15 +09:00
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