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

3170 Commits (c7f69e151e914e5aa5a8e67711ac68e7af7b6689)

Author SHA1 Message Date
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
Madrich 492fee282d Merge pull request #3 from assimp/master 
Update fork
 2015-03-20 13:09:38 +01:00
Kim Kulling 9da69190e0 Merge pull request #502 from assimp/opengex_support 
Opengex support
 2015-03-19 19:27:05 +01:00
Andreas Henne 59b0819866 STL loader can now handle more than one mesh in a single ascii file. 2015-03-19 17:27:06 +01:00
Kim Kulling 40d97fbd55 Merge remote-tracking branch 'origin/master' into opengex_support 2015-03-19 12:44:50 +01:00
Kim Kulling abe82a5d73 add missing include 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-03-19 12:34:11 +01:00
Kim Kulling 40369010c3 fix usage of c++11 type nullptr. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-03-19 12:14:17 +01:00
Kim Kulling f7e5f3ec6b assimp: fix build with latest version of openddl-parser lib. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-03-19 12:07:16 +01:00
Kim Kulling 70aafa478d avoid copying of private struct. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-03-19 11:38:15 +01:00
Kim Kulling 12efa14777 add openddl_parser directly to assimp. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-03-19 11:37:58 +01:00
Kim Kulling b0753c38de fix code reading finding: rename definition. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-03-19 11:37:11 +01:00
Alexander Gessler ee98c80654 Merge pull request #491 from arris69/Fix_Jassimp_for_Android 2015-03-18 23:06:23 +01:00
Kim Kulling f15d62194b add nodestack to deal with node hierarchy. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-03-18 21:37:57 +01:00
Kim Kulling 05208a5014 try to fix build of win32 crosscompile. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-03-17 19:43:41 +01:00
Kim Kulling 2717d51f7e Merge remote-tracking branch 'origin/master' into opengex_support 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>

Conflicts:
	code/ParsingUtils.h
 2015-03-17 14:26:39 +01:00
Kim Kulling 59633d172f implementation for mesh resolving. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-03-17 14:25:40 +01:00
Kim Kulling 0d5a2ce4c1 openddl-parser: latest greatest with fixes for invalid reference information. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-03-17 14:25:15 +01:00
Kim Kulling 7d7ccfd630 fix compiler warning. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-03-17 14:24:28 +01:00