RichardTea
|
6e200cb0d3
|
Merge branch 'master' into bug-3177-dae-geo-id
Impossible merge, have discarded upstream
|
2020-05-04 13:59:09 +01:00 |
|
RichardTea
|
ea917bd4ae
|
Move Collada into AssetLib folder
Should make the merge easier
|
2020-05-04 13:54:49 +01:00 |
Kim Kulling
|
91fa9a102b
|
closes https://github.com/assimp/assimp/issues/3181: fix typo for light type.
|
2020-05-03 12:17:32 +02:00 |
|
Kim Kulling
|
3b06f57150
|
add missing inclde +
|
2020-05-02 21:11:47 +02:00 |
|
Kim Kulling
|
514593548d
|
add assert-test for nullptr.
|
2020-05-02 21:07:41 +02:00 |
|
Kim Kulling
|
3329e76263
|
closes https://github.com/assimp/assimp/issues/3178: throw exception in case of invalid export stream.
|
2020-05-02 21:06:55 +02:00 |
|
Kim Kulling
|
f8e6512a63
|
Move format importer and exporter into its won folder.
|
2020-05-02 15:14:38 +02:00 |
|
RichardTea
|
1dabb1a094
|
Collada: Fix crash with AI_CONFIG_IMPORT_COLLADA_USE_COLLADA_NAMES
Add unit test for this
|
2020-05-01 14:59:09 +01: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 |
|
RichardTea
|
ee16d2c4c9
|
Fix camera, light and bone unique ids
Bones don't have a unit test yet
|
2020-05-01 11:13:38 +01:00 |
|
RichardTea
|
083ebdbc2e
|
Collada Export: More unique Ids
Nodes, Materials, Animations, Lights, Cameras, Bones
|
2020-04-30 18:28:06 +01:00 |
|
Kim Kulling
|
2d9d112015
|
fix warning
|
2020-04-29 21:35:42 +02:00 |
|
Kim Kulling
|
1c30b7bf8e
|
tryout: check if leak is coupled to type double.
|
2020-04-29 21:31:01 +02:00 |
|
Kim Kulling
|
e0bc0f7fad
|
try to fix double memleak.
|
2020-04-29 21:19:15 +02:00 |
|
Kim Kulling
|
da2bf5c7a4
|
fix wrong size
|
2020-04-29 21:13:46 +02:00 |
|
Kim Kulling
|
f808ed9fb5
|
fbxconverter: fix memoryleak.
|
2020-04-29 20:52:49 +02:00 |
|
Kim Kulling
|
c6131ce38a
|
scenecombiner: fix leak.
|
2020-04-29 20:43:23 +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 |
|
RichardTea
|
2c6ac23a4e
|
Apply Assimp clangformat to touched Collada files
|
2020-04-29 14:21:17 +01:00 |
Kim Kulling
|
efa046366e
|
Retrigger build
|
2020-04-28 09:14:53 +02:00 |
luca
|
4488e3e745
|
build on Linux with gcc and clang; warning as error only for 'assimp' target
|
2020-04-27 23:38:33 -07:00 |
|
luca
|
d98787f35b
|
CI: use clang on Unix, msvc on Windows;Remove explicit flags in CMakeLists.txt;
|
2020-04-26 12:50:42 -07:00 |
|
Kim Kulling
|
6c1e21d754
|
fix formatting.
|
2020-04-26 19:14:30 +02: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
|
c36b028412
|
fix type error for template deduction.
|
2020-04-21 16:39:18 +02:00 |
|
Kim Kulling
|
c91d3764ca
|
Merge branch 'master' into optimized_bonelimits
|
2020-04-21 08:45:50 +02:00 |
|
Kim Kulling
|
f71b332ed1
|
Update glTF2Asset.inl
fix VS-compiler warning.
|
2020-04-19 21:14:47 +02:00 |
|
Kim Kulling
|
e3563212d7
|
Merge branch 'master' into master
|
2020-04-19 21:13:12 +02:00 |
|
Kim Kulling
|
e0f6eb09e6
|
Merge branch 'master' into optimized_bonelimits
|
2020-04-17 20:37:28 +02:00 |
Hehongyuanlove
|
9c52fd7633
|
Update D3MFExporter.cpp
|
2020-04-17 12:58:41 +08:00 |
|
Hehongyuanlove
|
e9a72a5053
|
repair formate 3MF
|
2020-04-17 12:38:07 +08:00 |
|
Hehongyuanlove
|
3bbc8e76bd
|
Rgba2Hex to repair rgba(1,1,1,1)
|
2020-04-17 12:34:05 +08:00 |
|
Kim Kulling
|
c0dc26de8e
|
Merge branch 'master' into GLTF2_recursive_references_fix
|
2020-04-16 11:29:37 +02:00 |
|
Kim Kulling
|
996abd3fbe
|
Merge branch 'master' into GLTF2_invalid_buffer_fix
|
2020-04-16 11:08:29 +02:00 |
|
Kim Kulling
|
d12e938a70
|
Merge branch 'master' into ifdef_export_defines
|
2020-04-16 10:24:23 +02:00 |
|
Kim Kulling
|
e341eadfd9
|
Fix typo
|
2020-04-16 10:23:50 +02:00 |
Timur Umayev
|
69f8d47941
|
glTF2 support targetNames
|
2020-04-15 09:39:46 +01:00 |
Max Vollmer (Microsoft Havok)
|
a14b5fb06f
|
Merge branch 'master' into GLTF2_invalid_buffer_fix
|
2020-04-10 08:44:19 +01:00 |
|
Max Vollmer (Microsoft Havok)
|
485d7ab52e
|
Merge branch 'master' into GLTF2_recursive_references_fix
|
2020-04-10 08:44:18 +01:00 |
|
Kim Kulling
|
79af2b1a5c
|
Merge branch 'master' into kimkulling_dev
|
2020-04-09 19:55:45 +02:00 |
|
Kim Kulling
|
9a11d91cb8
|
code reformattings.
|
2020-04-06 13:33:03 +02:00 |
|
Kim Kulling
|
131aed73b0
|
closes https://github.com/assimp/assimp/issues/2166: add missing setter for metadata.
|
2020-04-06 11:16:16 +02:00 |
|
Kim Kulling
|
132ecae6f4
|
Merge branch 'master' into kimkulling_dev
|
2020-04-04 18:28:50 +02:00 |
|
Max Vollmer (Microsoft Havok)
|
a07bf8b26f
|
Merge branch 'master' into GLTF2_recursive_references_fix
|
2020-04-03 08:40:32 +01:00 |
|
Max Vollmer (Microsoft Havok)
|
d966f3394b
|
Merge branch 'master' into GLTF2_invalid_buffer_fix
|
2020-04-03 08:40:29 +01:00 |
|
Kim Kulling
|
c21a1ffffa
|
Remove comments to increase readability
|
2020-04-01 11:16:39 +02:00 |
|
Kim Kulling
|
a7208b02e0
|
Merge branch 'master' into assimp_gltf2_exporter
|
2020-04-01 08:42:48 +02:00 |