kimkulling
d40a3026db
closes https://github.com/assimp/assimp/issues/3165 : fix gcc build.
2020-05-28 21:02:13 +02:00
Kim Kulling
4b0a3305b1
Merge branch 'master' into master
2020-05-17 13:54:10 +02:00
Kim Kulling
cfbdacb02a
Merge branch 'master' into bug-3201-collada_root_meshes
2020-05-16 20:50:34 +02:00
Kim Kulling
df9c09d9e1
Merge branch 'master' into collada_unit_test_cleanup
2020-05-16 19:59:30 +02:00
Kim Kulling
2571b47a28
Merge branch 'master' into bug-3177-dae-geo-id
2020-05-13 20:24:53 +02:00
Jeremy Cytryn
c3a21666da
Make gltf2 export normal normalization safe
...
This avoids introducing NaNs e.g. when the input mesh has 0-length normals
2020-05-11 12:02:38 -07:00
Jeremy Cytryn
c5a9fbd47f
Gracefully handle NaNs and Infs in gltf2 accessor bound computation
2020-05-11 12:02:38 -07:00
Jeremy Cytryn
aef4ecada5
Fail gltf/gltf2 export whenever invalid / incomplete JSON is generated
...
This can happen currently for example if NaNs are introduced in accessor bounds as rapidjson cannot write NaN/inf floats (see subsequent commit for fix there) and will halt writing to buffer at this point. Fix here ensures that whenever anything like this happens we throw an exception so this ends up as a registered export failure case, rather than silently exporting the incomplete JSON
2020-05-11 12:02:38 -07:00
Kim Kulling
4c75857f50
Remove duplicate flag
2020-05-06 13:46:26 +02:00
RichardTea
dc8550290e
Ensure to delete the scene copy after the test
2020-05-05 10:53:26 +01: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
RichardTea
8e73984a11
Collada Root Nodes aren't allowed to have meshes
...
Create a null parent node instead
2020-05-04 17:47:09 +01: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
RichardTea
5a986090ca
Merge branch 'master' into collada_unit_test_cleanup
2020-05-04 13:25:38 +01: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
29c75f4948
Merge branch 'master' into collada_unit_test_cleanup
2020-05-01 12:09:28 +01:00
RichardTea
3e2dd186d1
Merge branch 'master' into bug-3177-dae-geo-id
2020-05-01 12:08:12 +01:00
RichardTea
e6c4175d8d
Rename Collada export tests
...
Use existing naming convention.
Brings all Collada tests together in Test Explorers
2020-05-01 11:49:15 +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
a639221ede
Update to float
...
- Temporary change to analyze leak.
2020-04-30 09:14:42 +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
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
c0dc26de8e
Merge branch 'master' into GLTF2_recursive_references_fix
2020-04-16 11:29:37 +02:00
Kim Kulling
5377d740e8
fix the build
2020-04-15 21:52:21 +02:00
Kim Kulling
d46ec3f9b9
fix init ordering of members
2020-04-15 20:41:38 +02:00
Kim Kulling
a0218c690b
Remove unused variable m
2020-04-15 20:06:22 +02:00
Marc-Antoine Lortie
e399a12f71
Small changes to C API unit tests.
...
- (1) Changed randomized math structure values to predefined values to prevent cases that could potentially lead to division by zero.
- (2) Removed unused variable(s) due to (1).
- (3) Renamed variable(s) for better clarity.
2020-04-13 14:13:54 -04:00
Marc-Antoine Lortie
ac16a857ff
Merge remote-tracking branch 'upstream/master' into add-tests-to-c-api-2
2020-04-13 09:08:45 -04:00
Kim Kulling
13429485d9
Update CMakeLists.txt
...
remove not needed lib
2020-04-10 17:00:38 +02:00
Kim Kulling
9b671c6eb4
Update CMakeLists.txt
...
Add explicit linking of irrxml.
2020-04-10 12:27:40 +02: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
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)
e61cb1794f
Merge branch 'master' into GLTF2_recursive_references_fix
2020-04-02 08:08:08 +01:00
Marc-Antoine Lortie
06e40b9820
Removed unneeded SceneDiffer.h includes.
2020-03-31 17:22:56 -04:00
Kim Kulling
bc3de4079a
Disable terragen test.
2020-03-31 13:49:22 +02:00
Kim Kulling
7f63a4b0d7
add terragen importer unittest.
2020-03-30 21:53:25 +02:00
Kim Kulling
4c177ad72e
fix possible warnings
2020-03-30 20:33:43 +02:00
Marc-Antoine Lortie
f9a7d2abf1
Added C API tests.
2020-03-27 07:59:10 -04:00
Kim Kulling
96c7c567e6
Merge branch 'master' into kimkulling_dev
2020-03-26 11:56:45 +01:00
Max Vollmer (Microsoft Havok)
3c9751ce0c
Merge branch 'master' into GLTF2_recursive_references_fix
2020-03-26 10:16:58 +00:00
Max Vollmer (Microsoft Havok)
2006eeed85
Merge branch 'master' into GLTF2_recursive_references_fix
2020-03-23 08:07:25 +00:00
Kim Kulling
6f8d96b57e
Merge branch 'master' into kimkulling_dev
2020-03-23 09:00:41 +01:00
Max Vollmer (Microsoft Havok)
973e38ad97
Merge branch 'master' into GLTF2_guarantee_rootnode_fix
2020-03-23 07:57:38 +00:00
Kim Kulling
c0ae9b6040
fix invalid check
2020-03-22 14:21:24 +01:00
Kim Kulling
14860f3822
fix warning.
2020-03-22 13:34:27 +01:00
Kim Kulling
68a9fa2df3
reformat unittests.
2020-03-22 12:13:09 +01:00