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

5484 Commits

Author SHA1 Message Date
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
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
Kim Kulling
875acc5166 Merge branch 'master' into patch-4 2021-05-04 20:59:06 +02:00
Kim Kulling
e85a69a960 Update D3MFImporter.cpp 2021-05-04 15:31:07 +02:00
vfxgordon
4231a86ad8 Merge branch 'master' into fbxBlendshapes 2021-05-04 06:22:22 -07:00
kimkulling
7690f92c81 Fix version of strnlen 2021-05-04 14:48:39 +02:00
kimkulling
ee5170c18a - fix security issue 2021-05-04 14:40:25 +02:00
Kim Kulling
9c44c0ab2b Merge branch 'master' into remove-useless-scaling-prototype 2021-05-04 13:02:00 +02:00
kimkulling
0e17939e8d Use const char* const 2021-05-04 12:09:38 +02:00
Kim Kulling
33a85e280f Merge branch 'master' into optimize_3mf_strings 2021-05-04 11:47:11 +02:00
kkulling
55fd820ed7 use const chars 2021-05-04 10:57:30 +02:00
Kim Kulling
39522178aa Merge branch 'master' into fix-scale-msg 2021-05-04 08:13:12 +02:00
vfxgordon
9ae3e88f6c Merge branch 'master' into fbxBlendshapes 2021-05-03 07:40:25 -07:00
Kim Kulling
f29828f657 Merge branch 'master' into fix-file-detection 2021-05-02 19:41:33 +02:00
Kim Kulling
e278673fe7 Merge branch 'master' into 3ds-namespace 2021-05-02 15:08:11 +02:00
Krishty
e73a2ed5e0 style fix: namespace instead of class with public static members 2021-05-01 23:20:37 +02:00
Krishty
65a2b98b86 updated C4D importer to use the Cineware SDK 
Maxon’s Melange SDK has been renamed Cineware SDK as of 21.004, and with it all namespaces and types. This commit
- makes CMake use contrib/Cineware instead of contrib/Melange;
- renames Assimp’s namespace melange to namespace cineware;
- removes useless functions and formatter references from class C4DImporter;
- removes duplicate conversion of cineware::String to aiString in the importer;
- updates comments accordingly;
- updates copyright info.
 2021-05-01 18:46:23 +02:00
Jason C
c2d3d22271 Fix crash in CanRead when file can not be opened. 
Addresses #3849
 2021-05-01 10:58:29 -04:00
Kim Kulling
78132d666f Merge branch 'master' into fix-3ds-matrix 2021-05-01 11:34:33 +02:00
Kim Kulling
7843b24e03 Merge branch 'master' into SceneCombiner_Memory_Leaks 2021-05-01 09:16:06 +02:00
contriteobserver
813b64ef52 corrected M3D_EXP_NOFACE test 2021-04-30 21:51:02 -07:00
contriteobserver
e51bb1e77e fixed signed/unsigned mismatch warning 2021-04-30 21:26:57 -07:00
contriteobserver
694f4c2e34 Merge branch 'master' into M3DasciiByDefault 2021-04-30 21:12:48 -07:00
contriteobserver
af0aca796e now compiling M3D ASCII support by default 
addresses issue  #3777
 2021-04-30 21:07:01 -07:00
Jason C
07257f4c66 Merge branch 'master' into patch-4 2021-04-30 22:23:23 -04:00
Kim Kulling
2feda5b4b2 Merge branch 'master' into md2-mdc-const 2021-04-30 20:10:45 +02:00
Garux
149224091f support missing closing brace in material list after Ascii Scene Exporter v2.51 2021-04-30 10:37:06 +03:00
Kim Kulling
57091d761e Merge branch 'master' into md2-mdc-const 2021-04-30 00:56:50 +02:00
Kim Kulling
0b92abe9b4 Merge branch 'master' into empty-string-style 2021-04-30 00:54:57 +02:00
vfxgordon
5298ed8f9e Merge branch 'master' into fbxBlendshapes 2021-04-29 15:21:16 -07:00
Kim Kulling
73e05ab6d3 Merge branch 'master' into add-step-extension 2021-04-30 00:13:32 +02:00
Garux
edf12bd357 fix md2 orientation 2021-04-30 00:02:37 +03:00
Krishty
666b5eff76 added .step extension to IFC loader 
The extension .step is at least as common as .stp, so both should be supported.
 2021-04-29 21:29:10 +02:00
Garux
3717e66fae consider aiProcess_FlipWindingOrder in aiProcess_GenNormals & aiProcess_GenSmoothNormals 2021-04-29 20:52:06 +03:00
Garux
4798ff3882 fix hl1 mdl orientation, tex coords, face windings order 2021-04-29 20:50:50 +03:00