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

2749 Commits (6249a1c06f75cadd8206ef961e75e4c388b04e64)

Author SHA1 Message Date
Kim Kulling 45cc0b582a fix creation of unused mesh instance. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-03-31 12:18:57 +02:00
Kim Kulling 754897d1aa add imported meshes from OpenGEX-importer to scene. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-03-30 23:54:32 +02:00
Kim Kulling 8857f26efb fix: add setup for number of copied vertex attributes. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-03-30 12:04:28 +02:00
Kim Kulling 7f3b044b83 add import of index array data. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-03-30 11:55:57 +02:00
Kim Kulling 0e11cfbe6f add copy op for positions, normals and texture coordinates. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-03-29 18:53:23 +02:00
Ser Lev Arris c2e6e3439e sry, one fi too less... 2015-03-29 11:59:57 +02:00
Ser Lev Arris ef7009f2c3 maybe Fixes assimp/assimp#516 2015-03-29 11:51:17 +02:00
Kim Kulling 20ad00b5e5 Merge branch 'master' of https://github.com/assimp/assimp 2015-03-28 20:47:17 +01:00
Ser Lev Arris 38a1abc908 ... method name ... 2015-03-28 15:01:01 +01:00
Ser Lev Arris 19d9b31d56 makro »lprintf« substitution gcc warnings cleanup 2015-03-28 14:45:21 +01:00
Alexander Gessler f96b49a112 Merge pull request #515 from assimp/regression-suite-fixes 
Regression suite fixes II
 2015-03-28 14:38:51 +01:00
Ser Lev Arris 311c1ecadb typo in method name fixed 2015-03-28 14:32:06 +01:00
Ser Lev Arris 79768ddc14 prepare for removal of hardcoded struct and primitive sizes. 
added getter to determine struct and primitive sizes.
(cleanup in the java code can be done later.)
 2015-03-28 14:21:47 +01:00
Alexander Gessler 0c9bbadf5f Update regression database (again). 2015-03-28 13:47:52 +01:00
Alexander Gessler 8d3853022a Merge branch 'master' of https://github.com/assimp/assimp 2015-03-28 13:44:11 +01:00
Alexander Gessler c07cddff9e Make regression test runner include "expected failure, ok" cases in its statistics. This previously caused discrepancy between the runner and the test generator. 2015-03-28 13:43:52 +01:00
Alexander Gessler d717c4b2dd Fix to have gen_db.py also include files that accidentally have uppercase file extensions, affecting ~200 files previously skipped. 2015-03-28 13:36:47 +01:00
Alexander Gessler 0943936b31 Fix an issue in the regression DB generator that caused the very last file extension in the list returned by `assimp listext` to be ignored because of a trailing CRLF. 2015-03-28 13:18:54 +01:00
Alexander Gessler fcdefc7b16 Re-enable LWS for regression testing (original reason no longer applies), blacklist some material file format otherwise causing noise. 2015-03-28 13:18:06 +01:00
Alexander Gessler e5d4f537bd CompareDump: do not use C++11 range based for loop. 2015-03-28 13:10:34 +01:00
Alexander Gessler a77f9419a2 XGLLoader: set aiImporterFlags_SupportCompressedFlavour flag. 2015-03-28 13:09:18 +01:00
Alexander Gessler 51514994f3 Merge pull request #512 from VirusFree/pr_FBX_Animations 
[FBX] add support for multiple animations
 2015-03-28 12:56:56 +01:00
Alexander Gessler 98039ee76e Update regression db. 2015-03-28 12:53:24 +01:00
Alexander Gessler ce7b3af1d7 CompareDump: fix typo in light compare code. 
Brings regression suite local runs to 100%.
 2015-03-28 12:53:08 +01:00
Alexander Gessler e2addcee77 CompareDump: fix reporting bugs. The top stack entry was missing (!) and we had an off-by-one in the index computation. 
Also, all of this should be rewritten from scratch.
 2015-03-28 12:51:46 +01:00
