Commit Graph

1094 Commits (f07901df9dbb082159ca1807f65d4d4f78bbbf61)

Author SHA1 Message Date
aramis_acg 3d5eae6be5 Moved some defines into the core, away from the public stuff.
Fixed build error regarding zutil.c with vc9.
Updated VC9 project files (again ...)
Moved version getters to aiVersion.h.
Deleted redundant fast_atof.h from irrXML.
Added vc9 config for cppunit
Fixed a missing include when building against stlport

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@307 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-01-19 19:34:34 +00:00
aramis_acg 561943e75c FIX: Obj loader failed to read models with strange UV coordinates (see https://sourceforge.net/forum/forum.php?thread_id=2869243&forum_id=817653).
Added the model that was reported as crashing to the regression test suite.


git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@306 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-01-19 00:40:48 +00:00
aramis_acg d41f570dc0 Added support for compressed x files (all files from dx sdk, except car2.x, work, no further tests yet).
Added a working makefile for mingw, provides more configs now. Not perfect yet.
Added decompression part of zlib (inflate).
Moved IrrXML to ./contrib dir.
Moved some IRR/IRRmesh shared code.
FIXME: makefile for gnu/linux is untested yet.
Code cleanup.
Unified #ifndef ASSIMP_BUILD_nnn_IMPORTER directives.
OBJ loader supports map_bump, map_ka, map_ks, map_ns now.
Endianess conversion in the ply loader is correct now.
Changed IRR/IRRMESH coordinate system conversion. Not absolutely right now, but better than before.


git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@305 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-01-18 23:48:25 +00:00
aramis_acg 9b83f3b3eb Added collada file to regression test suite.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@304 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-01-18 15:45:43 +00:00
aramis_acg 8dccb31e6e Fixed issues with gcc 4.3.2 - semicolon after namespace closing brace not accepted. Thanks to klickverbot to point it out.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@303 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-01-18 02:18:56 +00:00
ulfjorensen 244e2468c6 - Bugfix: ColladaLoader failed on <extra> tags in geometry elements
- Bugfix: ColladaLoader reads and filters mesh subgroups without faces now. Who the fuck writes them anyways? I'm looking at you, Maya export!
- Made the VC9 workspace load again. Thanks to Aramis for the hints.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@302 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-01-18 00:52:20 +00:00
rave3d d8cdfb9954 fixing vc9/UnitTest.vcproj
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@301 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-01-16 10:22:44 +00:00
aramis_acg 462bb953c2 Removed OptimizeGraph step - actually it isn't really useful, although I got it working very well.
Updated credits.
VC9 workspace updated by hand (no vc9 ...) so be careful.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@300 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-01-15 21:08:28 +00:00
aramis_acg 6557c28ef7 FIX: NFF face winding bug (actually it was in StandardShapes.cpp).
FIX: StandardShapes::MakeCone() - face order was incorrect in 50% of all cases.
Implemented StandardShapes::MakeCircle().
Fixed a compiler warning in B3DImporter.cpp.
Modified cone.nff - one texture isn't found, that's ok. The mapping should be better visible now.


git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@299 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-01-15 19:22:29 +00:00
aramis_acg 0f5c1cf3ba Patch [ 2508517 ]: Doc fixes II by Any Maloney
Fixed a compiler warning: 'dangerous use of <<, check operator order'. Operator order was right, added the braces, though.




git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@298 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-01-15 17:15:05 +00:00
rave3d cf14e806c9 workspaces/vc9
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@297 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-01-15 13:12:09 +00:00
rave3d 78c97c2b8b updating vc9 workspaces
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@296 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-01-15 12:50:43 +00:00
aramis_acg 47d69c0de5 Further work on the documentation.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@295 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-01-13 20:19:40 +00:00
aramis_acg d416a5d7b6 [ 2503202 ] Doc fixes. Thanks to Andy Maloney for the patch!
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@294 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-01-13 18:58:07 +00:00
aramis_acg 607356a844 Added empty end lines to all workaround files.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@293 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-01-12 22:26:11 +00:00
aramis_acg 58eb786d62 Major API cleanup. Unified formatting & doxygen tags in the public API.
Added factory provider for default log streams.
Added default log streams to std::out and std::cerr.
Updated VC8 project config, boost workarounds is now working for the viewer.
Updated unit test suite.
Fixed some minor issues in the postprocessing-framework.

BROKEN: DebugDLL build.




git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@292 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-01-12 22:06:54 +00:00
aramis_acg bba8dee77d Removed some stuff we don't need anymore.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@291 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-01-12 17:18:08 +00:00
aramis_acg 676b4f3cd8 Added batch script to cleanup any build stuff.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@290 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-01-12 17:14:56 +00:00
aramis_acg 84f8e3c68c Temporary fix: collada loader strips 'file://' from paths now.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@289 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-01-12 00:00:13 +00:00
marksibly ad79da7aa1 Added more brush/material properties
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@288 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-01-11 21:51:45 +00:00
marksibly 521fbb977e Improved sanity checking
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@287 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-01-11 21:38:01 +00:00
aramis_acg 0e28e824ae Added a larger ASCII-STL test file
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@286 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-01-11 18:29:18 +00:00
aramis_acg 6f815acc1b Updated Doxyfile + added custom style sheet for further modifications.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@285 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-01-11 18:28:33 +00:00
aramis_acg 6c69ebee4f Fixed texture paths in some NFF files.
Cleaned up Assimp C-API calls in the viewer.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@284 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-01-11 15:20:06 +00:00
aramis_acg b73cb1c569 HMP loader returns quads now, cleaned up the code a bit. Still longer than necessary.
BVH loader supports arbitrary rotation/translation orders now. Fixed a crash issue, added test models with ZYX and ZXY rotation order.
Updated CREDITS.
'Beautified' pushpack/poppack.
Collada loader does now also load XML files if 'COLLADA' is found in the header.
Fixed path issues in several IRR test files.


git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@282 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-01-10 17:58:06 +00:00
aramis_acg 39bfb7608b Optimized triangulation algorithm. Must more faster now.
Added loader for TERRAGEN terrains (*.ter).
ScenePreprocessor generates a default material if none is given.
AC: file extension bug
Added terragen test files.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@279 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-01-09 21:29:54 +00:00
aramis_acg 05e451d962 Updated mkfinal script.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@276 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-01-09 14:18:15 +00:00
aramis_acg 62a8f43ffe FIX: (aiMesh::mNumTextureCoords[n] == 0) is now propagated to 2.
Removed ATMNotUptoDate tag from SCons dir. The SCons script is generic.
Updated list of contributors.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@275 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-01-08 22:44:07 +00:00
aramis_acg e48d1a4e5a Tracker ID [2485593], patch by John Connors for better Linux/Scons support.
Removed BCC55 workspace. 

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@274 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-01-08 22:15:05 +00:00
aramis_acg ec3200bd36 Added Tizian Wieland to the CREDITS file.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@273 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-01-08 04:44:34 +00:00
aramis_acg b36c7ba6ca Added workaround for boost::tuple.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@272 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-01-08 04:25:35 +00:00
aramis_acg b51f7fff62 Added batch scripts to run the unittests automatically.
Added a directory to store detailled unittest results.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@271 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-01-07 15:16:26 +00:00
aramis_acg 7edb0c482e Added exception to the LICENSE file which applies to test models.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@270 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-01-07 15:08:36 +00:00
aramis_acg ef7ce429b8 Fixed naming of copyright file for the LWS test scene.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@269 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-01-07 15:07:21 +00:00
aramis_acg 2b62bfc403 Added several empty test files to verify that the loaders won't crash in this case.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@268 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-01-07 15:06:41 +00:00
aramis_acg b87e572220 Added batch script to copy DLL release exe's and dll to a common 'final' directory.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@267 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-01-07 15:04:15 +00:00
aramis_acg 1ded2f6a34 FIX: (aiMesh::mNumTextureCoords[n] == 0) is now propagated to 2.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@266 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-01-06 17:24:47 +00:00
aramis_acg a449804d6f Deleted build folders
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@265 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2008-12-31 15:26:16 +00:00
aramis_acg 2638d49144 Cleaned up Assimp-test repository of sample 3d models.
- fixed texture hardlinks 

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@264 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2008-12-30 13:05:33 +00:00
aramis_acg c8bea63e25 Cleaned up Assimp-test repository of sample 3d models.
- moved to subfolder test/models
  - removed the 'Files' suffix from the directories.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@263 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2008-12-30 12:32:45 +00:00
aramis_acg 321334fd12 [ 2373610 ] Patch for Linux and SCons. Added patch provided by John Connors, closed the corresponding tracker item.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@262 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2008-12-07 20:00:58 +00:00
alil f601c3c5b9 made it work again under linux
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@261 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2008-12-04 22:01:35 +00:00
ulfjorensen 917db45b3c - further Collada work: materials are now loaded from profile_COMMON, meshes are properly split up at material borders
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@260 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2008-12-04 17:06:26 +00:00
aramis_acg d320a4bc64 Removed MDR loader - too unimportant and would need much more work to work properly.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@259 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2008-12-01 15:25:38 +00:00
aramis_acg 9b53b2aa1a FIX: 3DS loader skips TCB keys correctly now.
Further work on 3DS light and camera support + target animation.
Removed obsolete files & directories.
AssimpPCH.h outputs the current build config now (MSVC only)
Simplified foreach workaround
Fixed compilation error in the DLL build

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@258 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2008-11-30 22:27:20 +00:00
alil e9fc71cc60 fixed some linux compilation issues
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@257 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2008-11-30 20:32:53 +00:00
aramis_acg 80da4a4093 Fixed missing #include <vector> in assimp.hpp. Thanks to Andy Maloney for the hint.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@256 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2008-11-29 16:32:34 +00:00
aramis_acg 94d289d1a3 Updated boost workaround. Added -noboost build config to VC8.
Added aiGetVersionMinor, aiGetVersionMajor, aiGetRevision and aiGetLegalInformation(). They allow to query the library version at runtime.
Added reference images for cylindric and spherical mapping.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@255 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2008-11-29 15:30:50 +00:00
aramis_acg be864ce4a0 Added support for cones and cylinders to NFF (the code to generate these primitives is hosted in StandardShapes.cpp).
Fixed some minor material bugs in NFF.
Added some more test NFF files, refactored and commented the old ones.
Added FromToMatrix function to aiMatrix4x4
Temporarily disabled animation support in SMD and fixed some minor bugs. Static models should load correctly in every case.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@254 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2008-11-28 23:02:27 +00:00
ulfjorensen 5639220859 - corrected example code in the documentation. Thanks to Ingrater to point it out.
- Further work on the Collada loader. Halve way through the material import, I have to leave it here and continue at home.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@253 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2008-11-27 15:54:35 +00:00