Commit Graph

  • 247f5cee3a Assimp_cmd: Drop malformed version spec from rc file. Alexander Gessler 2014-06-14 22:47:18 +02:00
  • 1c4a8e9017 Update doxygen documentation. Drop custom stylesheet. v3.1.1 Alexander Gessler 2014-06-14 19:00:09 +02:00
  • 8328f79b1e Drop VC solutions. Fixes #292. Alexander Gessler 2014-06-14 17:14:12 +02:00
  • 7bab8cd4d9 workaround: disable config for boost. Kim Kulling 2014-06-14 09:47:01 +02:00
  • 01057f6ef0 bugfix: assimp now deals with boost 1.55. Kim Kulling 2014-06-13 17:33:58 +02:00
  • 69570f675e Merge pull request #297 from gjaegy/master Alexander Gessler 2014-06-13 12:56:48 +02:00
  • 5efc0207f3 Merge branch 'master' of https://github.com/assimp/assimp Gregory Jaegy 2014-06-13 10:59:16 +02:00
  • 16ae05eeeb obj loader: added multiline support collada loaded: bug fixed when importing several files, whith one containing animation Gregory Jaegy 2014-06-13 10:56:10 +02:00
  • edc7a950c4 ReFix the stuff before Fix XFileExporter Normal Fix Collada (Triangle->Poly) Madrich 2014-06-11 00:41:18 +02:00
  • bd0c2835f8 Merge pull request #294 from treiguts/master Alexander Gessler 2014-06-10 22:24:08 +02:00
  • 8549e4b1b1 fixed OgreImporter compilation error with boost scoped_ptr EdgarsT 2014-06-10 19:58:02 +03:00
  • 272a59cd36 Fix convertToLH for uv coordinates Fix Collada export Fix XFile export Madrich 2014-06-10 13:14:41 +02:00
  • c4021fbaaf Fix Collada export validated by Schema Madrich 2014-06-09 15:17:45 +02:00
  • 77cec96d74 Fix collada Madrich 2014-06-07 21:17:31 +02:00
  • ec2ce90654 Add Scene Author + AuthorTool Add XFileExporter Add Collada Triangle+Line export Fix Obj Comment Madrich 2014-06-06 01:56:54 +02:00
  • e09d88fa59 bugfix: fix cmake static linkage option. Kim Kulling 2014-06-04 21:08:19 +02:00
  • 8b1a6ba920 Bump version number to 3.1 Alexander Gessler 2014-06-02 01:45:23 +02:00
  • 1403cabb71 FBXParser: fix compiler warning on double -> float. Alexander Gessler 2014-06-01 17:34:11 +02:00
  • 79d8e4c14a SimpleTexturedOpenGL/CMakeLists.txt: add path to DEVIL prebuilt library. Alexander Gessler 2014-06-01 17:33:50 +02:00
  • 9ddd459fe8 Extend Collada Exporter using lines and triangles Madrich 2014-05-31 12:50:07 +02:00
  • 84eb1930ea Merge pull request #291 from jonnenauha/dev Alexander Gessler 2014-05-31 03:02:47 +02:00
  • 199d455261 Make aiMatrix4x4t ctor that takes in pos, rot and scale take in const refs. Fixes #284. Jonne Nauha 2014-05-30 02:01:29 +03:00
  • 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. Jonne Nauha 2014-05-30 01:57:21 +03:00
  • 340b94f9a5 Merge pull request #287 from arkeon7/master Alexander Gessler 2014-05-28 17:05:19 +02:00
  • 3acf60f5d7 Correction on quaternion initialization values a 0 0 0 0 quaternion is not valid arkeon 2014-05-27 11:26:55 +02:00
  • 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 arkeon 2014-05-27 09:11:27 +02:00
  • 62554a055d Merge pull request #285 from jdduke/blend_fix_mirror_winding Alexander Gessler 2014-05-25 01:34:52 +02:00
  • d9b65f9bd8 Properly orient mirrored blend mesh faces Jared Duke 2014-05-24 08:41:33 -07:00
  • ecbf09ed8c Update CREDITS Alexander Gessler 2014-05-22 18:04:05 +02:00
  • e498819b12 Readme: add ogre binary format Alexander Gessler 2014-05-22 18:00:02 +02:00
  • ebb7eaaa55 Update Readme.md Alexander Gessler 2014-05-22 17:49:02 +02:00
  • 1b6b238f09 FBX: fix handling of string metadata. Before, we would accidentially confuse aiString and std::string and trigger a debug assertion. Alexander Gessler 2014-05-22 16:22:38 +02:00
  • 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. Alexander Gessler 2014-05-22 16:17:42 +02:00
  • 274a6ce1ff Fixed space Léo Terziman 2014-05-21 15:59:13 +02:00
  • e0aafb5733 Merge pull request #280 from jonnenauha/ogre-binary Alexander Gessler 2014-05-21 15:38:35 +02:00
  • 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. Jonne Nauha 2014-05-21 05:47:35 +03:00
  • 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 :). Jonne Nauha 2014-05-21 05:41:26 +03:00
  • 8a5041ea11 Merge remote-tracking branch 'upstream/master' into ogre-binary Jonne Nauha 2014-05-21 04:55:09 +03:00
  • 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. Jonne Nauha 2014-05-21 04:52:00 +03:00
  • 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. Jonne Nauha 2014-05-21 04:40:32 +03:00
  • 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. Jonne Nauha 2014-05-21 04:37:45 +03:00
  • f8e1dcb102 OgreImporter: Mirror bool return for XmlSerializer as it is in BinarySerializer. Document its meaning. Jonne Nauha 2014-05-21 04:06:22 +03:00
  • 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. Jonne Nauha 2014-05-21 04:00:11 +03:00
  • 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). Jonne Nauha 2014-05-21 00:09:30 +03:00
  • 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. Jonne Nauha 2014-05-20 04:52:53 +03:00
  • 279a97872a Merge pull request #279 from terziman/master Alexander Gessler 2014-05-19 19:27:10 +02:00
  • e7e0a5a090 Fixed assimp_cmd version message Léo Terziman 2014-05-19 14:56:39 +02:00
  • 311f5b47ca Fixed bug during compilation with mingw & improved git revision support for automatic up to date revision number. Léo Terziman 2014-05-19 14:36:24 +02:00
  • 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. Jonne Nauha 2014-05-18 12:30:16 +03:00
  • 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. Jonne Nauha 2014-05-18 11:57:44 +03:00
  • d531945888 Merge branch 'master' of github.com:assimp/assimp Alexander Gessler 2014-05-16 14:58:01 +02:00
  • 908b945f50 BoostWorkaround/shared_array and shared_ptr: fix checks for whether the boost originals are included already. Fixes #277 Alexander Gessler 2014-05-16 14:57:33 +02:00
  • 0f71d46c35 Merge pull request #276 from g-pechorin/master Kim Kulling 2014-05-14 21:35:48 +02:00
  • 057a7ffe60 added a lt operator to the inline Peter LaValle 2014-05-14 14:16:53 +01:00
  • 09fffac068 added a lt operator to the header Peter LaValle 2014-05-14 14:16:49 +01:00
  • 08bacc73a6 update: add ply example for ply importer. Kim Kulling 2014-05-13 14:14:53 +02:00
  • 36c08a0a7d Merge branch 'master' of https://github.com/assimp/assimp v3.1 Kim Kulling 2014-05-12 20:00:59 +02:00
  • 52f3cd0afb update: add static build to CI. Kim Kulling 2014-05-12 20:00:29 +02:00
  • c5ba04cabf Merge pull request #274 from JamesLupiani/BinaryXFileFix Kim Kulling 2014-05-12 19:57:50 +02:00
  • 427eaad642 Fixes #158 via anonymous user James Lupiani 2014-05-12 12:02:31 -05:00
  • 04f0075b63 Change default extension for binary STL exports from stlb to stl Alexander Gessler 2014-05-12 12:50:21 +02:00
  • fb1c9ab86d bugfix: fix cexport API for c compilers. Kim Kulling 2014-05-11 16:50:35 +02:00
  • 9245469fb8 bugfix: fix invalid include path in find assimp macro for cmake. Kim Kulling 2014-05-11 14:01:30 +02:00
  • 22d026ac40 update: add asset importer lib cmake find macro. Kim Kulling 2014-05-11 13:56:38 +02:00
  • f6925db3d8 update: add cmake_mimimum_required statement to each cmake file for consistency Kim Kulling 2014-05-10 10:31:42 +02:00
  • d5d9e59949 Merge pull request #270 from jonnenauha/redundant-material-fix Kim Kulling 2014-05-09 18:36:39 +02:00
  • 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. Jonne Nauha 2014-05-09 01:33:30 +03:00
  • a5e179edf5 Merge pull request #267 from terziman/master Kim Kulling 2014-05-05 13:49:36 +02:00
  • f8b79acb36 Fixed compilation errors on OgreImporter with Visual Studio 2012 Léo Terziman 2014-05-05 10:25:04 +02:00
  • 1ec72cdddb Release candidate 2 : 3.1 v3.1-rc2 Kim Kulling 2014-05-04 19:17:51 +02:00
  • 392730be07 bugfix: export processes for unittests. Kim Kulling 2014-05-04 16:02:52 +02:00
  • 8c8c5329e9 bugfix: - fix c-api: insert a missing typedef for the metadata api enum. - gix c-api: move cpp-include to cpp-part of the api. Kim Kulling 2014-05-04 15:24:12 +02:00
  • 14457d2be4 Merge branch 'master' of https://github.com/assimp/assimp Kim Kulling 2014-05-04 15:22:16 +02:00
  • 84491f22e2 update: enable tests as default because so it is much easier to run the unit tests after each bugfix. Kim Kulling 2014-05-04 15:20:26 +02:00
  • 7b38eed767 Merge pull request #266 from jonnenauha/ogre-enhancements Kim Kulling 2014-05-03 09:21:24 +02:00
  • 9ad74e461e OgreImporter: Added brackets for all conditional etc. statements, even when there is a single line as requested by @kimkulling. I'm still not sure about the coding convention but looked for guidance in the obj importer code. Now newline before { if only one line and no else/else if after it, othewise a newline before it. Jonne Nauha 2014-05-03 00:20:17 +03:00
  • 22a4215c06 OgreImporter: Remove unnecessary comments. Jonne Nauha 2014-05-02 01:54:42 +03:00
  • dcf6002bed Try fix travis ci produced build errors on gcc and clang. Jonne Nauha 2014-05-02 01:38:13 +03:00
  • 409c2cf332 OgreImporter: One more function cleanup. Jonne Nauha 2014-05-02 00:56:35 +03:00
  • 283394d695 OgreImporter: Cleanup skeleton related code and code that populates the assimp scene. Tested skeleton/animation imports and it seems to work correctly now. Jonne Nauha 2014-05-02 00:19:57 +03:00
  • f5c7b283bc OgreImporter: Cleanup and bugfixes to OgreSkeleton.cpp. This was actually so badly broken that it did nothing if the mesh referenced a binary skeleton. Now logs a warning for this case and tries to read from .skeleton.xml like the original author intended it to work. The assimp skeleton is still broken, I will fix that later on when I (eventually) get to that part of the code. Jonne Nauha 2014-05-01 18:51:26 +03:00
  • 45715df263 OgreImporter: Forgot to rebuild after filename changes so broke the build. Fix includes, add include guards and ASSIMP_BUILD_NO_OGRE_IMPORTER to missing places. Jonne Nauha 2014-05-01 17:19:03 +03:00
  • fcb97bb595 OgreImporter: Rename .hpp to .h. Shuffled parsing utils to a single file. Jonne Nauha 2014-05-01 16:49:26 +03:00
  • 6ea07f39e1 OgreImporter: Rewrote documentation for AI_CONFIG_IMPORT_OGRE_MATERIAL_FILE and AI_CONFIG_IMPORT_OGRE_TEXTURETYPE_FROM_FILENAME to reflect the current logic. And to be honest the earlier one was very confusing english and was not very clear what is happening with these config options. Jonne Nauha 2014-05-01 16:35:34 +03:00
  • f98584cdea OgreImporter: Remove unnecessary m_currentX state. Improve and clean OgreMaterial: split tech/pass/texture_unit to their own functions. Document missing features and potential bugs. Improve the original authors 'detection from texture filename' logic (enabled with AI_CONFIG_IMPORT_OGRE_TEXTURETYPE_FROM_FILENAME). Add generic detection from texture unit name, which is commonly used in Ogre materials. Jonne Nauha 2014-05-01 16:33:15 +03:00
  • 6c51fa2072 OgreImporter: Continue cleanup. Jonne Nauha 2014-04-30 05:52:59 +03:00
  • 09517b342b OgreImporter: Started cleanup and refactoring. Aim is to get this into a shape that its easy to read and understand before I start making any new features. Jonne Nauha 2014-04-30 05:43:13 +03:00
  • 825a61fbc0 update: - update version info for 3.1 - aiGetVersionRevision will now return the git tag. Kim Kulling 2014-05-01 11:32:15 +02:00
  • 8255d67a95 Merge pull request #265 from jonnenauha/vc9-fix Kim Kulling 2014-04-30 09:17:43 +02:00
  • c329e81c94 Fix stdint.h include that broke the build for VC9 and below. Jonne Nauha 2014-04-30 05:58:19 +03:00
  • d1886daf5a Merge branch 'master' of https://github.com/assimp/assimp Kim Kulling 2014-04-29 00:06:14 +02:00
  • fbaf89492d bugfix: Obj-importer is now able to deal with 3d-texture coordinates. Kim Kulling 2014-04-29 00:04:54 +02:00
  • 562dd01655 Merge pull request #261 from terziman/master Kim Kulling 2014-04-28 23:54:10 +02:00
  • 2047cf6764 Merge remote-tracking branch 'official/master' into contrib Léo Terziman 2014-04-28 09:11:40 +02:00
  • d49837819e bugfix: remove WIN32-lookup for boost setup because these features are platform independent. Kim Kulling 2014-04-26 09:59:27 +02:00
  • f63cf6b5c8 Merge pull request #260 from xantares/master Kim Kulling 2014-04-23 18:07:43 +02:00
  • d4f25c0096 Configure assimp-config.cmake.in after Boost is discovered as it requires the Boost version vars xantares 2014-04-23 14:12:10 +02:00
  • b6bf29bdfa Merge pull request #259 from YoheiKakiuchi/fix_build_shread_lib Kim Kulling 2014-04-23 13:41:19 +02:00
  • bd1d33e8e8 fix typo, BUILD_SHARED_LIBS YoheiKakiuchi 2014-04-23 19:14:38 +09:00
  • 7ec690adfa Merge pull request #258 from g-pechorin/patch-1 Alexander Gessler 2014-04-22 13:27:33 -04:00