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

4315 Commits (0a8966a3e62947231a94e36129742733eb425d2c)

Author SHA1 Message Date
Kim Kulling bd0449ea79 closes assimp/assimp/issues/1101: copy aiTexture type declaration instead 
of using decltype for declaration to fix iOS build.
 2016-12-14 21:42:01 +01:00
Kim Kulling 5caa232b15 Merge pull request #1109 from assimp/issue_899 
closes assimp/assimp/issues/899: fix parsing of texture name.
 2016-12-12 23:42:24 +01:00
Kim Kulling 5e101c32dd Build: fix typo in filename. 2016-12-12 21:34:55 +01:00
Kim Kulling df03c657bf Merge pull request #1106 from elect86/master 
OBJ, added the index to handle clamp option for each cubemap texture
 2016-12-12 21:22:56 +01:00
Kim Kulling 859d15d3a0 closes assimp/assimp/issues/899: fix parsing of texture name. 2016-12-12 21:22:03 +01:00
Kim Kulling d5e399cbf8 Merge pull request #1108 from elect86/patch-1 
Update PlyParser.h
 2016-12-12 10:59:13 +01:00
Giuseppe Barbieri 5127e18da6 Update PlyParser.h 
Typo
 2016-12-11 13:01:26 +01:00
Giuseppe Barbieri b1d5390413 Update ObjFileImporter.cpp 2016-12-09 19:31:07 +01:00
Giuseppe Barbieri 83896f18b3 Update ObjFileImporter.h 2016-12-09 19:27:01 +01:00
Kim Kulling b1e89e3636 closes https://github.com/assimp/assimp/issues/1098: add license info. 2016-12-08 20:07:56 +01:00
Kim Kulling dcaaabcb10 Merge pull request #1103 from assimp/dxf_testsuite 
Initial test suite for DFX-format.
 2016-12-08 19:42:21 +01:00
Kim Kulling 4ed6db57a2 Initial test suite for DFX-format. 2016-12-08 19:24:25 +01:00
Kim Kulling d24ba9a4bb Merge pull request #1099 from asmaloney/warning_fixes 
Fixes two type warnings and a missing case option
 2016-12-08 17:49:36 +01:00
Kim Kulling fd791ecab6 Merge pull request #1100 from asmaloney/spelling_fixes 
Fixes spelling in comments
 2016-12-08 15:10:23 +01:00
Andy Maloney 0c7aac02eb Fixes spelling in comments 2016-12-07 21:31:51 -05:00
Andy Maloney 3c5f1578c2 Fixes two type warnings and a missing case option 2016-12-07 20:30:45 -05:00
Kim Kulling a3a1c82380 Merge pull request #1087 from elect86/patch-4 
Update ObjFileMtlImporter.cpp
 2016-12-07 20:16:57 +01:00
Giuseppe Barbieri ff73821cea Update ObjFileMtlImporter.cpp 2016-12-07 19:52:03 +01:00
Kim Kulling 9072164e5d Merge pull request #1094 from mrautio/fix-compilation 
Fix MinGW compilation
 2016-12-05 14:24:36 +01:00
Mika Rautio 350ee2ff68 Fix MinGW compilation support 2016-12-05 13:01:16 +02:00
Mika Rautio 8929760b3e Add better MinGW support for IFCReaderGen big objects 2016-12-05 12:57:05 +02:00
Mika Rautio f9cce7f59c MinGW __stat64 support depends on MSVCRT version 2016-12-05 12:33:48 +02:00
Mika Rautio 17fc3eea8f Do not build exporter if its importer is not built 2016-12-05 11:12:46 +02:00
Kim Kulling 20b8400dad Merge pull request #1092 from assimp/issue_1089 
Readme: let readme stats looking more cleaner.
 2016-12-03 10:13:05 +01:00
Kim Kulling b2f2fd5f49 Readme: let readme stats looking more cleaner. 2016-12-03 10:10:06 +01:00
Kim Kulling eb302dab82 Remove compile warning. 2016-12-03 09:23:07 +01:00
Kim Kulling 573c8b1cb1 Merge pull request #1091 from assimp/issue_1089 
FBX: woraround for issue 1089.
 2016-12-02 16:59:19 +01:00
Kim Kulling 05510f82af Unittest: fix a uppcase typo for the example FBX-file. 2016-12-02 16:47:54 +01:00
Kim Kulling 769805efd0 Merge branch 'master' into issue_1089 2016-12-02 14:31:18 +01:00
Kim Kulling dcfc696e86 FBX: woraround for issue 1089. 2016-12-02 11:32:34 +01:00
Kim Kulling c46ac37c9b Merge pull request #1085 from elect86/patch-3 
Update ObjFileParser.cpp
 2016-12-01 17:56:20 +01:00
Kim Kulling eefb812316 Merge pull request #1090 from assimp/new_unittests 
New tests for importers.
 2016-12-01 10:53:07 +01:00
Kim Kulling edfb3fc410 New tests for importers. 2016-12-01 10:29:39 +01:00
Kim Kulling c80777f13f Enable SIBImport test. 2016-11-30 17:49:22 +01:00
Kim Kulling 2193a93875 Exporter: fix some review findings. 2016-11-30 17:17:07 +01:00
Kim Kulling a46b481985 Generate TestModelFactory for uniform test models in unittests. 2016-11-30 16:36:45 +01:00
Kim Kulling 12ea506504 Enable unittest for apacity bug for dae files. 2016-11-30 15:05:06 +01:00
Kim Kulling c2deb3e15f BaseIMporter: fix review findings. 2016-11-30 15:03:32 +01:00
Kim Kulling a80d7346d8 AMFImporter: fix some review findings. 2016-11-30 15:03:02 +01:00
Kim Kulling f2817587ab AMFImporter: use correct unique token to identify schema for AMF-assets. 2016-11-29 19:50:40 +01:00
Kim Kulling c54dcf6180 Remove dead code. 2016-11-29 19:38:42 +01:00
Kim Kulling 43e1cae2ea Fix appveyor build: disable bugger mingw config. 2016-11-28 10:40:10 +01:00
Giuseppe Barbieri a2c82051d4 Update ObjFileMtlImporter.cpp 
Fixed grammar
 2016-11-27 22:44:03 +01:00
Giuseppe Barbieri fe7863d22f Update ObjFileParser.cpp 
Fixed error message
 2016-11-27 20:32:59 +01:00
Kim Kulling 685d78cdaf Enable win32-build: mingw. 2016-11-27 17:35:22 +01:00
Kim Kulling 181f78687f Merge branch 'master' of https://github.com/assimp/assimp 2016-11-27 16:44:03 +01:00
Kim Kulling 8272514b83 ObjImporter: use pre increment as a micro optimization. 2016-11-27 16:43:25 +01:00
Kim Kulling 8bfe465d03 Merge pull request #1083 from jaredmulconry/implementation_warning_fix 
Fixed warnings on MSVC14 x64 (Issue #1065)
 2016-11-27 16:40:45 +01:00
Kim Kulling 1d9f91946f Merge pull request #1080 from johnmaf/bugfix/collada-transparency 
Properly export COLLADA <transparency> value
 2016-11-27 16:30:59 +01:00
Jared Mulconry 6f4cb363c8 Added a preprocessor definition for MSVC to silence safety warnings regarding 
C library functions. This addresses all warnings for MSVC x86 and x64 when
building zlib, tools and viewer as a static lib.
 2016-11-27 17:34:34 +11:00