Commit Graph

387 Commits (55a3d845c9fdeea5ae3409527bfe7b101839852c)

Author SHA1 Message Date
ulfjorensen 732884e2f4 - Bugfix: ColladaParser now properly tunnels XML reading through the Assimp IO System
- Bugfix: IrrXML-IOWrapper now properly inherits the irr interface
- moved some "using namespace" directives out of the header

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@351 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-03-03 15:43:26 +00:00
aramis_acg fd2faf92d3 Added LWO subdivision test case.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@350 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-02-16 15:22:17 +00:00
aramis_acg abe2d4834e MD3
- shaders are now processed
 - multi-part player models are handled correctly

Material system
 - added flags for 'usealpha' or 'ignorealpha' setting of textures

LWO
 - fixed texture assignment bug due to invalid tag list

3DS
 - improved handling of dummy nodes

Viewer:
 - lines&points are now displayed
 - improved animation control via slider (still some stuff missing)
 - skeleton is now displayed
 - some other minor fixes

Validator:
 - some material issues are warnings now (no errors anymore)

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@349 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-02-15 20:29:07 +00:00
aramis_acg ca337852bf Test suite
- regression file for LWO 
 - Additional shaders for Q3 MD3 files

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@348 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-02-15 20:26:01 +00:00
aramis_acg 2b9461fbf7 MD3
- finished support for multi-part player models
 - skin files are now read 
 - shaders are parsed, but not yet processed yet

DefaultIOSystem
 - file size is now cached over multiple calls to FileSize()

MaterialSystem
 - added AI_MATKEY_BLEND_FUNC property and the aiBlendMode enum to allow MD3 and Collada to pass transparency information correctly.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@346 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-02-13 22:03:57 +00:00
aramis_acg d70c092b71 MD3
- rough support for multi-part player models.

SceneCombiner
 - added support for cross-attachments of nodes in the whole graph

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@345 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-02-12 22:14:35 +00:00
aramis_acg e6758ce923 MD3
- tags are now imported as nodes in the hierarchy

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@344 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-02-12 16:44:12 +00:00
aramis_acg fd9769eae6 MD2
- fixed UV coords
 - added further test models

Collada
 - fixed invalid aiStrings

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@343 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-02-12 15:58:55 +00:00
aramis_acg e5b06832b7 Committing batch scrips to build final release packages easily and error-free.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@342 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-02-12 13:40:32 +00:00
aramis_acg 055c3f0d24 IRRMESH/IRR
- improved handling of materials with multiple textures
  - BUG: lightmapping is now broken for the moment

AssimpView
  - Skyboxes and bg images work again
  - Improved lightmap handling.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@341 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-02-11 22:24:17 +00:00
aramis_acg c865999420 Collada
- collada 1.5.0 textures are readable now
 - cube and volume maps and mip initializations are skipped
Material system
 - unified texture types. Added lightmap, displacement, reflection and 'unknown'. Everyone should be happy now (intending to remove ambient textures from the API).

ComputeUV
  Changed mapping axis property to vec3 
  Adapted step
   WARN: produces mirrored uv coords now. LH issue.

IRR  
  Updated to new texture types

3DS
  Updated to new texture types

