Commit Graph

4688 Commits (ee56ffa1f1ba6311707a2f3894b37c0764281d08)

Author SHA1 Message Date
aramis_acg 1a1d611038 Fix overall MATKEY_UVTRANSFORM usage to use the provided AddProperty specialization for aiTextureTransform.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@673 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-04-11 23:03:30 +00:00
aramis_acg 84f576c177 Or, even better, use the existing specialization of AddProperty for aiUVTransform.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@672 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-04-11 22:58:26 +00:00
aramis_acg 0aeff6179b Fix AC loader accidentially pulling in undefined contents right after the aiUVTransform it tries to add as material property.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@671 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-04-11 22:56:54 +00:00
aramis_acg 4f50c04347 Add shared_array to vc8 solution.
Fix shared_xxx::operator=.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@669 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-04-11 02:52:27 +00:00
aramis_acg 630005619b Add missing boost workaround files to CMakeLists.txt.
Boost workaround's shared_xxx stuff now matches boosts documented API.
Add shared_array.hpp to boost workaround (forgot to commit it when I added shared_ptr.hpp).

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@668 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-04-11 02:46:52 +00:00
aramis_acg d86314d02e Fix missing throw() declaration to silence g++.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@667 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-04-11 02:29:46 +00:00
aramis_acg 875b7f9ca2 AllocateFromAssimpHeap: add overload for nothrow-new.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@666 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-04-11 02:14:52 +00:00
aramis_acg 33544456cd Assimp-cmd now compiles fine using vc9 with a noboost target.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@665 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-04-11 01:54:46 +00:00
aramis_acg 01a25c1fb4 Get rid of ./extra folder in ./code. Move contents to main code folder.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@664 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-04-11 01:41:24 +00:00
aramis_acg f816066668 Add d3dx dlls to installer script.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@663 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-04-10 22:57:52 +00:00
aramis_acg 42aa8c5f39 Add sample logic for MATKEY_UVWSRC to doc.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@662 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-04-10 20:03:26 +00:00
aramis_acg 7cea2eb497 Change date in license header to 2006-2010. This involves updating quite a few files, sorry.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@661 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-04-10 15:30:22 +00:00
aramis_acg 1d595e14ad AssimpView-Build: SVNRevision is no longer doubly defined and the corresponding warning is gone.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@660 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-04-10 15:07:00 +00:00
aramis_acg bcf0ddc086 - don't delete the null logger.
- don't leak LogStreamInfo when detaching streams from DefaultLogger.
- detach the stream before deleting it in aiDetachAllLogStreams.
Thanks to Bart Botta for the patch.

