v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,843 Commits
74 Branches
37 Tags
234 MiB
Commit Graph

8843 Commits (4a2cb779bb7e5ac5597b8c1cc927aa91cfcfea98)

Author SHA1 Message Date
Kim Kulling 4a2cb779bb
Merge branch 'master' into issue_3183 2020-05-25 20:38:55 +02:00
Kim Kulling 8d98d8a72d
Merge pull request #3241 from assimp/kimkulling-dev 
File is duplicated
 2020-05-25 20:38:41 +02:00
Kim Kulling c82f8c0b8f
Remove duplicated code 
closes https://github.com/assimp/assimp/issues/3183
 2020-05-25 20:38:12 +02:00
Kim Kulling e33ed9e7a1
File is duplicated 
closes https://github.com/assimp/assimp/issues/3238
 2020-05-25 20:30:18 +02:00
Kim Kulling a6d554f645
Merge pull request #3233 from kshepherd2013/master 
Fixed rotation order bug in BVH Loader
 2020-05-21 22:21:58 +02:00
Kim Kulling a97e4c15b3
Merge branch 'master' into master 2020-05-21 21:15:50 +02:00
Kim Kulling 1681850424
Merge pull request #3232 from MalcolmTyrrell/verboseLogging 
Verbose logging
 2020-05-21 21:12:11 +02:00
Kim Kulling ecfca1d5c5
Merge branch 'master' into verboseLogging 2020-05-21 18:30:52 +02:00
Kim Kulling f940a37be6
Merge pull request #3235 from rmstyrczula/master 
Fix double free caused in FindInvalidDataProcess
 2020-05-20 10:20:00 +02:00
Ryan Styrczula c4055d04b4 Fix double free caused in FindInvalidDataProcess 
In debug builds, there's no issues, but in release, an invalid mesh that
is deleted in FindInvalidDataProcess will be double free'd when the
parent scene is destroyed.
 2020-05-19 14:38:10 -04:00
Kevin Shepherd 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
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 87a7662bee More thinks using VERBOSE_DEBUG 2020-05-18 11:45:00 +01:00
Kim Kulling 3b15eca099
Merge pull request #3226 from M4T1A5/gltf2_fix_skin_recursion 
[GLTF2] Fix infinite recursion in skin/node parsing
 2020-05-18 11:12:49 +02:00
Kim Kulling 2438e1b52e
Merge branch 'master' into gltf2_fix_skin_recursion 2020-05-18 09:05:28 +02:00
Kim Kulling 110f8845a2
Merge pull request #3215 from kalyan-kumar/unix-cmake-fix 
Add IMPORTED_CONFIGURATIONS property to cmake target.
 2020-05-17 16:21:42 +02:00
Kim Kulling 1259146daa
Merge branch 'master' into unix-cmake-fix 2020-05-17 14:14:12 +02:00
Kim Kulling 0fc82388f9
Merge pull request #3214 from jercytryn/master 
[gltf2 Export] More robust handling for non-finites and 0-length normals
 2020-05-17 14:12:48 +02:00
Kim Kulling 4b0a3305b1
Merge branch 'master' into master 2020-05-17 13:54:10 +02:00
Kim Kulling 9566284873
Merge pull request #3229 from assimp/qarmin-added_check_before_using 
Qarmin added check before using
 2020-05-17 13:53:44 +02:00
Kim Kulling 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
Kim Kulling 15125c5eb8
Merge pull request #3205 from RichardTea/bug-3201-collada_root_meshes 
Export Collada Meshes on root aiNode
 2020-05-17 11:39:02 +02:00
Kim Kulling cfbdacb02a
Merge branch 'master' into bug-3201-collada_root_meshes 2020-05-16 20:50:34 +02:00
Kim Kulling 883f18ebe5
Merge pull request #3195 from dmgolembiowski/master 
Any interest in Rust '18 port?
 2020-05-16 20:49:55 +02:00
Kim Kulling d7e8fefed7
Merge branch 'master' into master 2020-05-16 20:41:05 +02:00
Kim Kulling 7fe5257e0f
Merge pull request #3194 from RichardTea/collada_unit_test_cleanup 
Collada unit test cleanup
 2020-05-16 20:40:28 +02:00
Kim Kulling df9c09d9e1
Merge branch 'master' into collada_unit_test_cleanup 2020-05-16 19:59:30 +02:00
Malcolm Tyrrell d70685d37f Fix typo 2020-05-15 17:50:48 +01:00
Malcolm Tyrrell 90cdbd9d9a Fix ups 2020-05-15 17:46:50 +01:00
Malcolm Tyrrell 434c5e3d37 More verbose logging 2020-05-15 17:29:49 +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 2ffd1cb8db nits 2020-05-15 17:22:15 +01:00
Malcolm Tyrrell bcca3a0d79 No need for bespoke macros 2020-05-15 17:22:02 +01:00
Malcolm Tyrrell 6be0ce1ec9 Initial pass at adding logging 2020-05-15 17:21:45 +01:00
Matias Kangasjärvelä 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
Kim Kulling b7de061749
Merge pull request #3225 from assimp/inhosens-master 
Inhosens master
 2020-05-15 15:16:47 +02:00
kimkulling 464d4cf99a Merge branch 'master' of https://github.com/inhosens/assimp into inhosens-master 2020-05-15 15:08:30 +02:00
Kim Kulling e74d86b40e
Merge pull request #3224 from assimp/migenius-migenius-fix-ortho 
Migenius migenius fix ortho
 2020-05-15 14:09:42 +02:00
kimkulling 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
Kim Kulling 22607de237
Merge pull request #3223 from assimp/zyndor-master 
Zyndor master
 2020-05-15 10:51:41 +02:00
kimkulling a6b5abd698 Merge branch 'master' of https://github.com/zyndor/assimp into zyndor-master 2020-05-15 08:51:46 +02:00
Kim Kulling c32f587a89
Merge pull request #3188 from RichardTea/bug-3177-dae-geo-id 
Collada: Ensure export uses unique Mesh Ids
 2020-05-13 20:39:14 +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 578dc09810
Merge pull request #3175 from hoshiryu/fix_fbx_rotation 
Fix fbx rotation ;
 2020-05-11 19:19:40 +02:00
hoshiryu 3fdcd0861f Fix fbx rotation ; 2020-05-11 10:28:05 +02:00