Commit Graph

3951 Commits

Author SHA1 Message Date
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
Richard
3c651be640 Exporter::ExportToBlob() Pass on preprocessing and properties. Issue #2302 2019-01-17 13:55:05 +00: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
Kim Kulling
c1dc3901e7 fix more findings. 2018-12-28 11:17:27 +01:00
Kim Kulling
db202584ab remove dead code. 2018-12-28 01:45:47 +01:00
Kim Kulling
859153e3e6 more fixes for coverity-findings. 2018-12-28 01:44:56 +01:00
Kim Kulling
4c6db68d34 Coverity-findings 2018-12-27 22:28:23 +01:00
Marco Di Benedetto
ad7964be63 imported animation fix. 2018-12-21 10:36:03 +01:00
Andrés Iraolagoitía
3c1d6a3f87 Fix animations import in gltf2 2018-12-19 20:28:43 -03:00
Marco Di Benedetto
cf6dff0b93 Merge https://github.com/assimp/assimp 2018-12-19 17:27:17 +01:00
Kim Kulling
ae7a045396 Merge branch 'master' into timmmeh-gltf2-validation-patch 2018-12-11 07:59:11 +01:00
Kim Kulling
b5ebd24688 closes https://github.com/assimp/assimp/issues/817: use emmisive factor instead of color. 2018-12-10 22:07:26 +01:00
Kim Kulling
e22e93e6d7 Merge branch 'master' into allow_step_disable 2018-12-08 21:38:18 +01:00
ardenpm
fd75e4923c Merge pull request #7 from migenius/migenius-rsws52
Add check for NULL texcoord values.
2018-12-07 09:38:41 +11:00
Paul Arden
f63caf894e Add check for NULL texcoord values. 2018-12-06 12:56:02 +11:00
tirichards
bb9e3c3593 Fix failed assimp validation for glTF2 sample animations 2018-12-05 14:46:56 -08:00
sfalexrog
af323de741 Use ADD_ASSIMP_IMPORTER for STEP importer 2018-12-04 23:28:50 +03:00
twhittock
8b6c6613f9 collada export: Use Camera local coordinate system
Fixes #2255
2018-12-04 14:44:49 +00:00
Kim Kulling
f49dbc8f62 Merge branch 'master' into OFF_Importer_Redesign_js_francal 2018-12-03 23:15:05 +01:00
Kim Kulling
ce91f5c888 Off-Importer: introduce unittest. 2018-12-03 21:24:06 +01:00
sfalexrog
30d3c8c6a3 Fix CMake target alias typo 2018-12-03 23:22:34 +03:00
Kim Kulling
bb66af544a closes https://github.com/assimp/assimp/issues/2228: prepare pull-request. 2018-12-02 13:08:47 +01:00
Kim Kulling
117a2bc116 Merge branch 'master' into kimkulling-patch-2-1 2018-12-01 18:41:15 +01:00
Kim Kulling
aa0a5bb36f Merge branch 'master' into gltf2-anim-duration 2018-12-01 13:41:54 +01:00
Kim Kulling
576673536b Update SMDLoader.cpp
Fix compiler warning and do some reformattings.
2018-11-30 22:17:42 +01:00
Kim Kulling
b16f7c98c0 Merge branch 'master' into dev 2018-11-30 09:25:30 +01:00
wxyu
2761681022 Issue 1639: Smd mesh vertex bone assignment
bone.mOffsetMatrix not set when bone.iParent == -1
2018-11-30 14:42:05 +08:00
wxyu
9100ca8664 Fix: Smd Cannot read bone names containing spaces 2018-11-30 14:42:05 +08:00
wxyu
19521d222b Issue 1117: Smd load multiple animations
Read an animation list from a file
2018-11-30 14:42:05 +08:00
wxyu
8c2e975508 Fix smd animation mess
aiMatrix4x4t<TReal>::FromEulerAnglesXYZ modified to row order
2018-11-30 14:42:05 +08:00