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

1667 Commits (365417ccc5645ce79a3a8e390cb54706a67fbcae)

Author SHA1 Message Date
Madrich 148207a073 Fix removed AssimpPCH 2015-05-01 23:16:44 +02:00
Madrich 71ae322e7b Merge pull request #5 from assimp/master 
Update Fork
 2015-05-01 23:01:33 +02:00
Madrich 58a72d9302 Fix Warnings 
Add Time in Step File
 2015-05-01 22:19:40 +02:00
Madrich ca8a3909be Add StepExporter.cpp(stp) Export 
Fix XFile
 2015-05-01 21:40:51 +02:00
Highlife1911 4acb1d4c92 Removed FORCE attribute from CMake variable LIBRARY_SUFFIX 2015-05-01 14:13:28 +02:00
Alexander Gessler 2a7e49423a Merge pull request #547 from assimp/acgessler-patch-2 
Fix one-off in STEPFileEncoding causing UTF32 character decoding to fail.
 2015-04-30 15:19:01 +02:00
Kim Kulling 5357772cf5 fix build. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-04-30 14:31:23 +02:00
Kim Kulling d5699cc89f fox build: add missing include for ai_assert. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-04-30 13:47:33 +02:00
Kim Kulling 31cce98680 fix color handling in opengex importer. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-04-30 12:54:59 +02:00
Alexander Gessler 78faabf0fa Fix one-off in STEPFileEncoding causing UTF32 character decoding to fail. 2015-04-30 02:37:35 +02:00
Alexander Gessler 880cb473b0 Merge pull request #546 from terziman/master 
Minor improvments & bug fixes
 2015-04-30 02:35:52 +02:00
Léo Terziman c99bd9825a Fixed bug introduced by misleading names in materials properties between "type" parameters of function referring to the "semantic" field of properties (and NOT the type field...) 2015-04-29 18:13:16 +02:00
Kim Kulling 2f8f0b1b02 Merge branch 'master' of https://github.com/assimp/assimp 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>

Conflicts:
	code/ObjFileParser.cpp
 2015-04-29 13:18:51 +02:00
Kim Kulling 995bc41d57 color node handling opengex 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-04-29 11:57:39 +02:00
Léo Terziman ca2e47b205 Fixed some typos 2015-04-29 09:26:11 +02:00
Léo Terziman 91c751a03a Added missing header 2015-04-28 12:29:39 +02:00
Léo Terziman 5b9af11f9b Merge remote-tracking branch 'official/master' into contrib 2015-04-28 12:04:53 +02:00
Alexander Gessler 5c890c1a90 Merge pull request #544 from aru/cygwin-build-fix 
Modifying files to let assimp build under cygwin.
 2015-04-21 15:56:40 -07:00
U-ORADEV\albihern 956fde6e66 Renaming ByteSwap.h to ByteSwapper.h to let assimp compile under cygwin. 2015-04-20 17:49:02 -05:00
U-ORADEV\albihern 7043551068 Modifying files to let assimp build under cygwin. 2015-04-20 17:36:47 -05:00
Łukasz Twarduś 55ae853c2e Fix compilation with libc++ 2015-04-19 10:55:58 +02:00
Kim Kulling eb1ee61420 fix code reading findings: use of std::copy 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-04-18 19:17:48 +02:00
Kim Kulling 68ca2ca427 Merge branch 'master' of https://github.com/assimp/assimp 2015-04-18 19:17:19 +02:00
Kim Kulling 08886e28d7 use <> include bracket style. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-04-18 19:17:10 +02:00
Alexander Gessler 27c6552ae8 Merge pull request #538 from cubeman99/master 
Added NaN check when outputting normals in PLY exporter, to avoid '-1.#IND'
 2015-04-18 07:29:37 -07:00
David Jordan b38572d1bc std::fabs from cmath should be right 2015-04-17 23:50:14 -04:00
David Jordan b575acf2b6 std::absf to std::fabsf 2015-04-17 23:38:54 -04:00
David Jordan e86d40e4e2 Added infinity check for outputting PLY normals 2015-04-17 23:29:26 -04:00
Kim Kulling 76dd9467b2 fix win32-build for assimp_viewer . 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-04-17 20:02:55 +02:00
Alexander Gessler f435712273 Fix Mac build issues (clang 6.0 compiling x86_64) 2015-04-17 06:42:58 +02:00
David Jordan f00101f496 Added include of qnan.h (now that AssimpPCH.h include was taken out) 2015-04-16 21:30:50 -04:00
David Jordan 3545d805d2 Merge branch 'master' of https://github.com/assimp/assimp 2015-04-16 20:40:16 -04:00
David Jordan fa626aa855 Added NaN check when outputting normals in PLY exporter, to avoid outputting '-1.#IND' 2015-04-16 18:01:24 -04:00
Kim Kulling d12868adc4 use correct type in forward declaration. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-04-16 12:32:35 +02:00
Kim Kulling 97946e25c9 fix travis build 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-04-16 12:09:06 +02:00
Kim Kulling e4b84ff48a fix mem leak. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-04-16 11:47:14 +02:00
Kim Kulling 02ee002878 fix build for vs2013 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-04-16 11:38:53 +02:00
Kim Kulling 444a77e170 Merge branch 'master' of https://github.com/assimp/assimp 2015-04-16 11:10:21 +02:00
Kim Kulling ead3e8d275 first version of material handling for opengex 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-04-16 11:10:12 +02:00
abma 1c1f3c25f8 awww, merge error 2015-04-16 03:13:19 +02:00
abma 611778045d fix for upstream changes 2015-04-16 02:55:41 +02:00
abma 8c45a4dc3b Merge remote-tracking branch 'origin' 
Conflicts:
	code/C4DImporter.cpp
	code/OgreImporter.h
 2015-04-16 01:03:00 +02:00
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
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