- DefaultLogger does not properly delete log streams if they're still attached to it when the logger is destroyed. This is the behaviour specified in the documentation.
- Adapt AssimpView's logger usage, which didn't follow the spec as well.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@659 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-04-10 15:00:36 +00:00
aramis_acg 616bd39b6f Fix: don't use std::back_inserter to append to a sequence when push_back does the job as well. back_inserter would need to include <iterator> to be truly portable.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@658 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-04-09 20:58:41 +00:00
aramis_acg b10315e2df shared_ptr: Add missing conversion to bool.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@657 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-04-06 11:46:49 +00:00
aramis_acg 9a8de06e3a Assign dummy names to COB materials.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@656 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-04-06 00:55:12 +00:00
aramis_acg d1bebeba8e remove dynamic_cast's from COB loader.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@655 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-04-06 00:34:23 +00:00
aramis_acg a391303910 Fix non ISO compliant use of ternary operator.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@654 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-04-06 00:27:46 +00:00
aramis_acg 4d2d4a64e0 Fix non ISO compliant use of ternary operator.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@653 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-04-06 00:26:27 +00:00
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 0fb732de91 Fix crash when trying to load MDL files produced by the half life engine. This sub format is actually not supported, but the attempt to reject it was a crash.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@650 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-04-05 19:50:25 +00:00
aramis_acg 11f5a3cec5 vc8: Fix debug-x64 output&intermediate directories.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@647 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-04-05 00:26:45 +00:00
aramis_acg d0c49d05b0 Update mkfinal script to build ZIPed releases.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@646 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-04-04 20:25:56 +00:00
aramis_acg 75c1cc3edd Fix version number in assimpcmd and assimpview.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@645 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-04-04 15:47:46 +00:00
aramis_acg 29935e2138 Set overall version to 1.1.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@644 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-04-04 14:19:33 +00:00
aramis_acg 313ece9a85 Installer now includes runtime redistributable. 64 Bit support enabled. Add dummy readme and instructions how to build the installer using Inno Setup.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@643 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-04-04 14:18:48 +00:00
aramis_acg 418033eb60 Change doc version number to 1.1, rebuild CHMs.
Add missing docs for the newer assimpcmd utilities.
(fix path to html workshop in doxygen scripts to make 'em work on my machine :-)

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@642 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-04-04 10:03:41 +00:00
klickverbot 1d0e6b73fe [D] Folded in minor aiAnimation documentation update.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@641 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-04-03 15:50:36 +00:00
aramis_acg 29c54dc69d Inno setup script does now set proper version on the generated executable.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@640 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-04-03 03:45:00 +00:00
aramis_acg 2f691e66b5 Commit updated script for inno setup (the one I used to build the rc package).
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@639 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-04-03 02:32:05 +00:00
aramis_acg 5c027a1c3c Remove old noboost folders.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@638 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-04-03 01:47:47 +00:00
aramis_acg 3a376dcab2 Update year in LICENSE (seemingly we have 2010 now).
Clarify license for models in the test repository.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@637 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-04-03 01:04:35 +00:00
aramis_acg b321270e88 Add graphical SDK installer for Windows using Inno Setup.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@636 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-04-03 01:01:56 +00:00
aramis_acg 6db8987248 Fix shared_ptr workaround.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@635 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-04-02 23:41:20 +00:00
aramis_acg f9b4a825aa COB loaders should now read most binary files as well.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@634 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-04-02 23:25:52 +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 bb5aca8a17 Add TinyFormatter, a convenience wrapper around std::stringstream's, intended to replace boost.format.
Fix non-standard friend declaration in noboost/shared_ptr.
Deprecate boost.format workaround.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@632 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-04-02 00:17:58 +00:00
aramis_acg 4bb7cbb422 Add boost.shared_ptr workaround.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@631 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-04-01 20:25:07 +00:00
adario 7877f3fe6f Fixed a pathname separator issue on Mac OS X.
Class FileSystemFilter was sometimes using a backslash as pathname separator even on Mac OS X, where that character is not allowed in pathnames.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@630 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-03-31 14:20:25 +00:00
aramis_acg a84774cbe2 Increase OBJ loader static working buffer size to 4096 to avoid huge lines being cropped.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@629 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-03-30 12:13:40 +00:00
jonathanklein 61fb6cf3f1 -small Bugfix in Ogre Animation Loading, still not fully functional, but a bit better now
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@628 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-03-24 21:26:31 +00:00
aramis_acg ce71d7c775 Remove ambiguous note on wildcards from assimp_cmd doc.
Add documentation page for 'assimp cmpdump'.
Rebuild doc for assimp_cmd.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@627 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-03-23 18:53:44 +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 63d6ca8669 FIX: AseLoader is no stateless and can thus be called repeatedly.
Shut up gcc in LWOMaterial.cpp by adding an assertion, not all enumeration values handled.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@625 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-03-23 18:22:45 +00:00
aramis_acg c58dcee5b9 Add 'testbatchload' verb to assimp_cmd. It expects a list of input files and loads them all. This is intended to test reusability of a single importer. Not mentioned in doc.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@624 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-03-23 18:16:22 +00:00
adario ef71f3dba7 Fixed a polygon type issue in the LWOLoader.
LightWave polygons of type 'BONE' and 'SUBD' (animation bones and subdivision surfaces) were not being processed at all, sometimes resulting in empty meshes.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@623 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-03-19 23:35:29 +00:00
aramis_acg 22ec6b0c1f Remove typo from CMakeLists
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@622 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-03-19 22:37:29 +00:00
jonathanklein 25416b494f further work at Ogre Importer:
- split some code to OgreImporterMaterial.cpp
- Animation keys now are absolute, like required
- WorldToBoneSpace is now BoneToWorldSpace (hence we compute the inverse and the variable is renamed)

Animations still don't work really, so this version has basically no new features

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@621 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-03-19 20:45:40 +00:00
jonathanklein fb666493ad - small documentation improvements
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@620 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-03-19 20:26:43 +00:00