Commit Graph

2027 Commits (c4021fbaafff951fab9258e6bf834ba77a565839)

Author SHA1 Message Date
Madrich c4021fbaaf Fix Collada export validated by Schema 2014-06-09 15:17:45 +02:00
Madrich 77cec96d74 Fix collada 2014-06-07 21:17:31 +02:00
Madrich ec2ce90654 Add Scene Author + AuthorTool
Add XFileExporter
Add Collada Triangle+Line export
Fix Obj Comment
2014-06-06 01:56:54 +02:00
Madrich 9ddd459fe8 Extend Collada Exporter using lines and triangles 2014-05-31 12:50:11 +02:00
Alexander Gessler 84eb1930ea Merge pull request #291 from jonnenauha/dev
Fixes for #284 and #290
2014-05-31 03:02:47 +02:00
Jonne Nauha 199d455261 Make aiMatrix4x4t ctor that takes in pos, rot and scale take in const refs. Fixes #284. 2014-05-30 02:01:29 +03:00
Jonne Nauha fe87b09246 Move pstdint.h for <= VC9 under include. Apps that include the Assimp headers need to have this available, as its pulled in by metadata.h. Fixes #290. 2014-05-30 01:57:21 +03:00
Alexander Gessler 340b94f9a5 Merge pull request #287 from arkeon7/master
Correction on FBX material texture UV index
2014-05-28 17:05:19 +02:00
arkeon 3acf60f5d7 Correction on quaternion initialization values
a 0 0 0 0 quaternion is not valid
2014-05-27 11:26:55 +02:00
arkeon b2ac7b878f Correction on FBX material texture UV index
(keep the previous method for "allMaterials" option, this should be change too since the materials indexes used are not the good ones, or just remove the object / material test
2014-05-27 09:11:27 +02:00
Alexander Gessler 62554a055d Merge pull request #285 from jdduke/blend_fix_mirror_winding
Properly orient mirrored blend mesh faces
2014-05-25 01:34:52 +02:00
Jared Duke d9b65f9bd8 Properly orient mirrored blend mesh faces
If the mirrored axis count is odd, the face orientation has logically
been inverted.  In such cases, the winding order should be inverted as
well, easing the burden on applications sensitive to index ordering
(e.g., one-sided renderers) to detect and fix such issues after import.
Add this functionality for .blend meshes.
2014-05-24 08:49:33 -07:00
Alexander Gessler ecbf09ed8c Update CREDITS
Add jonnenauha to CREDITS, update description
2014-05-22 18:04:05 +02:00
Alexander Gessler e498819b12 Readme: add ogre binary format 2014-05-22 18:00:02 +02:00
Alexander Gessler ebb7eaaa55 Update Readme.md 2014-05-22 17:49:02 +02:00
Alexander Gessler 1b6b238f09 FBX: fix handling of string metadata. Before, we would accidentially confuse aiString and std::string and trigger a debug assertion. 2014-05-22 16:22:38 +02:00
Alexander Gessler becd298e77 FBX: use memcpy() instead of reinterpret_cast or union to populate a float from a blob, causing SIGBUS errors on Android due to memory alignment of the source blob not being a multiple of 4/8. This fixes #24. 2014-05-22 16:17:42 +02:00
Alexander Gessler e0aafb5733 Merge pull request #280 from jonnenauha/ogre-binary
Ogre binary format support
2014-05-21 15:38:35 +02:00
Jonne Nauha b651420d7f .gitignore: Add stuff to the ignore list if one happens to build in the root and not in /build. This is atm kind of mandatory if you want the regression tests to find your binary. 2014-05-21 05:47:35 +03:00
Jonne Nauha 4f82b02958 Regression tests: Fix finding aassimp.exe on VC9 default build. Look for x86 executable if x64 is not found. Create dump output dir if does not exist (broke the script). Report where assimp.exe was looked in. Add todos for ignoring multi dot extensions from test like .skeleton.xml. Rebuild ds.zip via gen_db.py, success rate went from 40% to 99%. Seems these were not updated in a while (2-3 years :). 2014-05-21 05:41:26 +03:00
Jonne Nauha 8a5041ea11 Merge remote-tracking branch 'upstream/master' into ogre-binary 2014-05-21 04:55:09 +03:00
Jonne Nauha 6ba2a8bce9 OgreImporter: Add the new set of test assets from the Ogre3D SDK samples. Included Ogre3D license and a readme that explains in detail where they were copied and what modifications were done to them post copy. 2014-05-21 04:52:00 +03:00
Jonne Nauha 2696de527d OgreImporter: Remove old Ogre test assets from test/models-nonbsd/Ogre. These will be replaced by a proper set of assets that will test all functionality in both binary and xml form + materials. 2014-05-21 04:40:32 +03:00
Jonne Nauha 43e620e04a OgreImporter: Fix UV flip for binary meshes. Fix exception XML parsing when positions are declared in a previous vertex buffer than the currentl parsed one (that has eg. UVs). Remove debug prints from material parser. 2014-05-21 04:37:45 +03:00
Jonne Nauha f8e1dcb102 OgreImporter: Mirror bool return for XmlSerializer as it is in BinarySerializer. Document its meaning. 2014-05-21 04:06:22 +03:00
Jonne Nauha 1129ae5a6e OgreImporter: Implement binary skeleton serialization. Fix bone/animation matrix stuff to be simpler (aka read as Quats to internal structures). Cleanup code for pull request. 2014-05-21 04:00:11 +03:00
Jonne Nauha cf9b705829 OgreImporter: Move skeleton functions to the end of file (after mesh functions). Put all constant to same place in the file. Implement support for 'animationlinks' (skipped) and bone 'scale' (read to Bone but not utilized atm). 2014-05-21 00:09:30 +03:00
Jonne Nauha 0b937c5a4b OgreImporter: Proper rewrite of the XML parser to OgreXmlSerializer. Now more robust for XML sources, previously had hardcoded expectations on the child node ordering. Implement common Skeleton class for both binary and xml serialization. Implement shared IVertexData with proper bone assignment to Assimp bone weights functionality. 2014-05-20 04:52:53 +03:00
Alexander Gessler 279a97872a Merge pull request #279 from terziman/master
Fixed bug during compilation with mingw
2014-05-19 19:27:10 +02:00
Léo Terziman e7e0a5a090 Fixed assimp_cmd version message 2014-05-19 14:56:39 +02:00
Léo Terziman 311f5b47ca Fixed bug during compilation with mingw & improved git revision support for automatic up to date revision number. 2014-05-19 14:36:24 +02:00
Jonne Nauha 75598f69b7 OgreImporter: Format code and move commented verbose debug logging behind internal OGRE_BINARY_SERIALIZER_DEBUG. Thow deadly importer error on clear invlid mesh file errors. 2014-05-18 12:30:16 +03:00
Jonne Nauha 4b16b182be OgreImporter: Implement Ogre binary mesh support (.mesh). All Ogre3D SDK media samples tested to work. Assimp repo does not yet have binary versions of Ogre meshes. 2014-05-18 11:57:44 +03:00
Alexander Gessler d531945888 Merge branch 'master' of github.com:assimp/assimp 2014-05-16 14:58:01 +02:00
Alexander Gessler 908b945f50 BoostWorkaround/shared_array and shared_ptr: fix checks for whether the boost originals are included already. Fixes #277 2014-05-16 14:57:33 +02:00
Kim Kulling 0f71d46c35 Merge pull request #276 from g-pechorin/master
lt operator for aiVector3
2014-05-14 21:35:48 +02:00
Peter LaValle 057a7ffe60 added a lt operator to the inline
added a lt operator to the inline, so that I can use aiVectors as stl keys and such
2014-05-14 14:16:53 +01:00
Peter LaValle 09fffac068 added a lt operator to the header
added a lt operator to the header, so that I can use aiVectors as stl keys and such
2014-05-14 14:16:49 +01:00
Kim Kulling 08bacc73a6 update: add ply example for ply importer. 2014-05-13 14:14:53 +02:00
Kim Kulling 36c08a0a7d Merge branch 'master' of https://github.com/assimp/assimp 2014-05-12 20:00:59 +02:00
Kim Kulling 52f3cd0afb update: add static build to CI.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-05-12 20:00:29 +02:00
Kim Kulling c5ba04cabf Merge pull request #274 from JamesLupiani/BinaryXFileFix
Fixes #158 via anonymous user
2014-05-12 19:57:50 +02:00
James Lupiani 427eaad642 Fixes #158 via anonymous user 2014-05-12 12:04:19 -05:00
Alexander Gessler 04f0075b63 Change default extension for binary STL exports from stlb to stl 2014-05-12 12:50:21 +02:00
Kim Kulling fb1c9ab86d bugfix: fix cexport API for c compilers. 2014-05-11 16:50:35 +02:00
Kim Kulling 9245469fb8 bugfix: fix invalid include path in find assimp macro for cmake. 2014-05-11 14:01:30 +02:00
Kim Kulling 22d026ac40 update: add asset importer lib cmake find macro. 2014-05-11 13:56:38 +02:00
Kim Kulling f6925db3d8 update: add cmake_mimimum_required statement to each cmake file
for consistency
2014-05-10 10:31:42 +02:00
Kim Kulling d5d9e59949 Merge pull request #270 from jonnenauha/redundant-material-fix
RemoveRedundantMaterials: Fix crash bug when unreferenced materials are removed.
2014-05-09 18:36:39 +02:00
Jonne Nauha eea8099b05 RemoveRedundantMaterials: Fix crash bug when unreferenced materials were destroyed. The logic only rebuilt the material list if there were redundant materials being removed. This is a clear bug as it left freed aiMaterial ptrs into the list and did not fix the scene->numMaterials to be correct, even when deleting materials. This crashed later on in the ComputeUVMappingsProcess that accessed the freed ptr. 2014-05-09 01:33:30 +03:00