Commit Graph

4635 Commits (ba658e7813722445b69359065ee78d2aa9ef0bea)

Author SHA1 Message Date
jonathanklein 005887f381 Ogre: MaterialLoader now searches for Materialfile with the MaterialName as Filename
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1192 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-03-09 11:42:47 +00:00
ulfjorensen 6970307b4e - Collada Exporter id naming scheme once again revised to exclude any potential invalid chars
- Collada Exporter outputs proper URLs for texture file names now.
- Updated Collada Loader to understand and convert texture file name URLs

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1191 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-03-08 16:08:46 +00:00
jonathanklein 3ed356d3c4 Ogre Importer: Support for Shared Geometry, as exported by Blender2Ogre for Blender 2.6 (still experimental)
CleanUp for OgreImporter (splitted the big file in smaller ones)

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1190 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-03-07 22:42:40 +00:00
ulfjorensen 7a0c5a431e - filtered some more invalid characters from collada export URL generation
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1189 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-03-05 22:00:00 +00:00
jonathanklein 62b2ca3c1b Support for boost 1.49
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1188 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-03-03 15:18:43 +00:00
ulfjorensen 9d4c46b53c - Bugfix: ColladaExporter avoids output of empty xml elements
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1187 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-02-28 09:06:25 +00:00
kimmi 648e8fe924 - Bugfix: Fix two possible reasons for bug ID 3039342 : On skipping an invalid material description in obj-loader avoid creating aiMaterial instance. Release obj-specific material instances.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1186 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-02-26 13:36:29 +00:00
aramis_acg 8fc1d1c529 - add the test file that led to fix r1183 to the regression test suite. See https://sourceforge.net/projects/assimp/forums/forum/817654/topic/5052480 (I hope the licensing classification is right, if not, please inform me).
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1185 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-02-23 16:40:00 +00:00
aramis_acg df13d315db # workaround crash in aiReleaseImport due to an suspected bug in gcc. See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=52339. See assimp-discussions for the details.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1184 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-02-23 14:10:18 +00:00
aramis_acg 34e7ce131b # BlenderLoader: use dna index to locate scenes, not SC tag. This fixes https://sourceforge.net/projects/assimp/forums/forum/817654/topic/5052480.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1183 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-02-23 14:02:09 +00:00
aramis_acg 035079b307 - remove unused folder.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1182 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-02-23 13:55:41 +00:00
aramis_acg 6485f8d486 # OgreImporter: fix bool-to-int conversion warning.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1181 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-02-23 13:53:12 +00:00
aramis_acg 8e5a2ad464 - add blender 2.6.2 test file.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1180 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-02-23 13:48:55 +00:00
jonathanklein 2743a0706e small fix
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1179 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-02-21 16:46:37 +00:00
jonathanklein 8c0d3a9a31 Ogre
- Animations without Scaling Key supported
- when the model has more than 1 texcoord, the first one is loaded (instead of nothing)

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1178 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-02-21 16:46:02 +00:00
jonathanklein 521088e134 Ogre:
- better support for OgreXmlConverter generated files

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1177 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-02-20 10:27:27 +00:00
kimmi 37fb338c1f - Update : Fix the M3-Importer: geometry import works.
- Update : Add a non-bsp example model for the m3-loader.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1176 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-02-19 09:10:04 +00:00
kimmi 946b2f0354 Bugfix : Fix the extension check for the m3-loader.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1175 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-02-18 18:03:39 +00:00
ulfjorensen 6cb8ca9652 - Collada exporter texture references in materials are now written correctly
- removed various optional xml attributes from Collada Exporter which caused warnings in OpenCollada



