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

1793 Commits (9721759da4cff8a5d3b27e50aee935544fb38144)

Author SHA1 Message Date
Richard 814ef32dce Refactor: Delete unused fields 2015-05-17 20:43:25 -06:00
Richard 5bb09377cb Refactor: Delete unused variable 2015-05-17 20:40:35 -06:00
Richard 7b3fa5ebc2 Refactor: Delete unused forward decls, delete unused function 2015-05-17 20:22:31 -06:00
Richard 79c916daf4 Refactor: Remove unused variable 2015-05-17 20:05:05 -06:00
Richard 2de6dd4973 Refactor: Delete unused variable 2015-05-17 20:02:58 -06:00
Richard 6ae9797648 Refactor: Initialize members in declaration order; initialize POD arrays 2015-05-17 20:01:51 -06:00
Richard d25c36960a Refactor: Initialize all POD members 2015-05-17 19:57:11 -06:00
Richard 8c94e51e90 Refactor: Delete unused functions 2015-05-17 19:47:13 -06:00
Richard fbf90a28ff Fixed: Ensure variable is always initialized before use 2015-05-17 19:46:01 -06:00
Richard 63520d562a Refactor: Initialize members in declaration order; prefer initialization over assignment 2015-05-17 19:42:30 -06:00
Richard bf4a73e42e Refactor: Remove unused member variable 2015-05-17 19:42:07 -06:00
Wil Shipley 91ca983d5f - Workaround for Collada exporter in SketchUp 15.3.331 (possibly others) where it'll export the wrong "count" when exporting "lines". 
- When I encounter this condition I just print a warning and use the actual number of points in the file instead of the number they give, as opposed to throwing an exception and bailing on the whole file.
	- For an example of this kind of file see https://3dwarehouse.sketchup.com/warehouse/getpubliccontent?contentId=e4587719-2609-49ed-a2f6-20b98d1215f3&fn=Kartell-GE.zip
	- Some people have complained about this on http://forums.sketchup.com/t/bug-in-lines-exported-at-collada-format/8145
 2015-05-17 18:36:17 -07:00
Andy Maloney c014bb977c - add missing initialization of several class members 
- prefer check for empty() over check for size() in OptimizeGraph (empty() is guaranteed to be constant time, size() is not)
- fix a couple of incorrect indentations
 2015-05-17 20:48:23 -04:00
wise86Android fb4eb83e84 add the ability to export cameras information in a collada file 2015-05-17 20:54:45 +02:00
shin_mbpr_late2013 98b234020b Fixed AssBin loader. 
File reads were used in ai_assert. The function has side effects, so it should not be used in an assert.
Fixed AddGTest.cmake.
There was an issue regarding Xcode project file. The path of libgtest.a was incorrectly set.
 2015-05-16 23:39:24 +09:00
Alexander Gessler a1268bf864 Merge branch 'master' of https://github.com/assimp/assimp 2015-05-12 21:52:25 +02:00
Alexander Gessler 0fe8e739c3 Use "wb" when writing binary STL exports, fixes #556. 2015-05-12 21:51:27 +02:00
Alexander Gessler e3c29b7e4b Merge pull request #554 from assimp/fix-obj-material-name-spaces 
OBJ: Support spaces in material names, fixes #545.
 2015-05-12 21:44:07 +02:00
Alexander Gessler faea2ecccc OBJ: Support spaces in material names, fixes #545. 
Adding test file.
 2015-05-10 23:50:18 +02:00
abma b4f5c57b3e allow to compile only enabled loaders 2015-05-06 23:15:15 +02:00
Kim Kulling 70722ad318 Merge branch 'master' of https://github.com/assimp/assimp 2015-05-05 22:27:13 +02:00
Kim Kulling fd3a0d4a9d fix name handling of geoemtryobjectname nodes 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-05-05 22:27:05 +02:00
Madrich b6d91ec11a Fix Path functions 
Fix XFilePrefix for mesh name
Add Color for faces in Step Export
 2015-05-02 12:19:20 +02:00
