Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,959 Commits 19 Branches 43 Tags
225b6fa1663a77fa79392e08e3b7ea2519a02b70
Commit Graph

3862 Commits

Author SHA1 Message Date
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
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
Tom Mettam
a09de30d83 Add support for component controlled matrix transforms, i.e transform(0)(0) etc. 2015-01-21 01:45:35 +00:00
Kim Kulling
62225f61e4 Merge branch 'master' into opengex_support 
Conflicts:
	.gitignore
 2015-01-13 20:21:17 +01:00
Léo Terziman
b367d9b390 Fixed some warnings related to empty statement when using assert & building in release mode 2014-12-18 11:01:16 +01:00
Léo Terziman
469db95cd5 Merge remote-tracking branch 'official/master' into contrib 2014-12-18 10:42:29 +01:00
abma
b1221ade64 fix some errors/warnings found by static code analyzer 2014-12-16 23:41:10 +01:00
Léo Terziman
3303f97f13 Merge remote-tracking branch 'official/master' into contrib 2014-12-16 17:48:30 +01:00
Andreas Henne
ab7754ab2a Code style changes. 2014-12-11 23:05:09 +01:00
Andreas Henne
33f9745b62 Formatting changes. 2014-12-05 19:40:09 +01:00
Andreas Henne
4550279629 Added binary ply exporter. 2014-12-05 17:25:18 +01:00
Kim Kulling
bc0fd00e96 Merge pull request #414 from l337r007/collada-tristrips 
Collada: tristrip support: helps a lot :-). Thanks for that!
 2014-12-01 20:48:10 +01:00
Kim Kulling
7a31a68cfc adapt c-api to get ImporterDesc for a given loader ( see https://github.com/assimp/assimp/issues/412 ). 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2014-12-01 20:34:15 +01:00
Kim Kulling
1f13158b31 fix vs2013 compiler warnings and add missing doxygen tags. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2014-11-29 12:12:32 +01:00
Kim Kulling
098ddd3a95 make copy constructor and a assignment operator private to avoid misuse of helper class scope guard 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2014-11-29 11:56:39 +01:00
Kim Kulling
9f80a2a2a9 update parser. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2014-11-29 11:33:49 +01:00
Wolfgang Herget
c08a5581dd ColladaParser::CopyVertex: don't make a local copy of the vertex' indices. 
Instead, we address the relevant indices in the main vector directly by
adding the input offsets to the per-vertex base offset.
 2014-11-20 17:53:06 +01:00
Wolfgang Herget
8dead93504 ColladaParser: don't arbitrarily limit number of per-vertex attributes. 2014-11-20 16:42:41 +01:00
Wolfgang Herget
ca3ce4703d Rename ColladaParser::CopyPrimitive to ::CopyVertex. 
That's a bit closer to what the function actually does.
 2014-11-20 13:12:09 +01:00
Wolfgang Herget
13a157ea66 For Polylists, manually compute the start offset outside CopyPrimitive. 2014-11-20 13:10:15 +01:00
Johannes Ebersold
e568c2df9d ColladaParser::ReadIndexData: don't rely on the specified number of primitives. 
Especially TriStrips don't specify triangle count upfront, so one needs to
sum up the count of triangles read from all <p> tags in a tristrip collection.
 2014-11-19 14:40:43 +01:00
Johannes Ebersold
72f67ea0cd Whitespace changes 2014-11-19 14:40:42 +01:00
Johannes Ebersold
593484829b Add Function ColladaParser::ReadPrimTriStrips. 
This does the index mangling for reading tristrips.
 2014-11-19 14:40:42 +01:00
Johannes Ebersold
0f40dcca7e Add calculation for nuber of Primitives for TriStrips 2014-11-19 14:40:42 +01:00
Johannes Ebersold
7c4bf383d7 Move vertex copy operation into switch statement. 
We will be adding special handling for Tristrips in an upcoming commit,
which unfortunately doesn't map to a common copy loop as it is.
 2014-11-19 14:40:42 +01:00
Johannes Ebersold
4ef244f672 Extract function ColladaParser::CopyPrimitive 2014-11-19 14:40:42 +01:00
Johannes Ebersold
70d2c8571b ColladaParser::ReadPrimitives: get rid of "idx" iterator. 
We will be adding non-sequential access to the indices vector in one of the upcoming commits.
 2014-11-19 14:04:49 +01:00