Commit Graph

114 Commits (42aa8c5f39a45f4c0ed3e2076b1c134b447a1c86)

Author SHA1 Message Date
aramis_acg 3c03e0fca5 COB loader does now honour explicit chunk sizes. if none are given in a particular chunk, the loader reverts to the old behaviour.
COB loader converts textures properly now.
Add textured test files to confirm the previous issue.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@652 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-04-06 00:13:30 +00:00
aramis_acg 4c1b5a532d Add first WIP version of a TrueSpace loader. Currently only ASCII COB/SCNs are supported.
Add some fast_atof overloads to simplify calling it.
Add another convenience c'tor to aiColorMM.
Add COB test models.
Remove unreferenced member in B3D importer.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@633 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-04-02 04:17:05 +00:00
aramis_acg 24edb60955 Add a tiny test script to load all files in a test directory using one importer instance repeatedly.
Fix importer unit test, wasn't yet migrated to DeadlyImportError's.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@626 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-03-23 18:26:48 +00:00
aramis_acg 762a7df46a Revamp exception handling. ImportErrorException renamed to DeadlyImportError to avoid silent regressions. Exceptions now thrown by value, and caught by reference. Put guards in all C++ and C API functions to avoid unwanted exception propagation across module and language boundaries.
PLEASE TEST CAREFULLY IF THIS SHOULD CAUSE REGRESSIONS.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@617 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-03-18 17:00:12 +00:00
aramis_acg eff7bc9f73 Add jeep.3ds in milkshape format to test suite.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@612 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-03-16 21:54:27 +00:00
aramis_acg 6589ccc642 Add test file triggering a terrible buffer overflow in revisions prior to r609. Regression database not yet updated.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@611 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-03-16 00:12:33 +00:00
aramis_acg 8bb198e794 regression-suite: run.py now calls assimp with the -l switch
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@608 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-03-13 17:16:19 +00:00
aramis_acg b56f35c2b8 Rebuild regression database (vc8, fp:precise).
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@602 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-03-13 12:40:49 +00:00
aramis_acg f98e0925a7 Fix typo in utils.py
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@601 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-03-13 12:16:26 +00:00
aramis_acg 2d19e7cbbe Make regression suite scripts work on posix as well.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@600 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-03-13 12:13:53 +00:00
aramis_acg 30ca88e782 Add first version of regression suite (python parts only). Work in progress.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@597 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-03-12 23:56:10 +00:00
aramis_acg 8ab6bc8a26 - Fix: unittest suite now shutdowns the logging system correctly.
- Add alternative model+ppfx testing sequence to importertest.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@594 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-03-11 18:38:35 +00:00
aramis_acg e2daf37a39 - Fix http://sourceforge.net/projects/assimp/forums/forum/817654/topic/3591099.
- Add unit test to avoid ppfx-related issue with re-use of Importer's in future.
- X file loader now properly resets all of its members.
- OptimizeMeshes step now properly resets all of its member.
- Fix old (and already deprecated) makefile.mingw.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@593 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-03-11 18:24:54 +00:00
klickverbot ed41aa8ce1 Renamed CMake project to Assimp, as the semi-full name »AssetImporter« was used nowhere else.
Sorry, kimmi, if this was on purpose – feel free to revert.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@578 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-03-03 22:07:59 +00:00
klickverbot ac8479f542 Moved private headers to code/ as discussed; removed boost::random workaround which was no longer needed; CMake cleanup part two (Boost detection, …).
Please be quick to suspect this commit if the build should break on Windows/MSVC.