Madrich 2dde962f0d FilePath Functions in DefaultIOSystems 
Replacements in Exporters
 2015-05-02 01:56:20 +02:00
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
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
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 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
Léo Terziman f120a75617 Merge remote-tracking branch 'official/master' into contrib 2015-03-10 15:40:03 +01:00
Léo Terziman 18e6a8fbdb improved handling of commas in fast_atof 2015-03-10 15:39:27 +01:00
DenisMikhalev 62676b56aa Adds safety and prevents crashes for damaged files 2015-03-09 19:40:13 +03:00
Turo Lamminen ba4689fd05 Whitespace 2015-03-09 12:33:13 +02:00
Turo Lamminen c342778f42 Fix read past end of buffer after call to TokenMatch 
IsSpaceOrNewLine returns true on end of input (NUL character). But if
TokenMatch considers a token at end of input to match it sets "in" to
one past end of buffer. This will lead to reading past the end of
buffer on any subsequent operation.
 2015-03-09 12:33:13 +02:00
Léo Terziman 18ef31cc06 Merge remote-tracking branch 'official/master' into contrib 2015-03-09 11:31:15 +01:00
DenisMikhalev c410512173 Use material names, set default direction to UP_Y, process extra tag 2015-03-08 22:37:48 +03:00
Kim Kulling 727888ea10 Merge pull request #480 from turol/subdiv-memory 
Free edges map before recursive calls to reduce memory consumption
 2015-03-08 10:32:26 +01:00
abma 873ae5db3f addition to c4997f16db 
(thanks turol)
 2015-03-08 03:26:25 +01:00
Turo Lamminen c89274d366 Free edges map before recursive calls to reduce memory consumption 2015-03-08 00:16:48 +02:00
ulf 76c69205b1 - reintroduced IFC openings to floors and ceilings. Were disabled for some unknown reasons, I hope I didn't break anything. Everything I tested works fine. 2015-03-06 14:14:45 +01:00
ulf 03a7f36858 Merge branch 'master' of https://github.com/assimp/assimp 2015-03-05 20:18:00 +01:00
ulf a2c9904d59 - Bugfix: polygon-bounded half space clipping now assumes plane in correct coordinate space 
- Bugfix: closing polygon loop along boundary polygon now correctly projects boundary vertices to polygon plane
 2015-03-05 20:17:26 +01:00
ulf 0cdc528e01 - Bugfix: IFC loader tested squared length against non-squared epsilon in RemoveDegenerates() 2015-03-03 15:56:09 +01:00
abma c4997f16db remove "register" keyword: 
clang warns: 'register' storage class specifier is deprecated
http://stackoverflow.com/questions/10675072/is-the-register-keyword-still-used
 2015-03-02 23:44:02 +01:00
Alexander Gessler b1e8c192db Merge pull request #464 from turol/master 
Clean up some warnings
 2015-02-28 14:41:26 +01:00
Alexander Gessler f6f8462113 Update IfcLoader to use numeric_limits<uint32_t> instead of UINT32_MAX, fixes gcc build and is more consistent with the rest of the codebase. Fixes #471. 2015-02-28 13:40:10 +01:00
Turo Lamminen 5a74e07f5f Mark some more functions with AI_WONT_RETURN 2015-02-27 23:09:12 +02:00
Turo Lamminen dfd171be6d Remove unnecessary semicolons after FBXDocument property declarations 2015-02-27 23:09:12 +02:00
Turo Lamminen 308884f144 Remove unnecessary semicolons after function definition 
Picked up by clang -Wextra-semi
 2015-02-27 23:09:12 +02:00
Turo Lamminen e8bcad0840 Silence a warning and add an assertion 
Another false positive uninitialized variable. Actually it's only false
if ToOutputVertexIndex does't return NULL which should only happen if
index is out of bounds. Add assertion to make sure of that.
 2015-02-27 23:09:03 +02:00
ulf b71ded1ad0 - manually merged C4D importer code from acgessler branch 
- manually merged IFC bugfixes and improvements from schrompf branch
 2015-02-23 14:23:28 +01:00
Léo Terziman 2274c96e3b Merge remote-tracking branch 'official/master' into contrib 2015-02-18 17:22:44 +01:00
Léo Terziman d9a2293491 Improved handling of transparency in collada importer 
+ started preliminary support for RGB_ZERO collada transparency mode
+ added option to manually invert transparency values to deal with broken exporters that don't follow the specs
 2015-02-18 17:20:03 +01:00