Alexander Gessler e0dd061dcb CompareDump: add debug trace of past push/pop operations to assist debugging. 2015-03-28 12:46:15 +01:00
Alexander Gessler fafe5584b6 gen_db.py no longer generating dumps for files blacklisted (settings.files_to_ignore). 2015-03-28 12:12:53 +01:00
Kim Kulling aa9dd6a14b - check property name before setting up the primitive type for meshes. 
- fix lookup for vertex attribute type lookup.

Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-03-28 12:08:59 +01:00
Kim Kulling 11b9d83d4c openddlparser: latest greatest ( contains fix for correct handling of data array lists ). 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-03-28 10:50:32 +01:00
Alexander Gessler 6573bf08c6 Merge pull request #514 from arris69/FixJava_final 
Fixes assimp/assimp#509
 2015-03-28 08:56:55 +01:00
Ser Lev Arris d2d41a8aee jni header update due new function 2015-03-27 19:03:58 +01:00
Ser Lev Arris bdf813ecf0 new function to get aiVectorKey size 2015-03-27 18:09:39 +01:00
Ser Lev Arris 9e4a499383 Fixes assimp/assimp#509 2015-03-27 11:04:23 +01:00
Léo Terziman 454b85a0ad Improved prototype of Importer & Exporter SetProperty* functions for better integration with tools such as SWIG 2015-03-27 10:56:03 +01:00
Alexander Gessler 2be44365dd Merge pull request #513 from assimp/xgl-fixes 
XGL fixes
 2015-03-27 10:12:04 +01:00
Léo Terziman 60d58901a5 Merge remote-tracking branch 'official/master' into contrib 
Conflicts:
	code/ColladaParser.cpp
	include/assimp/config.h
 2015-03-27 09:55:21 +01:00
Alexander Gessler 6824c8cbfe Merge branch 'master' of https://github.com/assimp/assimp 2015-03-26 22:45:20 +01:00
Alexander Gessler 8666b614c6 Fix non-determinism in XGL importer output due to std::multimap value ordering not guaranteed < C++11. 
One step closer to a fully reproducible regression test suite.
 2015-03-26 22:45:00 +01:00
George Papadopoulos 08ba782bd5 [FBX] add support for multiple animations (by using LocalStart/LocalStop in takes) 
+ change key type from uint to int (fixes bugs from negative int_t becoming a junk uint_t value )
+ detect and ignore channels with no keys in the specified take start/stop window
+ add test model with multiple animations
 2015-03-26 23:23:38 +02:00
Kim Kulling b17a1255a1 add setup for mesh primitives and prepare vertex array copy ops. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-03-26 20:17:26 +01:00
Kim Kulling ca4385fcf2 fix compiler warning ( signed against unsigned ). 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-03-26 10:11:14 +01:00
Kim Kulling 7a01f77a08 fix invalid lookup for token type in opengex-parser. 2015-03-25 21:35:32 +01:00
Kim Kulling d19a677f88 openddl-parser: latest greatest. 
Contains fix for https://github.com/kimkulling/openddl-parser/issues/10 and https://github.com/kimkulling/openddl-parser/issues/13
 2015-03-25 19:55:39 +01:00
Kim Kulling 23b3728254 add setup of transformation information in opengex importer. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-03-24 00:08:42 +01:00
Kim Kulling 5b2ab2f76a OpenDDLParser: latest greatest, 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-03-23 18:46:41 +01:00
Alexander Gessler 8f577e2e77 Merge pull request #505 from arris69/Build_with_Android_NDK 
integration of android ndk (for travis build)
 2015-03-23 00:05:20 +01:00
Ser Lev Arris 947429152f finishing. 
also skip filtering C4D importer due fixed in 14324c60cf
 2015-03-22 18:27:06 +01:00
Alexander Gessler 14324c60cf Add missing ASSIMP_BUILD_NO_C4D_IMPORTER check to C4DImporter.cpp. Fixes #503. 2015-03-22 17:53:53 +01:00
Ser Lev Arris 2b7ceb301e work finished, feel free to commit/cherry-pick 2015-03-21 17:09:17 +01:00
Ser Lev Arris c9ae68a8e0 Merge branch 'Build_with_Android_NDK' of https://github.com/arris69/assimp into Build_with_Android_NDK 2015-03-21 17:05:07 +01:00