benkyd/tinyobjloader
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
153 Commits 18 Branches 15 Tags
12a55a8f71b28de939aa9372591e84b234c92ede
Commit Graph

153 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Syoyo Fujita
12a55a8f71 Fix source code layout. 2016-02-03 19:36:45 +09:00
Syoyo Fujita
1afdd32131 Fix travis script. 2016-02-03 19:34:28 +09:00
Syoyo Fujita
6082a1a4f3 Add osx for Travis build. 2016-02-03 18:49:49 +09:00
Syoyo Fujita
41515c8c78 Apply clang-format. 2016-01-30 00:48:42 +09:00
Syoyo Fujita
968ad8248e Cosmetic updates. 2016-01-29 19:55:04 +09:00
Syoyo Fujita
b3eed44b3e Merge branch 'master' of github.com:syoyo/tinyobjloader 2016-01-29 19:50:29 +09:00
Syoyo Fujita
6e711298a7 Merge branch 'dboogert-master' 2016-01-29 19:49:54 +09:00
Syoyo Fujita
9f24c7c38e Merge branch 'master' of https://github.com/dboogert/tinyobjloader into dboogert-master 
Conflicts:
	test.cc
	tiny_obj_loader.cc
	tiny_obj_loader.h
 2016-01-29 19:49:07 +09:00
dboogert
2fcdd32bc3 subd support: n-sided polygons & pixar crease tags 
+ optional parameter to triangulate polygons to maintain compatibility
+ added create tag test & example subd crease tag file from OpenSubD source code
 2016-01-28 18:34:08 +00:00
Syoyo Fujita
66d96ab3c2 Merge pull request #63 from mogemimi/fix-minor-typos 
Fix minor typos
 2016-01-18 12:47:41 +09:00
mogemimi
0e23d499c7 Fix minor typos 2016-01-18 08:05:54 +09:00
Syoyo Fujita
74614d9fd9 Add Travis badge. 2016-01-04 23:26:29 +09:00
Syoyo Fujita
320a670bc8 Add Travis CI script. 2016-01-04 23:24:43 +09:00
Syoyo Fujita
85d18ea7cd Add simple ninja script. 2015-12-05 12:34:44 +09:00
Syoyo Fujita
783b8c4886 Suppress clang compiler warnings. 2015-12-05 12:34:28 +09:00
Syoyo Fujita
3997ecf8e0 Merge branch 'master' of github.com:syoyo/tinyobjloader 2015-11-26 23:03:40 +09:00
Syoyo Fujita
353d527fe8 Add Cocos2d-x. 
Make tinyobjloader header-only.
 2015-11-26 14:10:32 +09:00
Syoyo Fujita
ec78aa2bd1 Add Cocos2d-x. 2015-11-18 22:44:18 +09:00
Syoyo Fujita
c1be55ffe2 Udate README. Fixes #60. 2015-11-12 10:50:40 +09:00
Syoyo Fujita
3681c44aa3 Update README. 2015-11-07 23:14:12 +09:00
Syoyo Fujita
a13e1d6164 Update python binding to match new API. 2015-11-07 23:10:42 +09:00
Syoyo Fujita
4f992f483d Merge branch 'master' of github.com:syoyo/tinyobjloader 2015-11-07 23:09:24 +09:00
Syoyo Fujita
e7e7eed616 Change API and handle no-mtl-file case correctly. Fixes #58. 2015-11-07 23:08:39 +09:00
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