Commit Graph

6170 Commits (80cf028629bcefaf3bb38f7eb8d1e7fbcf9027e6)

Author SHA1 Message Date
jonathanklein 0e5ae5145b Ogre Importer: Small fixes
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1228 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-03-21 08:49:46 +00:00
aramis_acg 5aeed46a25 # CMake, samples and tools can now be switched on/off independently.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1227 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-03-21 02:19:18 +00:00
kimmi 71b8fa7cb5 Bugfix : Commit not saved changes.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1226 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-03-20 22:41:39 +00:00
kimmi 6c1cb4f159 Bugfix : Fixed some compiler warnings and some C99 and C++11 specific syntax. ( merged from GitHub, thanks to Riku Palomäki ).
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1225 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-03-20 21:31:56 +00:00
kimmi 694cf75070 Bugfix : Fixed a possibly crash bug in ~aiExportDataBlob, was using a wrong delete. ( merged from GitHub, thanks to Riku Palomäki ).
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1224 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-03-20 21:12:38 +00:00
kimmi d17071746d Bugfix : Removed some unnecessary const_casts. ( merged from GitHub, thanks to Riku Palomäki ).
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1223 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-03-20 21:11:05 +00:00
kimmi fa71305e07 Bugfix : Removed useless and weird const_cast from TokenMatch. ( merged from GitHub, thanks to Riku Palomäki ).
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1222 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-03-20 21:03:14 +00:00
kimmi d7341094ca Bugfix : Fixed the Subdivision input mesh to be non-const. ( merged from GitHub, thanks to Riku Palomäki ).
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1221 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-03-20 21:00:16 +00:00
kimmi 9f6e45d651 Bugfix : Removed const_cast from CIOSystemWrapper::Exists. ( merged from GitHub, thanks to Riku Palomäki ).
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1220 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-03-20 20:54:31 +00:00
kimmi 478846c310 Bugfix : Cleaned up code and removed const_cast in DXFImporter::ConvertMeshes. ( merged from GitHub, thanks to Riku Palomäki ).
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1219 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-03-20 20:52:28 +00:00
kimmi 23381d9710 Bugfix : Refactored ImproveCacheLocalityProcess::ProcessMesh. ( merged from GitHub, thanks to Riku Palomäki ).
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1218 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-03-20 20:48:26 +00:00
kimmi 42def11d13 Bugfix : Replaced ugly (const_)casting by a better ctor and placement new. ( merged from GitHub, thanks to Riku Palomäki ).
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1217 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-03-20 20:45:33 +00:00
kimmi cb71e6f5f2 Bugfix : pcGroupTris isn't really const, removed const and const_cast ( merged from GitHub, thanks to Riku Palomäki ).
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1216 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-03-20 20:42:16 +00:00
kimmi f8deb8ff83 Bugfix : Replaced some new[]s with std::vectors ( merged from GitHub, thanks to Riku Palomäki ).
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1215 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-03-20 20:37:15 +00:00
kimmi 79f255bc40 Bugfix : Replaced some new[]s with std::vectors ( merged from GitHub, thanks to Riku Palomäki ).
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1214 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-03-20 20:35:21 +00:00
kimmi b724ac5c2c - Bugfix : Fix build of Obj-FileImporter ( this is currently only a work-around, loader is leaking memory, I am working on it ).
- Update : Merge fixes from GitHub, thanks to Riku Palomäki ( more fixes will merged soon ).

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1213 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-03-20 20:31:14 +00:00
aramis_acg e65087c338 + add test files for the new XGL/ZGL importer.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1211 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-03-20 16:53:10 +00:00
aramis_acg 397603bac0 + add XGL/ZGL importer. Some features (includes, object refs, textures not supported yet).
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1210 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-03-20 16:52:33 +00:00
aramis_acg 687a4644d6 # fast_atof: fix comma handling.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1209 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-03-20 16:29:57 +00:00
klickverbot d2e36b7a37 Added Marcel Metz to CREDITS.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1208 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-03-19 18:41:26 +00:00
klickverbot fc114f5a5e OpenGL sample: GCC fixes.
Thanks to Marcel Metz for the patch.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1207 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-03-19 18:41:11 +00:00
klickverbot 3b0d2cbdb3 Enable simple OpenGL sample under Linux.
Thanks to Marcel Metz for the patch.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1206 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-03-19 18:40:48 +00:00
aramis_acg 25fbc9989c # fix VS10 Debug Runtime check Failure due to data loss on type conversion.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1205 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-03-19 17:33:21 +00:00
jonathanklein d9b8db78cd Ogre: Animation Bug fixed (they seem to work now)
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1204 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-03-18 13:04:11 +00:00
aramis_acg 861974f05c # gcc fix: Remove "OgreImporter::" prefix in OgreImporter::ProcessSubMesh(....
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1203 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-03-18 03:22:05 +00:00
ulfjorensen f633437d88 - Bugfix: Collada loader writes "zero transparency" to material now
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1202 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-03-16 13:06:56 +00:00
aramis_acg b908b00f96 - Collada: read falloff and hotspot_beam spotlight properties to be compatible with OpenCollada. Thanks to gargaj for the patch.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1201 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-03-14 02:29:17 +00:00
jonathanklein 973e3fede3 Ogre: Shared BoneWeights get loaded
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1200 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-03-13 16:29:29 +00:00
jonathanklein 761c974fde Ogre: Improvements on loading Skeleton and Animation Keys (nearly working now!)
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1199 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-03-13 13:59:07 +00:00
jonathanklein df7f177794 Ogre: Fix in Material Loader
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1198 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-03-12 13:59:51 +00:00
aramis_acg accbcb575b - fix off-by-one error in FileSystemFilter.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1197 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-03-11 20:04:35 +00:00
aramis_acg 2d7b59e134 - update vc9 vcproj
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1196 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-03-11 19:20:25 +00:00
jonathanklein 7f1e7b7d6b Ogre: TestModel added, Texture-Bug in Materialloader fixed
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1195 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-03-10 23:04:02 +00:00
ulfjorensen 89c3aaebbc removed accidental C++11 usage
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1194 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-03-09 21:11:42 +00:00
jonathanklein 830388ab90 Ogre: VertexAttributs from SharedGeometry are now loaded correctly; Material Loading is more robustly
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1193 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-03-09 11:43:31 +00:00
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