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

566 Commits (f5221439094c5acaf6db6b08e42853fcc2b434dc)

Author SHA1 Message Date
rave3d dc3218b08a adding some #ifndef SWIG for swig processing 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@743 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-05-27 18:30:28 +00:00
aramis_acg 053d606a21 blenderloader now skips over common name prefix, such as OB for objects, MA for materials, ME for meshes, ... 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@739 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-05-26 00:39:04 +00:00
aramis_acg 1b87557fd1 update to zlib 1.2.5. 
blenderloader now reads gzip compressed files.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@737 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-05-26 00:21:07 +00:00
aramis_acg 9d978918d1 colladaloader now skips over empty data arrays. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@736 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-05-25 14:37:28 +00:00
aramis_acg 188aa3da37 blender loader now reads basic material colors and even simple textures, be them embedded into the BLEND file or not. 
adding some test files.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@735 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-05-24 01:24:18 +00:00
aramis_acg cd301ff090 collada loader now longer fails if the accessor type attribute comes before the accessor name. Thanks to Christopher Dissauer to point it out (http://sourceforge.net/projects/assimp/forums/forum/817653/topic/3716168). 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@733 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-05-21 22:47:31 +00:00
aramis_acg 3cf20b605d blender loader now loads material assignments. 
blender loader no longer produces randomized output in some scenarious. nice side effect of less asthetic diversity: less segfaults.
assimpview is no longer topmost.



git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@732 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-05-21 22:39:31 +00:00
aramis_acg 367a452ed9 colladaloader: fix <extra> handling. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@730 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-05-20 13:41:03 +00:00
aramis_acg b9b4ea177b MS3D loader now uses aiMesh::mName to express the original group names from the MS3D file. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@729 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-05-20 12:19:05 +00:00
aramis_acg 7f4cc4ca60 collada loader no longer sets default wrapping mode to MIRROR. See https://sourceforge.net/projects/assimp/forums/forum/817653/topic/3714378 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@728 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-05-20 12:09:22 +00:00
aramis_acg f9b06f8d89 3ds loader now sets aiMesh::mName according to the original mesh groups found in the file. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@727 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-05-20 12:07:04 +00:00
ulfjorensen 6e133a6cd9 - Fixed compilation for some targets 
- Removed BOOST_FOREACH usage in ColladaParser::ReadPrimitives() because they seem to cause problems in NOBOOST builds

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@726 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-05-18 12:20:09 +00:00
aramis_acg a44e065f58 fix some issues with Assimp_itoa10. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@725 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-05-14 12:27:29 +00:00
kimmi a22e44f94d - BUGFIX :: Fix typos in doxygen documentation. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@723 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-05-13 15:55:35 +00:00
kimmi 3b35e4e3b8 - REFACTORING : Replace an assert by an ai_assert-statement. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@722 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-05-13 15:50:42 +00:00
aramis_acg 55bdc6db63 Ogre: Use explicit qualification for boost stuff to avoid potential tr1 conflicts with vc10. Thanks to Krishty to point it out. Use TinyFormatter instead of boost::format. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@721 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-05-10 21:06:44 +00:00
aramis_acg 261f49c468 Add mName member to aiMesh. 
JoinVerticesProcess and SortByPType copy the mesh name to all clone or sub meshes they create.
JoinVerticesProcess' verbose output now prints mesh name, no longer using sprintf (TinyFormatter's age has come).

WARN: This is a public API change (not a breaking one, however).

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@719 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-05-10 13:59:29 +00:00
aramis_acg 35f6851dba fix gcc warning: can't pass non-POD through ... 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@718 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-05-10 10:39:43 +00:00
aramis_acg 32bfa9ac21 Add WIP version of the BLENDER importer. DO NOT USE FOR PRODUCTION YET! 
Loads static meshes. Sometimes (it segfaults on the rest). No materials, cameras, fancy stuff. Works with all versions of blender. No compressed blend files yet.

