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

10089 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kim Kulling
7a3c8e5504 Merge branch 'master' into md2orient 2021-05-12 13:07:27 +02:00
Kim Kulling
8b13223314 Merge pull request #3851 from krishty/c4d-cineware 
updated C4D importer to use the Cineware SDK
 2021-05-12 12:27:25 +02:00
Kim Kulling
f127144f71 Merge branch 'master' into c4d-cineware 2021-05-12 10:57:17 +02:00
Kim Kulling
3768a2194e Merge pull request #3842 from Garux/hl1mdlOrient 
fix hl1 mdl orientation, tex coords, face windings order
 2021-05-12 10:05:38 +02:00
Kim Kulling
8013c5011c Merge branch 'master' into hl1mdlOrient 2021-05-12 08:21:40 +02:00
Kim Kulling
f197e93035 Merge pull request #3898 from JC3/patch-2 
Reapply [amf] Fix crash when file could not be parsed.
 2021-05-11 20:48:27 +02:00
Jason C
75af93aaa4 Merge branch 'master' into patch-2 2021-05-11 12:12:07 -04:00
Kim Kulling
951c8a976c Merge pull request #3844 from Garux/aseHack 
support missing closing brace in material list after Ascii Scene Exporter v2.51
 2021-05-11 16:20:31 +02:00
Kim Kulling
4ee2f5f69d Merge branch 'master' into aseHack 2021-05-11 11:40:24 +02:00
Jason C
00b625a2ae [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.

---

This change was previously made in 785cca1bb4, as part of PR #3890, but was lost in a merge.
 2021-05-10 19:06:39 -04:00
Kim Kulling
7ff6144c2c Merge pull request #3881 from JC3/jc3-spam-killa 
Misc. log output and message fixes
 2021-05-11 00:09:16 +02:00
Kim Kulling
cb7d3ac598 Merge branch 'master' into jc3-spam-killa 2021-05-10 22:21:13 +02:00
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
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
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
Jason C
9a2a0384f4 Merge branch 'master' into patch-3 2021-05-07 17:53:18 -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
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
25cf5dd487 Merge branch 'master' into mRootNode_mTransformation 2021-05-06 21:40:03 +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
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