v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,377 Commits
74 Branches
37 Tags
234 MiB
Commit Graph

408 Commits (kimkulling/add_zlib_to_dockerfile_issue-5403)

Author SHA1 Message Date
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
RichardTea e993cdc309 Merge branch 'master' into collada_zae 2019-07-25 12:42:08 +01:00
RichardTea 9b78060a4a Add copyright headers to ZipArchiveIOSystem 2019-07-25 10:14:42 +01:00
RichardTea 9e04df810e ZipArchiveIOSystem should be sorted, fix ZipFile::Read() 
Q3BSP relies on the sort order
Read() should return number of elements read, not count of bytes
Read() should clip to the file size and return elements actually read,
instead of aborting if try to read too much
 2019-07-25 09:53:18 +01:00
RichardTea c6620478ec Fix GCC warnings reported by Travis 2019-07-24 16:12:06 +01:00
Pierre Anquez 17adc98eec
Fix issue #2557 2019-07-23 15:58:30 +02:00
Kim Kulling 41ea607739
Merge branch 'master' into collada_zae 2019-07-20 14:12:18 +02:00
RichardTea 07d3a7d5b0 Fix some warnings 
Hopefully the sorts out the MSVC2013 compiler
 2019-07-12 16:02:51 +01:00
RichardTea 678dd32da3 Add missing header 2019-07-12 15:37:10 +01:00
kimkulling 53c0f91305 Add unittest for json. 2019-07-12 16:08:51 +02:00
RichardTea 2c7f607e7c Create ZipArchiveIOSystem 
Moved IOSystem Unzip functionality out of D3MF Importer into include/assimp
Cleaned up and more efficient:
Don't map the archive until the caller opens a file or requests the contents list
Don't extract any files until they are opened
Store the location of the data within the ZIP and extract it later if the file is opened.
 2019-07-12 11:22:17 +01:00
kkulling eb5e829436 Assjson: add json export to list of exporters. 2019-07-11 17:43:03 +02:00
kkulling b463ddd399 closes https://github.com/assimp/assimp/issues/340: start integrating assimp2json. 2019-07-11 17:37:31 +02:00
Kim Kulling 05f5b54f75
Merge branch 'master' into issue_2518_active_importer_ident 2019-06-27 14:02:01 +02:00
Kim Kulling 0f66a917e5 Add unittest. 2019-06-24 21:37:53 +02:00
RichardTea 8f43fb144a Add "importerIndex" Importer property 
This indicates the index of the Importer that was selected, or -1 if did not find one at all.
 2019-06-24 14:55:48 +01:00
Rahul Sheth dab8041bcd rewrite include paths for Hunter packages 2019-06-13 21:32:36 -07:00
Kim Kulling 4dcb3c9235
Update ImporterRegistry.cpp 
fix case-sensiive folder bug.
 2019-06-11 21:55:21 +02:00
Kim Kulling 2da3a38d60 Fix the compile pass, still unresolved symbols. 2019-06-10 23:26:00 +02:00
Kim Kulling 2d985b92c9 Fix references in cmake file. 2019-06-09 18:43:56 +02:00
Kim Kulling 57c46db042 Reorg of code. 2019-06-06 14:45:43 +02:00