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

10040 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
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
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
Kim Kulling
992f10e7bf Merge branch 'master' into remove-useless-scaling-prototype 2021-05-05 21:54:31 +02: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
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
Kim Kulling
072aee7cbe Merge branch 'master' into add-step-extension 2021-05-04 22:35:21 +02:00
Kim Kulling
38df0f4376 Merge pull request #3834 from JC3/patch-4 
ASSIMP_ENABLE_DEV_IMPORTERS env var, applied to X3D importer
 2021-05-04 22:33:48 +02:00
Kim Kulling
dc6fa58814 Merge branch 'master' into patch-4 2021-05-04 21:08:56 +02:00
Kim Kulling
be85eac703 Merge pull request #3877 from olsoneric/olsoneric-issue_2339_py_cant_load_obj 
Use POINTER(char) for binary data. For pyassimp issue #2339: Can't load OBJ
 2021-05-04 21:08:35 +02:00
Kim Kulling
875acc5166 Merge branch 'master' into patch-4 2021-05-04 20:59:06 +02:00
Eric Olson
f17d58cadd Use POINTER(c_char) for binary data with pyassimp 
"For a general character pointer that may also point to binary data,
POINTER(c_char) must be used." c_char_p is for a zero-terminated string.

Reference: https://docs.python.org/3/library/ctypes.html#ctypes.c_char_p

Applying this change to the 4.1.4 released python module fixes #2339 for
me in Ubuntu.
 2021-05-04 13:38:38 -05:00
Kim Kulling
cd0fd30821 Merge pull request #3819 from vfxgordon/fbxBlendshapes 
Fixed weighting issue with blendShapeChannels
 2021-05-04 17:44:32 +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
Kim Kulling
47cacf8aa6 Merge branch 'master' into optimize_3mf_strings 2021-05-04 14:42:16 +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
Kim Kulling
ff18354997 Merge pull request #3869 from assimp/optimize_3mf_strings 
use const chars
 2021-05-04 12:46:38 +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