Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
8,961 Commits 19 Branches 43 Tags
306e03d497700a67cd0c39b393bb4b59f9bdbd9b
Commit Graph

590 Commits

Author SHA1 Message Date
Kim Kulling
306e03d497 Merge branch 'master' into extras_property_callback 2020-07-11 22:46:19 +02:00
Kim Kulling
108b3a62e5 Update Exporter.hpp 
revert merge issue
 2020-07-11 22:45:45 +02:00
Malcolm Tyrrell
51150cb3df Ensure asserts are defined where expected. 2020-07-02 14:53:29 +01:00
Yingying Wang
97085c1c05 update sync 2020-06-30 11:48:37 -07:00
Yingying Wang
36f899bf09 sync update 2020-06-30 11:45:11 -07:00
Hill Ma
30f09e9fc0 Fix build when ASSIMP_DOUBLE_PRECISION is on. 
Tested:
$ cmake -DASSIMP_DOUBLE_PRECISION=1 -DASSIMP_BUILD_MDL_IMPORTER=0 ..; make

The MDL importer is disabled due to the fact that there is some float-only code
in MDL. This also means bin/assimp and bin/unit would not link successfully with
the above build flags.
 2020-06-28 17:36:21 -07:00
Evangel
d75d59a4fd Added operator== and operator!= to aiMetadata to allow for testing. 
Updated utMetadata.copy_test to reflect that there's now 8 metadata types.
 2020-06-26 15:07:42 +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
Kim Kulling
95e822a6ec Merge branch 'master' into aiAssertHandler 2020-06-24 20:47:10 +02:00
Malcolm Tyrrell
170c00eee7 Useful comment. 2020-06-24 11:51:03 +01:00
Malcolm Tyrrell
edaa8e4a80 Need to use ASSIMP_BUILD_DEBUG. 2020-06-24 11:37:43 +01:00
Kim Kulling
6205af4efb replace NULL and avoid ai_assert with more than 2 tests. 2020-06-23 21:05:42 +02:00
Malcolm Tyrrell
9188f56839 Allow assert handling to be replaced. 2020-06-23 11:55:51 +01:00
Kim Kulling
6397bfbf90 replace NULL by nullptr on loadFile. 2020-06-21 12:03:38 +02:00
ywang
e65434bf82 extra callback 2020-06-11 17:37:06 -07:00
ywang
f57e7221c0 temp 2020-06-10 13:23:29 -07:00
Yingying Wang
578a7ac502 add Callback API in ExporterProperties 2020-06-09 11:20:48 -07:00
Malcolm Tyrrell
14692368d5 Same for LogDebug -> LogVerboseDebug 2020-05-18 11:55:14 +01:00
Malcolm Tyrrell
df2630d0e8 Change in comment. 2020-05-18 11:45:13 +01:00
Malcolm Tyrrell
e11d78596f Use verbose debug logging in certain places 2020-05-15 17:26:17 +01:00
Malcolm Tyrrell
5e0136d737 Add concept of verboseDebug 2020-05-15 17:23:07 +01:00
Malcolm Tyrrell
6be0ce1ec9 Initial pass at adding logging 2020-05-15 17:21:45 +01:00
Kim Kulling
2571b47a28 Merge branch 'master' into bug-3177-dae-geo-id 2020-05-13 20:24:53 +02:00
RichardTea
fa1d2f09db Merge branch 'master' into bug-3177-dae-geo-id 2020-05-05 09:33:48 +01:00
Kim Kulling
ddee1b1ddb Merge branch 'master' into aaronfranke-file-formatting 2020-05-05 10:21:46 +02:00
kkulling
4e16716924 Merge branch 'file-formatting' of https://github.com/aaronfranke/assimp into aaronfranke-file-formatting 2020-05-05 10:17:52 +02:00
Kim Kulling
6afb72216c Compile constructor of aiMetadataType only for c++ 2020-05-04 20:50:44 +02:00
Kim Kulling
3b4a9812e5 add init list for metadatatype. 2020-05-04 20:40:08 +02:00
kimkulling
5c9a08e375 closes https://github.com/assimp/assimp/issues/3190 : fix leak. 2020-05-04 15:36:54 +02:00
RichardTea
6e200cb0d3 Merge branch 'master' into bug-3177-dae-geo-id 
Impossible merge, have discarded upstream
 2020-05-04 13:59:09 +01:00
Kim Kulling
3b06f57150 add missing inclde + 2020-05-02 21:11:47 +02:00
RichardTea
3e2dd186d1 Merge branch 'master' into bug-3177-dae-geo-id 2020-05-01 12:08:12 +01:00
RichardTea
5b9f207f1f ColladaExporter cleanup 
Namespace, NULL and includes
 2020-05-01 11:54:34 +01:00
Kim Kulling
52122a9900 Merge branch 'master' into kimkulling_dev 2020-05-01 10:49:03 +02:00
Kim Kulling
da2bf5c7a4 fix wrong size 2020-04-29 21:13:46 +02:00
Kim Kulling
c6131ce38a scenecombiner: fix leak. 2020-04-29 20:43:23 +02:00
Kim Kulling
fd555a1349 review findings. 2020-04-29 20:33:37 +02:00
RichardTea
ff9f3b8608 Collada: Ensure <geometry> has unique id 
Use the "id" for mesh names by default.
Set option AI_CONFIG_IMPORT_COLLADA_USE_COLLADA_NAMES to use the mesh "name" instead
 2020-04-29 17:17:46 +01:00
Kim Kulling
bafb8e3189 closes https://github.com/assimp/assimp/issues/3165: remove deprecated code whch causes compiler warning. 2020-04-26 08:59:52 +02:00
Kim Kulling
9b1759dcc2 Merge branch 'master' into migenius-migenius-rsws53-mig-2 2020-04-22 19:59:53 +02:00
Kim Kulling
ca70b44e44 Merge branch 'migenius-rsws53-mig-2' of https://github.com/migenius/assimp into migenius-migenius-rsws53-mig-2 2020-04-22 19:58:41 +02:00
Kim Kulling
232761be02 Fix another typo 2020-04-21 16:09:11 +02:00
Kim Kulling
843ca6e386 Fix typo 2020-04-21 15:50:17 +02:00
Kim Kulling
428b91154a Adapt smallvector 
- Add doc ( public header )
- Fix type error
 2020-04-21 08:59:40 +02:00
Kim Kulling
788f2f244e Adapt code 
- Reformatting based on clang-format rules
- Add usage of size_t instead of unsigned int for sizes
- Fix typo in naming
 2020-04-21 08:50:51 +02:00
Kim Kulling
e0f6eb09e6 Merge branch 'master' into optimized_bonelimits 2020-04-17 20:37:28 +02:00
Kim Kulling
e299f71cfe Adapt the formatting 2020-04-17 16:16:28 +02:00
Hehongyuanlove
f80bdc5b71 Update StringUtils.h 2020-04-17 12:57:33 +08:00
Hehongyuanlove
59e32a5ad9 Update StringUtils.h 2020-04-17 12:51:18 +08:00
Hehongyuanlove
cc3760aff1 Update StringUtils.h 2020-04-17 12:50:49 +08:00