(Again, sorry for the large commit, but I didnt want to flood the commit log with my git-style tiny commits.)

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@577 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-03-03 21:48:23 +00:00
jonathanklein df9a4bf66c - New Ogre testmodel inclusive blend File
- Changed axes for location keys

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@574 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-03-03 15:50:32 +00:00
aramis_acg 5738860990 - Change BaseImporter::GetExtensionList to add all known file extensions to a std::set, so uniqueness is guaranteed. Also rewrite all related functions in Importer. NOTE: This does *not* change the public interface.
- FIX build error on vc8/release-noboost x64, ConvertUTF.c had wrong PCH settings.
- ADD knowext and listext verbs to assimp_cmd, add some raw docs.
- Update unit tests to reflect these changes. Currently I keep getting failures in some tests, this needs to be resolved *urgently*.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@567 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-03-02 17:38:01 +00:00
aramis_acg 707b06a7fe Add experimental MS3D loader, static meshes only at the moment.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@542 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-02-07 00:54:48 +00:00
aramis_acg 2e3fee99f0 ADD Vertex utility class to simplify conversion from and to interleaved vertices.
Refactor JoinVerticesProcess to utilize the new utility.
ADD basic operators for aiColor4D, move to dedicated header and implementation file.
ADD some utility functions to SpatialSort.
ADD my existing Catmull-Clark implementation to Assimp for all model formats with support for subdivision surfaces. Slightly WIP, likely to produce errors on non-closed meshes. Currently only implemented in the AC3D loader.
Switch to byteswap intrinsics instead of inline assembly (bswap). Currently MSVC only.
FIX phong shading in assimp_view.
VertexTriangleAdjacency class now also works on arbitrary polygons - UNTESTED, tbd.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@532 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-01-28 21:17:25 +00:00
aramis_acg 1452a7a83d FIX: ColladaLoader now ignores missing 'meter' attribute in Collada files produced by C4D. Adding a c4ddae test file. Thanks to Tobias Rittig to point it out.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@483 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-09-26 21:54:56 +00:00
jonathanklein 29bb83ebb6 - Meshs without UVs are now supported
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@479 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-09-17 19:05:46 +00:00
jonathanklein a8ccd6fbd5 Adding test models for ogre (not nice, because i made them myself)
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@475 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-09-05 10:49:36 +00:00
aramis_acg a251827cb9 Adding support for Unicode input files to most text file loaders (BVH and MD5 missing for now).
IrrXML receives memmapped UTF-8 input data now, it's own (faulty) conversion is not used anymore.
aiString's are explicitly UTF-8 now.
Slight refactorings and improvements.
Adding UTF-8/UTF-16 text files for ASE,obj,collada,ac3d. These contain various japanese/chinese character sequences.
Changing assimp_view's node view to display UTF-8 multibyte sequences correctly.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@469 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-08-21 22:49:58 +00:00
kimmi 82bb2313f0 - Add cmake buildfile for unitests ( currently no cppunit is part of the makefile ).
- Add cmake buildfile for assimp_cmd application.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@463 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-08-02 20:53:30 +00:00
klickverbot f0be9ad6f1 Renamed the texture files referenced by test/models/IRRMesh/cellar.irrmesh to the (lowercase) names which are stored in the model file.
This caused an error on case-sensitive operating systems like Linux.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@457 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-07-31 22:38:19 +00:00
aramis_acg adb4ab602e Adding Importer::ReadFileFromMemory to make Chromanoid happy.
Updating unit test suite to verify the newly added stuff for correctness.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@444 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-06-21 19:44:48 +00:00
aramis_acg 298babe1bb Adding two animated B3D test files. Thanks to the webmaster of psionic3D.co.uk for the permission to use them.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@435 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-06-05 16:36:16 +00:00
aramis_acg d881a16402 Logging functions are now available to C-Users, too. Cleaning up headers.
Changing spelling of some enums to camel.
Ply loader loads tristrips correctly now.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@425 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-05-28 11:32:54 +00:00
aramis_acg 077511b1a0 FIX: WaveFront MTL files will no line break at the end will now read properly.
Manually removing the line break from a test file for regression testing.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@418 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-05-09 23:54:16 +00:00
aramis_acg afcfdf27ea Fixing crash at Importer::IsExtensionSupported().
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@411 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-04-27 19:58:34 +00:00
aramis_acg d7b4dd6ae3 Adding very basic reading support for CSM (CharacterStudio Motion). No proper hierarchy reconstruction yet, just plain marker import.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@408 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-04-26 15:09:03 +00:00
aramis_acg 897a7f7ae3 - Adding a collada test file with two UV channels.
- Fixing ColladaLoader's error message if an UV set is invalid.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@401 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-04-23 18:46:25 +00:00
aramis_acg bd196ea318 - Changing LWO loader's VMAP selection strategy. Unassigned VMAPs (UVs and VColors) are now kept, if possible. Referenced VMAPs have higher priority so everything should be backward compatible.
- assimp_cmd writes vertex colors in 'Colors' elements now.
- assimp_cmd writes 'set=' attribute for UVs and vertex colors.
- Adding test files for the awesome new LWO capabilities.


