Commit Graph

10376 Commits (c3a097abc9f1060b50e7da1620aa4e107633bf18)

Author SHA1 Message Date
kimmi d3e9607ab6 Kill g++ compiler warning (no newline at end of file).
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@234 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2008-11-09 15:57:03 +00:00
aramis_acg df9f4130eb Further work on the IRR and IRRMESH loaders. IRR is still WIP, IRRMESH loads lightmaps correctly now.
Added lightmap viewing support to the viewer. Irrlicht's tone scaling is hardcoded for the moment, a proper implementation will follow with the new viewer.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@232 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2008-11-05 12:26:11 +00:00
aramis_acg 7c50899481 Fixed 3DS, ASE, MD3 and Q3D orientation after Schrompf' recent changes to the RH-LH conversion.
WIP version of animation support in the 3DS loader. Still hoping to find out why the pivots aren't handled correctly ...
Added first draft of a B3D loader provided by Mark Sibly.
Moved DeterminePType-Step to ScenePreprocessor.
Small LWO fix. Still texturing problems.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@231 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2008-11-04 20:41:11 +00:00
ulfjorensen 195d9a9cb1 - Bugfix: XFileLoader does not generate dummy bone arrays anymore. Had screwed HasBones()-Test in the viewer, making bone-less objects vanish from view
- made HasFooBar()-checks more precise on the way
- cleared up everyone's destructors to also delete arrays if the corresponding mNumFoo member was zero. This hopefully does not break all too much
- Bugfix: meshes without bones now properly show up with DisableMaterials enabled

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@230 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2008-11-04 17:21:08 +00:00
aramis_acg 562050cf6d Added test models
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@229 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2008-11-04 16:44:27 +00:00
ulfjorensen 593e3e55ba - added test file for BVH file format
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@228 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2008-11-03 17:59:54 +00:00
ulfjorensen c25e576a01 - BVH-Loader more or less final now. Reads motion capturing date which plays fine in the viewer, just mirrored ATM.
- Fixed RH->LH conversion, now correctly exchanging Y and Z axis. WARNING: this might propably break face orientations and stuff... I'm to revisit this in the next days. 

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@227 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2008-11-03 17:59:04 +00:00
alil 6ee05b6238 a first version for mdl7 loading on BE is now working (still one warning of a missed uv index)
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@226 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2008-11-02 23:35:45 +00:00
aramis_acg 240dbfd864 Small fix to the ASE loader - workaround for bitmaps with filename "None".
Further work on the IRR loader. Still work in progress.
Fixed a minor issue in StandardShapes.
Fixed a bug in the Q3D loader causing models without textures to load incorrectly.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@225 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2008-11-02 22:30:37 +00:00
alil df85f0aead added some stuff to reduce compiler warnings of unused vars
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@224 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2008-11-02 22:22:13 +00:00
alil 49b66d47dc worked on be stuff for mdl loader
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@223 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2008-11-02 22:21:07 +00:00
ulfjorensen d54c695be4 - bone animations now also work with Disabled Materials Shader. There should be something missing, but it works. Strange...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@222 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2008-11-02 21:24:27 +00:00
ulfjorensen 42123de268 -Bugfix: Anim interpolation does not produce invalid floats anymore on one-frame animation tracks
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@221 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2008-11-02 20:49:27 +00:00
ulfjorensen 0f56c48aca - finally found the last bug in the viewer animation code. Dwarf is now dwarfing, Tiny is now running correctly.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@220 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2008-11-02 19:34:24 +00:00
ulfjorensen d965f0d06a - Viewer: additional bugfixes while trying to get the animations to work
- added anim interpolation for anim playback
- Bugfix: FindInvalidDataProcess was still mixed up a bit

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@219 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2008-11-02 17:20:29 +00:00
aramis_acg ac200212a9 Added ScenePreProcessor helper class to add missing dummy animation channels.
Modified FindInvalidData's behaviour regarding animation channels
Futher work on the IRR scene and IRRMESH loaders. Q3D fix. 
Updated aiNodeAnim documentation.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@218 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2008-11-02 16:58:31 +00:00
aramis_acg 4daa0294a2 Updated VC9 workspace.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@217 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2008-11-02 14:36:09 +00:00
aramis_acg ba93c7ef09 Fixed x64 compilation problem cause of an int 3 asm instruction.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@216 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2008-11-02 14:29:46 +00:00
aramis_acg 5d2fd0ef35 Fixed some minor bugs in the Q3D loader. All test models from quick3d.org load correctly now.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@215 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2008-11-01 16:42:16 +00:00
aramis_acg daae32d62f - Fixed a bug in FindInvalidData causing some animation channels to be lost
- Added Q3D loader. Seems to work quite well with Quick 3D 4.0
- Updated makefile, fixed GCC compilation error cause of packed matrix fields

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@214 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2008-11-01 15:14:00 +00:00
ulfjorensen c7e6fe3d73 - Bugfix: animation scene tree is correctly created and traversed now
- Bugfix: viewer should not crash anymore when loading a second asset after a first asset with bones
- deactived invalid animation filtering for the moment


