Commit Graph

9443 Commits (aee01e8345b7a1d33bc766bb3d798458f81c48d7)

Author SHA1 Message Date
Kim Kulling aee01e8345
Merge pull request #3514 from ms-maxvollmer/gltf_fixes
GLTF: Fix crash on invalid base64 data + improved error messages
2020-12-08 19:48:53 +01:00
Kim Kulling 233d834514
Merge branch 'master' into gltf_fixes 2020-12-07 20:36:53 +01:00
Kim Kulling 41904ad7ce
Merge pull request #3516 from assimp/kimkulling-patch-8
Update Readme.md
2020-12-07 20:30:21 +01:00
Kim Kulling 1f8c75c871
Merge branch 'master' into kimkulling-patch-8 2020-12-07 16:55:07 +01:00
Kim Kulling c0d7ea981a
Merge branch 'master' into gltf_fixes 2020-12-04 16:02:16 +01:00
Kim Kulling 63f1b66224
Merge pull request #3512 from boguscoder/master
Fix for 3489 | Preserve morph targets when splitting by bone count
2020-12-04 15:58:22 +01:00
Kim Kulling eccdc6dc96
Merge branch 'master' into master 2020-12-04 15:30:56 +01:00
Kim Kulling f87ab4b4d7
Merge pull request #3506 from MalcolmTyrrell/fbxExceptionSafety
Fbx exception safety
2020-12-04 15:30:27 +01:00
Kim Kulling 5020a0aa33
Merge branch 'master' into fbxExceptionSafety 2020-12-04 11:01:56 +01:00
Max Vollmer (Microsoft Havok) e737adde50
Merge branch 'master' into gltf_fixes 2020-12-04 08:58:52 +00:00
Kim Kulling 00b626c3c5
Merge pull request #3505 from Neil-Clifford-FB/scenepreprocessor-memoryleak
Sceneprecessor - potential memory leak
2020-12-03 20:41:50 +01:00
Kim Kulling c7aeb882e6
Update ScenePreprocessor.cpp 2020-12-03 17:28:51 +01:00
Max Vollmer (Microsoft Havok) a0ebad1698
Merge branch 'master' into gltf_fixes 2020-12-03 09:28:48 +00:00
Kim Kulling c5f45e26bd
Merge branch 'master' into scenepreprocessor-memoryleak 2020-12-03 10:08:05 +01:00
Kim Kulling 542ca843be
Update Readme.md 2020-12-01 16:38:18 +01:00
Kim Kulling 0458ead7a2
Merge pull request #3503 from natanaeljr/master
Update Android port README.md with ABI doc
2020-12-01 12:30:09 +01:00
Kim Kulling 75204dfe7f
Update README.md 2020-12-01 08:58:45 +01:00
Kim Kulling 223372aaba
Merge branch 'master' into master 2020-11-30 19:05:31 +01:00
Max Vollmer 53ff0702ce Fixed check for base64 char values 2020-11-30 16:21:29 +00:00
Max Vollmer 7d72c78c8e Some improvements 2020-11-30 15:20:51 +00:00
Max Vollmer 6ed1488e6e * Improved error messages
* Throw instead of asserts on invalid file input
2020-11-30 15:04:06 +00:00
Oleg Bogdanov 4d4a3c42f6 Fix for 3489 | Preserve morph targets when splitting by bone count 2020-11-28 10:01:50 -08:00
Kim Kulling 88be8ec698
Merge branch 'master' into fbxExceptionSafety 2020-11-27 21:49:58 +01:00
Kim Kulling 9ae112309f
Merge pull request #3511 from MalcolmTyrrell/fbxVideoKeys
Simplification: textures_converted keys can just be pointers
2020-11-27 21:49:21 +01:00
Malcolm Tyrrell 149b8d1fd1 Don't need operator< either. 2020-11-27 14:26:51 +00:00
Malcolm Tyrrell 14f79caf41 textures_converted keys can just be pointers 2020-11-26 16:29:37 +00:00
Neil Clifford ea60563822
Merge branch 'master' into scenepreprocessor-memoryleak 2020-11-26 08:57:57 +00:00
Kim Kulling 11b4153949
Merge pull request #3487 from inhosens/master
Prevent to generate redundant morph targets for glTF2
2020-11-25 17:13:38 +01:00
Kim Kulling 4590f06756
Merge branch 'master' into master 2020-11-25 16:57:49 +01:00
Kim Kulling dc9db3eaf2
Merge pull request #3504 from Neil-Clifford-FB/fbxparser-overead
FBXParser.cpp - handle buffer over-read correctly
2020-11-25 11:30:52 +01:00
Kim Kulling c059e58c5e
Merge branch 'master' into fbxparser-overead 2020-11-24 08:36:15 +01:00
Kim Kulling fe78310486
Merge branch 'master' into fbxExceptionSafety 2020-11-23 10:08:23 +01:00
Kim Kulling afd69bea8a
Merge pull request #3510 from Evangel63/scene_name
Added mName to aiScene.
2020-11-23 10:07:58 +01:00
Evangel 98e42e22b8 Added check around setting pScene->mName from asset.scene. 2020-11-22 15:49:41 +10:00
Evangel 30584c1ec1 Replaced name with scene_name to avoid shadowing. 2020-11-22 15:36:08 +10:00
Evangel 67abcb10ba Added mName to aiScene. Primarily to provide access to the "name" member of glTF2 scenes. 2020-11-22 15:33:31 +10:00
Malcolm Tyrrell 885a196c74 Unsigned 2020-11-19 16:30:44 +00:00
Kim Kulling 8108338215
Merge branch 'master' into master 2020-11-19 16:34:15 +01:00
Kim Kulling b1f3c48551
Merge pull request #3484 from MalcolmTyrrell/findDegeneratesOptimization
Optimize FindDegenerates so it doesn't explode
2020-11-19 16:33:46 +01:00
Neil Clifford fc842a0f97 Sceneprecessor potential memory leak 2020-11-19 13:20:43 +00:00
Neil Clifford 7b59cc297e FBXParser.cpp - handle buffer over-read cases correctly 2020-11-19 12:20:06 +00:00
Kim Kulling d10bf9a0d3
Merge branch 'master' into master 2020-11-18 21:30:58 +01:00
Inho Lee e3083c21f0 glTF2: import correct animation values for CUBICSPLINE
CUBICSPLINE interpolation has tangent values with the animation data.
Current import don't care this interpolation type but it will help not
to fetch tangent values instead of animation data.

Note: Assimp cannot support interpolation types yet.
2020-11-17 17:21:07 +01:00
Malcolm Tyrrell c00153089a Neater construction 2020-11-17 10:45:10 +00:00
Malcolm Tyrrell 213a9f9d55 First pass at PotentialNode 2020-11-17 10:39:03 +00:00
Malcolm Tyrrell c4573a6d5c
Merge branch 'master' into findDegeneratesOptimization 2020-11-17 09:44:13 +00:00
Natanael Rabello 813f171493 Update Android port README.md with ABI doc 2020-11-16 21:45:01 -03:00
Kim Kulling 749a4963a2
Merge pull request #3501 from Nodrev/issue_3500
Fixing issue 3500, invalid outer cone angle readed from gltf2 file on  machines which defines M_PI as a double value
2020-11-16 22:03:54 +01:00
Kim Kulling c4ba5eeeea
Merge branch 'master' into issue_3500 2020-11-16 21:52:14 +01:00
Kim Kulling 25aaa333eb
Merge pull request #3502 from MalcolmTyrrell/fbxTextureFix
Prevent crash with malformed texture reference
2020-11-16 21:51:41 +01:00