Commit Graph

70 Commits

Author SHA1 Message Date
Kim Kulling
37210372a8 Update VertexTriangleAdjacency.cpp
closes https://github.com/assimp/assimp/issues/2806: calculate corret number of vertices.
2020-01-07 21:26:37 +01:00
RichardTea
4a8b7800ff Update M3D ASCII exporter ident and extension
Changed to match existing Assimp style.
Set extension as per:
https://gitlab.com/bztsrc/model3d/blob/master/docs/a3d_format.md
2019-12-09 11:23:57 +00:00
Kim Kulling
9f3c26dbd8 Update Importer.cpp
fix typo
2019-12-07 09:18:45 +01:00
Kim Kulling
7648c438ca Update Importer.cpp
fix more typos.
2019-12-07 09:08:15 +01:00
Kim Kulling
26f6e5ad30 Update Importer.cpp
fix typo
2019-12-07 08:58:47 +01:00
Kim Kulling
ef13fb2ddd Update Importer.cpp
Fix minor review findings.
2019-12-06 21:38:07 +01:00
Malcolm Tyrrell
fabfcf3cb0 More checking 2019-12-05 12:33:00 +00:00
Malcolm Tyrrell
894b8e3519 Initial version 2019-12-05 12:32:22 +00:00
Kim Kulling
e5edd8a28a Merge branch 'master' into preserve_error_string 2019-12-03 11:29:35 +01:00
Mike Samsonov
631da3a3d1 Merge branch 'master' into preserve_error_string 2019-12-02 10:35:29 +00:00
Kim Kulling
4071fcd398 Update Exporter.cpp
Fix format.
2019-12-01 22:46:48 +01:00
Kim Kulling
54720e36cb Merge branch 'master' into fix_vertex_weighted_repeatedly 2019-12-01 22:46:18 +01:00
Paul Arden
929d83398d Remove duplicate call to exporter. Fixes issue #2718. 2019-11-25 13:51:33 +11:00
Loïc
5cfb0fd633 Add function aiGetVersionPatch() to be able to display Assimp version as in Git tags 2019-11-22 18:27:34 +01:00
Kim Kulling
868aea8d94 Merge branch 'master' into fix_vertex_weighted_repeatedly 2019-11-22 08:19:50 +01:00
Mike Samsonov
80f5283b2f Error string of Importer should contain a message in case of an exception 2019-11-18 16:57:01 +00:00
Kim Kulling
17257cd2ae just a try, i dunno have a clue ... 2019-11-16 15:51:26 +01:00
Kim Kulling
aa25c815bd closes https://github.com/assimp/assimp/issues/1320: make sure build works with all exporter disabled. 2019-11-10 09:47:50 +01:00
Yingying Wang
ddf7c0ad8f avoid weighting vertex repeatedly when joining identical vertices 2019-11-05 17:34:32 -08:00
Mike Samsonov
adec426b7c Fix for exporting fbx bigger than 2GB 2019-11-05 17:11:56 +00:00
Zoltan Baldaszti
dda46f5f4d Merge branch 'master' into master 2019-11-02 01:14:04 +01:00
Kim Kulling
be09110aa8 Merge branch 'master' into feature/easy-armature-lookup 2019-10-29 21:09:50 +01:00
bzt
0baec5f0bd Added M3D format support 2019-10-29 14:14:00 +01:00
RevoluPowered
9c8d835704 Explicitly use nullptr 2019-10-27 14:16:39 +00:00
RevoluPowered
a30936954e Best to check the number of children before checking the actual array 2019-10-27 14:16:39 +00:00
RevoluPowered
514257f587 Added unit tests for ArmaturePopulate when used (added huestos model to tests)
Added clear documentation for this too to explain, you need to enable it to make it available

Signed-off-by: RevoluPowered <gordon@gordonite.tech>
2019-10-27 14:16:39 +00:00
Kim Kulling
120e97e55b Merge branch 'master' into assimp_version_2693 2019-10-27 13:47:59 +01:00
Paul Arden
e6a051d953 Fix compilation on VS2013 due to compiler bug with brace initialisers. This fixes issue #2678. 2019-10-16 19:06:57 +11:00
RichardTea
059ee0e091 Update assimp legal and version
Will now report the major and minor versions specified in cmakelists
2019-10-11 16:28:14 +01:00
Kim Kulling
78cfec41ec Merge branch 'master' into issue_2693 2019-10-06 11:11:22 +02:00
Engin Manap
afec2e2c49 Fix #2693 aiGetVersionMajor return wrong version
The 2 constants MinorVersion and MajorVersion are updated for 5.0
2019-10-05 19:23:02 +02:00
Victor Cebollada
e0fee3d87b gltf2.0 importer - Support for mesh morph animations added.
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
2019-09-25 09:58:23 +01:00
kimkulling
7ff7a5d64e glTF: Try to remove duplicate code. 2019-09-11 17:00:39 +02:00
Kim Kulling
f8bcd7cb40 Merge branch 'master' into thomasbiang-fix_issue_joinIdenticalVertices_notNeeded 2019-09-07 10:02:20 +02:00
Kim Kulling
336ae0e55a Merge branch 'fix_issue_joinIdenticalVertices_notNeeded' of https://github.com/thomasbiang/assimp into thomasbiang-fix_issue_joinIdenticalVertices_notNeeded 2019-09-07 09:58:07 +02:00
Kim Kulling
3546403284 Merge branch 'master' into crash_in_ai_mesh_desctuctor 2019-09-06 20:45:16 +02:00
Mike Samsonov
873a358ce4 A crash in the aiMesh descructor 2019-09-05 11:44:02 +01:00
Ryan McCampbell
eb762e654e Removed WindowsStore checks 2019-09-03 23:13:44 -04:00
Ryan McCampbell
a16906686f Fixed type conversion warnings 2019-09-03 21:06:48 -04:00
Ryan McCampbell
a8822a2b29 Cleaned up formatting in DefaultIOSystem.cpp 2019-09-03 11:18:01 -04:00
Ryan McCampbell
0685e415ad removed extra null character in Utf8ToWide and WideToUtf8 2019-09-03 11:18:01 -04:00
Ryan McCampbell
6c65b5b549 Cleaned up unicode code and removed fixed-size buffers 2019-09-03 11:18:01 -04:00
Ryan McCampbell
727cf0c49f Fixed unicode on windows 2019-09-03 11:18:01 -04:00
Kim Kulling
0f18ec9e2c Merge branch 'master' into accessibleIsVerbose 2019-09-02 20:47:04 +02:00
Malcolm Tyrrell
01d0f06d3a Make IsVerbose accessible outside the exporter 2019-08-30 11:42:23 +01:00
Gordon MacPherson
abdd853ca5 FIX missing update call for scale to post process 2019-08-27 15:50:50 +01:00
ywang
3d0775eebc respect export flag if aiJoinIdenticalVertices is not needed 2019-08-12 18:10:43 -07:00
Kim Kulling
090e896ebf Merge branch 'master' into collada_zae 2019-08-06 21:22:02 +02:00
Kim Kulling
d83af91095 Update Exporter.cpp
Add exporter detail.
2019-07-29 09:03:29 +02:00
RichardTea
7e8a3ec4cb Add unit test of valid and unique Exporter IDs, rename assjson id
"json" is a very vague exporter ID, change to "assjson"

Add a unit test to ensure all exporter have unique IDs
and that they all have an ID, description and extension
2019-07-25 13:38:49 +01:00