Commit Graph

12783 Commits

Author SHA1 Message Date
Kim Kulling
cdc0bd00ce Merge pull request #3890 from JC3/jc3-importer-open-error-handling
Fix importer ReadFile issues on file open error or when opening empty files
2021-05-10 22:19:52 +02:00
Kim Kulling
e1a0e16a4e Merge branch 'master' into jc3-importer-open-error-handling 2021-05-10 22:07:25 +02:00
Kim Kulling
76ccaeb42f Merge pull request #3841 from Garux/mdcOrient
orient mdc correctly
2021-05-10 22:06:47 +02:00
Kim Kulling
4807853f09 Merge branch 'master' into mdcOrient 2021-05-10 21:06:15 +02:00
Krishty
ab43f3fefd Merge branch 'stb-image-updated' of https://github.com/krishty/assimp into stb-image-updated 2021-05-10 20:44:55 +02:00
Krishty
d75f8bd5b0 silence warnings in stb_image.h
Re-applies 09c5564d5b to stb_image.h’s new path.
2021-05-10 20:44:43 +02:00
Kim Kulling
433620350e Merge branch 'master' into stb-image-updated 2021-05-10 11:30:45 +02:00
Jason C
f87b180147 Merge branch 'master' into jc3-importer-open-error-handling 2021-05-09 17:02:04 -04:00
Kim Kulling
b30cbcf117 Merge branch 'master' into jc3-spam-killa 2021-05-09 21:47:17 +02:00
Kim Kulling
38dc92c5c9 Merge pull request #3880 from JC3/jc3-cctype-fixes
Make sure ctype calls use unsigned chars.
2021-05-09 21:46:35 +02:00
Jason C
0f85990fe3 Merge branch 'master' into jc3-importer-open-error-handling 2021-05-09 14:42:17 -04:00
Jason C
5cc05c26a7 Merge branch 'master' into jc3-spam-killa 2021-05-09 14:41:39 -04:00
Kim Kulling
319770db9d Merge branch 'master' into jc3-cctype-fixes 2021-05-09 20:37:21 +02:00
Kim Kulling
226b34bb35 Merge pull request #3850 from JC3/patch-3
Fix crash in CanRead when file can not be opened.
2021-05-09 20:25:58 +02:00
Jason C
859b32c045 [Logger] Log a notification instead of silently dropping long log messages.
Logs a notification instead of silently dropping long log messages, which can complicate debugging.

This way, if you don't see a message you expect to see, you'll immediately know why.

