Commit Graph

567 Commits (78b44c3aedf4d5ef727c6bf302f87a998edefb05)

Author SHA1 Message Date
aramis_acg f0044cf7d7 # fix LWS animation evaluator. pivot implementation still incorrect.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@922 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-03-18 18:27:22 +00:00
kimmi efc5c91746 - BUGFIX : Fix CanRead-method of obj-file-importer class: add missing token for a format validation.
- REFACTORING : Make token list static.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@920 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-03-18 12:21:26 +00:00
kimmi dbfa8a4f37 BUGFIX : Fix an android-specific build issue in the logging.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@919 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-03-16 22:55:28 +00:00
aramis_acg f77d0afa55 - revert previous changes to the 3DS loader until further clarification is done.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@917 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-03-08 17:46:39 +00:00
aramis_acg 1eee9890a9 - move ByteSwap template code from StreamReader.h to ByteSwap.h, where it belongs to.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@915 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-03-08 16:23:37 +00:00
aramis_acg ee827e8870 - update CMakeLists. However, the export interface still remains disabled.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@914 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-03-08 16:15:09 +00:00
aramis_acg 621bdef663 - rework exporter interface to be based primarily on the existing IOSystem.
- implement ExportToBlob/aiExportToBlob via a custom IOSystem implementation.
- split exporter C and C++ interfaces.
+ test cases for the exporter interface

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@913 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-03-08 16:09:54 +00:00
aramis_acg 32c8ca0a37 # PretransformVertices step now (re-)normalizes normals and tangents after applying transformations on them. See [https://sourceforge.net/projects/assimp/forums/forum/817653/topic/4378272?message=9501683].
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@912 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-03-03 11:36:22 +00:00
aramis_acg 649483f97f # bugfix 3ds orientation. [see https://sourceforge.net/projects/assimp/forums/forum/817653/topic/4086997]
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@911 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-02-27 19:47:00 +00:00
aramis_acg 990f5bd77e - DXF: convert AutoCAD's coordinate system conventions to Assimp's.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@910 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-02-27 19:15:17 +00:00
aramis_acg 6587130e9c # fix dxf face order (and the normals, respectively).
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@909 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-02-27 17:40:07 +00:00
aramis_acg 21e3b5e087 # fix debug build of the MakeVerboseFormat-process - it asserted AI_MAX_NUMBER_OF_TEXTURECOORDS==4 for no reason.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@908 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-02-27 17:20:21 +00:00
aramis_acg bee6884864 - DXF: improve polyline (2D) reading.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@907 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-02-23 14:24:14 +00:00
aramis_acg 4a88e50aa4 - revamp DXF loader. It now correctly distinguishes BLOCKS and ENTITIES and resolves cross references to entities from a block. Support for block-based coordinate-space transformations. Better polymesh handling. Improve error reporting. Refactor loader structure: the class itself is now stateless, reading is done using LineSplitter.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@905 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-02-22 19:58:29 +00:00
aramis_acg 00238e84e8 # fix vc8 compilation. See https://sourceforge.net/projects/assimp/forums/forum/817654/topic/4372824
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@904 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-02-22 19:51:32 +00:00
aramis_acg 94767ecf8c Merge https://github.com/tonttu/assimp
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@903 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-02-20 00:01:52 +00:00
aramis_acg 2b9ad081e0 - CHANGE vertex count and texture channel count limits to 8. Adapt all parts of the code which depended on both of them being set to 4. Test suite passes.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@900 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-02-03 14:14:09 +00:00
aramis_acg 58ce3ee879 # fix potential LWO crashbug related to UV processing [http://sourceforge.net/projects/assimp/forums/forum/817653/topic/4070109]
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@899 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-02-03 13:22:38 +00:00
ulfjorensen 0d5ac4725a Adapted included to allow compiling with Visual Studio 2010
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@898 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-01-27 17:03:30 +00:00
ulfjorensen 0e77095ace Experimental bugfix: avoid most pstdint.h stuff when VC10 stdint.h is included.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@897 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-01-24 19:44:09 +00:00
kimmi 45fca4b005 BUGFIX : Fix compile error on SunOS xentros 5.11: symbol conflict.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@896 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-01-23 22:49:02 +00:00
ulfjorensen 28008debf7 forgot the new files...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@895 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-01-21 15:37:34 +00:00
ulfjorensen 3a4651b0ec Bugfix: SplitByBoneCountProcess sometimes split too early
Export API continued.
First version of the Collada Exporter added. Handles static geometry and node hierarchy upto now. 

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@894 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-01-21 15:37:00 +00:00
aramis_acg 553b3567c8 - work on export API prototype, now relies on IOStreams.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@893 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-01-11 22:15:28 +00:00
aramis_acg 99f2e3bd97 # bugfix typo in blender loader leading to warnings due to non-existent fields in the DNA.
# bugfix: blender loader no longer fails on embedded textures with uppercase file names.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@892 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-01-11 22:11:58 +00:00
aramis_acg a63c56f4f7 + add boost.noncopyable to boost-workaround.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@891 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-01-09 23:15:20 +00:00
kimmi f1d02ecd5d - UPDATE : Add missing files for export-API.
- UPDATE : Disable export API for temporary until implementation is finished.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@890 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-01-09 19:39:42 +00:00
kimmi a6a1d57781 BUGFIX : Set the object name in assimp-node instance.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@888 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-01-09 19:36:18 +00:00
ulfjorensen cef429bb70 Refined exporter implementation
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@887 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-01-06 14:16:22 +00:00
aramis_acg e5f7fe0c3a - More work on the current draft of the export interface. Again, please comment.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@886 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-01-05 22:07:51 +00:00
ulfjorensen ae23c03bd9 First proposal of the Assimp export API. Please comment.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@885 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-01-05 15:33:01 +00:00
aramis_acg 24a0132598 + SplitByBonesCountProcess: make bone limit configurable.
- fix tabbing.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@883 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-01-05 13:22:44 +00:00
ulfjorensen 9a47236bb3 Bugfix: SplitByBoneCount process now updates "used"-flags for bones after having checked the whole face. Avoids the addition of empty bones to a submesh when a face requires multiple bones of which only a part fit into the bone count limit.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@882 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-01-04 19:31:54 +00:00
aramis_acg 74d9339274 - Change AI_FAST_ATOF_RELAVANT_DECIMALS to 10.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@880 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-12-27 15:59:06 +00:00
aramis_acg 3baec40ade # fix memory leak in Importer -- progress handler was never deleted. Thanks to dee_ment to point it out (see https://sourceforge.net/tracker/index.php?func=detail&aid=3134561&group_id=226462&atid=1067632).
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@877 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-12-11 15:50:14 +00:00
aramis_acg 62f6b57637 # fix throw statement in Q3BSPFileImporter.cpp -- we don't new() DeadlyImportError.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@876 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-12-06 21:34:31 +00:00
aramis_acg e2e5463845 # fix potential memory leak in MD5Loader.cpp.
- unify formatting in the aforementioned loader.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@875 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-12-06 21:31:52 +00:00
aramis_acg 86629f5c10 - remove old test code stub. I have no idea how this ugly piece of shit managed to survive *that* long.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@874 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-12-06 19:49:55 +00:00
kimmi bd92f15128 - BUGFIX : Fix aiQuaternion::nomalize method.
- UPDATE : Improve performance by avoiding multiple divisions.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@873 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-11-27 13:53:34 +00:00
ulfjorensen a9e96e2f9b - added a new post processing step to split up meshes into submeshes with a limited number of bones.
- fixed some wording details

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@864 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-11-22 18:14:51 +00:00
klickverbot 140efeadc0 Bump the SOVERSION on CMake builds as well.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@855 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-11-21 19:01:22 +00:00
aramis_acg 580041dce7 - fix regression on Ogre importer.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@851 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-11-21 18:27:28 +00:00
aramis_acg 6f1408a7f0 - update CHANGES.current.
- mark aiAnimMesh data structures as *NOT CURRENTLY USED*. They are, however, still contained and visible because some ports may be relying on their presence.
- add SimpleAssimpViewX sample provided by drparallax. Thanks! (http://sourceforge.net/projects/assimp/forums/forum/817654/topic/3917829)


git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@843 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-11-21 14:57:00 +00:00
ulfjorensen ec6ef9f145 Added a workaround to the Collada parser to handle certain XML tags which irrxml doesn't handle well. Corrected formatting on the way.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@842 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-11-19 14:06:32 +00:00
ulfjorensen fba2f78e06 Added a workaround to guess which material applies to anonymous Collada geometry subgroups.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@841 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-11-19 12:49:51 +00:00
klickverbot 76e15fd5c9 Use the *_SECURE_NO_WARNINGS defines for MSVC 2010 as well.
MSVC is Windows-only anyway, so I removed the extra check.
The version check could probably be just MSVC since I can think of no way the defines would break older or future versions.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@840 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-11-10 21:54:05 +00:00
jonathanklein 998de54048 some code updates, ogre animation still not working :(
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@837 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-11-09 18:13:08 +00:00
kimmi e0e0bf3c1e BUGFIX: Use correct not-importing preprocessor declaration for blender importer.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@836 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-11-05 20:31:13 +00:00
kimmi 5ef9e63ac6 - UPDATE : Add first version of bsp-loader with assimp-internal texture support.
- UPDATE : Actualize docu.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@835 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-11-05 18:45:42 +00:00
aramis_acg 8a336e8876 - Update build for xcode - parallel and universal, plus PCH. Update XCode project to reflect current state of the tree (thanks to Jørgen P. Tjernø for the patch)
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@834 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-11-02 18:19:49 +00:00
kimmi b0d8d83b75 BUGFIX 2970556: Fix possible overflow in material importer ( obj ) .
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@833 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-10-26 18:48:55 +00:00
kimmi 613a4cc679 - BUGFIX: Crash in obj-model.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@832 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-10-26 18:32:07 +00:00
aramis_acg abec0f9a77 - windows.h not needed in Q3BSPFileImporter.cpp (merge flaw?).
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@831 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-10-18 22:19:39 +00:00
kimmi ff3769cb19 BUGFIX: Fix memory leaks in Q3-bsp loader.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@830 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-10-18 21:15:35 +00:00
kimmi d7ce23893e BUGFIX: Fix for material import in Q3-BSP-loader ( thanks to Matthias Fauconneau ).
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@829 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-10-18 19:18:28 +00:00
aramis_acg 8a27ecf827 Fix: FindLoader() now converts the input file extension to lowercase.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@828 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-10-13 19:34:44 +00:00
ulfjorensen f601309db5 - anonym XFile materials are named now, to prevent them from being merged somehow
- added another boost dependency - lexical_cast - and a little replacement for all those boost haters out there

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@826 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-10-08 17:27:59 +00:00
ulfjorensen 8aac702e1e - Workaround: ASCII XFiles aren't as strict on separator chars as before anymore. Should allow some more files to be parsed correctly.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@825 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-10-08 16:51:54 +00:00
ulfjorensen 136ef7609d Bugfix: removed unnecessary windows.h include from Quake3BSP loader
Bugfix: added workaround to allow reading invalid Collada files sporting negative indices into data arrays

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@824 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-10-04 18:12:35 +00:00
kimmi 733fd48f9e - UPDATE : Add documentation to Q3BSP-importer.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@822 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-09-29 19:42:50 +00:00
kimmi d4f563c795 - UPDATE : Add bugfixes for the correct topology import from a bsp-level.
- UPDATE : Add the first pk3-archive for the bsp-loader.
- UPDATE : Add missing license info to aiAssert-file.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@818 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-09-26 15:56:52 +00:00
kimmi bbca6ce865 Fix g++ specific compiler warning: Usage of temporary object.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@817 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-09-15 20:29:48 +00:00
aramis_acg bd4a4fd608 further work on http://sourceforge.net/tracker/index.php?func=detail&aid=3054873&group_id=226462&atid=1067632 - first try the old node resolving algorithm (which checks for node IDs), if this fails switch to a workaround which takes both node names and IDs into account.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@815 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-09-13 14:40:25 +00:00
aramis_acg e440fb2769 NDOLoader: improve reusability of some temporary vectors.
ColladaLoader: fix http://sourceforge.net/tracker/?func=detail&aid=3054873&group_id=226462&atid=1067632, thanks to Adario for the report.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@814 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-09-11 19:44:06 +00:00
ulfjorensen 960f7defd7 Workaround: Collada loader combines alot of animations each affecting a single node into a combined animation. The stupidity of some export plugins knows no bounds.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@812 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-09-04 15:36:38 +00:00
aramis_acg 693a3a039d BlenderLoader: don't output diffuse color if it is all black. Seems to be Blenders way of telling us there is no diffuse color.
AssimpView: add 'no transparency' option in UI and implement underlying logic.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@811 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-08-31 17:24:04 +00:00
aramis_acg 76bdf7d0cb Fix makefile.mingw, see http://sourceforge.net/projects/assimp/forums/forum/817654/topic/3828839.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@808 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-08-30 13:13:18 +00:00
aramis_acg cab35c496d [3053648] Obj: segfault when first line is a material.
Add test file to reproduce the issues. Thanks to Ingo Kresse for providing the patch.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@807 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-08-27 12:36:02 +00:00
aramis_acg c5c5338397 Add first version of the planned progress feedback API to the public Cpp API. Currently, progress reporting is done between each major import stage.
Fix various issues with the vc9 solution and assimp_cmd.
Declare some more Importer methods const. This marks them as safe to use from within a progress callback.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@806 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-08-26 18:16:12 +00:00
aramis_acg a9fd7651fa Print version line to log upon loading a new file. This should aid at debugging incoming bugreports with logs attached.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@804 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-08-26 14:20:28 +00:00
klickverbot 9cc61781d0 Changes forgotten in the previous commit – the code was moved out to the top-level CMakeLists.txt.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@803 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-08-25 16:55:38 +00:00
aramis_acg 9d70caef0a [3031725] FileSystemFilter destroys "://" in paths. Addresss this issue. FileSystemFilter now acts with more caution, first tries to open the file given the input path.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@801 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-08-23 18:52:53 +00:00
aramis_acg 9b6b99842d Blenderloader: get rid of some type mismatch warnings in 32 bit mode.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@800 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-08-23 18:13:36 +00:00
aramis_acg 72a64192b8 Unittests: make them compile again in builds with regular boost.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@799 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-08-23 18:03:34 +00:00
aramis_acg 20cc623ecd noboost: Add working implementation for boost.format to get proper Collada error messages. See https://sourceforge.net/projects/assimp/forums/forum/817654/topic/3820367.
Add unit test for this.

Fix build errors due to invalid pch settings in vc9 | release-noboost.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@798 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-08-23 17:49:03 +00:00
aramis_acg 7a50b03fc5 Obj: Remove deprecated assertion - empty object names are fine.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@796 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-08-23 15:34:48 +00:00
aramis_acg dbcc1902ed ColladaParser: skip over extra <camera>,<light>,<material>,.. chunks contained within <extra> blocks. Thanks to Juha Vesanen for the fix.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@793 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-08-23 10:33:30 +00:00
ulfjorensen e3fffb7a52 - added some more empty element checks to Collada loader
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@792 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-08-22 11:40:36 +00:00
aramis_acg 81bebcd0ec Add basic support for the IZWARE NENDO file format (extension: ndo). The loader has been tested with files in format version 1.0, 1.1 and 1.2. Materials and textures are read but ignored for now.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@791 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-08-09 08:24:16 +00:00
kimmi 8fef884dbc - UPDATE : Use of correct indices in Q3BSP-loader
- UPDATE : Add enum for primitive-description in Q3BSP-loader.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@790 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-08-07 15:10:27 +00:00
aramis_acg 3204cf2736 Add conditional define to allow users to compile against their own zlib's.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@784 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-07-16 17:49:04 +00:00
aramis_acg e5aad11944 Introduce limits for vertices, faces (per mesh), face indices (per face) and weights (per bone).
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@783 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-07-16 11:44:31 +00:00
aramis_acg a9fd02c14e JoinIdenticalVertices: Performance optimizations by Krishty („Fuck the System”). Yields a 9x speedup in first benchmarks with meshes > 2k triangles.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@780 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-07-11 23:07:11 +00:00
aramis_acg 8881d5f752 - SpatialSort generation now notifies the logger.
- Fix VC10 incompatibility in BlenderDNA (0 to ptr-to-mem conversion fails). Thanks to Krishty to point it out.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@775 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-07-09 17:49:29 +00:00
aramis_acg b18d782231 Fix compile error in debug builds.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@774 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-07-09 17:45:21 +00:00
aramis_acg 9c1306a95a Skip ear cutting algorithm for quadrilaterals, makes triangulation MUCH, MUCH faster (100x) for models composed of quadrilaterals (i.e. Blender, Terragen).
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@773 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-07-09 16:44:13 +00:00
aramis_acg aae8637666 Add GLOB_MEASURE_TIME configuration option to profile the runtime of the postprocessing steps.
Start new documentation page for Performance/Profiling questions.
Migrate existing notes on multithreading to a new doc page, add more details.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@772 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-07-08 22:44:44 +00:00
kimmi 7f2f5e7555 - UPDATE : Q3BSPLoader now imports topology of a quake-level. Known issues: It seems, that faces a still missing.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@771 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-07-08 21:25:48 +00:00
aramis_acg 729b70ae0f BLENDER: Normal vectors are now read properly.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@766 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-07-07 15:17:18 +00:00
aramis_acg fb2815047d Update my standalone handcrafted makefiles to compile ./contrib/unzip as well.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@765 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-07-07 14:54:22 +00:00
aramis_acg d082330cea BLENDER: Fix potential stack overflow caused by a DOM object referencing itself.
Add general infrastructure to apply modifiers.
Implement mirror and subdivision modifiers using existing stuff.
Update BlenderDNA with related structures.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@763 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-07-07 14:50:19 +00:00
aramis_acg 9f951857de Fix non-standard use of friend in tuple replacement. https://sourceforge.net/projects/assimp/forums/forum/817654/topic/3735078
Disable PCH for unzip files now for the whole build matrix.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@758 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-06-24 10:49:39 +00:00
ulfjorensen 3adce87c5c - Made it mostly compile again
- Updated VC9 project files

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@756 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-06-21 17:28:02 +00:00
kimmi f017b5a4a4 - FEATURE : First version of PK3 format loader.
- FEATURE : First prototype of Quake 3 BSP format loader.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@755 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-06-18 17:36:46 +00:00
aramis_acg ca645a493c MDL loader now checks for magic bytes even if the file extension is .mdl.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@754 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-06-11 14:38:31 +00:00
ulfjorensen 2e909b35d8 Bugfix: Collada node instances are correctly loaded and resolved now.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@752 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-06-07 14:02:56 +00:00
ulfjorensen a9161ede18 Bugfix WIP: collada instanced nodes, still working on it.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@751 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-06-04 14:36:41 +00:00
ulfjorensen 219f9fadc6 Bugfix: removed misuse of "static" attribute preventing multithreaded usage of the importer
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@750 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-06-04 14:05:06 +00:00
kimmi c38c91d28d Bugfix : Fixed not ANSI character in comment.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@746 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-05-30 18:35:55 +00:00
kimmi f3310b0f36 BUGFIX : Fix handling of multiple materials per object definition in Obj-Loader.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@745 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-05-30 12:45:38 +00:00