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

1533 Commits (9f9774403d9800cf1640ba050a786aef578438dd)

Author SHA1 Message Date
Turo Lamminen 9f9774403d Remove assertion when too long message attempted 
Since these can be caused by malformed input files assert is the wrong thing.
 2015-04-01 16:03:06 +03:00
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
Kim Kulling 20ad00b5e5 Merge branch 'master' of https://github.com/assimp/assimp 2015-03-28 20:47:17 +01:00
Alexander Gessler 8d3853022a Merge branch 'master' of https://github.com/assimp/assimp 2015-03-28 13:44:11 +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
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
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 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
Alexander Gessler 14324c60cf Add missing ASSIMP_BUILD_NO_C4D_IMPORTER check to C4DImporter.cpp. Fixes #503. 2015-03-22 17:53:53 +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
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
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
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 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 7d7ccfd630 fix compiler warning. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-03-17 14:24:28 +01:00
Alexander Gessler b304e7b45c Add missing break in switch statement in BlobIOSystem.h. Fixes #438. 
This probably didn't affect anyone for real since no on uses relative seeks.
 2015-03-16 23:26:41 +01:00
Alexander Gessler adc44d1e83 If caller provides no ExportProperties, pass a pointer to empty properties to the Exporter implementation (instead of a NULL). 2015-03-16 23:09:41 +01:00
Alexander Gessler 4bf090e92c Merge branch 'master' of https://github.com/Madrich/assimp 
Conflicts:
	code/ColladaParser.cpp
 2015-03-16 23:04:16 +01:00
Kim Kulling 207906f039 first parsing of references and geometry objects. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-03-16 20:34:42 +01:00
ulf fdad4b51a1 Merge branch 'master' of https://github.com/assimp/assimp 2015-03-16 11:35:33 +01:00
ulf dbc7dc005d - IfcLoader now evaluates all curve segments at both start and end. Leads to a lot of duplicates which get filtered out afterwards, but fixes the "cutting corners" phenomen that sometimes appeared in conjunction with trimmed curves 2015-03-16 11:35:07 +01:00
Alexander Gessler dca3f09940 Merge pull request #497 from assimp/regression-ci-test 
Regression suite fixes, fix cases of non-deterministic output #1.
 2015-03-16 09:15:55 +01:00
Alexander Gessler 7ee5eaafc6 Fix compile: set::erase() returns void prior to C++11. 2015-03-15 23:40:29 +01:00
Alexander Gessler 16880b3dbd Fix build after mis-merge. 2015-03-15 23:31:58 +01:00
Alexander Gessler dc441d09e5 Blender importer: fix accidental use of uninitialized fields in the default material. 
IMHO C++03+ guarantees zero initialization here, so it may be a MSVC-specific issue.
 2015-03-15 14:42:28 +01:00
Alexander Gessler 1c64c590f2 Blender importer: always sort sets of objects by their name. Previously we accidentally ordered pointers to objects by their memory address, which was non-deterministic and caused regression tests to be flaky. 2015-03-15 01:26:15 +01:00
Alexander Gessler c59878e427 Merge branch 'master' of github.com:assimp/assimp 
Conflicts:
	code/ColladaLoader.cpp
 2015-03-15 00:18:39 +01:00
Madrich c4eb04bb8c Fix XFile name for $ and {} 
Memleak copy constructor
 2015-03-14 20:52:53 +01:00
Alexander Gessler ff4e1d9446 Sub-sample axis-angle channels if the delta between two consecutive key-frame angles is >= 180 degrees. Fixes #458. 2015-03-14 19:57:13 +01:00
Madrich edd3ed9e8f Back PretransformVertice Change 
Fix Node Name in XFileExport
 2015-03-14 19:48:08 +01:00
Madrich 56da80bc6e Copy constructor ExportProperties 
Fix name dummy node in PreTransformVertices
 2015-03-14 19:03:44 +01:00
Madrich 290a16eea5 Copy constructor for ExportProperties 
Export Propertie defines in config.h
Remove unnecessary
 2015-03-14 16:31:33 +01:00
Madrich 8b1b12682f Add ExportProperties 2015-03-14 14:03:14 +01:00
ulf ad9d178f0a - Bugfix: IfcLoader lost nodes and geometry when they were stored in subnodes of IfcSpace and the setting "Filter IfcSpace" was enabled 2015-03-13 15:13:53 +01:00
Wil Shipley 90a07713c0 Added 'const' to () operator on CompareVector 
So it can build on clang.
 2015-03-11 16:55:21 -07:00
Alexander Gessler 163bbc25c7 Merge pull request #486 from DenisMikhalev/issue-2 
Adds safety and prevents crashes for damaged files
 2015-03-10 16:09:07 +01:00
DenisMikhalev 62676b56aa Adds safety and prevents crashes for damaged files 2015-03-09 19:40:13 +03:00