v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,745 Commits
74 Branches
37 Tags
234 MiB
Commit Graph

3745 Commits (7b9162136f3c1994a882885cd5a2c7d0b4e92315)

Author SHA1 Message Date
carlsonsolutiondesign fa0427ca28 Copies the GenericValue(uint64_t) to a GenericValue(unsigned long) for compilation on Mac OS X 10.11.2. Not compiled on Windows yet. Will have to reboot and install Visual Studio or equivalent to compile, so I'm hoping someone else can look at the code and merge for Windows and Linux. Thanks! 2015-12-17 12:16:25 -05:00
John Carlson 0ebab2ef23 Merge pull request #1 from assimp/master 
Pull from master 12-17-2015
 2015-12-17 09:53:56 -05:00
lutz.hoeren 90ddb93940 Fix for FBX Files that do not have a Comma on a new line in a data block 2015-12-17 11:48:44 +01:00
lutz.hoeren 7e02b34090 Merge branch 'master' of https://github.com/luho383/assimp 2015-12-16 15:26:10 +01:00
lutz.hoeren e8a02ef890 Only read Element Data when there is a valid Mapping Information 2015-12-16 15:25:33 +01:00
Kim Kulling f75b919d42 Merge branch 'ov-issue-707' 2015-12-14 18:49:46 +01:00
Kim Kulling 3d6e1483d8 Update readme. 2015-12-14 18:42:31 +01:00
Kim Kulling 6b297b8960 New obj regression data. 2015-12-14 18:39:32 +01:00
Kim Kulling 6dfc99aa3d New db.zip. 2015-12-14 18:38:01 +01:00
Kim Kulling e0015b8610 Regression: updated test db. 2015-12-14 18:12:14 +01:00
Kim Kulling 87b3af4c3b Merge branch 'issue-707' of https://github.com/ov/assimp into ov-issue-707 2015-12-14 17:46:54 +01:00
Kim Kulling b60f57ece7 Merge pull request #716 from rmitton/empty_objmtl 
Added support for empty .MTL files.
 2015-12-14 09:29:31 +01:00
Kim Kulling 40272b4d26 Merge pull request #715 from rmitton/doc_fixes 
Tiny misc fixes for documentation
 2015-12-14 09:12:17 +01:00
Kim Kulling db96007f77 Merge pull request #717 from rmitton/sib_import 
Importer for Nevercenter Silo SIB files.
 2015-12-14 09:09:52 +01:00
rmitton d952823ffd Importer for Silo SIB files. 
Wrote an importer for Nevercenter Silo's binary SIB model format
 2015-12-13 22:14:19 -08:00
rmitton b9a4e99607 Added support for empty .MTL files. 
Some programs such as Silo export an empty .MTL file if you export a
.OBJ that doesn't use any materials. This patch allows the loading of
such files.
 2015-12-13 22:13:25 -08:00
rmitton 957426ed72 Tiny misc fixes for documentation 2015-12-13 22:12:25 -08:00
Vitaly Ovchinnikov 6e2b0b4fd1 a speedup 2015-12-14 15:37:27 +13:00
Vitaly Ovchinnikov b6f14eb917 Normalize() is replaced with NormalizeSafe() to prevent invalid vectors generation 2015-12-14 15:31:49 +13:00
Vitaly Ovchinnikov af40c99a6a trimming spaces around material names 2015-12-14 08:32:09 +13:00
Vitaly Ovchinnikov c9ef6132a8 a small fix 2015-12-13 23:10:31 +13:00
Vitaly Ovchinnikov 6214fbfbbe this patch fixes multiple objects generation in OBJ reader if faces are prepended with 'usemtl' line 2015-12-13 22:54:50 +13:00
Kim Kulling 078dd0c08b Merge pull request #705 from Vertexwahn/master 
Added custom target that copies generated libs and bin files to lib32/lib64 and bin32/64 folder
 2015-12-11 14:09:59 +01:00
