Commit Graph

5888 Commits (070acfbaddc99db506b90667dc3026644561dcd8)

Author SHA1 Message Date
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
Wil Shipley 5164b1bd24 Turned off several warnings so code doesn't explode with them.
Someone who speaks C++ should maybe go back through and see if these
warning are really relevant!
2015-03-26 13:47:53 -07: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
Ser Lev Arris db7f9fc54d closes assimp/assimp#506 2015-03-21 17:00:43 +01:00
Ser Lev Arris e2c91f3d23 closes #506 2015-03-21 16:56:42 +01:00
Ser Lev Arris 527bf8c255 bit cleanup and wait untip issue #506 is fixed 2015-03-21 12:35:29 +01:00
Ser Lev Arris 8fe8e993da Merge branch 'Build_with_Android_NDK' of https://github.com/arris69/assimp into Build_with_Android_NDK 2015-03-21 11:13:50 +01:00
Ser Lev Arris a7e4babd9d gcc_struct, old fish, but reinterpreted: 92f4c84488 2015-03-21 11:10:33 +01:00
Ser Lev Arris 3bd1a791c0 gcc_struct, old fish, but reinterprated: 92f4c84488 2015-03-21 11:08:06 +01:00
Ser Lev Arris 3e6043de70 use correct variable for compiler selection... 2015-03-21 10:54:46 +01:00
Ser Lev Arris f3ed79ab41 make use of travis languages, build java jar too.
https://github.com/assimp/assimp/pull/505#issuecomment-84198261
2015-03-21 10:32:15 +01:00
Ser Lev Arris 54dcc64d33 enable some importers, skip otherbuild for test/discuss 2015-03-20 22:36:57 +01:00
Ser Lev Arris 448ce916c2 build don't starts? (reverted branch setting) 2015-03-20 22:06:03 +01:00
Kim Kulling d045dbdb69 fix openddl-issue wih token type containing line end.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-03-20 21:55:19 +01:00
Ser Lev Arris 2dda345bdb build don't starts? (reverted branch setting) 2015-03-20 21:41:23 +01:00
Ser Lev Arris f63607e945 build don't starts? 2015-03-20 21:34:12 +01:00
Ser Lev Arris 23797dc8cc for sure jassimp needs the assimp lib too 2015-03-20 21:15:57 +01:00
Ser Lev Arris 1ddcbf49da use ant to compile jassimp 2015-03-20 21:11:08 +01:00
Ser Lev Arris 32b1579c80 install the android NDK 2015-03-20 21:05:25 +01:00
Kim Kulling c78ed74e70 - update gitignore file.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-03-20 16:56:43 +01:00
Kim Kulling 0995f3662d prepare handlers for missing nodes.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-03-20 16:56:28 +01:00
Andreas Henne 816ceeda69 Eliminated error in MSVC. 2015-03-20 14:18:26 +01:00
Kim Kulling 690ebe4f1e fix https://github.com/assimp/assimp/issues/504: use correct define for check if OpenGEX-importer shall be used or not.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-03-20 13:34:48 +01:00