The *correct* approach would be to eliminate length filtering here entirely and use `snprintf` appropriately (also there's a tiny -- probably negligible -- performance hit here in calling `strlen` regardless of whether or not the verbosity level matches). Failing that, the second best option is to copy and truncate messages here. However, for now, this should be OK.
2021-05-07 22:32:32 -04:00
Jason C
e37e00c51f [assimp/fast_atof] Fixed garbage in exception messages.
Also reduced 100 byte context output to 30 (which is still probably excessive, but not *as* excessive).
2021-05-07 20:21:56 -04:00
ywang
a19b708144 support both ktx and ktx2 2021-05-07 16:27:23 -07:00
Jason C
9a2a0384f4 Merge branch 'master' into patch-3 2021-05-07 17:53:18 -04:00
Jason C
279e9a186f Merge branch 'master' into jc3-dnase 2021-05-07 14:49:22 -04:00
Jason C
6eb15080ec Merge branch 'master' into jc3-importer-open-error-handling 2021-05-07 14:49:00 -04:00
Jason C
2fd6102573 Merge branch 'master' into jc3-spam-killa 2021-05-07 14:48:24 -04:00
Jason C
7b404788a6 Merge branch 'master' into jc3-cctype-fixes 2021-05-07 14:48:01 -04:00
Carsten Rudolph
1b33dd1965 Document AI_CONFIG_EXPORT_BLOB_NAME. 2021-05-07 17:31:38 +02:00
Carsten Rudolph
8ff52c0f89 Pass base name from export properties to the IO system. 2021-05-07 17:31:30 +02:00
Carsten Rudolph
be85f238f4 Add optional blob base name to blob IO system. 2021-05-07 17:30:58 +02:00
Carsten Rudolph
964778cac1 Add AI_CONFIG_EXPORT_BLOB_NAME export property. 2021-05-07 17:30:26 +02:00
Kim Kulling
25a0eb0d67 Merge branch 'master' into mdcOrient 2021-05-07 13:03:08 +02:00
Kim Kulling
d7c65d363c Merge pull request #3839 from Garux/mRootNode_mTransformation
consider pScene->mRootNode->mTransformation set by some importers while using AI_CONFIG_PP_PTV_ROOT_TRANSFORMATION
2021-05-07 11:52:44 +02:00
Kim Kulling
8cae8c5461 Fix static code analysis findings 2021-05-07 11:52:16 +02:00
Kim Kulling
56bfa1ce5c Make constructros with one arg explicit 2021-05-07 11:36:21 +02:00
ywang
2b9d88c943 support basis universal 2021-05-06 15:10:06 -07:00
Kim Kulling
25cf5dd487 Merge branch 'master' into mRootNode_mTransformation 2021-05-06 21:40:03 +02:00
Kim Kulling
350f2ea1d3 Fix build and merged master. 2021-05-06 21:36:25 +02:00
Kim Kulling
52228a93f8 Fix X3DGeohelper. 2021-05-06 21:07:38 +02:00
Kim Kulling
b1b937ea79 Merge pull request #3838 from Garux/fixGenNormals
consider aiProcess_FlipWindingOrder in aiProcess_GenNormals & aiProcess_GenSmoothNormals
2021-05-06 20:40:17 +02:00
Kim Kulling
e120544978 Merge branch 'master' into fixGenNormals 2021-05-06 17:28:37 +02:00
Kim Kulling
1c90d28f9b Merge pull request #3837 from krishty/add-step-extension
added .step extension to IFC loader
2021-05-06 17:25:22 +02:00
Kim Kulling
bc7551b778 Merge branch 'master' into add-step-extension 2021-05-06 14:19:53 +02:00
Kim Kulling
253fdbdeda Merge pull request #3808 from ericwa/SimpleTexturedDirectx11Fixes
SimpleTexturedDirectx11 sample: support embedded uncompressed textures
2021-05-06 14:19:15 +02:00
Kim Kulling
f53ae076a7 Merge branch 'master' into SimpleTexturedDirectx11Fixes 2021-05-06 14:07:08 +02:00
Kim Kulling
90d3ff27f8 Merge pull request #3806 from krishty/remove-useless-scaling-prototype
removed dead code from 0d29203e24
2021-05-06 14:04:35 +02:00
Kim Kulling
55056d11fd Add missing include 2021-05-06 11:50:08 +02:00
Jason C
7da9c42c81 [blender] Disable creation of "dna.txt"
Developers who want to enable it can either:

- *Temporarily* set ASSIMP_BUILD_BLENDER_DEBUG_DNA=1 in BlenderDNA.h, or
- *Temporarily* define ASSIMP_BUILD_BLENDER_DEBUG_DNA=1 on the build command line.

Addresses #3886.
2021-05-05 19:30:29 -04:00
Jason C
c08ad2e5c2 Merge branch 'master' into jc3-cctype-fixes 2021-05-05 19:04:47 -04:00
Jason C
de5c8ece6f [xgl] Fail if file could not be parsed.
Fail instead of returning empty scene.

Partially addresses #3888.

TODO: Propagate XML error detail through exception (depends on #3881).
2021-05-05 17:49:10 -04:00
Jason C
98f586c8d4 [irr] Fail if file could not be parsed.
Fail instead of returning empty scene.

Partially addresses #3888.

TODO: Propagate XML error detail through exception (depends on #3881).
2021-05-05 17:48:44 -04:00
Jason C
470913bf27 [assbin] Fail if file could not be opened
Fail instead of returning empty scene.

Partially addresses #3888.
2021-05-05 17:46:24 -04:00
Jason C
0d3e8b52be [sib] Fix assertion failure when file could not be opened.
Check result of IOSystem::Open before constructing stream.

Partially addresses #3888.
2021-05-05 17:32:10 -04:00
Jason C
a80b3b25eb [quick3d] Fix assertion failure when file could not be opened.
Check result of IOSystem::Open before constructing stream.

Partially addresses #3888.
2021-05-05 17:31:50 -04:00
Jason C
e52c297284 [nendo] Fix assertion failure when file could not be opened.
Check result of IOSystem::Open before constructing stream.

Partially addresses #3888.
2021-05-05 17:31:24 -04:00