v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,695 Commits
74 Branches
37 Tags
234 MiB
Commit Graph

6695 Commits (cec163c0251151ed58eb7f5f0fa361dda0ceac15)

Author SHA1 Message Date
jonathanklein 5b462d484b Ogre: small tweaks 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1253 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-06-03 11:06:47 +00:00
kimmi 7384ce4005 Bugfix: Fix gcc 4.4 compilation error on r1251, thanks to Rosen Diankov for that. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1252 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-06-03 06:10:26 +00:00
kimmi 9d00c18761 Feature : Prepare FindPackage feature. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1251 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-05-28 19:20:56 +00:00
kimmi 8441ecf6bf Bugfix : Fix a compiler issue with OSX and Linux. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1250 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-05-28 10:19:50 +00:00
Alexander Gessler bd98ee8681 - update readme to describe my fbx work and to link to blenderwiki. 2012-05-26 17:42:13 +02:00
ulfjorensen 0693df00c5 - Bugfix: catched a null pointer crash when post processing removed everything from an invalid scene 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1249 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-05-23 09:25:40 +00:00
jonathanklein d9d57804fa Ogre: Support for multiple texcoords 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1248 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-05-23 09:23:34 +00:00
kimmi 1ac5a47c5d Bugfix : Fix a compiler bug for iOS arm, thanks to Brian Miller. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1247 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-05-20 20:41:06 +00:00
ulfjorensen 6d2857ed4a Bugfix: collada loader now preserves empty data arrays to work around stupid exporters writing empty animation channels 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1246 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-05-05 07:38:14 +00:00
kimmi 7cb9438522 Refactoring : Move sources into one source variable to avoid redundant code. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1245 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-05-01 10:33:55 +00:00
kimmi f9cd8845b1 - Bugfix : Bug 3511751 closed, handling no defined material name. 
- Update : Add a model for the regression test.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1244 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-05-01 09:39:51 +00:00
aramis_acg 425c929aaa Update Xcode Project ([3520119] by Andy Maloney) 
This patch updates the Xcode project from git 93c3723da5.

It does the following:

- add/remove include files to the project since they moved
- add/remove the OGRE files to the project since they changed
- removes the _GLIBCXX defines since they are no longer used
- sets the compiler to LLVM GCC 4.2
- sets the SDK to Mac OS X 10.5 so it will build on 10.5 and 10.6
- removes the PPC-related VALID_ARCHS

This means it's set up for Mac OS X 10.5 and higher and will build a 32/64-bit universal lib by default.

I didn't touch any Boost-related stuff since I'm not using it, but it should be just a matter of updating the included libs with whatever version you have installed.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1242 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-04-22 23:26:49 +00:00
aramis_acg ec6c62e005 - consistent use of ai_assert instead of assert. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1241 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-04-22 23:22:40 +00:00
aramis_acg adfef670cc - rename assert.h to ai_assert.h. See also https://sourceforge.net/tracker/?func=detail&atid=1067632&aid=3520178&group_id=226462 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1240 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-04-22 23:14:39 +00:00
aramis_acg d3030b2aea Patch [3520366] Docs: Spelling and grammar fixes for postprocess.h by Andy Maloney. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1239 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-04-22 23:02:24 +00:00
aramis_acg bbaf838463 - update unit tests. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1238 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-04-22 23:00:44 +00:00
aramis_acg 53665faacf - make BaseImporter::GetExtensionList more robust, improve error checking. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1237 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-04-22 22:59:47 +00:00
aramis_acg 078c1cd621 # bugfix Importer::GetImporterIndex 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1236 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-04-22 22:59:15 +00:00
aramis_acg 68d2b71893 Patch [3520194] Fix compiler warning for non-virtual destructor by Andy Maloney. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1235 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-04-22 22:33:43 +00:00
aramis_acg 5a81b42ebe - add mFileExtensions field to aiImporterDesc, BaseImporter::GetExtensionList is now longer virtual since this would be redundant. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1234 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-04-22 22:26:26 +00:00
aramis_acg 93c3723da5 # Remove Experimental flag from blender loader. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1233 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-04-18 23:23:14 +00:00
aramis_acg e479355d0a + add aiImporterDesc API to hold importer meta information. 
- cleanup some Importer APIs: FindLoader -> GetImporter, add some utility APIs. Note that this is a breaking API change.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1232 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-04-18 23:07:52 +00:00
ulfjorensen 5975f3eff2 - Bugfix: fixed Collada parser to accept empty data elements again 
- Workaround: added a little extra code to handle texture filenames of Maxon Cinema Collada Exporter 

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1231 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-04-02 10:43:18 +00:00
aramis_acg 07841c3e13 # Blender: fix memory leaking due to cycle refs. Thanks to Vitalii Trubchaninov for pointing this out. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1230 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-03-27 22:09:09 +00:00
kimmi 6caf98d945 Bugfix : Changed ColladaParser to be non-const in ColladaLoader::BuildMaterials. ( merged from GitHub, thanks to Riku Palomäki ). 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1229 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-03-21 22:17:42 +00:00
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