- StreamReader now uses shared_ptr's to manage ownership of the stream.
- Adapt other loaders accordingly.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@717 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-05-10 10:22:24 +00:00
aramis_acg 1928dc7df7 fix shared_ptr and shared_array implementation. add pointer_cast facility. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@716 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-05-10 10:18:54 +00:00
aramis_acg 0b01eb472b Add copyright headers to Ogre units. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@713 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-04-30 07:15:08 +00:00
aramis_acg c224dfaf81 [2994288] AI_BE / AI_LE macros - Thanks to mick-p for the patch. 
Add shared_ptr to pch includes.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@712 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-04-30 07:11:06 +00:00
aramis_acg 1748e38753 FIX: gcc complains because binding a packed field to a normal reference is not permitted. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@707 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-04-26 12:27:36 +00:00
aramis_acg a53360aa4d FIX: Change quaternion orientation for B3D loader (this format was forgotten with r502). 
FIX: MS3D loader assigns group names to mesh nodes, possibly leading to two nodes with the same name if a group name is the name of a bone as well. This prevents animations from working properly.

These changes are merged with the 1.1 branch as well. 

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@705 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-04-24 00:18:34 +00:00
jonathanklein a85b851442 - Multiple Submeshes are loaded now 
- In standard materials the colors are now loaded
- not excessively tested, but it should work

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@704 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-04-19 17:50:52 +00:00
aramis_acg 0695775bc4 Comment unknown pragma for it raises a warning (this may be intentional, but nevertheless I find it annoying). 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@702 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-04-17 21:36:13 +00:00
aramis_acg 99e5cbcbe0 Add deprecation note to legacy makefiles in code. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@698 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-04-17 18:41:22 +00:00
jonathanklein 5685312fe0 - PoseToKey Matrix is computed just computed when it changes 
- VertexWeights will be normalized to 1

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@686 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-04-16 19:10:09 +00:00
aramis_acg 1bcd29d704 Fix: OgreImporter relies on non ISO std::exception c'tor. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@684 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-04-15 10:35:15 +00:00
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
aramis_acg ebc03be3ac Fix usage of AI_MATKEY_UVTRANSFORM in LWO loader. The buffer was incorrectly dimensioned, random data got pulled into the material key's data section. This fixes a few failures in the regression testing suite. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@603 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-03-13 12:59:50 +00:00
aramis_acg 9fd2245eb1 Add specification/prototype header for the ASSBIN format utilized by assimp_cmd to store its minidumps or fully-fledged binary copies of our data structure. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@599 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-03-13 00:09:56 +00:00
aramis_acg e2daf37a39 - Fix http://sourceforge.net/projects/assimp/forums/forum/817654/topic/3591099. 
- Add unit test to avoid ppfx-related issue with re-use of Importer's in future.
- X file loader now properly resets all of its members.
- OptimizeMeshes step now properly resets all of its member.
- Fix old (and already deprecated) makefile.mingw.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@593 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-03-11 18:24:54 +00:00
aramis_acg 08ace2f27b - Fix Importer::FindLoader - it failed on file extensions with only one character (i.e. x). This fixes an unit test. 
- Revert VTAdj code. It fails the unit test and the new facility (support arbitrary polygons instead of triangles only) is not used anywhere.
- Unit test suite passes now.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@592 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-03-11 16:47:36 +00:00
aramis_acg 4f6d81a29b - Clarify documentation for Importer::GetOrphanedScene. 
- Change doc revision to 590.
- Rebuild CHM doc (online docs updated as well).
- Add TBD entry to LWO loader to remind me if I find enough time to fix that.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@591 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-03-08 20:21:30 +00:00
aramis_acg a7f298e6c3 - Move mkutil to packaging/windows-mkzip. Any further scripts to build dedicated download packages from a SVN working copy should go into packaging/<x> from now. 
- Migrate mkutil/revision.h to the root folder, adjust all dependent paths.
- Get rid of unneeded win batch scripts.


git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@584 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-03-04 18:46:54 +00:00
klickverbot ac8479f542 Moved private headers to code/ as discussed; removed boost::random workaround which was no longer needed; CMake cleanup part two (Boost detection, …). 
Please be quick to suspect this commit if the build should break on Windows/MSVC.

