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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
9623663671
[3051124] cmake pkg-config assimp.pc file gen.; fix minor issue with assimp.pc INSTALL.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@797 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-08-23 15:44:59 +00:00
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
bcafa25012
Add missing zlib files to assimp_cmd's vc9 solution.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@795 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-08-23 15:16:18 +00:00
fa0029ca2b
[3051124] cmake pkg-config assimp.pc file gen; Thanks to Filipe Vieira for the patch.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@794 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-08-23 11:43:15 +00:00
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
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
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
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
4ad0d569f3
Ingnore an error producing SetProperty method on AssimpSwigPort.i
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@789 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-08-06 18:41:05 +00:00
1f68e8c6f3
Update Assimp.NET project files to always build x86 (32 bit) to support Managed Direct X even on 64 bit Windows for Debug and Release targets.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@788 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-07-23 20:51:05 +00:00
118e2d1da7
Remove some vcproj.user files that managed to get into the repository by accident.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@787 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-07-21 07:52:27 +00:00
827b00226e
Fix 3029892: assimpview crashes if the animation slider is touched while no asset is loaded.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@786 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-07-18 21:16:40 +00:00
f7f8c90fa1
Fix missing zlib.h in ioapi.c.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@785 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-07-16 18:05:16 +00:00
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
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
1c0e25288b
Update of C#/.NET bindings plus working Managed DirectX Viewer that displays standard DirectX Fixed Function Materials (Ambient, Diffuse, Specular, Emissive) and the first set of texture coordinates if contained in the model.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@782 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-07-12 13:13:43 +00:00
9d69165ae7
assimp_cmd now specifies the GLOB_MEASURE_TIME propery
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@781 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-07-11 23:26:30 +00:00
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
9e8a9586b3
Add defines to easily detect the current target architecture.
...
Supplement missing compile switches for recent feature additions.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@779 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-07-11 00:38:14 +00:00
7f958444e2
Add defines to easily detect the current target architecture.
...
Supplement missing compile switches for recent feature additions.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@778 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-07-11 00:37:34 +00:00
aramis_acg
ulfjorensen
kimmi
klickverbot
rave3d
adamdavidson