Commit Graph

387 Commits (685d2b83c5381a59db0a1ffc0880a2d64ed8bd29)

Author SHA1 Message Date
aramis_acg 685d2b83c5 Fix error in aiString documentation. MAXLEN includes the terminal NULL. This is unusual, but true.
Fix overflow vulnerability in SceneCombiner. Thanks to Krishty to point it out.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@683 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-04-14 21:45:00 +00:00
aramis_acg 6a2a542986 Remove invalid character from string literal in code/MDLLoader.cpp (^2 actually).
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@682 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-04-14 21:18:16 +00:00
aramis_acg 0d3490c00c Fix: scene validation forgets to validate aiScene::mTextures.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@678 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-04-13 21:06:03 +00:00
aramis_acg 906c45eeeb Fix: qnan detection code. Appearently I fooled myself when I wrote this.
Fix: MDLLoader does not reset texture array properly when textures are substituted by plain colors. This caused crashes in ~aiScene or heap corruption.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@677 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-04-13 17:34:55 +00:00
aramis_acg da87178a25 Fix: OgreImporter overflows a vector if no weight assignments are given.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@676 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-04-13 15:51:18 +00:00
adario 35c97d169e Fixed camera FOV computation in the ColladaLoader.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@675 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-04-13 15:45:18 +00:00
aramis_acg 1a1d611038 Fix overall MATKEY_UVTRANSFORM usage to use the provided AddProperty specialization for aiTextureTransform.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@673 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-04-11 23:03:30 +00:00
aramis_acg 84f576c177 Or, even better, use the existing specialization of AddProperty for aiUVTransform.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@672 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-04-11 22:58:26 +00:00
aramis_acg 0aeff6179b Fix AC loader accidentially pulling in undefined contents right after the aiUVTransform it tries to add as material property.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@671 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-04-11 22:56:54 +00:00
aramis_acg 4f50c04347 Add shared_array to vc8 solution.
Fix shared_xxx::operator=.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@669 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-04-11 02:52:27 +00:00
aramis_acg 630005619b Add missing boost workaround files to CMakeLists.txt.
Boost workaround's shared_xxx stuff now matches boosts documented API.
Add shared_array.hpp to boost workaround (forgot to commit it when I added shared_ptr.hpp).

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@668 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-04-11 02:46:52 +00:00
aramis_acg d86314d02e Fix missing throw() declaration to silence g++.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@667 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-04-11 02:29:46 +00:00
aramis_acg 875b7f9ca2 AllocateFromAssimpHeap: add overload for nothrow-new.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@666 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-04-11 02:14:52 +00:00
aramis_acg 01a25c1fb4 Get rid of ./extra folder in ./code. Move contents to main code folder.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@664 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-04-11 01:41:24 +00:00
aramis_acg 7cea2eb497 Change date in license header to 2006-2010. This involves updating quite a few files, sorry.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@661 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-04-10 15:30:22 +00:00
aramis_acg bcf0ddc086 - don't delete the null logger.
- don't leak LogStreamInfo when detaching streams from DefaultLogger.
- detach the stream before deleting it in aiDetachAllLogStreams.
Thanks to Bart Botta for the patch.