(Again, sorry for the large commit, but I didnt want to flood the commit log with my git-style tiny commits.)

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@577 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-03-03 21:48:23 +00:00
klickverbot ee6c6e5187 CMake cleanup, part one (sorry for the large commit). 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@576 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-03-03 21:46:56 +00:00
jonathanklein df9a4bf66c - New Ogre testmodel inclusive blend File 
- Changed axes for location keys

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@574 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-03-03 15:50:32 +00:00
aramis_acg 5738860990 - Change BaseImporter::GetExtensionList to add all known file extensions to a std::set, so uniqueness is guaranteed. Also rewrite all related functions in Importer. NOTE: This does *not* change the public interface. 
- FIX build error on vc8/release-noboost x64, ConvertUTF.c had wrong PCH settings.
- ADD knowext and listext verbs to assimp_cmd, add some raw docs.
- Update unit tests to reflect these changes. Currently I keep getting failures in some tests, this needs to be resolved *urgently*.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@567 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-03-02 17:38:01 +00:00
aramis_acg 93ed38e50b FIX: Change call to OutputDebugString to OutputDebugStringA to deal with _UNICODE builds. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@563 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-03-02 11:54:41 +00:00
aramis_acg df13041f42 Remove randomness from SceneCombiner. 
This offers two advantages: firstly, boost::random isn't used by Assimp at all with these changes. Secondly, the results of the IRR/LWS loaders are guaranteed to be identical on each run now. That's crucial of course, I just failed to recognize it in the past.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@559 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-02-28 01:28:00 +00:00
kimmi 78f27eef13 BUGFIX : Fix incorrect INSTALL target. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@558 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-02-27 14:04:14 +00:00
kimmi 7050ae5a3d - UPDATE : Add Install target to CMake build. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@556 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-02-27 12:00:00 +00:00
ulfjorensen 3e529ac1fc Bugfix: Collada animation parser now handles multi-value data types correctly. Or at least I hope so. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@555 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-02-26 15:17:19 +00:00
ulfjorensen 993ca25cdb Bugfix: fixed rather stupid typo in Collada anim keyframe interpolation 
Bugfix: Collada Loader now respects skin controller bind shape matrix

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@549 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-02-22 18:06:50 +00:00
rave3d 52228add3a add some #ifdefs for SWIG 
fixed a compile error in DefaultIOSystem
add swig-script


git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@546 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-02-15 18:28:32 +00:00
aramis_acg 707b06a7fe Add experimental MS3D loader, static meshes only at the moment. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@542 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-02-07 00:54:48 +00:00
aramis_acg 17326515d4 Get rid of warnings on GCC4.4 with -wall 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@541 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-02-06 23:52:41 +00:00
aramis_acg 7dcbff5d5c Adding overloads for unsigned integer types to ByteSwap and StreamReader. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@540 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-02-06 13:15:35 +00:00
aramis_acg 1fd3cfd311 MSVC: Add noreturn attribute to aiAssert and ValidateDSProcess::ReportError. This reduces warnings in VS2010's static code analysis tool. Thanks to Chris Maiwald for the patch. 
Correct include order in assimp_view.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@539 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-02-05 22:32:19 +00:00
kimmi ea3cdcd843 BUGFIX : Fix make 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@538 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-02-04 19:04:21 +00:00
kimmi 08f18ec0fb - UPDATE : BAse makefile now provides an install target. Use like make install. The sdk will be installed to /usr/bin/assimp. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@537 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-02-03 21:49:34 +00:00
kimmi 21f948288c BUGFIX : Fix crash in material loader. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@535 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-02-02 19:54:37 +00:00
kimmi 5c0432057a - REFACTORING : Removing deprecated code from obj-loader. 
- BUGFIX      : Fix memory leak in obj-loader, when an empty mesh was detected and ignored.
- BUGFIX      : Fix invalid material assignment in obj-loader, when groups are used instead of objects. 


