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

8871 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kim Kulling
2aa6ca89bc Merge pull request #3271 from DavidBerger98/pyassimp-contextmanager 
Pyassimp - contextmanager for load function
 2020-06-10 10:05:03 +02:00
David
b84dbb68ec Update READMEs 2020-06-09 08:33:09 +02:00
David
efbabf3b0d Implement contextmanager for load 2020-06-09 08:32:59 +02:00
Kim Kulling
ce838dfafb Merge pull request #3265 from assimp/issue_3255 
Perform sanity check only in debug
 2020-06-07 18:47:38 +02:00
Kim Kulling
b37d42f6b5 Perform sanity check only in debug 
closes https://github.com/assimp/assimp/issues/3255
 2020-06-07 18:03:47 +02:00
Kim Kulling
968a729df5 Merge pull request #3263 from AlecLafita/issue_3258 
Added rapidjson define to avoid warnings in c++17
 2020-06-07 10:48:51 +02:00
Kim Kulling
e6446e1e68 Merge branch 'master' into issue_3258 2020-06-07 08:23:04 +02:00
Kim Kulling
5307d5ee0f Merge pull request #3262 from assimp/issue_3256 
closes https://github.com/assimp/assimp/issues/3256: Remove redundand…
 2020-06-06 15:55:24 +02:00
Alec
2c0df39ef3 Added rapidjson define to avoid warnings in c++17 2020-06-06 14:33:41 +02:00
Kim Kulling
62273b63e5 closes https://github.com/assimp/assimp/issues/3256: Remove redundand code 2020-06-06 12:22:01 +02:00
Kim Kulling
ab0dcdc321 Merge pull request #3249 from hbina/evaluate_expression 
Evaluated expressions and clean up some code in tests
 2020-06-02 19:01:05 +02:00
Hanif Bin Ariffin
7db6475592 Change from (int division -> cast) to (cast -> float division) 2020-05-29 11:59:28 -04:00
Hanif Bin Ariffin
eceb8aeed1 Cleaned up implicit conversion and code. 2020-05-28 19:22:06 -04:00
Hanif Bin Ariffin
d4ca91f408 Evaluated the following expressions to either values. 2020-05-28 19:20:54 -04:00
Kim Kulling
1427e67b54 Merge pull request #3219 from thomasbiang/gltf2_sparseAccessor_import 
Gltf2 Support Importing sparse accessor
 2020-05-26 21:44:56 +02:00
Kim Kulling
2c9cfefe67 Merge branch 'master' into gltf2_sparseAccessor_import 2020-05-26 21:30:51 +02:00
Kim Kulling
03eb08d98e Merge pull request #3243 from assimp/issue_3183-1 
Update utRemoveComponent.cpp
 2020-05-25 21:02:00 +02:00
Kim Kulling
ee45a18852 Merge branch 'master' into issue_3183-1 2020-05-25 20:50:19 +02:00
Kim Kulling
a7e03ddb1c Merge pull request #3242 from assimp/issue_3183 
Remove duplicated code
 2020-05-25 20:50:03 +02:00
Kim Kulling
c94ed5c7b1 Update utRemoveComponent.cpp 
closes https://github.com/assimp/assimp/issues/3183
 2020-05-25 20:40:19 +02:00
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
78c9ac2889 Merge branch 'master' into gltf2_sparseAccessor_import 2020-05-25 16:11:01 +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
Yingying Wang
193deb3441 cleanup 2020-05-18 12:01:09 -07:00
Yingying Wang
e39c632809 cleanup 2020-05-18 11:50:51 -07:00
Yingying Wang
a87df0eb32 merge 2020-05-18 11:35:46 -07:00
Yingying Wang
0897c4c7be merge 2020-05-18 11:31:44 -07:00
Yingying Wang
02cbd36271 pull master 2020-05-18 11:15:18 -07: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
af3033ee8b Merge branch 'master' into gltf2_sparseAccessor_import 2020-05-17 17:21:55 +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