git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@213 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2008-11-01 14:18:13 +00:00
aramis_acg 99e92472fc Fixed shift warning in irrxml.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@212 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2008-11-01 11:31:03 +00:00
ulfjorensen 6b02833561 - fixed stupid little bug in the SceneAnimator - does not crash anymore on animations with empty tracks
- reverted matrix operations to what I think is the correct matrix sequence. Skinned meshes still not working, though
- fixed a strange runtime exception in the irrlicht mesh loader

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@211 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2008-10-31 23:17:43 +00:00
aramis_acg a7088d6263 Rewrote 3DS loader to support BE - added temporary light & camera & animation support. few models not working anymore, transformation bug still unsolved.
Fixed normal vector handling in the ASE loader. Improved animation & camera & light support - as for the 3DS Loader, still in the works.
Fixed AC - Loader. It is now able to load models with complex hierarchies correctly. Added a small workaround for Quick3D, which writes invalid AC files.
DXF-Loader skips {...} blocks produced by 3DS Max & AutoCad correctly now.
DefaultLogger doesn't repeat identical log messages now.
FindInvalidData-Process removes empty or dummy animation tracks now.
LWO-Loader recognizes complex shaders (such as Fresnel) correctly now. Other LLWO bugs still unsolved.
Fixed bugs in the Ply parser, causing non-triangular faces to crash.
Added some additional helperutilities to StreamReader.
Fixed a bug in ProcessHelper.h causing SPlitLargeMeses and SortBxPType to crash for meshes containing many bones.
Changed OB default material from black to gray.
Added additional test fils: ply (bugfix), ase (animation), QUick3D & Irr (in the works), STL (export from 3DS Max)

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@210 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2008-10-31 19:32:00 +00:00
alil 2888a1099e fixed BE problems in MDLLoader MD1,3,5 (I think 1-6, but there are no test examples) now work on BE systems.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@209 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2008-10-30 22:42:35 +00:00
ulfjorensen bed30a9b92 - fixed upload of skinning matrices to the shader.
- VC9 project files updated.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@208 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2008-10-30 20:41:01 +00:00
aramis_acg e1261bb9fe Small viewer fixes, at least something is visible now.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@207 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2008-10-30 19:51:01 +00:00
ulfjorensen 9f92c7098e - further works on the viewer's way to animation country. Now really fucked up, but Aramis is going to help me fix it.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@206 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2008-10-30 12:49:28 +00:00
alil cfeb8b2b2a added include <map> as the std::map is needed in this file
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@205 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2008-10-29 22:29:07 +00:00
alil 740e22d313 removed bad be code in validate header
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@204 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2008-10-29 22:19:14 +00:00
ulfjorensen 730b77c68e - removed implementation headers from the public interface
- corrected a few places that did not include those headers by other means
- Bugfix: SkeletonMeshBuilder should now finally work correctly when skipping invalid node connections

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@203 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2008-10-29 22:02:00 +00:00
ulfjorensen 7101c33401 - further changes to add dummy animation support to the viewer. Still under heavy construction, bone meshes are not rendered correctly with this version at the moment. I'm sorry. Will be fixed soon.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@202 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2008-10-29 17:08:03 +00:00
alil ef3cd69ae6 worked on getting assimpl compiled on BE
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@201 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2008-10-28 23:18:06 +00:00
aramis_acg e9dc280739 Fixed linker error reported by PuMI causing the DLL build to fail.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@200 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2008-10-28 12:05:11 +00:00
ulfjorensen d618a57428 - Bugfix again: SkeletonMeshBuilder avoids validation warning for empty bones now.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@199 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2008-10-27 22:22:05 +00:00
ulfjorensen 093fa3377f - Bugfix: SkeletonMeshBuilder does not create invalid faces anymore for child nodes at local position (0, 0, 0)
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@198 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2008-10-27 20:27:05 +00:00
aramis_acg 3d3b9719f8 Fixed third-person camera movement bug in the viewer.
Fixed a bug that caused the viewer to render "random" polygons in some special cases. 
ASE: Added parsing support for *GROUP nodes. Improved light & camera handling (still WIP). Fixed a bug that was caused by a recent change. Improved logging.
Updated PretransformVertices. The step works now (and supports line and point meshes). Important: The position of the step in the pipeline has changed. No unit test yet.
Minor fixes to SortByPType. Added a config option that allows users to specify which primitive types they don't need. 
Added WIP version of an Irrlicht Scene Loader (.irr).
Added a small helper class ("BatchLoader") to make it easy for loaders to load subsequent meshes from external files (needed for irr and lws).
Added test models for IRR. Added dwarf.x from the Irrlicht repository (readme included) to the test X files.
[Current TODO: Fix bugs in: AC, 3DS, LWO. Finish MDR and OG. Implement: IRR, LWS. Write some more ut's ... ]

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@197 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2008-10-27 00:36:26 +00:00
ulfjorensen a62b94079f - Removed Boost_MultiArray-Remake
- Fixed rotation matrix to quaternion conversion, hopefully final this time.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@196 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2008-10-26 18:58:34 +00:00
aramis_acg 67be21715d Added a huge 'at the moment not working, sorry' mark to all build configs we don't maintain in the current development phase.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@195 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2008-10-25 09:01:40 +00:00
aramis_acg ce6ce098e9 Removed aiProcess_FindDegenerates from the viewer. The step seems to cause some problems that have not yet been solved.
Added irrmesh (Irrlicht Mesh Format) loader to Assimp. Works quite stable, but no lightmapping support yet.
Removed tinyxml, replaced it with irrxml instead. Added an IOStreamToIrrXML wrapper.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@194 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2008-10-24 20:37:54 +00:00
aramis_acg 44ea300651 Added irrmesh test files.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@193 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2008-10-24 20:04:43 +00:00
aramis_acg 383a614931 Fixed some minor issues in the AC loader. However, it still crashes with large and complicated models. Line handling is complete.
Moved the code to find degenerated primitives to a separate step that is not anymore active by default. 
The FindInvalidData-Step isn't active by default now. It hast a flag and must be explicitly requested.
Added line and point handling code to the CalcTangentsStep - not yet tested.
Added support for the Sense 8 (WorldToolKit) NFF file format. The format uses the same file extension as the "Neutral File Format" (and is implemented in the same loader). Seems to work well, added test files for it.
Added itoa10 function - so we have itoa on all platforms.
Small optimizations in the SortByPType step.
Fixed the material validation: textured meshes without uv coords cause a warning now.
Fixed a minor isses with the OFF loader.
Added empty unit tests for the new steps - to be filled in the next days. 
Added SceneCombiner.cpp. It contains utilities to join meshes and scenes. The latter will be needed by the LWS loader (LWS files contain references to external LWO files and the LWO loader is already to complicated that it would make sense to add an additional code path to it). Mesh joining is needed by some pp steps, but the code has not yet been moved to its new location.
Added WIP light & camera support to the ASE loader. Works for the moment, but there's much missing. ASE parser refactored, the code is still quite long but at least cleaner. Fixed a bug that caused ASE to import invalid texture coordinates.
Makefiles and VC8 solution are up-to-date. The rest isn't.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@192 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2008-10-22 20:06:16 +00:00
ulfjorensen 013ff599a5 Dummy animation support for AssimpView - work in progress. Uses boost in a new way, just because I can.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@191 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2008-10-22 15:36:54 +00:00
aramis_acg de476178cd Added cast to unsigned long in PretransformVertices.cpp. Hopefully this fixes the compiler issues with GCC4 on linux.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@190 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2008-10-20 11:21:45 +00:00
ulfjorensen 8271164d74 - Further work at the BVH loader. Still work in progress.
- Added a helper class to build a mesh for a meshless node hierarchy

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@189 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2008-10-19 21:44:12 +00:00
aramis_acg a34378934d Fixed a minor problem with the vertex format hash in the PretransformVertices step. Remember, the step seems still to swizzle materials in some cases.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@188 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2008-10-19 21:26:52 +00:00
aramis_acg 094ed7b9c0 Added missing pointer to NULL assignment in PretransformVertices.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@187 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2008-10-19 21:17:01 +00:00
alil c0148c090f fixed some linux issues
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@186 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2008-10-19 19:51:24 +00:00
aramis_acg 2da2835b29 Fixed bug in the AC loader causing lines to load incorrectly. Seems to work now.
Added some more essential includes to AssimpPCH.hAdded support for line and point meshes to most steps - I did nto yet adapt all unit tests, so meshes with mixed primitive types are not absolutely safe at the moment.
Added camera and light support to the PretransformVert step. Fixed some small inaccuracies and fixed a bug reported by Mark Sibly causing all transformations to be invalid. However the step is nto yet completely correct, there are still some small artifacts.
Updated light and camera data structures, added temporary validation code for the
Renamed AI_SCENE_FLAGS_ANIM_SKELETON_ONLY to a more generic AI_SCENE_FLAGS_INCOMPLETE flag.
Fixed bug in the OFF loader causing meshes with polygons to crash
Added line support to the DXF loader - seems to fail for the moment cause of SortByPType.
Added support for lights and cameras to NFF, implemented another NFF format subtype (file starts with 'nff'). Implemented NFF 'tpp' chunk and a corresponding texture extension.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@185 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2008-10-19 11:32:33 +00:00
aramis_acg 3aecad406c Added DXF test file containing lines
Added Cube.off, an off files that contains more than 3 idxs per face. It crashes at the moment, but my current revision here is able to load it.


git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@184 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2008-10-18 22:52:05 +00:00