- DefaultLogger does not properly delete log streams if they're still attached to it when the logger is destroyed. This is the behaviour specified in the documentation.
- Adapt AssimpView's logger usage, which didn't follow the spec as well.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@659 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-04-10 15:00:36 +00:00
aramis_acg 616bd39b6f Fix: don't use std::back_inserter to append to a sequence when push_back does the job as well. back_inserter would need to include <iterator> to be truly portable.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@658 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-04-09 20:58:41 +00:00
aramis_acg b10315e2df shared_ptr: Add missing conversion to bool.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@657 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-04-06 11:46:49 +00:00
aramis_acg 9a8de06e3a Assign dummy names to COB materials.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@656 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-04-06 00:55:12 +00:00
aramis_acg d1bebeba8e remove dynamic_cast's from COB loader.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@655 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-04-06 00:34:23 +00:00
aramis_acg a391303910 Fix non ISO compliant use of ternary operator.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@654 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-04-06 00:27:46 +00:00
aramis_acg 4d2d4a64e0 Fix non ISO compliant use of ternary operator.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@653 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-04-06 00:26:27 +00:00
aramis_acg 3c03e0fca5 COB loader does now honour explicit chunk sizes. if none are given in a particular chunk, the loader reverts to the old behaviour.
COB loader converts textures properly now.
Add textured test files to confirm the previous issue.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@652 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-04-06 00:13:30 +00:00
aramis_acg 0fb732de91 Fix crash when trying to load MDL files produced by the half life engine. This sub format is actually not supported, but the attempt to reject it was a crash.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@650 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-04-05 19:50:25 +00:00
aramis_acg 29935e2138 Set overall version to 1.1.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@644 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-04-04 14:19:33 +00:00
aramis_acg 6db8987248 Fix shared_ptr workaround.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@635 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-04-02 23:41:20 +00:00
aramis_acg f9b4a825aa COB loaders should now read most binary files as well.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@634 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-04-02 23:25:52 +00:00
aramis_acg 4c1b5a532d Add first WIP version of a TrueSpace loader. Currently only ASCII COB/SCNs are supported.
Add some fast_atof overloads to simplify calling it.
Add another convenience c'tor to aiColorMM.
Add COB test models.
Remove unreferenced member in B3D importer.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@633 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-04-02 04:17:05 +00:00
aramis_acg bb5aca8a17 Add TinyFormatter, a convenience wrapper around std::stringstream's, intended to replace boost.format.
Fix non-standard friend declaration in noboost/shared_ptr.
Deprecate boost.format workaround.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@632 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-04-02 00:17:58 +00:00
aramis_acg 4bb7cbb422 Add boost.shared_ptr workaround.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@631 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-04-01 20:25:07 +00:00
adario 7877f3fe6f Fixed a pathname separator issue on Mac OS X.
Class FileSystemFilter was sometimes using a backslash as pathname separator even on Mac OS X, where that character is not allowed in pathnames.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@630 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-03-31 14:20:25 +00:00
aramis_acg a84774cbe2 Increase OBJ loader static working buffer size to 4096 to avoid huge lines being cropped.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@629 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-03-30 12:13:40 +00:00
jonathanklein 61fb6cf3f1 -small Bugfix in Ogre Animation Loading, still not fully functional, but a bit better now
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@628 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-03-24 21:26:31 +00:00
aramis_acg 63d6ca8669 FIX: AseLoader is no stateless and can thus be called repeatedly.
Shut up gcc in LWOMaterial.cpp by adding an assertion, not all enumeration values handled.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@625 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-03-23 18:22:45 +00:00
adario ef71f3dba7 Fixed a polygon type issue in the LWOLoader.
LightWave polygons of type 'BONE' and 'SUBD' (animation bones and subdivision surfaces) were not being processed at all, sometimes resulting in empty meshes.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@623 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-03-19 23:35:29 +00:00
aramis_acg 22ec6b0c1f Remove typo from CMakeLists
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@622 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-03-19 22:37:29 +00:00
jonathanklein 25416b494f further work at Ogre Importer:
- split some code to OgreImporterMaterial.cpp
- Animation keys now are absolute, like required
- WorldToBoneSpace is now BoneToWorldSpace (hence we compute the inverse and the variable is renamed)

Animations still don't work really, so this version has basically no new features

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@621 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-03-19 20:45:40 +00:00
jonathanklein fb666493ad - small documentation improvements
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@620 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-03-19 20:26:43 +00:00
aramis_acg 255e68aafc Fix unterminated buffer in a certain error messahe produced by the LWO loader.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@619 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-03-18 17:25:11 +00:00
aramis_acg 50264941dd [2972343] LightWave/modo patch. See http://sourceforge.net/tracker/index.php?func=detail&aid=2972343&group_id=226462&atid=1067634
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@618 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-03-18 17:20:49 +00:00
aramis_acg 762a7df46a Revamp exception handling. ImportErrorException renamed to DeadlyImportError to avoid silent regressions. Exceptions now thrown by value, and caught by reference. Put guards in all C++ and C API functions to avoid unwanted exception propagation across module and language boundaries.
PLEASE TEST CAREFULLY IF THIS SHOULD CAUSE REGRESSIONS.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@617 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-03-18 17:00:12 +00:00
aramis_acg 4512d1294c Fix makefile.mingw for the NOBOOST=1 case.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@615 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-03-17 18:20:51 +00:00
aramis_acg 52db9697f4 MS3D animations working now, fix default material assignment, cleanup comment parsing.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@614 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-03-17 18:04:08 +00:00
aramis_acg 28d4287934 Add preliminary animation support to MS3D. Very much WIP. Animations involving translation keys only are fine, rotations are messed up.
Fix problem related to floating-point inaccuracy in ValidateDS.
aiMatrix4x4::FromEulerAngleXYZ returns itself now, so chaining is possible.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@613 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-03-16 21:58:10 +00:00
aramis_acg 70c4eb4d3a Fix buffer overrun in Obj-loader (this is related to [2970556]).
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@610 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-03-16 00:04:17 +00:00
aramis_acg 77a00c6d27 [2970566] dxf import bug/limitation. Thanks to fgasnier for the hint.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@609 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-03-15 23:45:19 +00:00
aramis_acg 46d56ff619 Change string validation to suit the new binary layout.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@607 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-03-13 17:14:59 +00:00
aramis_acg 07a5daa799 Fix validation of string material properties in the aiProcess_ValidateDataStructure process.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@606 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-03-13 17:03:13 +00:00
aramis_acg 844d814710 Fix possible heap corruption in the MDL material loader.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@605 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-03-13 16:21:20 +00:00
aramis_acg 686f2655db Material system now auto-converts from string to float/int arrays.
Fixing binary layout of material properties across platforms with diverging word sizes.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@604 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-03-13 16:20:18 +00:00