Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,783 Commits 19 Branches 43 Tags
bugfix/fix_copyrights_in_python
Commit Graph

6877 Commits

Author SHA1 Message Date
abma
bf4913b5c9 remove AssimpPCH.h: fixes #534 2015-04-16 01:00:17 +02:00
abma
470ad98281 fix "headercheck": 
part of https://github.com/assimp/assimp/issues/534
 2015-04-15 21:22:26 +02:00
Kim Kulling
56e8dc5a43 Merge branch 'master' of https://github.com/assimp/assimp 2015-04-14 12:04:47 +02:00
Kim Kulling
1899de6ea9 remove dead code. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-04-14 12:03:51 +02:00
Alexander Gessler
0cee21ce3c COB: code cleanup. 2015-04-13 21:52:09 +02:00
Alexander Gessler
b3a3558da3 Re-gen IFC parsing code with alphabetic order of types. This hopefully gives a stable diff base for the future. 2015-04-13 21:42:50 +02:00
ulf
28de609a56 Merge branch 'master' of https://github.com/assimp/assimp 2015-04-13 16:02:02 +02:00
ulf
806d3ac8e1 - IFC reader regenerated from schema to include IfcArbitraryProfileDefWithVoids 
- implemented IfcArbitraryProfileDefWithVoids to fix solar panel covers in test\models-nonbsd\IFC\rac_basic_sample_project.ifc
- warning: another dirty hack on top of dirty hacks - one day all these CSG implementations will blow up in our faces. Mark my words.
 2015-04-13 16:01:33 +02:00
Alexander Gessler
e2f234707a Fix possible crash in SceneCombiner when the destinations scene has mPrivate==null. Fixes #401. 2015-04-12 19:53:24 +02:00
Kim Kulling
ed57fac879 create node tree 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-04-08 20:43:55 +02:00
Kim Kulling
ecf390d51f set the correct reference to meshes. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-04-06 14:56:12 +02:00
Kim Kulling
22fc756d4a - fix double initialization. 
- use correct number of vectors for dynamic array.

Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-04-05 23:17:16 +02:00
Kim Kulling
df1134b1a3 - initiate texture coordinate array. 
- use correct number of vertices for vertex array,

Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-04-05 21:19:47 +02:00
Kim Kulling
c0e3540ec1 use size_t instead of unsigned int ( static code analysis finding ). 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-04-05 21:19:07 +02:00
Alexander Gessler
50d5c5c4ef Merge pull request #527 from VirusFree/pr_strtol10_64 
fix for strtol10_64
 2015-04-05 17:25:50 +02:00
Alexander Gessler
9a7f90220a Merge pull request #526 from VirusFree/pr_OpenGEX_textureCoords_init 
[OpenGEXImporter] Correctly initialize m_textureCoords array
 2015-04-05 17:05:16 +02:00
George Papadopoulos
54ce3d843f fix for strtol10_64 2015-04-05 16:40:40 +03:00
George Papadopoulos
6a1522ded8 [OpenGEXImporter] Correctly initialize m_textureCoords array 2015-04-05 16:29:33 +03:00
George Papadopoulos
da3c347a57 add strtol10_64 and fix FBX text parsing for int_64 (for animation KTime) 2015-04-05 15:19:55 +03:00
Kim Kulling
3fa6882384 generate unique indices for importes vertices in opengex importer. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-04-04 18:52:59 +02:00
Kim Kulling
a50fa5f1de add missing doc in obj importer. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-04-04 18:52:24 +02:00
Kim Kulling
65cb05f381 fix invalid index counter. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-04-02 01:10:53 +02:00
Turo Lamminen
681c32d5ec AC3D: Throw DeadlyImportError when too many vertices instead of out-of-memory exception 
Valgrind can't throw an exception when running out of memory. The program
wil just crash. This fixes it in some cases but not all.
 2015-04-01 20:52:58 +03:00
Turo Lamminen
bf5c9413f9 AC3D: Throw exception when encountering a bad vertex index 2015-04-01 16:22:46 +03:00
Turo Lamminen
16c57ab1d3 AC3D: Throw exception on too many vertices instead of crashing 2015-04-01 16:22:06 +03:00
Turo Lamminen
3e728e80eb Obj: Change asserts to exceptions 
These can be triggered by malformed input file so they can't be assertions.
 2015-04-01 16:13:46 +03:00
Turo Lamminen
4c28f31f43 X: Throw error when scene contains no root node 
Otherwise MakeLeftHandedProcess will crash.
 2015-04-01 16:11:53 +03:00
Turo Lamminen
8cdf9467c5 MD3: Fix assertion failures when filename doesn't contain '.' 2015-04-01 16:09:59 +03:00
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
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
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
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