Vertexwahn 270355f326 Improved Findassimp.cmake to support VS2013. Added deployment of VS2013 libs and dll files. 2015-12-11 10:33:47 +01:00
Alexander Gessler 5fc66d6c43 Merge pull request #706 from expipiplus1/spelling 
Correct spelling
 2015-12-10 21:49:24 +01:00
Vertexwahn 1fd66df37d Improved Findassimp.cmake to support VS2015. 2015-12-10 17:58:55 +01:00
Joe Hermaszewski 210764a6ff Correct spelling 2015-12-10 16:19:33 +00:00
Vertexwahn c6d1fcca74 Added custom target that copies generated libs and bin files to lib32/lib64 and bin32/64 folder 2015-12-10 17:15:27 +01:00
Vertexwahn cbafae9e49 Merge pull request #1 from assimp/master 
Merge
 2015-12-10 16:52:03 +01:00
Kim Kulling b440f67aae Merge pull request #704 from Vertexwahn/master 
Added missing DLL suffix for VS2015 build.
 2015-12-09 23:52:15 +01:00
Kim Kulling 9a6049d98d Merge branch 'master' of https://github.com/assimp/assimp 2015-12-09 23:50:00 +01:00
Kim Kulling 35fafe3a6f ColladaParser: use initializer lists again. 2015-12-09 23:49:03 +01:00
Vertexwahn 3013b6b62f Added missing DLL suffix for VS2015 build. 2015-12-09 21:58:29 +01:00
Kim Kulling bf4ca8162d Update ColladaParser.cpp 
Introduce workaround again to fix the build.
 2015-12-09 15:07:58 +01:00
Kim Kulling 9ae7d438f0 Update ColladaParser.cpp 
Try to close resource leak.
 2015-12-09 12:10:31 +01:00
Kim Kulling bcff6210b3 Regression test: fix deprecated python print call. 2015-12-08 21:33:08 +01:00
Kim Kulling b694bfd021 fix build 2015-12-08 20:36:31 +01:00
Léo Terziman 6eebf8455a Merge remote-tracking branch 'official/master' into contrib 2015-12-08 15:25:13 +01:00
Léo Terziman 445ae1fec3 In collada: implemented all missing transparency features from standard (ie RGB_ZERO, RGB_ONE and A_ZERO) 
+ removed user option to invert transparency as it does not seem to be needed anymore
+ fixed bug in default reflectivity value
 2015-12-08 15:24:07 +01:00
lutz.hoeren 2f3c47cab6 Only read Element Data when there is a valid Mapping Information 2015-12-08 12:26:41 +01:00
Kim Kulling 0a6788d56f try to fix build. 2015-12-07 20:43:01 +01:00
Kim Kulling f5e13874e0 glTF: check if exporter option has broke someting. 2015-12-06 16:49:10 +01:00
Kim Kulling 99b51eb456 Merge branch 'master' of https://github.com/assimp/assimp 2015-12-06 12:20:11 +01:00
Kim Kulling 6641188a8e assimp/issues/702: fix resource leak and use initializer list for all 
attributes of the loader instance.
 2015-12-06 12:18:33 +01:00
Kim Kulling a972397196 Merge pull request #699 from otgerp/master 
glTF exporter + improved the importer (and code refactor)
 2015-12-03 13:19:38 +01:00
Otger ffdcc78d91 Merge 2015-12-02 21:06:22 +01:00
Kim Kulling 8736907009 Importer: fix overflowImporter: fix overflow. 2015-12-02 19:58:43 +01:00
Kim Kulling f839232938 Uinittests: add missing license info headers. 2015-12-02 14:54:29 +01:00
Kim Kulling 1ef84a962f README: add glTF to readme.md 2015-12-01 19:34:54 +01:00
Kim Kulling f896c3329a Build: remove deprecated third party lib from cmake 2015-11-30 12:52:49 +01:00