f67c71d5c7
Merge branch 'master' into fbx_blendshape_channelName
2020-06-12 10:55:32 +02:00
ffaa634c48
Merge branch 'master' into issue_3165
2020-06-09 10:48:27 +02:00
620bebb999
diable warning only for gcc 8.0 or greater
2020-06-09 10:14:57 +02:00
42afc40d16
Disable warning only for gcc 8.0 or greater
2020-06-09 10:13:43 +02:00
35fb4c9370
Remove dead code
2020-06-09 10:07:25 +02:00
5c7bed01f1
remove dead code.
2020-06-09 10:06:50 +02:00
9e46f9751f
Check for invalid texture coordinate accessor. Fixes #3269 .
2020-06-09 15:49:38 +10:00
26421aebc9
support channel name in blendshape name
2020-06-08 13:33:16 -07:00
b37d42f6b5
Perform sanity check only in debug
...
closes https://github.com/assimp/assimp/issues/3255
2020-06-07 18:03:47 +02:00
e6446e1e68
Merge branch 'master' into issue_3258
2020-06-07 08:23:04 +02:00
2c0df39ef3
Added rapidjson define to avoid warnings in c++17
2020-06-06 14:33:41 +02:00
62273b63e5
closes https://github.com/assimp/assimp/issues/3256 : Remove redundand code
2020-06-06 12:22:01 +02:00
4e34853ac7
gltf2 export target names for blendshapes
2020-06-05 12:17:27 -07:00
6d04e16c7e
Merge branch 'master' into issue_3165
2020-05-28 21:51:58 +02:00
d40a3026db
closes https://github.com/assimp/assimp/issues/3165 : fix gcc build.
2020-05-28 21:02:13 +02:00
78c9ac2889
Merge branch 'master' into gltf2_sparseAccessor_import
2020-05-25 16:11:01 +02:00
2be731d1bf
Merge branch 'master' into pugi_xml
2020-05-22 10:09:46 +02:00
a97e4c15b3
Merge branch 'master' into master
2020-05-21 21:15:50 +02:00
ecfca1d5c5
Merge branch 'master' into verboseLogging
2020-05-21 18:30:52 +02:00
193deb3441
cleanup
2020-05-18 12:01:09 -07:00
e39c632809
cleanup
2020-05-18 11:50:51 -07:00
0897c4c7be
merge
2020-05-18 11:31:44 -07:00
02cbd36271
pull master
2020-05-18 11:15:18 -07:00
e9a3cc2c8a
Fixed rotation order bug in BVH Loader
...
This bug has been present since after the 4.10 release.
It fixes the issue "play the bvh error" #2187
Almost all bvh files are affected, such as any of the CMU library.
The bug is caused by the introduction of channelMap in the BVHLoader.cpp - function void BVHLoader::CreateAnimation(aiScene *pScene). The channelMap loses the rotation order present oin the BVH file, and always applies the rotations in X,Y,Z order.
2020-05-18 16:07:46 +01:00
14692368d5
Same for LogDebug -> LogVerboseDebug
2020-05-18 11:55:14 +01:00
87a7662bee
More thinks using VERBOSE_DEBUG
2020-05-18 11:45:00 +01:00
2438e1b52e
Merge branch 'master' into gltf2_fix_skin_recursion
2020-05-18 09:05:28 +02:00
4b0a3305b1
Merge branch 'master' into master
2020-05-17 13:54:10 +02:00
4f24b3dac2
Merge branch 'added_check_before_using' of https://github.com/qarmin/assimp into qarmin-added_check_before_using
2020-05-17 11:48:24 +02:00
cfbdacb02a
Merge branch 'master' into bug-3201-collada_root_meshes
2020-05-16 20:50:34 +02:00
d70685d37f
Fix typo
2020-05-15 17:50:48 +01:00
90cdbd9d9a
Fix ups
2020-05-15 17:46:50 +01:00
434c5e3d37
More verbose logging
2020-05-15 17:29:49 +01:00
2ffd1cb8db
nits
2020-05-15 17:22:15 +01:00
bcca3a0d79
No need for bespoke macros
2020-05-15 17:22:02 +01:00
6be0ce1ec9
Initial pass at adding logging
2020-05-15 17:21:45 +01:00
7a16a7a7e4
Fix infinite recursion in gltf2 skin parsing
...
Previously parsing a node caused the skin that was attached to it
to be parsed, which caused the skins node joints to be parsed,
which could cause the skin to be re-parsed leading to infinite or
at the very least exponential recursion.
The fix is to just get a reference to a temporarily uninitialized
skin as they were being parsed after the scene graph just to be safe
anyway. This way we avoid the recursion problem and all the references
will be valid in the end.
2020-05-15 16:48:41 +03:00
464d4cf99a
Merge branch 'master' of https://github.com/inhosens/assimp into inhosens-master
2020-05-15 15:08:30 +02:00
246ec2b0dc
Merge branch 'migenius-fix-ortho' of https://github.com/migenius/assimp into migenius-migenius-fix-ortho
2020-05-15 13:37:03 +02:00
a6b5abd698
Merge branch 'master' of https://github.com/zyndor/assimp into zyndor-master
2020-05-15 08:51:46 +02:00
2571b47a28
Merge branch 'master' into bug-3177-dae-geo-id
2020-05-13 20:24:53 +02:00
e9b67cdb89
gltf2 import sparse accessor
2020-05-11 14:34:35 -07:00
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
c5a9fbd47f
Gracefully handle NaNs and Infs in gltf2 accessor bound computation
2020-05-11 12:02:38 -07:00
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
3fdcd0861f
Fix fbx rotation ;
2020-05-11 10:28:05 +02:00
a1bcca2c99
remove step prototype: does not work this way.
2020-05-07 14:00:40 +02:00
60e8146b9f
fix wrong target idx when importing
2020-05-05 12:51:40 -07:00
56a4e61533
Collada: Don't copy the scene when exporting
...
This was purely to add a virtual top-level node
Use a flag instead.
Also add more const
2020-05-05 10:16:13 +01:00
6e447b2c44
Merge branch 'bug-3177-dae-geo-id' into bug-3201-collada_root_meshes
2020-05-05 09:52:08 +01:00
d1ae6ac77a
Fix typo in <visual_scene>
...
Swapped Id and Name
2020-05-05 09:51:41 +01:00
fa1d2f09db
Merge branch 'master' into bug-3177-dae-geo-id
2020-05-05 09:33:48 +01:00
ddee1b1ddb
Merge branch 'master' into aaronfranke-file-formatting
2020-05-05 10:21:46 +02:00
4e16716924
Merge branch 'file-formatting' of https://github.com/aaronfranke/assimp into aaronfranke-file-formatting
2020-05-05 10:17:52 +02:00
bf95d1da7c
fix conversion
2020-05-04 21:48:46 +02:00
8e73984a11
Collada Root Nodes aren't allowed to have meshes
...
Create a null parent node instead
2020-05-04 17:47:09 +01:00
6e200cb0d3
Merge branch 'master' into bug-3177-dae-geo-id
...
Impossible merge, have discarded upstream
2020-05-04 13:59:09 +01:00
ea917bd4ae
Move Collada into AssetLib folder
...
Should make the merge easier
2020-05-04 13:54:49 +01:00
91fa9a102b
closes https://github.com/assimp/assimp/issues/3181 : fix typo for light type.
2020-05-03 12:17:32 +02:00
3b06f57150
add missing inclde +
2020-05-02 21:11:47 +02:00
514593548d
add assert-test for nullptr.
2020-05-02 21:07:41 +02:00
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
f8e6512a63
Move format importer and exporter into its won folder.
2020-05-02 15:14:38 +02:00
Kim Kulling
Paul Arden
Yingying Wang
Alec
kimkulling
Kevin Shepherd
Malcolm Tyrrell
Matias Kangasjärvelä
Jeremy Cytryn
hoshiryu
RichardTea
kkulling