Commit Graph

1059 Commits (81ef6af2dfba284b7668ca2116fcab667bc9c9e8)

Author SHA1 Message Date
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 739be64dec - update inno setup script for the viewer-only package.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@850 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-11-21 16:50:52 +00:00
aramis_acg 05546ec7b6 really update C# Readme.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@849 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-11-21 16:43:41 +00:00
aramis_acg 3b35d2216b - update Assimp.net viewer application to take the model file to be loaded from the command line.
- add a screenshot to proof that it works ;-)
- update Readme.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@848 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-11-21 16:41:36 +00:00
aramis_acg 5ded0698e1 - update dreadful note in /port/swig
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@847 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-11-21 16:14:43 +00:00
aramis_acg ed3719e119 - really update doc.
- update build & installer scripts.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@846 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-11-21 16:11:32 +00:00
aramis_acg 617f15c77b - update docs.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@845 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-11-21 15:15:19 +00:00
aramis_acg 53808afd2d - more CHANGES
- (forgot this in my last message): change version number to 2.0.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@844 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-11-21 14:58:27 +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
klickverbot 7e5e2d7ea1 Quick fix to make the SimpleOpenGL sample compile with MinGW.
This commit is cluttered with whitespace fixes, sorry for that.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@839 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-11-10 19:34:40 +00:00
klickverbot c4b8389d6e Mark the std::vector wrappers for the C-style arrays as const.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@838 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-11-10 19:34:06 +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
aramis_acg fdda697af7 Move test models with problematic license restrictions to test/models-nonbsd and update the test suites accordingly.
Update note in LICENSE accordingly.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@827 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-10-13 17:57:06 +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 0fd0f68b26 UPDATE: Add opengl-samples to cmake build enviroment for windows systems.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@823 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-10-03 12:08:21 +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
klickverbot 72e5b99baa CMake: Added two configuration options for excluding the unit tests and the tools from the build.
By default, the tools are built along the library, the tests are not, however.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@821 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-09-27 08:31:09 +00:00
klickverbot 315649313e CMake: Fixed building with Boost workaround.
The path to the include directory had not been updated when the snippet was moved into the top-level CMakeLists.txt.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@820 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-09-27 08:30:54 +00:00
klickverbot c1430e1573 CMake: Show a helpful error message with CMake 2.8+ if Boost has not been found.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@819 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-09-27 08:30:37 +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 027e6e7453 Add test case for the recently solved collada instance node troubles (https://sourceforge.net/tracker/index.php?func=detail&aid=3054873&group_id=226462&atid=1067632).
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@816 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-09-14 22:11:51 +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 400086e19f Fix possible data corruption in AssimpView (see http://sourceforge.net/projects/assimp/forums/forum/817654/topic/3831953). Thanks to mick-p to point it out.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@810 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-08-31 03:25:12 +00:00
aramis_acg 631f3a2ff9 assimp_cmd: make sure we define both DEBUG and _DEBUG in debug builds. This fixes build trouble with vc9-debug.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@809 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-08-31 02:39:00 +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 2f71990dc2 Update revision.h.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@805 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-08-26 14:23:11 +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
klickverbot b0196db29f CMake: Fixed building tools when the Boost headers are not in the default include path; fixed pkg-config file installation for out-of-source builds.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@802 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-08-25 16:46:21 +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