Commit Graph

1513 Commits (ca8a3909be79c6a04b40c5f0d090e6f4843c905b)

Author SHA1 Message Date
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
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
abma b1221ade64 fix some errors/warnings found by static code analyzer 2014-12-16 23:41:10 +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
Johannes Ebersold 543bd5c0d0 ColladaParser::ReadPrimitives: rename "a" to currentPrimitive 2014-11-19 13:51:22 +01:00
Jared Duke c7b6b5ea2f Support lowercase 'ns' and 'ni' obj material tokens
Previously, the obj material parser would interpret all key tokens
starting with 'n' as 'newmtl' tokens. However, there are other tokens
that can start with 'n', namely 'ns' and 'ni' for material properties.
Make the parser robust to such cases, despite their canonical forms
being uppercase.

Resolves #410.
2014-11-18 16:56:46 -08:00
Kim Kulling dbf9536213 bugfix: add correct handling for metric line end for example file.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-11-02 20:30:45 +01:00
Kim Kulling 1a5695ff48 update: add parsing of metric nodes.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-11-02 19:01:04 +01:00
Kim Kulling 6843c42da1 update:
- merge master into branch
- fix metrix header parsing.

Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-10-28 21:45:09 +01:00
Kim Kulling f84589fec4 Merge branch 'master' into opengex_support 2014-10-24 15:24:32 +02:00
Kim Kulling cee583db06 bugfix: fix compiler warning: converting double to float.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-10-22 23:05:25 +02:00
Alexander Gessler b483be3069 Merge pull request #402 from jdduke/disable_bmesh
Temporarily disable Blender BMesh conversion
2014-10-10 22:46:25 -07:00
Jared Duke a1a1bf77a8 Temporarily disable Blender BMesh conversion
Disable BMesh conversion while associated unresolved issues receive due
attention. Referencing #400, #373, #318  #315 and #132.
2014-10-10 14:16:42 -07:00
Kim Kulling 487c9449d2 bugfix: search for token checks for the given tokenlist against the lowercased info coming from the asset file. So we also have to used a lowercased token. Thanks to Robinson for the report.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-10-10 15:59:42 +02:00
Filip Wasil 88f6e8213b Android JNI asset extraction support (API 9+)
- installation fixes

Signed-off-by: Filip Wasil <filip.wasil@tieto.com>
2014-10-07 17:05:14 +02:00
Filip Wasil 7224476ee1 Android JNI asset extraction support (API 9+)
Signed-off-by: Filip Wasil <filip.wasil@tieto.com>
2014-10-07 16:33:43 +02:00
Gargaj 397989e169 Null-terminate string
In theory it shouldn't be necessary since the length is specified but there are parts like https://github.com/assimp/assimp/blob/master/code/MaterialSystem.cpp#L74 that depend on it.
2014-09-26 01:29:23 +02:00
Kim Kulling a5afbcf29c refactoring: remove duplicate code.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-09-23 23:34:05 +02:00
abma 775b26e614 use std:: namespace for most cmath functions:
http://en.cppreference.com/w/cpp/header/cmath
2014-09-23 00:43:33 +02:00
Kim Kulling b359deb7fd update:
- add assert test in obj-import
- fix material token in Obj.

Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-09-21 20:37:36 +02:00
Jared Duke 4dcd316430 Use strict inequality when validating BMesh uvloop access
Change the inequality to a strict inequality when validating
BMesh uvloop access during face conversion.
2014-09-20 10:23:21 -07:00
Alexander Gessler 6a8f69ad5d Merge pull request #386 from jdduke/rebase_fbx_fov
Rebase FBX regression db entries
2014-09-16 09:37:37 -07:00
Alexander Gessler aac40dd5b8 Merge pull request #385 from jdduke/fix_blend_and_rebase_regression_tests
Fix non-BMesh-containing .blend import
2014-09-16 01:10:53 -07:00
Jared Duke 046b7e5f47 Rebase FBX regression db entries
The FBX importer now properly parses field-of-view tokens. Rebase
only the failing FBX entries to accomodate the fix, also removing
the comment noting the (now incorrect) comment about improper import
of the FOV property.
2014-09-15 18:14:38 -07:00
Jared Duke c482458cae Fix non-BMesh containing .blend import
BlenderBMeshConverter was erroneously asserting that it contained valid
mesh upon construction. The assertion should only occur when
triangulation is requested, allowing non-BMesh blender meshes to load
properly.

