9f951857de
Fix non-standard use of friend in tuple replacement. https://sourceforge.net/projects/assimp/forums/forum/817654/topic/3735078
...
Disable PCH for unzip files now for the whole build matrix.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@758 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-06-24 10:49:39 +00:00
3adce87c5c
- Made it mostly compile again
...
- Updated VC9 project files
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@756 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-06-21 17:28:02 +00:00
f017b5a4a4
- FEATURE : First version of PK3 format loader.
...
- FEATURE : First prototype of Quake 3 BSP format loader.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@755 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-06-18 17:36:46 +00:00
ca645a493c
MDL loader now checks for magic bytes even if the file extension is .mdl.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@754 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-06-11 14:38:31 +00:00
2e909b35d8
Bugfix: Collada node instances are correctly loaded and resolved now.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@752 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-06-07 14:02:56 +00:00
a9161ede18
Bugfix WIP: collada instanced nodes, still working on it.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@751 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-06-04 14:36:41 +00:00
219f9fadc6
Bugfix: removed misuse of "static" attribute preventing multithreaded usage of the importer
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@750 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-06-04 14:05:06 +00:00
c38c91d28d
Bugfix : Fixed not ANSI character in comment.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@746 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-05-30 18:35:55 +00:00
f3310b0f36
BUGFIX : Fix handling of multiple materials per object definition in Obj-Loader.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@745 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-05-30 12:45:38 +00:00
31ff5d27eb
fix: colladaloader is now a bit more tolerant to empty top-level (library) elements. See https://sourceforge.net/tracker/index.php?func=detail&aid=3008871&group_id=226462&atid=1067632
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@744 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-05-29 20:53:42 +00:00
dc3218b08a
adding some #ifndef SWIG for swig processing
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@743 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-05-27 18:30:28 +00:00
053d606a21
blenderloader now skips over common name prefix, such as OB for objects, MA for materials, ME for meshes, ...
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@739 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-05-26 00:39:04 +00:00
1b87557fd1
update to zlib 1.2.5.
...
blenderloader now reads gzip compressed files.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@737 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-05-26 00:21:07 +00:00
9d978918d1
colladaloader now skips over empty data arrays.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@736 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-05-25 14:37:28 +00:00
188aa3da37
blender loader now reads basic material colors and even simple textures, be them embedded into the BLEND file or not.
...
adding some test files.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@735 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-05-24 01:24:18 +00:00
cd301ff090
collada loader now longer fails if the accessor type attribute comes before the accessor name. Thanks to Christopher Dissauer to point it out ( http://sourceforge.net/projects/assimp/forums/forum/817653/topic/3716168 ).
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@733 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-05-21 22:47:31 +00:00
3cf20b605d
blender loader now loads material assignments.
...
blender loader no longer produces randomized output in some scenarious. nice side effect of less asthetic diversity: less segfaults.
assimpview is no longer topmost.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@732 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-05-21 22:39:31 +00:00
367a452ed9
colladaloader: fix <extra> handling.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@730 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-05-20 13:41:03 +00:00
b9b4ea177b
MS3D loader now uses aiMesh::mName to express the original group names from the MS3D file.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@729 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-05-20 12:19:05 +00:00
7f4cc4ca60
collada loader no longer sets default wrapping mode to MIRROR. See https://sourceforge.net/projects/assimp/forums/forum/817653/topic/3714378
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@728 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-05-20 12:09:22 +00:00
f9b06f8d89
3ds loader now sets aiMesh::mName according to the original mesh groups found in the file.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@727 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-05-20 12:07:04 +00:00
6e133a6cd9
- Fixed compilation for some targets
...
- Removed BOOST_FOREACH usage in ColladaParser::ReadPrimitives() because they seem to cause problems in NOBOOST builds
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@726 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-05-18 12:20:09 +00:00
a44e065f58
fix some issues with Assimp_itoa10.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@725 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-05-14 12:27:29 +00:00
a22e44f94d
- BUGFIX :: Fix typos in doxygen documentation.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@723 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-05-13 15:55:35 +00:00
3b35e4e3b8
- REFACTORING : Replace an assert by an ai_assert-statement.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@722 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-05-13 15:50:42 +00:00
55bdc6db63
Ogre: Use explicit qualification for boost stuff to avoid potential tr1 conflicts with vc10. Thanks to Krishty to point it out. Use TinyFormatter instead of boost::format.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@721 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-05-10 21:06:44 +00:00
261f49c468
Add mName member to aiMesh.
...
JoinVerticesProcess and SortByPType copy the mesh name to all clone or sub meshes they create.
JoinVerticesProcess' verbose output now prints mesh name, no longer using sprintf (TinyFormatter's age has come).
WARN: This is a public API change (not a breaking one, however).
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@719 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-05-10 13:59:29 +00:00
35f6851dba
fix gcc warning: can't pass non-POD through ...
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@718 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-05-10 10:39:43 +00:00
32bfa9ac21
Add WIP version of the BLENDER importer. DO NOT USE FOR PRODUCTION YET!
...
Loads static meshes. Sometimes (it segfaults on the rest). No materials, cameras, fancy stuff. Works with all versions of blender. No compressed blend files yet.
- StreamReader now uses shared_ptr's to manage ownership of the stream.
- Adapt other loaders accordingly.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@717 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-05-10 10:22:24 +00:00
1928dc7df7
fix shared_ptr and shared_array implementation. add pointer_cast facility.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@716 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-05-10 10:18:54 +00:00
0b01eb472b
Add copyright headers to Ogre units.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@713 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-04-30 07:15:08 +00:00
c224dfaf81
[2994288] AI_BE / AI_LE macros - Thanks to mick-p for the patch.
...
Add shared_ptr to pch includes.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@712 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-04-30 07:11:06 +00:00
1748e38753
FIX: gcc complains because binding a packed field to a normal reference is not permitted.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@707 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-04-26 12:27:36 +00:00
a53360aa4d
FIX: Change quaternion orientation for B3D loader (this format was forgotten with r502).
...
FIX: MS3D loader assigns group names to mesh nodes, possibly leading to two nodes with the same name if a group name is the name of a bone as well. This prevents animations from working properly.
These changes are merged with the 1.1 branch as well.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@705 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-04-24 00:18:34 +00:00
a85b851442
- Multiple Submeshes are loaded now
...
- In standard materials the colors are now loaded
- not excessively tested, but it should work
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@704 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-04-19 17:50:52 +00:00
0695775bc4
Comment unknown pragma for it raises a warning (this may be intentional, but nevertheless I find it annoying).
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@702 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-04-17 21:36:13 +00:00
99e5cbcbe0
Add deprecation note to legacy makefiles in code.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@698 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-04-17 18:41:22 +00:00
5685312fe0
- PoseToKey Matrix is computed just computed when it changes
...
- VertexWeights will be normalized to 1
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@686 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-04-16 19:10:09 +00:00
1bcd29d704
Fix: OgreImporter relies on non ISO std::exception c'tor.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@684 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-04-15 10:35:15 +00:00
685d2b83c5
Fix error in aiString documentation. MAXLEN includes the terminal NULL. This is unusual, but true.
...
Fix overflow vulnerability in SceneCombiner. Thanks to Krishty to point it out.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@683 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-04-14 21:45:00 +00:00
6a2a542986
Remove invalid character from string literal in code/MDLLoader.cpp (^2 actually).
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@682 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-04-14 21:18:16 +00:00
0d3490c00c
Fix: scene validation forgets to validate aiScene::mTextures.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@678 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-04-13 21:06:03 +00:00
906c45eeeb
Fix: qnan detection code. Appearently I fooled myself when I wrote this.
...
Fix: MDLLoader does not reset texture array properly when textures are substituted by plain colors. This caused crashes in ~aiScene or heap corruption.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@677 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-04-13 17:34:55 +00:00
da87178a25
Fix: OgreImporter overflows a vector if no weight assignments are given.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@676 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-04-13 15:51:18 +00:00
35c97d169e
Fixed camera FOV computation in the ColladaLoader.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@675 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-04-13 15:45:18 +00:00
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
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
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
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
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
ulfjorensen
kimmi
rave3d
jonathanklein
adario