Commit Graph

5118 Commits

Author SHA1 Message Date
Kim Kulling
f67a9f253f Merge branch 'master' into 3dsMax2021PbrMaterials 2020-12-03 22:20:01 +01:00
Kim Kulling
c7aeb882e6 Update ScenePreprocessor.cpp 2020-12-03 17:28:51 +01:00
Malcolm Tyrrell
471d2acc92 Improvements & style 2020-12-03 11:17:45 +00:00
Kim Kulling
c5f45e26bd Merge branch 'master' into scenepreprocessor-memoryleak 2020-12-03 10:08:05 +01:00
Malcolm Tyrrell
19af3f0d31 Swap the meaning using the out_mat property. 2020-12-02 16:59:29 +00:00
Malcolm Tyrrell
f7be3048de New 3ds Max PBR Materials in FBX 2020-12-01 12:05:42 +00: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
4590f06756 Merge branch 'master' into master 2020-11-25 16:57:49 +01:00
Kim Kulling
c059e58c5e Merge branch 'master' into fbxparser-overead 2020-11-24 08:36:15 +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
Kim Kulling
8108338215 Merge branch 'master' into master 2020-11-19 16:34:15 +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
c4573a6d5c Merge branch 'master' into findDegeneratesOptimization 2020-11-17 09:44:13 +00:00
Kim Kulling
c4ba5eeeea Merge branch 'master' into issue_3500 2020-11-16 21:52:14 +01:00
Malcolm Tyrrell
3221522f95 Prevent crash with malformed texture reference 2020-11-16 17:29:19 +00:00
Malcolm Tyrrell
d9b90f714a Fix typo 2020-11-16 11:06:39 +00:00
Malcolm Tyrrell
3ce0958b98 Merge branch 'master' into findDegeneratesOptimization 2020-11-16 09:13:13 +00:00
Jean-François Verdon
09ca11d063 Fixing issue 3500, invalid outer cone angle readed from gltf2 file on machines which defines M_PI as a double value 2020-11-16 09:19:13 +01:00
Kim Kulling
647cef8a8b Merge branch 'master' into nullBufferviewFix 2020-11-15 19:02:09 +01:00
Kim Kulling
0d5e5790cb Fix findings. 2020-11-14 12:44:49 +01:00
Kim Kulling
db7e594221 Merge branch 'master' into findDegeneratesOptimization 2020-11-14 12:32:57 +01:00
Inho Lee
8845d7eed3 Prevent to generate redundant morph targets for glTF2 2020-11-11 20:49:22 +01:00
Kim Kulling
fa0951012f closes https://github.com/assimp/assimp/issues/1044: fix envelope handling in lightintensity. 2020-11-11 20:32:55 +01:00
Kim Kulling
707ad68fba Merge branch 'master' into findDegeneratesOptimization 2020-11-11 09:54:08 +01:00
Kim Kulling
ab34b25a03 Merge branch 'master' into kimkulling-patch-8 2020-11-10 15:32:04 +01:00
Kim Kulling
8c91d1a3cd closes https://github.com/assimp/assimp/issues/3198: make aiMaterial::GetName const. 2020-11-10 12:50:17 +01:00
Kim Kulling
a8381113eb Update ObjFileMtlImporter.cpp 2020-11-10 10:23:28 +01:00
Kim Kulling
856d4c016e closes https://github.com/assimp/assimp/issues/3448
Add transmission alpha value. if any.
2020-11-10 10:03:09 +01:00
Malcolm Tyrrell
0f246edb97 Prevent GetValue from corrupting memory 2020-11-06 13:43:16 +00:00
Malcolm Tyrrell
34e3e6293a Style 2020-11-06 09:57:48 +00:00
Malcolm Tyrrell
0af05e7a60 Better message 2020-11-05 15:10:52 +00:00
Malcolm Tyrrell
01b2088dd3 A missing bufferview was causing a crash. 2020-11-05 15:02:41 +00:00
Kim Kulling
6873d79505 Delete AMFImporter_Postprocess.cpp 2020-11-03 13:00:28 +01:00
Malcolm Tyrrell
3deae8760c Optimize FindDegenerates so it doesn't explode 2020-11-02 14:43:35 +00:00
Kim Kulling
206f28b8ad Merge branch 'master' into fix/3365 2020-10-29 13:40:00 +01:00
Kim Kulling
72bc41b50f Merge branch 'master' into fix/xcode-compile-20201018 2020-10-28 22:00:08 +01:00
Kim Kulling
8c135f779e Merge branch 'master' into readFbxWeightsInConfig 2020-10-28 20:38:29 +01:00
Kim Kulling
3fd95aff4e Merge branch 'master' into fix/3365 2020-10-27 17:43:28 +01:00
Kim Kulling
df768bdd99 Merge branch 'master' into patch-1 2020-10-27 16:20:33 +01:00
Kim Kulling
7e1a8f09c5 more openddl-fixes 2020-10-26 21:35:44 +01:00
Kim Kulling
aee2e9a87d Merge branch 'master' into patch-1 2020-10-25 20:35:06 +01:00
Kim Kulling
57e691e28e openddl: latest greatest. 2020-10-25 10:34:43 +01:00
Kim Kulling
55feb0cb78 Merge branch 'master' into fix/xcode-compile-20201018 2020-10-23 22:06:49 +02:00