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
274a6ce1ff
Fixed space
2014-05-21 15:59:13 +02:00
e0aafb5733
Merge pull request #280 from jonnenauha/ogre-binary
...
Ogre binary format support
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.
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 :).
2014-05-21 05:41:26 +03:00
8a5041ea11
Merge remote-tracking branch 'upstream/master' into ogre-binary
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.
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.
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.
2014-05-21 04:37:45 +03:00
f8e1dcb102
OgreImporter: Mirror bool return for XmlSerializer as it is in BinarySerializer. Document its meaning.
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.
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).
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.
2014-05-20 04:52:53 +03:00
279a97872a
Merge pull request #279 from terziman/master
...
Fixed bug during compilation with mingw
2014-05-19 19:27:10 +02:00
e7e0a5a090
Fixed assimp_cmd version message
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.
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.
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.
2014-05-18 11:57:44 +03:00
d531945888
Merge branch 'master' of github.com:assimp/assimp
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
2014-05-16 14:57:33 +02:00
0f71d46c35
Merge pull request #276 from g-pechorin/master
...
lt operator for aiVector3
2014-05-14 21:35:48 +02:00
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
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
08bacc73a6
update: add ply example for ply importer.
2014-05-13 14:14:53 +02:00
36c08a0a7d
Merge branch 'master' of https://github.com/assimp/assimp
2014-05-12 20:00:59 +02:00
52f3cd0afb
update: add static build to CI.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-05-12 20:00:29 +02:00
c5ba04cabf
Merge pull request #274 from JamesLupiani/BinaryXFileFix
...
Fixes #158 via anonymous user
2014-05-12 19:57:50 +02:00
427eaad642
Fixes #158 via anonymous user
2014-05-12 12:04:19 -05:00
04f0075b63
Change default extension for binary STL exports from stlb to stl
2014-05-12 12:50:21 +02:00
fb1c9ab86d
bugfix: fix cexport API for c compilers.
2014-05-11 16:50:35 +02:00
9245469fb8
bugfix: fix invalid include path in find assimp macro for cmake.
2014-05-11 14:01:30 +02:00
22d026ac40
update: add asset importer lib cmake find macro.
2014-05-11 13:56:38 +02:00
f6925db3d8
update: add cmake_mimimum_required statement to each cmake file
...
for consistency
2014-05-10 10:31:42 +02:00
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
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
a5e179edf5
Merge pull request #267 from terziman/master
...
Fixed compilation errors on OgreImporter with Visual Studio 2012
2014-05-05 13:49:36 +02:00
f8b79acb36
Fixed compilation errors on OgreImporter with Visual Studio 2012
2014-05-05 10:25:04 +02:00
1ec72cdddb
Release candidate 2 : 3.1
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-05-04 19:17:51 +02:00
392730be07
bugfix: export processes for unittests.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
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.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-05-04 15:24:12 +02:00
14457d2be4
Merge branch 'master' of https://github.com/assimp/assimp
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.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-05-04 15:20:26 +02:00
7b38eed767
Merge pull request #266 from jonnenauha/ogre-enhancements
...
Ogre importer cleanup, improvements and bug fixes
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.
2014-05-03 00:20:17 +03:00
22a4215c06
OgreImporter: Remove unnecessary comments.
2014-05-02 01:54:42 +03:00
dcf6002bed
Try fix travis ci produced build errors on gcc and clang.
2014-05-02 01:38:13 +03:00
409c2cf332
OgreImporter: One more function cleanup.
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.
2014-05-02 00:28:14 +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.
2014-05-02 00:28:13 +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.
2014-05-02 00:28:12 +03:00
Alexander Gessler
Léo Terziman
Jonne Nauha
Kim Kulling
Peter LaValle
Kim Kulling
James Lupiani