git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1174 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-02-18 15:20:28 +00:00
kimmi 1fef449654 Update : Remove secure warnings from assimp_view.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1173 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-02-18 12:43:48 +00:00
jonathanklein eebba5348d - Added Debug Postfix
- added Viewer Installer

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1172 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-02-18 10:55:47 +00:00
jonathanklein 6852eb6ffe - compiler error fixes for sample programs
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1171 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-02-18 10:53:58 +00:00
ulfjorensen f41e106efc - ColladaExporter filters empty meshes which fooled certain loaders - specifically Assimp's Collada Loader :-)
- Bugfix: ColladaExporter now writes proper URLs when referencing materials in meshes

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1170 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-02-17 10:48:25 +00:00
aramis_acg 08fe2e7d20 + add Ply exporter.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1169 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-02-16 02:11:29 +00:00
aramis_acg 23c16a3ef9 - assimpview: reuse textures to minimize memory usage. This may break editing stuff, but I'll fix this asap.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1168 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-02-16 00:05:47 +00:00
ulfjorensen 4ebba5bdd4 Removed C++11 usage which I accidentally inserted
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1167 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-02-15 23:44:52 +00:00
aramis_acg 745c1035bf - assimpview: do not create a new default texture each time we need one. Turns out memory is not unlimited.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1166 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-02-15 23:13:52 +00:00
ulfjorensen 82f027b01f - added materials to Collada Export
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1165 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-02-14 17:42:25 +00:00
ulfjorensen fa6039e1cb Bugfix: Collada Exporter writes proper mesh references now - that makes static scenes work just fine
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1164 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-02-13 15:53:59 +00:00
aramis_acg 29d3a18962 Fix [3211530] heap corruption in the ms3d importer.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1163 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-02-05 16:10:50 +00:00
aramis_acg 58d0a89b25 - rework FileSystemFilter to scan sub-folders of the model folder recursively for external files. This should fix [3473792] (https://sourceforge.net/tracker/?func=detail&atid=1067634&aid=3473792&group_id=226462).
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1160 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-02-05 15:13:39 +00:00
aramis_acg ced8d8279a Fix [3484066] Compilation error in Visual Studio 2011 Preview
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1159 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-02-05 14:38:47 +00:00
kimmi bed6c84cb6 - Update : IMport uv- coordinates.
- Bugfix : Fix invvalid M3-faces.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1158 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-02-04 21:08:20 +00:00
aramis_acg c84a14a7a8 [3118522] OBJ material/texture filename with spaces support.
I also added a test case for this issue.

(see https://sourceforge.net/tracker/?func=detail&aid=3118522&group_id=226462&atid=1067632)

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1157 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-02-03 18:16:15 +00:00
aramis_acg 06bfcbf22d # [3191607] ColladaLoader error: attempt to copy-construct an iterator from a singular (see https://sourceforge.net/tracker/?func=detail&aid=3191607&group_id=226462&atid=1067632)
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1156 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-02-03 18:05:38 +00:00
aramis_acg 6f2ca1bb22 [3459159] Tidy up UI layout in assimp_view.
I changed the size slightly, but left the majority of the patch unchanged. Many thanks to Tor Andersson for the original patch! (see https://sourceforge.net/tracker/?func=detail&aid=3459159&group_id=226462&atid=1067634)

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1155 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-02-03 17:50:01 +00:00
aramis_acg d508e44030 - change major version number to 3.0. trunk is definitely no longer compatible with 2.0.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1154 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-02-03 17:39:33 +00:00
aramis_acg 4b61e27590 - TriangulateProcess: use ear cutting for quads. This fixes [3429812] (http://sourceforge.net/tracker/?func=detail&aid=3429812&group_id=226462&atid=1067632).
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1153 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-02-03 17:36:07 +00:00
aramis_acg c8c9d6cec8 - finetune doc css.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1152 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-02-03 17:27:39 +00:00
aramis_acg fd293547c4 - update documentation.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1151 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-02-03 17:26:06 +00:00
aramis_acg 6fa251c2f2 - unify naming of all header files. Obviously, this is a breaking change that affects all users.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1150 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-02-03 17:04:06 +00:00
aramis_acg f07901df9d - update tools/
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1149 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-02-03 16:26:11 +00:00
aramis_acg 075b1acaf0 - move include/ to include/assimp/ to have consistent header locations between installed and trunk version.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1148 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-02-03 16:25:12 +00:00
aramis_acg 4dbf539b44 - update license header. Update copyright year and unify naming: our name is 'assimp', not 'ASSIMP'.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1147 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-02-03 03:38:30 +00:00
aramis_acg db3cee8501 # Ifc: fix bug while filling window contours.
# Ifc: filter out duplicate openings.
- poly2tri: change comparison epsilon to a more suitable value (found by trial&error).

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1146 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-02-03 02:28:25 +00:00
aramis_acg 4080cd601c # Ifc: merge overlapping openings if possible.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1145 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-02-03 00:50:07 +00:00
aramis_acg 16b3d19f7f # fast_atoreal_move: avoid floating-point casts. Compilers have trouble optimizing this.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1144 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-02-02 22:53:26 +00:00
aramis_acg 15e50959e6 - Ifc: enable double-precision arithmetics for the entire pipeline. This does fix bugs, but unfortunately not all if them.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1143 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-02-02 22:50:24 +00:00
aramis_acg 4fcf61c31f # Ifc: update color conversion routines to always work with single precision.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1142 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-02-02 22:42:11 +00:00
aramis_acg bfb8fd8483 # Ifc: fix materials when running double precision.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1141 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-02-02 22:41:23 +00:00