Note that this fixes a number of .blend regression tests that are
currently baselined as failures.
2014-09-15 17:19:33 -07:00
Denis Biryukov ab6b5a7b21 Fix gcc warnings. (initialization order) 2014-09-15 23:35:03 +04:00
Jared Duke 35c9a33718 Fix crash for Blender poly to face conversion without UVs
BlenderBMeshConverter assumes that the BMesh has UVs, but that is not
always the case. Handle the non-UV case by only adding a T face when
UVs are present.
2014-09-13 09:43:00 -07:00
Jared Duke 485aa8b39d Fix null check in Q3BSPFileImporter
Reverse the null condition, preventing invalid texture stream
dereferencing. Fixes #380.
2014-09-12 19:37:10 -07:00
Kim Kulling db582ee024 bugfix: replace nullptr with NULL:
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-09-12 18:12:18 +02:00
Kim Kulling 49c9786b0a update: avoid mesh generation on heap, when the mesh will be empty ( obj-loader ).
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-09-12 15:40:50 +02:00
Kim Kulling 7dff0c6d52 refactoring: remove not use iosystem.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-09-12 12:05:42 +02:00
Kim Kulling 75d3c8e9f2 update: metric parsing ongoing.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-09-12 12:00:03 +02:00
Jared Duke 43c82b0b38 Remove std::isnan and std::isinf usage from utFastAtofTest
These functions were added in C++11, and should not be used nakedly
in the current code base. Replace them with suitable C++03 constructs.
2014-09-09 16:34:10 -07:00
Jared Duke 66e608a393 Replace cppunit with the googletest framework
The GTest framework has a more active support base, and natively
supports CMake. Introduce it as an external dependency (using CMake's
ExternalProject_Add), replacing cppunit and porting the associated unit
tests.
2014-09-07 16:52:03 -07:00
Kim Kulling c3b35f3933 update: add endline. 2014-09-06 09:19:28 +02:00
acgessler 185f01963f LWO: replace legacy reinterpret_cast based code by memcpy to solve Android SIGBUS problems due to unaligned accesses. Fixes #351 2014-09-04 20:49:48 -07:00
acgessler 1a594b861a Collada: use a counter instead of clock() to generate unique names. Closes #357 2014-09-04 18:50:37 -07:00
Kim Kulling ed9a466c30 update:
- add OpenGEX parser sceleton
- add base datatypes for OpenGEX support.
2014-09-04 19:41:14 +02:00
George Papadopoulos 8bf26065de [FBX] parse upper cased Int/Enum properties 2014-09-01 19:06:59 +03:00
Adam Petrone 625d2b7c4a Fix #325; Blender UV unwrap issue
The BMesh converter might be missing more details, but this should get basic UVs working for now.
2014-08-30 00:50:26 -04:00
Alexander Gessler 201807f733 Merge pull request #350 from Gargaj/ambientlight
Enable ambient lights
2014-08-28 09:20:04 -07:00
Gargaj d333e08343 add ambient light type, allow collada to load it 2014-08-28 16:27:29 +02:00
Gargaj e2401c8b58 fix va_end call 2014-08-28 15:51:01 +02:00
Gargaj 6f828087f9 add stdarg.h 2014-08-28 15:45:48 +02:00
Gargaj 19de24a442 ...and some more assbin leftovers 2014-08-28 15:42:22 +02:00
Gargaj 8f0208e5a8 whoops, still some residue from ASSBIN 2014-08-28 15:41:17 +02:00
Gargaj c47dc2802e convert assxml exporter 2014-08-28 15:38:57 +02:00
Gargaj 2e9195819a start assxml exporter basics 2014-08-28 15:17:53 +02:00
Kim Kulling 7f45f5fc95 bugfix: fix license.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-08-27 23:01:35 +02:00