git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@534 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-01-31 16:53:08 +00:00
aramis_acg c55be8ada3 FIX: Cleaning up use of printf() format specifiers. %i mostly replaced by %u when appropriate. 
FIX: 'size_t to %i' printf() vulnerability. 
FIX: Subdivision, change line&point handling, add missing parentheses to clarify order.
Add missing headers to vc9 workspace.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@533 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-01-28 23:01:33 +00:00
aramis_acg 2e3fee99f0 ADD Vertex utility class to simplify conversion from and to interleaved vertices. 
Refactor JoinVerticesProcess to utilize the new utility.
ADD basic operators for aiColor4D, move to dedicated header and implementation file.
ADD some utility functions to SpatialSort.
ADD my existing Catmull-Clark implementation to Assimp for all model formats with support for subdivision surfaces. Slightly WIP, likely to produce errors on non-closed meshes. Currently only implemented in the AC3D loader.
Switch to byteswap intrinsics instead of inline assembly (bswap). Currently MSVC only.
FIX phong shading in assimp_view.
VertexTriangleAdjacency class now also works on arbitrary polygons - UNTESTED, tbd.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@532 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-01-28 21:17:25 +00:00
aramis_acg c999f65a7d FIX: SMDLoader was broken due to erroneous 'rt' in input stream construction. 
FIX: MD3Loader, revive dead branch.
FIX: TargetAnimation - clarify doc on preconditions. 
FIX: aiMatrix3x3::FromTo - move cross product into a branch to save it we can do it without it.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@530 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-01-19 20:05:14 +00:00
aramis_acg 1c0f3f1b2e BUGFIX: Fix typo in PlyLoader.cpp. Thanks to Chris Maiwald for the bugreport. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@529 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-01-19 16:32:41 +00:00
ulfjorensen 6d3c8b3bc7 Bugfix: Collada loader now translates bone names to proper node names so that users should be able to associate the correct nodes to bones, equal what addressing scheme was used in the Collada file 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@526 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-01-10 10:38:52 +00:00
ulfjorensen 185c30c85b Bugfix: moved ai_assert condition evaluation out of the assert function to avoid constructing two expensive strings on every single call. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@525 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-01-06 22:04:31 +00:00
kimmi c508bafbad - BUGFIX : Fix optimization flag in makefiles. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@524 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-01-06 18:51:58 +00:00
kimmi a955f4008a BUGFIX: Fix compiler warning: variable not initialized. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@523 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-12-24 12:02:06 +00:00
kimmi 76385013d0 BUGFIX: Fix compiler warning: suggest parthesis. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@522 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-12-24 11:56:35 +00:00
kimmi 408b6b2d74 BUGFIX: Fix compiler warning: wrong order in initlist 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@521 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-12-24 11:47:31 +00:00
kimmi 497b387d45 BUGFIX: Fix compiler warning: comparison between signed and unsigned integer expressions 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@520 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-12-24 11:40:16 +00:00
kimmi 7cb337a8b8 BUGFIX: Fix compiler warning : suggested parthesis. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@519 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-12-24 11:34:57 +00:00
kimmi c920982464 BUGFIX: Fix compiler warning: wrong initialization order in initlist. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@518 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-12-24 11:29:28 +00:00
kimmi 07029ea363 BUGFIX: Fix compiler warning: wrong initialization order in initlist. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@517 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-12-24 11:28:54 +00:00
kimmi 9730eb6490 BUGFIX: Fix compiler warning: wrong initialization order in initlist. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@516 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-12-24 11:27:24 +00:00
kimmi 713d4e4b4e BUGFIX: Fix compiler warning: variable not referenced. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@515 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-12-24 11:26:34 +00:00
kimmi 84ff1090c2 - BUGFIX: Fix compiler warning: variable is not initialized. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@514 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-12-24 11:05:32 +00:00
aramis_acg a9ece90b81 FIX: Scons workspace was missing a reference to contrib/ConvertUTF. 
FIX: assimp_cmd doesn't anymore execute ConvertToLeftHanded if only -fuv or -fwo is specified.
FIX: Amd64-Build with vc8 - invalid integer promotion
FIX: Remove '_asm int 3' debug stuff from IrrXML. 

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@512 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-12-14 17:17:41 +00:00
kimmi a870710f56 - REFACTORING : Remove not used header from ObjFileParser. 
- REFACTORING : Rename IO instance of ObjParser.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@509 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-12-06 12:14:47 +00:00
kimmi 1829481591 - UPDATE : Add group loading support to Obj-Loader. Many thanks to Robert Ramirez for this Patch. 
- UPDATE : Add Robert Ramirez to CREDITS file.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@506 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-11-27 14:33:29 +00:00
aramis_acg 46809f0dfa COLLADA: Add support for <reflectivity> elements. This maps to AI_MATKEY_REFLECTIVITY. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@504 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-11-22 14:06:51 +00:00
ulfjorensen f85d7b63ef - Bugfix: Collada parser did not skip unknown material properties correctly, leading to strange XML error messages 
- Bugfix: Collada parser should read tangents / bitangents correctly now

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@503 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-11-22 12:46:49 +00:00
aramis_acg 35cfb90e6f BREAKING CHANGE: aiQuaternion + / aiQuaternion to aiMatrix conversion does now conform to the 'usual' quaternion conventions. See the discussion at https://sourceforge.net/projects/assimp/forums/forum/817653/topic/3442128 for all the details. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@502 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-11-19 23:22:53 +00:00
aramis_acg 89475c7e42 FIX: Orphaned assertion caused compile errors in debug builds. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@501 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-11-13 23:27:28 +00:00
aramis_acg d0ab169de9 FIX broken MD5Parser.cpp. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@500 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-10-26 18:41:58 +00:00
kimmi 4639ef0d1b - BUGFIX : Fix compiler warning: not referenced parameter. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@497 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-10-24 10:53:15 +00:00
aramis_acg 1b8c8561fd FIX: ColladaLoader now skips empty init_from-Tags produced by C4D's heroic Collada exporter. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@496 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-10-22 08:08:04 +00:00
aramis_acg c6899cd999 FIX: Adding empty final line to some units where it was missing. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@495 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-10-11 13:57:55 +00:00
kimmi 4ece1c859a - BUGFIX: Fix compiler warnings. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@493 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-10-11 11:32:04 +00:00
kimmi a61411d4b4 - BUGFIX: Fix compiler warnings. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@492 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-10-11 11:31:49 +00:00
kimmi e85bd7d5b9 - BUGFIX : Fix compiler warning ( not referenced parameter ). 
- BUGFIX : Fix compiler warning ( constant condition ).

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@491 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-10-10 12:32:23 +00:00
kimmi 5c1804f3ad - BUGFIX : Fixed compiler warning ( constant condition ). 
- BUGFIX : Fixed compiler warning ( not referenced parameter ).

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@490 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-10-10 11:59:00 +00:00
aramis_acg cc1ff304df FEATURE: Adding format auto-detection to OBJ loader basing on some distinct keywords. 
FEATURE: PretransformVertices step is now optionally able to normalize meshes (-1...1 range).

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@488 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-09-30 17:55:21 +00:00
aramis_acg 8b19981ce9 Obj loader ignores empty meshes now. Thanks for tomva for the patch (see http://sourceforge.net/projects/assimp/forums/forum/817654/topic/3402881). 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@487 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-09-29 11:01:20 +00:00
aramis_acg 35b7416437 FIX: gcc's complaints about OgreImporter. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@486 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-09-29 10:39:17 +00:00
jonathanklein 449bff99be Ogre Animations implemented but they don't work yet. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@485 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-09-28 16:53:33 +00:00
aramis_acg 1452a7a83d FIX: ColladaLoader now ignores missing 'meter' attribute in Collada files produced by C4D. Adding a c4ddae test file. Thanks to Tobias Rittig to point it out. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@483 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-09-26 21:54:56 +00:00
aramis_acg c89107a117 FEATURE: FindInvalidData step now provides a configuration option to fine-tune the accuracy of floating-point comparisons. 
Ogre-Importer now compiles with -noboost.
Fixing GCC complaints about inproper 'address of temporary' in Ogre-Importer.


git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@480 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-09-21 17:41:57 +00:00
jonathanklein 29bb83ebb6 - Meshs without UVs are now supported 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@479 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-09-17 19:05:46 +00:00
jonathanklein d4d8c290db Ogre Importer now loads the skeleton, animation loading will be available soon 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@478 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-09-13 18:26:54 +00:00
jonathanklein 3cb336ff7d - Uv coords are no flipped so that they are correct now 
- Custom Materials can be read (see Ogre importer documentation)
- Blender Ogre Exporter Material Template File added

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@477 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-09-05 15:49:23 +00:00
jonathanklein 8cfb2e26cf - Ogre Importer Beta 
- Ogre Importer Documentation
- Extended the general documentation at some points

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@476 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-09-05 12:04:32 +00:00
aramis_acg 8929ee3da5 Doc now includes parts of the internal API. 
Documenting importer plugin development.
Cleaning up doxygen usage in the public API.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@473 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-08-31 15:51:54 +00:00
aramis_acg 64168ba975 FIX: ObjLoader failed to locate material files if the input path contained 'wrong' path delimiters. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@471 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-08-24 08:46:04 +00:00
aramis_acg a251827cb9 Adding support for Unicode input files to most text file loaders (BVH and MD5 missing for now). 
IrrXML receives memmapped UTF-8 input data now, it's own (faulty) conversion is not used anymore.
aiString's are explicitly UTF-8 now.
Slight refactorings and improvements.
Adding UTF-8/UTF-16 text files for ASE,obj,collada,ac3d. These contain various japanese/chinese character sequences.
Changing assimp_view's node view to display UTF-8 multibyte sequences correctly.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@469 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-08-21 22:49:58 +00:00
aramis_acg 3b95a1e782 Adding aiMaterial::GetTextureCount()/aiMaterialGetTextureCount(). 
'Removing' some MSVC compile warnings from B3D.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@468 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-08-21 11:26:54 +00:00
kimmi d3ff282987 - Removed dead code. 
- Fixed some compiler warnings ( occurred with warning level 4 ).

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@467 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-08-19 20:45:51 +00:00
ulfjorensen 12070a1d52 Bugfix: made various internal structures namespace-local to avoid strange linker issues in case of name conflict 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@466 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-08-18 16:17:27 +00:00
aramis_acg 07428f37c7 FIX: GenFaceNormals process returns unit normals now. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@464 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-08-08 10:50:46 +00:00
kimmi af725fd545 - Bugfix 2824877: Avoid handling of negative ids in face definitions. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@462 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-08-02 17:17:40 +00:00
kimmi eda47a6f0b - Add new helper funtion to detect end of buffer. 
- Bugfix Obj-loader: If material file is not ended with a newline material loader crashes: Check for end of buffer.
- Refactoring: Rename helper function isSpace to isSeparator to make sense of function much clearer!

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@461 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-08-02 17:11:38 +00:00
ulfjorensen 98e53f976e - Bugfix: IrrXML loader ignores trailing whitespace on closing tags now 
- Bugfix: Collada loader now filters bone vertex weights with weight zero - blame XSI collada export.
- Bugfix: Collada animation resolver now also considers IDs when searching for nodes by name

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@460 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-08-01 20:20:22 +00:00
ulfjorensen 3f2fa97f18 - Bugfix: Collada-Loader now also reads animations containing multiple channels 
- Bugfix: Collada-Loader new resolves subelement animation channels correctly
- silenced some warnings in the B3DImporter code. There are a lot more over there, though.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@459 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-08-01 13:57:29 +00:00
aramis_acg 2d994c514c Changing 3DS parsing routines to work iteratively instead of recursively. This hopefully avoids unwanted stack overflowing with deeply-nested model hierarchies. 
Updating revision number.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@445 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-06-23 12:25:35 +00:00
aramis_acg adb4ab602e Adding Importer::ReadFileFromMemory to make Chromanoid happy. 
Updating unit test suite to verify the newly added stuff for correctness.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@444 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-06-21 19:44:48 +00:00
aramis_acg a4d7871096 [2805689] GCC 4.4 compatibility. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@443 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-06-20 14:54:50 +00:00
aramis_acg cc96f55c61 Adding samples/SimpleOpenGL. 
Adding basic math functions to the C API. This functionality is exposed to C++ users via operator overloading of aiMatrix4x4, aiMatrix3x3, aiVector3D.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@442 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-06-20 14:49:49 +00:00
marksibly 99af04ec64 Fixed bug with multi mesh objects 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@436 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-06-08 23:32:16 +00:00
aramis_acg a534c364b2 AssimpView now finds textures stored with their full path in the asset's directory. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@434 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-06-05 01:47:55 +00:00
aramis_acg 9070dc1f3c Further work on jAssimp. Still WIP and NOT USABLE, but interface getting stable now, most JNI code written. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@433 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-06-04 17:44:51 +00:00
ulfjorensen fe58fa6603 - Bugfix: Collada loader now loads meshes with mixed textured / non-textured parts correctly. At least I hope so, the example files load fine now. 
- Bugfix: implemented Collada Look-At transformation type. Untested due to lack of testing material

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@428 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-06-02 20:03:08 +00:00
marksibly a241829149 Implemented anims/bones 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@427 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-06-02 05:08:24 +00:00
kimmi 7ae85f56fa Bugfix: Remove local header from CMake script. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@426 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-05-28 17:32:36 +00:00
aramis_acg d881a16402 Logging functions are now available to C-Users, too. Cleaning up headers. 
Changing spelling of some enums to camel.
Ply loader loads tristrips correctly now.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@425 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-05-28 11:32:54 +00:00
aramis_acg 1aa80ca8da Adding Importer::ApplyPostProcessing(), uncommenting RegisterPPStep() and UnregisterPPStep(). 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@423 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-05-25 17:19:20 +00:00
aramis_acg de14e06805 FIX: Nasty debug-only bug in FindInstancesProcess. 
FIX: Crash at ReplaceCurrentTexture().
FIX: Crash at 'compute smooth normals' in AssimpView.
FIX: Obj shininess is now scaled by 4.0.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@421 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-05-16 15:33:01 +00:00
aramis_acg 13804abf2e FIX: ObjLoader reads opacity now. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@419 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-05-10 00:08:06 +00:00
aramis_acg 077511b1a0 FIX: WaveFront MTL files will no line break at the end will now read properly. 
Manually removing the line break from a test file for regression testing.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@418 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-05-09 23:54:16 +00:00
aramis_acg a677cdd1c0 LWO: Improving handling of VMAD chunks to process multiple discontinous UV's correctly. 
LWO: Error messages include VMAP/VMAD name now.
LWO: Subdivision weight maps are read; but not yet evaluated. 

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@415 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-05-05 14:32:01 +00:00
aramis_acg 25088fd7da FIX: IrrMesh lightmap scale factor is imported correctly now. 
FIX: aiProcess_TransformUVCoords tried to transform untransformed channels, and 'he' changed their order from time to time.
FIX: Viewer displays lightmap with scaling factor correctly now.
Further work on documentation, material doc is WIP for the moment.
Some improvements to fast_atof.
Updating makeifle.mingw to reflect my new boost location (arg, too lazy to make it better ...). 

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@413 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-05-03 21:49:34 +00:00
aramis_acg afcfdf27ea Fixing crash at Importer::IsExtensionSupported(). 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@411 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-04-27 19:58:34 +00:00
sueastside b2ffa9dd1b Added ASSIMP_API to aiCreateQuaternionFromMatrix and aiDecomposeMatrix. 
Added aiDecomposeMatrix to PyAssimp.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@410 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-04-27 15:43:01 +00:00
aramis_acg e4cddb9e9d Adding aiCreateQuaternionFromMatrix() and aiDecomposeMatrix() to expose some cpp maths functionality for c. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@409 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-04-27 15:16:32 +00:00
aramis_acg d7b4dd6ae3 Adding very basic reading support for CSM (CharacterStudio Motion). No proper hierarchy reconstruction yet, just plain marker import. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@408 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-04-26 15:09:03 +00:00
aramis_acg 01f558bcfe OFF: AI_MATKEY_TWOSIDED is now always set to 1. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@405 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-04-25 17:41:32 +00:00
aramis_acg 9abcba4bc2 Integrating aiProcess_OptimizeGraph and aiProcess_OptimizeMeshes back into the Assimp core. They're stable enough now. 
Moving private members of Assimp::Importer to a pimpl, hopefully solving strange crashes with vc9 debug builds.
Updating assimp_cmd to reflect these changes.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@403 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-04-24 20:53:24 +00:00
aramis_acg 897a7f7ae3 - Adding a collada test file with two UV channels. 
- Fixing ColladaLoader's error message if an UV set is invalid.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@401 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-04-23 18:46:25 +00:00
aramis_acg d6aacefa1e - BUGFIX: ColladaLoader handles multiple UVs/VColors correctly now. Thanks to Ingrater to point it out. 
- ScenePreprocessor will now detect 3D UV channels with all-empty third component.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@400 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-04-23 14:13:20 +00:00
aramis_acg e8386dc837 Fixing a minor issue in FileSystemFilter which prevented some external files from being loaded. Thanks to Jonathan Klein to point it out. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@399 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-04-22 11:58:25 +00:00
aramis_acg bd196ea318 - Changing LWO loader's VMAP selection strategy. Unassigned VMAPs (UVs and VColors) are now kept, if possible. Referenced VMAPs have higher priority so everything should be backward compatible. 
- assimp_cmd writes vertex colors in 'Colors' elements now.
- assimp_cmd writes 'set=' attribute for UVs and vertex colors.
- Adding test files for the awesome new LWO capabilities.


git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@396 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-04-20 16:49:46 +00:00
aramis_acg 0d53ac5ad5 Fixing build errors. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@395 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-04-19 10:36:36 +00:00
kimmi 85a14fa265 Bugfix: Memory leak fixed. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@394 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-04-18 23:41:50 +00:00
kimmi 9dfe7764b2 - Fix a compiler warning ( double to float ). 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@392 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-04-18 18:03:54 +00:00
kimmi ea085bddd1 - Remove crt- and secure-warnings for VC8.0 in cmake enviroment. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@391 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-04-18 11:24:00 +00:00
kimmi 0ec4348188 - Add first prototype for CMake enviroment. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@390 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-04-18 00:10:16 +00:00
aramis_acg 00729f83f7 FIX: multiple LWO layers referencing a single texture won't anymore cause all layers except the first to have no proper uv coordinates. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@389 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-04-15 16:24:58 +00:00
aramis_acg acdbf77c6e Fixing a rare bug when parsing floating-point numbers in exponent form. Thanks to zhao lei to point it out. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@388 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-04-15 14:16:11 +00:00
aramis_acg fcc6455447 Removing stdint.h dependency from the public API to avoid conflicts with other libraries. 
Cleaned up aiTexture.h, AssimpPCH.h and MaterialSystem.h.
Updated child apps & makefiles to reflect these changes.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@385 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-04-11 14:31:57 +00:00
aramis_acg 0c762117b8 ColladaLoader does now load transparency. hacky, but it could work. 
Cleaned up Collada material importing. No changes to other loader parts.
Adding missing FileSystemFilter.h to vc8 build config.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@383 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-04-10 22:51:12 +00:00
aramis_acg f3324da6ea ColladaLoader does now utilize SkeletonMeshBuilder to build animated meshes for animation skeletons. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@382 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-04-10 22:10:11 +00:00
aramis_acg a3b32f306c Adding a file system filter layer to correct invalid paths automatically. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@381 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-04-10 21:59:22 +00:00
aramis_acg fb33a6bfc4 ASE rejects ASC files completely now. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@380 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-04-09 23:31:13 +00:00
aramis_acg bcfbc37301 MD5 parser will now reject files with version!=10. 
3DS Loader -> improved light and camera handling.
DXF -> minor fixes, refactoring.
Updating DLL revision number.


git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@379 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-04-09 21:37:49 +00:00
ulfjorensen 87ee56efd3 - Bugfix: BikeFromXSI.dae loads again. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@377 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-04-06 22:57:43 +00:00
aramis_acg 4b6da4fd6e FIX: strange 3DS look-at vectors are auto-corrected now 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@376 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-04-06 17:09:32 +00:00
ulfjorensen e471b966c5 - Collada loader now supports node animations 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@375 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-04-06 17:00:03 +00:00