69570f675e
Merge pull request #297 from gjaegy/master
...
fixed collada import bug + added obj importer '\' newline feature
2014-06-13 12:56:48 +02:00
5efc0207f3
Merge branch 'master' of https://github.com/assimp/assimp
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
2014-06-13 10:56:10 +02:00
edc7a950c4
ReFix the stuff before
...
Fix XFileExporter Normal
Fix Collada (Triangle->Poly)
2014-06-11 00:41:18 +02:00
bd0c2835f8
Merge pull request #294 from treiguts/master
...
fixed OgreImporter compilation error with boost scoped_ptr
2014-06-10 22:24:08 +02:00
8549e4b1b1
fixed OgreImporter compilation error with boost scoped_ptr
2014-06-10 19:58:02 +03:00
272a59cd36
Fix convertToLH for uv coordinates
...
Fix Collada export
Fix XFile export
2014-06-10 13:14:41 +02:00
c4021fbaaf
Fix Collada export validated by Schema
2014-06-09 15:17:45 +02:00
77cec96d74
Fix collada
2014-06-07 21:17:31 +02:00
ec2ce90654
Add Scene Author + AuthorTool
...
Add XFileExporter
Add Collada Triangle+Line export
Fix Obj Comment
2014-06-06 01:56:54 +02:00
e09d88fa59
bugfix: fix cmake static linkage option.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-06-04 21:08:19 +02:00
8b1a6ba920
Bump version number to 3.1
2014-06-02 01:45:23 +02:00
1403cabb71
FBXParser: fix compiler warning on double -> float.
2014-06-01 17:34:11 +02:00
79d8e4c14a
SimpleTexturedOpenGL/CMakeLists.txt: add path to DEVIL prebuilt library.
2014-06-01 17:33:50 +02:00
9ddd459fe8
Extend Collada Exporter using lines and triangles
2014-05-31 12:50:11 +02:00
84eb1930ea
Merge pull request #291 from jonnenauha/dev
...
Fixes for #284 and #290
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 .
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 .
2014-05-30 01:57:21 +03:00
340b94f9a5
Merge pull request #287 from arkeon7/master
...
Correction on FBX material texture UV index
2014-05-28 17:05:19 +02:00
3acf60f5d7
Correction on quaternion initialization values
...
a 0 0 0 0 quaternion is not valid
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
2014-05-27 09:11:27 +02:00
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
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
ecbf09ed8c
Update CREDITS
...
Add jonnenauha to CREDITS, update description
2014-05-22 18:04:05 +02:00
e498819b12
Readme: add ogre binary format
2014-05-22 18:00:02 +02:00
ebb7eaaa55
Update Readme.md
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.
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 .
2014-05-22 16:17:42 +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
Alexander Gessler
Gregory Jaegy
Madrich
EdgarsT
Kim Kulling
Jonne Nauha
arkeon
Jared Duke
Léo Terziman
Peter LaValle
Kim Kulling