Kim Kulling
df8792d24b
Merge branch 'master' into gltf1_gltf2_split
2020-07-16 10:45:55 +02:00
Kim Kulling
b1dd77fbbc
Merge branch 'master' into gltf2_sparseAccessor_export
2020-07-11 22:57:31 +02:00
Max Vollmer
abf43eaf74
* Added ASSIMP_BUILD_NO_GLTF1_IMPORTER, ASSIMP_BUILD_NO_GLTF2_IMPORTER, ASSIMP_BUILD_NO_GLTF1_EXPORTER, and ASSIMP_BUILD_NO_GLTF2_EXPORTER to allow disabling GLTF1 and GLTF2 independently.
...
* ASSIMP_BUILD_NO_GLTF_IMPORTER and ASSIMP_BUILD_NO_GLTF_EXPORTER remain with same behavior as before
2020-07-05 19:22:31 +01:00
Yingying Wang
97085c1c05
update sync
2020-06-30 11:48:37 -07:00
Yingying Wang
3f2e5518eb
update sync
2020-06-30 11:29:08 -07:00
Evangel
6d85280c8d
Added bool, removed unused debug parameter
2020-06-27 12:53:26 +10:00
Evangel
f6b4370f6a
Added arbitrary recursive metadata to allow for glTF2's extensions to be properly represented.
...
Primary changes are to include/assimp/metadata.h, adding in the aiMetadata GetAiType function,
adding the operator= to allow an aiMetadata type to be assigned, adding a check for the
AI_AIMETADATA type flag as it can't be trivially memcpy'd.
operator= is implemented with a by-value argument as then the copy is made by the copy
constructor and we can just swap everything out and let the destructor handle the mess.
Implemented parsing of the "extensions" flag on all glTF2 Nodes. Doesn't use the ReadValue
helper function on numbers as it did not seem to fill out the Nullable structure properly.
2020-06-26 14:28:41 +10:00
ywang
e65434bf82
extra callback
2020-06-11 17:37:06 -07:00
Kim Kulling
ffaa634c48
Merge branch 'master' into issue_3165
2020-06-09 10:48:27 +02:00
Kim Kulling
620bebb999
diable warning only for gcc 8.0 or greater
2020-06-09 10:14:57 +02:00
Yingying Wang
12dc736d94
Merge branch 'master' of https://github.com/thomasbiang/assimp into gltf2_sparseAccessor_export
2020-06-08 14:32:23 -07:00
Alec
2c0df39ef3
Added rapidjson define to avoid warnings in c++17
2020-06-06 14:33:41 +02:00
Kim Kulling
6d04e16c7e
Merge branch 'master' into issue_3165
2020-05-28 21:51:58 +02:00
kimkulling
d40a3026db
closes https://github.com/assimp/assimp/issues/3165 : fix gcc build.
2020-05-28 21:02:13 +02:00
Yingying Wang
c10e409a5d
merge
2020-05-18 12:16:45 -07:00
Yingying Wang
e39c632809
cleanup
2020-05-18 11:50:51 -07:00
Yingying Wang
0897c4c7be
merge
2020-05-18 11:31:44 -07:00
Yingying Wang
02cbd36271
pull master
2020-05-18 11:15:18 -07:00
Yingying Wang
b8e39b58d1
clean up
2020-05-15 12:32:58 -07:00
Yingying Wang
f6720271cb
sparce accessor exporter
2020-05-15 12:20:31 -07:00
kimkulling
a6b5abd698
Merge branch 'master' of https://github.com/zyndor/assimp into zyndor-master
2020-05-15 08:51:46 +02:00
Yingying Wang
e9b67cdb89
gltf2 import sparse accessor
2020-05-11 14:34:35 -07:00
Kim Kulling
f8e6512a63
Move format importer and exporter into its won folder.
2020-05-02 15:14:38 +02:00