Commit Graph

1468 Commits (c59878e427911315d5ef9b75c0c8ccfe551c6944)

Author SHA1 Message Date
Alexander Gessler c59878e427 Merge branch 'master' of github.com:assimp/assimp
Conflicts:
	code/ColladaLoader.cpp
2015-03-15 00:18:39 +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
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
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
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
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
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
OgreTransporter 4e8f7fb802 Fix Visual Studio prefixes 2015-02-08 12:26:29 +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
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
Turo Lamminen c5d048a98a Fix crash when 3DS file contains faces but no vertices 2015-01-28 18:37:36 +02:00
Alexander Gessler cc346d3e12 Merge pull request #437 from CasperTech/master
Add support for component controlled matrix transforms, i.e transform(0)...
2015-01-25 19:44:27 +01:00
Alexander Gessler f62d03bd03 Merge pull request #439 from expipiplus1/master
Fix incorrect abs usage
2015-01-25 19:41:46 +01:00
Johnny Dickinson 380021e7c4 Check that zlib initialized correctly in FBX parser
Check the return code of inflateInit() indicates success to avoid
crashing later when zstream contains invalid data.
2015-01-24 00:00:35 -05:00
Ricardo Ortiz a94e668486 Define CMAKE_DEBUG_POSTFIX and use it instead of ASSIMP_DEBUG_PREFIX
to have a consistent library name accross platforms.
2015-01-23 14:19:29 -05:00
Joe Hermaszewski e8d4479344 Squash incorrect abs usage
Replace calls to abs with a float to calls to std::abs. Before int abs(int)
was being called.
2015-01-22 20:03:13 +00:00