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
aramis_acg
31ff5d27eb
fix: colladaloader is now a bit more tolerant to empty top-level (library) elements. See https://sourceforge.net/tracker/index.php?func=detail&aid=3008871&group_id=226462&atid=1067632
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@744 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-05-29 20:53:42 +00:00
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