Max Vollmer
6ed1488e6e
* Improved error messages
...
* Throw instead of asserts on invalid file input
2020-11-30 15:04:06 +00:00
Kim Kulling
88be8ec698
Merge branch 'master' into fbxExceptionSafety
2020-11-27 21:49:58 +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
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
Kim Kulling
fe78310486
Merge branch 'master' into fbxExceptionSafety
2020-11-23 10:08:23 +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
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
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
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
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
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
8c135f779e
Merge branch 'master' into readFbxWeightsInConfig
2020-10-28 20:38:29 +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
Max Vollmer
4006bb71f4
Fixes for crashes in GLTF2 Importer
2020-10-23 12:01:43 +01:00
#Momo
b168d8f441
replaced data with taking address of first element
...
oops, seems like `data()` returns `char*` only since C++17. Replaced with taking address of first string element
2020-10-21 23:41:33 +03:00
#Momo
7781fe5781
MSVC crash workaround
...
I do not know why, but the following line causes crash if assimp was compiled using MSVC with RelWithDebInfo configuration:
`std::transform(shading.begin(), shading.end(), shading.begin(), Assimp::ToLower<char>);`
replacing `shading.begin()` with `shading.data()` fixes this issue.
2020-10-21 23:21:50 +03:00
Kim Kulling
b842b4a3c1
Merge branch 'master' into fbxReportAssetIssuesProperly
2020-10-21 20:02:48 +02:00
Kim Kulling
bbac168ced
Merge branch 'master' into collada_cleanup
2020-10-19 23:56:52 +02:00
Kim Kulling
69143ed149
fix unittests.
2020-10-19 23:53:27 +02:00
Kim Kulling
080322b9e2
cleanup collada xml migration.
2020-10-19 19:06:11 +02:00
Malcolm Tyrrell
a2cd5619b4
Merge branch 'master' into readFbxWeightsInConfig
2020-10-19 10:16:02 +01:00
Inho Lee
ad7f8910e9
Rollback the method to handle empty bones for GLTF2
...
A patch made the assimp to ignore empty bones.
However, some assets can have bones which don't have weights
but are connected to other bones.
2020-10-16 17:09:17 +02:00
Inho Lee
9f880e2214
Fix glTF1 orthographic camera
2020-10-16 08:56:55 +02:00
Malcolm Tyrrell
0363c18f1f
Read weights
2020-10-15 10:07:24 +01:00
Kim Kulling
7660070aa4
Merge branch 'master' into master
2020-10-14 21:01:35 +02:00
Kim Kulling
857f62cde0
closes pParam.mReference = source;
2020-10-14 20:34:46 +02:00
Jukka Maatta
6848a18999
Fix for issue #3445
...
Add const to avoid creating a temporary copy.
This should fix the cmake compilation error on XGLLoader.cpp shown in bug #3445
The fix is similar to commit bbe6f7f213
2020-10-13 21:56:43 +03:00
Kim Kulling
636f28965f
Merge branch 'master' into fbxReportAssetIssuesProperly
2020-10-11 18:13:43 +02:00
Sahin Serdar Kocdemir
eb9928e029
fix for fbx files using stringray materials;
2020-10-09 07:28:15 +01:00
Malcolm Tyrrell
20733537d7
Merge branch 'master' into fbxReportAssetIssuesProperly
2020-10-08 09:54:04 +01:00
Optimizer0
152343b186
Merge branch 'master' into master
2020-10-06 08:35:26 +05:30
Malcolm Tyrrell
4bdaf20b70
Add comment.
2020-10-05 14:23:42 +01:00
Isuru2000psn
f2b3ec2e0c
strict-aliasing level 3 warnings fix
2020-10-05 15:29:09 +05:30
Malcolm Tyrrell
585fb89154
Make an assert a DeadlyImportError.
2020-10-02 15:25:16 +01:00
Malcolm Tyrrell
6b9c477763
The floar parsing routines are now DeadlyErrors.
2020-10-02 13:58:55 +01:00
Kim Kulling
c7f7ed8901
Update ColladaLoader.cpp
2020-09-30 20:51:54 +02:00
Kim Kulling
0191c661b5
fix division by zero.
2020-09-30 20:39:26 +02:00
Kim Kulling
177426185e
Fix invalid cast
2020-09-30 16:38:13 +02:00
Kim Kulling
50d21e08f3
fix memoy leak.
2020-09-30 12:05:32 +02:00
Kim Kulling
788099a223
Merge branch 'master' into pugi_xml
2020-09-29 21:29:37 +02:00
Kim Kulling
c591f7de2f
make xml parsing more verbose.
2020-09-29 21:01:10 +02:00
Kim Kulling
db49a541c3
remove unused attributes.
2020-09-28 20:35:30 +02:00
Kim Kulling
ef9a78b49d
remove unused attributes.
2020-09-28 20:34:44 +02:00
Kim Kulling
bf4ad2837f
Remove dead code.
2020-09-28 15:20:59 +02:00
Kim Kulling
c598a12340
Remove unused variable.
2020-09-28 09:15:56 +02:00
Kim Kulling
89ac168014
ogre: fix warning: not inited variable.
2020-09-27 21:23:55 +02:00
Kim Kulling
1c85676a9c
collada: fix warning: not inited variable.
2020-09-27 21:19:23 +02:00
Kim Kulling
052cc2e070
collada: fix warning: not inited variable.
2020-09-27 21:16:51 +02:00
Kim Kulling
5038f21d06
collada: fix warning: not inited variable.
2020-09-27 21:14:21 +02:00
Kim Kulling
202907d471
collada: fix warning: unused variable.
2020-09-27 21:11:42 +02:00
Kim Kulling
3f97a1df2c
collada: fix warning: unused variable.
2020-09-27 21:09:06 +02:00
Kim Kulling
bdd3c96eee
amf: fix warning: unused variable.
2020-09-27 21:06:14 +02:00
Kim Kulling
5877f81419
amf: fix warning: unused variable.
2020-09-27 21:03:59 +02:00
Kim Kulling
5230b91611
amf: fix warning: unused variable.
2020-09-27 21:01:48 +02:00
Kim Kulling
8143ea5aec
amf: fix warning: unused variable.
2020-09-27 20:58:08 +02:00
Kim Kulling
9a19a4723b
amf: fix warning: unused variable.
2020-09-27 20:54:21 +02:00
Kim Kulling
5653a82a87
fix the unittests.
2020-09-27 20:20:44 +02:00
Kim Kulling
9234fee35e
Ogre: fix xml migration.
2020-09-27 09:36:38 +02:00
Sherief Farouk
a3c8cfc0ff
Fix for build break due to warnings-as-errors when not building M3D exporter.
2020-09-26 23:21:23 -07:00
Kim Kulling
d6892b3f58
Merge branch 'master' into pugi_xml
2020-09-25 21:00:09 +02:00
Kim Kulling
557273818d
collada: next iteration.
2020-09-23 21:23:12 +02:00
Kim Kulling
34351b3cb9
fix collada material parsing.
2020-09-23 00:20:06 +02:00
Kim Kulling
c0e58c1895
Merge branch 'master' into gltfBufferViewSizeFix
2020-09-22 20:02:16 +02:00
kimkulling
71f20eaa8a
next fixes
2020-09-22 15:51:21 +02:00
kimkulling
dee8e5bee1
Merge branch 'pugi_xml' of https://github.com/assimp/assimp into pugi_xml
2020-09-22 15:20:35 +02:00
Kim Kulling
c4039d5cf0
fix collada data parsing.
2020-09-21 20:05:16 +02:00
kimkulling
8c88526da8
fix collada unittests.
2020-09-21 16:39:24 +02:00
Max Vollmer (Microsoft Havok)
c9fb21661f
Merge branch 'master' into gltfBufferViewSizeFix
2020-09-18 08:01:24 +01:00
rahulshethsc
354e09e785
Merge branch 'master' into rbsheth_hunter_rapidjson
2020-09-17 14:39:04 -04:00
Fabian Schmidt
338c0b753c
Merge branch 'master' into collada_animation_ticks_per_sec_issue_3162
2020-09-16 21:43:35 +02:00
Max Vollmer (Microsoft Havok)
9c1edaee96
Merge branch 'master' into gltfBufferViewSizeFix
2020-09-16 10:08:47 +01:00
Kim Kulling
14d6141f69
Collada: fix scenenode parsing.
2020-09-14 21:35:36 +02:00
Kim Kulling
9e2c4e0cf4
Merge branch 'master' into rbsheth_hunter_rapidjson
2020-09-14 09:00:11 +02:00
Kim Kulling
23defc275a
Merge branch 'master' into makeInternalErrorsAccessible
2020-09-14 08:36:13 +02:00
kimkulling
d0932c405f
fix duplicated node parsing.
2020-09-11 15:46:46 +02:00
Kim Kulling
c1f50e116a
fix next unittests.
2020-09-11 00:46:29 +02:00
Kim Kulling
31f3812241
XGL: fix import of node values.
2020-09-10 21:03:02 +02:00
kimkulling
6ec07e4dc7
XGL: next steps.
2020-09-10 17:31:30 +02:00
kimkulling
cca9eddb1c
Fix material-base AMF-unittest.
2020-09-10 13:56:04 +02:00
Max Vollmer
615ffdf93f
What: Throw instead of assert when input file is invalid.
...
Why: Assimp shouldn't crash on invalid files. Asserts are disabled on Release builds.
2020-09-10 10:47:58 +01:00