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

10597 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Krishty
6c7ee61f14 Merge branch 'stb-image-updated' of https://github.com/krishty/assimp into stb-image-updated 2021-05-05 23:15:59 +02:00
Krishty
816da9b677 merge and update all copies of stb_image.h 2021-05-05 23:15:41 +02: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
Krishty
24df52647f merge and update all copies of stb_image.h 2021-05-05 23:05:44 +02: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
1e89c06157 Merge pull request #3882 from assimp/optimize_3mf_strings 
Optimize 3mf strings
 2021-05-05 15:56:14 +02:00
Kim Kulling
5325b327c3 Merge branch 'master' into optimize_3mf_strings 2021-05-05 15:12:06 +02:00
Kim Kulling
3f5c3eb38c Delete dna.txt 2021-05-05 15:11:36 +02:00
Kim Kulling
067993d607 Delete dae.dae 2021-05-05 15:11:20 +02:00
Kim Kulling
0aadd8a3f9 Delete spiderExport.stl 2021-05-05 15:10:59 +02:00
Kim Kulling
d1991ad949 Delete AssimpLog_Cpp.txt 2021-05-05 15:10:50 +02:00
Kim Kulling
e683c6eef9 Delete testExport.stl 2021-05-05 15:10:30 +02:00
Kim Kulling
9395322e56 Delete AssimpLog_C.txt 2021-05-05 15:10:22 +02:00
Max Vollmer (Microsoft Havok)
153b890b02 Prevent accessing nullpointers 2021-05-05 14:09:43 +01:00
kkulling
2a6b84c8ea - closes https://github.com/assimp/assimp/issues/3830 
- Fix rgba2hex
- Add tests
 2021-05-05 14:43:51 +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
6e65115253 [assimp/xml] Improved XML parse error message. 
Fixed typo, added detail.
 2021-05-05 00:33:57 -04:00