NFF
  Updated to new texture types

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@340 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-02-11 20:56:05 +00:00
aramis_acg af87633c9f Fixes to make gcc happy.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@339 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-02-08 23:19:11 +00:00
aramis_acg 7678b8e1be Collada
- added support for lights and cameras
 - added support for tangents and bitangents
 - added support for more than 2 UV components.
 - fixed node naming
 - beta support for instance_node elements. Works in most cases.
 - added support for more complex materials
 - UV index is now set correctly. hopefully.
 Material system
 - fixed potential problems regarding aiUVTransform
 - added utility macros for the base keys

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@338 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-02-08 22:55:51 +00:00
aramis_acg e54ef3944d Removed ptv flag from assimp_view.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@337 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-02-08 21:24:39 +00:00
aramis_acg 0e9ff778c8 FIX: ptv transforms tangents and bitangents now corrrectly.
FIX: Obj loader sets IOR material property now. Fixed spelling.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@336 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-02-08 21:22:03 +00:00
aramis_acg 8148ff36c0 Minor doc fixes.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@335 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-02-07 11:23:22 +00:00
aramis_acg 9fe1652c2b Cleaned up public headers.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@334 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-02-06 22:43:08 +00:00
aramis_acg 13d8e4a66d assimpview: fixed crash during normal recomputation.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@333 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-02-05 18:33:25 +00:00
aramis_acg 4048eb92f5 Fixed illumination model conversion in the OBJ loader.
Added map_d support to obj.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@332 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-02-05 18:13:34 +00:00
aramis_acg ec9226c5b9 Fixed nasty bug in FindInstancesProcess.cpp.
Added a small epsilon to some functions in the API.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@331 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-02-05 16:16:04 +00:00
marksibly 2b1f0cbac0 ' B3DImporter.cpp
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@330 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-02-04 00:39:32 +00:00
aramis_acg 8388877ed7 Deleted unused directories.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@329 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-02-03 14:17:01 +00:00
aramis_acg eb761a875f Some minor changes in postprocess step order. My fault, I didn't think.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@328 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-02-02 20:37:35 +00:00
aramis_acg 4b4526953e Changed some runtime asserts to boost::static_asserts.
Added FindInstances postprocessing step. Not fully tested yet, but seems to work well. Enabled it for the viewer, too.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@327 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-02-02 20:29:27 +00:00
aramis_acg 0c6894f6f9 Added the Wuson in B3D format.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@326 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-02-02 15:03:53 +00:00
marksibly b2b083cc87 Fixed materials/normals
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@325 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-01-31 23:24:11 +00:00
marksibly ed42533cce Converted output to right handed.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@324 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-01-30 00:07:09 +00:00
aramis_acg d751b63a77 Added the Wuson as OBJ and SMD file (SMD not animated ...). Export from MS3D.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@323 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-01-26 22:27:24 +00:00
aramis_acg 848e90f43f Fixed paths in some ASE test files.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@322 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-01-25 23:22:25 +00:00
aramis_acg 03fcec7fe3 Removed direct STL dependency from the Assimp interface, should hopefully avoid problems with binary incompatible STLs. Some API changes, e.g. in the logger.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@321 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-01-23 21:06:43 +00:00
aramis_acg b5ab82922d Updated documentation.
Added prebuild doxygen doc to repos.
Added a nice splash image to the doc.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@320 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-01-23 20:19:59 +00:00
aramis_acg ff64b31cca Fixed minor doc spelling issues.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@319 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-01-23 19:21:04 +00:00
aramis_acg 7dabd7cd72 Enabled 'fast' STL for vc9. secure_stl=0 && iterator_debugging=0.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@318 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-01-21 21:33:56 +00:00
aramis_acg 030d982cfa Added the cube.dae and the cube.x from kwxport + a license file. TODO: cube.x fails to load because of RGBA vertex colors.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@317 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-01-21 14:36:03 +00:00
aramis_acg 2ae20c3ff7 Added another x test model - fails to load due to RGBA vertex colors. Source is kwxport, MIT license, I think that's ok.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@316 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-01-21 14:28:32 +00:00
aramis_acg 366989769f Fixed camera doc.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@315 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-01-21 13:26:17 +00:00
aramis_acg 31969648cd [doc] Added first draft of a section for building assimp against STLport.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@314 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-01-20 22:01:31 +00:00
aramis_acg 00a83b8f2a Added vc8 and vc9 folders - I'll soon redirect the build output of vc to them.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@313 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-01-20 21:47:18 +00:00
aramis_acg 4727ad6c6a Fixed HMP typo.
Further work on 3DS target animations.
FixNormals-Step inverts face order now.
Further work on the doc to aiCamera.h, added helper function to get a view matrix.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@312 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-01-20 21:41:17 +00:00
aramis_acg 601d1c572e Fixed naming of aiNodeAnim in dox.h
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@311 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-01-20 20:26:35 +00:00
aramis_acg 3ba9ea8b5b Fixed mislead refactoring in HMPLoader.cpp. http://sourceforge.net/forum/forum.php?thread_id=2886037&forum_id=817653
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@310 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-01-20 11:32:39 +00:00
aramis_acg 5e59a60ea2 Added binary x test model exported from truespace. Didn't have one yet.
Redirected makefile output to ./bin/gcc.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@309 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-01-19 21:28:24 +00:00
aramis_acg 3e1e937bcc Updated VC9 workspace.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@308 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-01-19 19:46:14 +00:00
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