git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@396 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-04-20 16:49:46 +00:00
aramis_acg 56ead5dd7e Fixing minor issues with RunUnitTestSuite.bat.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@384 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-04-11 12:28:05 +00:00
aramis_acg 825118b970 Adding bob.md5, a great skinned character made by Ken Beyer of http://www.katsbits.com.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@378 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-04-09 21:25:04 +00:00
aramis_acg 29c33760e4 Triangulation:
- FEATURE: Concave polygons are now triangulated correctly.
 - internal face order is ccw now, flipwinding part of converttolh flag
 - added test files for the various formats supporting such polygons

FindDegenerates: 
 - improved behaviour when processing polygons, more tolerant.

Obj: 
 - material files are now properly read using the given IOSystem 
 - redirecting some std::cerr calls to our logger 
 - spaces and tabs are now allowed at the beginning of a line 

Viewer: 
 - max smoothing angle for normals is set to 90 deg now

vc9-workspace 
 - added assimp_cmd, renamed some virtual folders to be sexier.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@374 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-04-02 15:16:01 +00:00
aramis_acg 48d768f15f LWO
- added workaround for LWOB's with ill-formed SURF chunks 
 - layer hierarchy is now correct
 - fixed & simplified transparency handling

FindDegenerates 
 - fixed seldom crashes with RemoveDegenerates=1. 


git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@369 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-03-26 22:05:56 +00:00
aramis_acg c2d8881549 General
- changing Assimp's coordinate system from RH z-up to RH y-up
 - fixing coordinate system for LWO, 3DS, ASE, MD5, MDL, B3D, IRR, IRRMESH 
 - converttolh moved to three separate steps -> flipuv, flipwinding, makelh

LWO 
 - fixing texture coordinate generation -> mapping axis is correct now 
 - fixing z-fighting bug

ASE 
 - fixing crash due to invalid normal setup 
 - fixing parenting bug 
 - code cleanup

IRR 
 - code cleanup
 - fixing placement of externally loaded meshes 

MDL 
 - fixing texture coordinate space

PLY 
 - cleanup 
 - two-sided maat property is now set 

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@366 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-03-15 00:40:30 +00:00
aramis_acg 7080ba231c General
- added Conjugate() and Rotate() to aiQuaternion
 - SkeletonMeshBuilder can now start hierarchy construction at a given node
 
MD5
 - MD5MESH and MD5 anim now working.
 - MD5ANIM files can be loaded without corresponding MD5MESHES
 - Config option to prevent automatic loading of MD5ANIMs 
 - WIP version of MD5CAMERA support.
 - added test files. No anim test file yet.

BHV
 - fixing formatting 

LimitBoneWeights
 - prints now statistics to the logging system 

Viewer
 - does now specify the LBW post-processing step.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@359 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-03-08 15:29:34 +00:00
aramis_acg 4bbc03332b General
- Added format auto-detection to most loaders
  - Simplified BaseImporter::CanRead() with some utility methods
  - improved fast_atof -> no overruns anymore. Fuck you, irrlicht.
  - added assimp_cmd tool to allow command line model processing. Mainly adebugging tool for internal purposes, but others might find it useful, too.
  - vc8/vc9: revision number is now written to DLL version header
  - mkutil: some batch scripts to simplify tagging & building of release versions
  - some API cleanup
  - fixing some doxygen markup (+now explicit use of @file <filename>)
  - Icon for assimp_view and assimp_cmd

3DS
  - Normal vectors are not anymore inverted in some cases
  - Improved pivot handling
  - Improved handling of x-flipped meshes

Collada
  - fixed a minor bug (visual_scene element)

LWS 
  - WIP implementation. No animations yet, some bugs and crashes.
  - Animation system remains disabled, WIP code
  - many test files for LWS, but most of them test the anim support, which is, read above, currently disabled.

STL
  - fixing a log warning which appears for every model
  - added binary&ascii test spider, exported from truespace

MD3 
  - Cleaning up output tags for automatically joined player models.


IRR
  - Fixing coordinate system issues. 
  - Instance handling improved.
  - Some of the reported crashes not yet fixed.

PretransformVertices
  - Numerous performance improvements.
  - Added config option to preserve the hierarchy during the step.

RemoveRedundantMaterials
  - Added config option to specify a list of materials which are kept in every case.

UNREAL
  - Added support for the old unreal data format (*.a,*.d,*.uc)
  - tested only with exports from Milkshape
  - more Unreal stuff to come soon



git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@356 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-03-05 22:32:13 +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 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 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 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
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 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 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