Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,234 Commits 19 Branches 43 Tags
fc4ebefaa4f3a8d7d4d211ee419bcd568b4100fd
Commit Graph

5524 Commits

Author SHA1 Message Date
Kim Kulling
e1a0e16a4e Merge branch 'master' into jc3-importer-open-error-handling 2021-05-10 22:07:25 +02:00
Kim Kulling
4807853f09 Merge branch 'master' into mdcOrient 2021-05-10 21:06:15 +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
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
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
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
8ff52c0f89 Pass base name from export properties to the IO system. 2021-05-07 17:31:30 +02:00
Kim Kulling
25a0eb0d67 Merge branch 'master' into mdcOrient 2021-05-07 13:03:08 +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
e120544978 Merge branch 'master' into fixGenNormals 2021-05-06 17:28:37 +02:00
Kim Kulling
bc7551b778 Merge branch 'master' into add-step-extension 2021-05-06 14:19:53 +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
Jason C
1cd3752ec6 [ms3d] 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:06 -04:00
Jason C
7f13387487 [cob] Fix assertion failure when file could not be opened. 
Check result of IOSystem::Open before constructing stream.

Partially addresses #3888.
 2021-05-05 17:30:29 -04:00
Jason C
116ebf6e10 [3ds] Fix assertion failure when file could not be opened 
Check result of IOSystem::Open before constructing stream.

Partially addresses #3888.
 2021-05-05 17:30:05 -04:00
Jason C
785cca1bb4 [amf] Fix crash when file could not be parsed. 
Fix double free of mXmlParser (deleted but not reset in ParseFile, then deleted again in ~AMFImporter).

Should probably use a smart pointer instead, though.

Partially addresses https://github.com/assimp/assimp/issues/3888.
 2021-05-05 17:13:10 -04:00
Jason C
f5a31b70f5 Merge branch 'master' into patch-3 2021-05-05 16:24:46 -04:00
Kim Kulling
992f10e7bf Merge branch 'master' into remove-useless-scaling-prototype 2021-05-05 21:54:31 +02:00
Jason C
7ae8a52d9f Merge branch 'master' into jc3-spam-killa 2021-05-05 10:33:29 -04:00
Kim Kulling
5325b327c3 Merge branch 'master' into optimize_3mf_strings 2021-05-05 15:12:06 +02:00
Max Vollmer (Microsoft Havok)
153b890b02 Prevent accessing nullpointers 2021-05-05 14:09:43 +01:00
kkulling
f15dcfa981 - Fix model parsing 2021-05-05 13:10:52 +02:00
kkulling
cbce6d3dad Merge branch 'optimize_3mf_strings' of https://github.com/assimp/assimp into optimize_3mf_strings 2021-05-05 10:46:54 +02:00
Jason C
ccd1a4455e [ply] Fix minor typo in error message. 2021-05-04 21:57:00 -04:00
Jason C
a03dc4edaa [amf] Fix minor typo in error message. 
Added missing space to detail string on parse failure.
 2021-05-04 21:56:49 -04:00
Jason C
f8609c2c2d [opengex] Direct OpenDDLParser log messages to assimp logger 
Also filter unprintable characters. Addresses second part of #3862.
 2021-05-04 21:54:14 -04:00
Jason C
9a04f5d4b0 Fix garbage messages in SIB, MD2, and MDC loaders. 2021-05-04 21:53:16 -04:00
Jason C
a9fb1e56ae Add ai_str_toprintable; fixed garbage messages in HMP, MDL, Q3D loaders. 
- ai_str_toprintable: See docs in StringUtils.h.
- HMP, MDL, Q3D: In particular, newlines in binary data were complicating logging.
 2021-05-04 20:33:16 -04:00
Jason C
c8ad8c6017 [mmd] Remove stderr spam. 
Removed stderr spam and cleaned up exception text.

Addresses #3865.
 2021-05-04 20:33:16 -04:00
Jason C
2925592c64 [assimp] Make sure ctype calls use unsigned char. 
Cast to unsigned char as required by C++ (see C++ **[cctype.cyn]** -> ISO C99 section 7.4, [see also](https://en.cppreference.com/w/cpp/string/byte/isspace)).

Addresses https://github.com/assimp/assimp/issues/3867 and then some.
 2021-05-04 17:31:13 -04:00
Kim Kulling
072aee7cbe Merge branch 'master' into add-step-extension 2021-05-04 22:35:21 +02:00
Krishty
b57ce004f8 reduced FBX string bloat 
The FBX importer used two std::strings where string literals would have been sufficient.
 2021-05-04 22:01:01 +02:00
Krishty
f3c18556d1 reduced OpenGEX string bloat 
The OpenGEX importer defined a few global std::string constants, only to convert them back to C strings on use. This commit defines them as C strings from the beginning.

strncmp() was used to compare these strings to other strings, but the length limit was set to string length, which made it equivalent to strcmp(), just slower. Fixed that as well.
 2021-05-04 22:01:01 +02:00
Krishty
7b6dab5e20 reduced DXF string bloat 
The DXF importer defined a global std::string constant, only to convert it back to a C string on use.

This commit defines the constant as a C string right away, thus saving 340 B of code and data.
 2021-05-04 22:01:00 +02:00