Marco Di Benedetto
b15c93c726
Merge https://github.com/assimp/assimp
2019-03-07 14:35:41 +01:00
Kim Kulling
b9c8e0856f
Merge branch 'master' into fix-bug-autogenerated-names
2019-03-01 20:24:45 +01:00
Lawrence Kok
e9eda062a1
In ColladaLoader in version 3.2.0 (release est. 2015) the name assignment was based on name attribute (xml) with optional fallbacks to id and sid. Over time this was changed to fix a bug and support for names was removed, only to be later (re)added using an optional `useColladaName` setting. We discovered a problem that with when using the name based assignment it doesn't assign automatically generated names like what it did in the logic in v3.2.0 and on the id based approach on current master.
...
We discovered this causes problems with matching the aiCamera and aiLight. So we rectified this problem by auto generating names also on the name based method.
2019-03-01 10:43:18 +07:00
Vitaly Ovchinnikov
7b01ff6b8d
ignoring invalid normals and uvs indices instead of canceling the import completely
2019-02-27 12:15:03 +13:00
Kim Kulling
16080ba60c
Merge branch 'master' into simple_skin_test
2019-02-25 22:06:56 +01:00
Kim Kulling
206004c7d6
introduce simple skin-test +some findings.
2019-02-25 22:06:24 +01:00
Kim Kulling
f59f3976c0
closes https://github.com/assimp/assimp/issues/1593 : fix computation of percentf for 3DS.
2019-02-20 00:02:19 +01:00
Kim Kulling
adbc7e8f70
closes https://github.com/assimp/assimp/issues/2115 : rollback setup of FBX-camera.
2019-02-19 20:23:20 +01:00
Kim Kulling
050430cae0
Merge branch 'master' into issue_2340
2019-02-19 13:14:59 +01:00
Kim Kulling
ae41ae3211
closes https://github.com/assimp/assimp/issues/305 ': fix viewer
2019-02-18 21:43:45 +01:00
Marc-Anton Boehm-von Thenen
4d0740a120
[Issue_2340] Proper closing endif()...
2019-02-18 14:15:39 +01:00
Marc-Anton Boehm-von Thenen
a94c8bf3f6
[Issue_2340] Wrong precondition layout... missed ANDROID=ON and ASSIMP_ANDROID_JNIIOSYSTEM=OFFvalid constellation
2019-02-18 14:14:27 +01:00
Marc-Anton Boehm-von Thenen
c3129e55d2
[Issue_2340] Added ASSIMP_ANDROID_JNIIOSYSTEM precheck to only remain set to ON in proper ANDROID enabled toolchain environment
2019-02-18 14:10:32 +01:00
Kim Kulling
4621bde985
Merge branch 'master' into topic/Bug2034_typeCodeC
2019-02-08 14:38:25 +01:00
Lassi Lääti
cc276c3180
cast size_t to unsigned int
2019-02-06 21:14:22 +02:00
Malcolm Tyrrell
02a5f6b62f
Remove unneeded newline.
2019-02-06 11:15:27 +00:00
Malcolm Tyrrell
f9014d7410
Add tokenization of 'c' type arrays, both compressed and uncompressed.
2019-02-06 11:15:21 +00:00
Kim Kulling
6e39c22554
Fix potential security issues.
2019-02-05 22:05:52 +01:00
Mike Samsonov
5ce1cfedfe
warning fix for gcc
2019-02-04 16:15:52 +00:00
Mike Samsonov
971ba308b3
Merged PR 2811682: buffer grow changes and large files support
...
Buffer grow changes:
The exporting of relatevely large data could take a few days, because reallocation of a buffer every time for a few new bytes is overkill. I've introduced standard capacity member for the buffer and growth it by 1.5 times every time. That helps a lot, descrease exporting to a minute (from a few days).
Large file support:
glTF is a json file, all lengths and offsets don't have a type, just numbers, but code was always reading it as uint32, this doesn't work for files bigger than int32 (almost all files we have as an example). So, I've changed it to be reading as size_t. Specification doesn't specify the type for it, so it's not against spec.
2019-02-04 15:16:28 +00:00
Kim Kulling
0801a62ef7
Merge branch 'master' into kimkulling-dev
2019-01-30 16:09:33 +01:00
kimkulling
a06133ab52
Update copyrights.
2019-01-30 09:41:39 +01:00
FRICOTEAUX
38bebaf4d3
Fix glTF2 export with no texture coordinates
2019-01-28 16:02:09 +01:00
Kim Kulling
b35331b92a
Update FindInvalidDataProcess.cpp
...
-Fix some review findings.
2019-01-28 10:50:36 +01:00
Kim Kulling
4c2898c82b
Merge branch 'master' into issue_2251
2019-01-28 10:06:44 +01:00
Kim Kulling
5d6fc7a557
Closes https://github.com/assimp/assimp/issues/2251 : introduce AI_CONFIG_PP_FID_IGNORE_TEXTURECOORDS to avoid removing textures.
2019-01-27 21:05:58 +01:00
Adrian Perez
8191080986
Adapt MemoryIOSystem to delegate unhandled calls to shadowed IO system
2019-01-21 14:14:48 -08:00
Kim Kulling
a04b96ef66
Disable step.
2019-01-20 20:29:23 +01:00
Kim Kulling
002af28e54
Merge branch 'master' into fbx-keep-material-params
2019-01-18 17:35:34 +01:00
Merwan Achibet
7dc32ab9b6
Preserve all the material parameters from FBX models
2019-01-17 19:07:15 +01:00
SchroerDev
f7fe729c88
Update FBXConverter.cpp
2019-01-17 12:32:36 +01:00
SchroerDev
3a3340b926
add FBX Line Element support
...
add FBX Line Element support
2019-01-17 12:26:22 +01:00
Kim Kulling
19c3cea0db
Merge branch 'master' into fix_obj_progress_reporting
2019-01-09 22:09:25 +01:00
Marc Kurtz
e37a4de2c2
Fix progress reporting in ObjFileParser. Remove old unused code which is claiming to still take up "1/3" of the total progress.
2019-01-08 15:56:57 -05:00
rickomax
f170c84226
Test fixes
...
Test fixes
2019-01-06 19:38:29 -02:00
rickomax
35a044bda3
Various additions/fixes (FBX blend-shapes support added)
...
Added animMesh name assignment at ColladaLoader
Fixed animMesh post-processing on ConvertToLhProcess (blend-shapes weren't being affected by post-processing)
Added WindowsStore define. This is used to change some incompatible WinRT methods
Added FBX blend-shapes and blend-shapes animations support
Added Maya FBX specific texture slots parsing
Added extra FBX metadata parsing
Added GLTF2 vertex color parsing
Fixed IFC-Loader zip-buffer reading rountine
Fixed OBJ file parsing line-breaker bug
Fixed IOStreamBuffer cache over-read bug
Added mName field to aiAnimMesh
Reverted EmissiveFactor, TransparencyFactor and SpecularFactor assignment on FBXConverter. Really, the commit #817 breaks a lot of old code.
2019-01-06 16:37:30 -02:00
Kim Kulling
a44d56976c
Merge branch 'Coverity-findings' of https://github.com/assimp/assimp into Coverity-findings
2018-12-31 14:54:40 +01:00
Kim Kulling
c63b1a1fd5
fix review finding: dereference after null-check.
2018-12-31 14:47:54 +01:00
Kim Kulling
96032ca341
Merge branch 'master' into Coverity-findings
2018-12-31 12:16:55 +01:00
Kim Kulling
425a784b23
fix finding: possible override.
2018-12-31 12:16:20 +01:00
Kim Kulling
92bb0febdf
fix review finding: fix resource leak.
2018-12-30 16:11:39 +01:00
Kim Kulling
3596c822a5
fix review finding: Wrapper object use after free.
2018-12-30 16:04:49 +01:00
Kim Kulling
b42d959418
fix review warning: wrapper object used after free.
2018-12-30 16:02:22 +01:00
Kim Kulling
35d69c360c
fix out-of-bound access.
2018-12-30 15:59:15 +01:00
Kim Kulling
281c191367
fix streamreader::end definition for iterators.
2018-12-30 10:44:43 +01:00
Kim Kulling
a8fda89079
remove unique_ptr ina local function / method.
2018-12-30 10:36:23 +01:00
Kim Kulling
8912bb333c
Fix memory leak.
2018-12-30 10:33:21 +01:00
Kim Kulling
f6cbb26d9c
Fix unnecessary allocation.
2018-12-30 10:30:12 +01:00
Kim Kulling
e09428c95b
eremove useless assertion test.
2018-12-29 21:29:42 +01:00
Kim Kulling
f5e94a2840
Add a check for the resule of a dynamic cast.
2018-12-29 21:27:20 +01:00