Alexander Gessler 51b790c482 ColladaLoader: format. 2015-02-15 22:26:59 +01:00
Alexander Gessler ce1302cd71 Fix VC12 warning "empty but controlled statement found". 2015-02-15 22:20:34 +01:00
Alexander Gessler aae0f7e7b1 3DSExporter: export materials first, then meshes. Our own importer requires this. 2015-02-15 22:12:19 +01:00
Kim Kulling 0292868917 add geomentry node handling. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-02-14 16:12:09 +01:00
Turo Lamminen 570d02ff6e Silence more uninitialized variable warnings 
These are false positives since aiMaterial::Get will have written to output
if it returns AI_SUCCESS but the compiler can't see that.
 2015-02-13 13:15:26 +02:00
Turo Lamminen f708d0b122 Silence some uninitialized variable warnings 
These are false positives but the compiler isn't smart enough to see that.
Also it might make more sense to use switch here.
 2015-02-13 12:21:59 +02:00
Turo Lamminen 84a9514d4b Fix warning about possibly uninitialized variable 
It might be better to move FindEmptyUVChannel call earlier
 2015-02-13 12:14:39 +02:00
Kim Kulling bd1168af30 fix invalid line endling handling. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-02-10 20:46:02 +01:00
Kim Kulling 9e87fa178a add property parsing to opengex parser. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-02-10 20:09:26 +01:00
Kim Kulling c3e2fa0761 - untabify obj parser. 
- bugfix openddl: latest version

Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-02-10 19:31:23 +01:00
OgreTransporter 4e8f7fb802 Fix Visual Studio prefixes 2015-02-08 12:26:29 +01:00
Kim Kulling 124f408976 add property parsing. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-02-07 19:52:06 +01:00
Kim Kulling 303a6893fc fix the build. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-02-07 13:23:32 +01:00
Kim Kulling 20b3ce6a40 replace opengexparser by using openddl-parser. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-02-07 12:47:53 +01:00
Turo Lamminen de66f15a0a Fix division by zero 2015-02-02 16:03:24 +02:00
Turo Lamminen b93bd167ed Fix infinite loop in STL loader error path 
It appears that this was never tested since hitting it caused an infinite loop.

Fixes testcase hangs/c2eb1fa3e74c6ffe0cebcb1672b03140
 2015-02-01 00:35:00 +02:00
Turo Lamminen fe89773c6f Fix infinite loop in PLY parser 
Fixes testcase hangs/9ab979ab256c70aaec9b651f32f051e9
 2015-02-01 00:22:32 +02:00
Turo Lamminen 6b9f9afd7a Fix infinite loop in STL loader 
If next character was not part of valid token and not whitespace we
would end up spinning in the loop indefinitely. Fix by using do..while
loop which always skips at least one character.

Fixes testcase hangs/73b42cd3b6d05e2ddb5c0fe5888459bc
 2015-02-01 00:09:32 +02:00
Alexander Gessler 08ad6ae8fe Merge pull request #450 from turol/afl-fixes 
Fix some bugs found with afl
 2015-01-31 20:51:07 +01:00
Turo Lamminen 792da49933 Fix out-of-bounds write when STL file node name is too long 2015-01-31 21:36:13 +02:00
Turo Lamminen f971b66c47 Fix out-of-bounds read in invalid compressed X file 2015-01-31 21:36:08 +02:00
Kim Kulling 063b2733fc Merge branch 'master' into opengex_support 2015-01-31 11:09:20 +01:00
Kim Kulling 1ee4c06e4b add openddl-parser to contrib. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-01-31 11:07:48 +01:00
Turo Lamminen 95ad827277 Remove bogus delete[] on error path 
mBuffer is a pointer inside a std::vector so don't try to delete[] it.
 2015-01-29 23:22:56 +02:00
Turo Lamminen 0108d5b1f9 Fix read past end of buffer on malformed LWOB files 2015-01-29 23:22:56 +02:00
Turo Lamminen 16f9ca35d2 Fix out-of-bounds read when OFF file contains no vertices 2015-01-29 23:22:56 +02:00
Turo Lamminen af09e68654 Fix memory corruption when LWO file contains bad-sized points chunk 2015-01-29 23:22:41 +02:00
Turo Lamminen 2f0675ac53 Fix memory corruption when 3DS file has more smoothing groups than faces 2015-01-29 23:18:19 +02:00
Kim Kulling b700cd917f Merge pull request #452 from ricortiz/FixExportedLibraryNameVariable 
Fix exported library name variable
 2015-01-29 17:24:30 +01:00