Commit Graph

7141 Commits (6b3d6c3b8f53a493e44ed60dafde22a243dc169b)

Author SHA1 Message Date
Kim Kulling f8a23e128b
Update MemoryIOWrapper.h
Make code more readable.
2019-01-22 20:47:24 +01:00
Kim Kulling 05ea039846
Merge branch 'master' into ETC_Inc 2019-01-22 20:10:50 +01:00
Kim Kulling ad18cd9660
Update MemoryIOWrapper.h
Fix leak.
2019-01-22 11:13:26 +01:00
Adrian Perez 87112eefae Fill in rest of interface; switch created_stream to a unique_ptr 2019-01-21 14:37:33 -08:00
Adrian Perez 8191080986 Adapt MemoryIOSystem to delegate unhandled calls to shadowed IO system 2019-01-21 14:14:48 -08:00
Kim Kulling 40a1c1ed07
Merge pull request #2307 from assimp/disable_step
Disable step.
2019-01-20 21:12:37 +01:00
Kim Kulling a04b96ef66 Disable step. 2019-01-20 20:29:23 +01:00
Kim Kulling 9765eb988a
Merge pull request #2304 from merwaaan/fbx-keep-material-params
Preserve all the material parameters from FBX models
2019-01-19 18:32:52 +01:00
Kim Kulling 002af28e54
Merge branch 'master' into fbx-keep-material-params 2019-01-18 17:35:34 +01:00
Kim Kulling 3216f1d073
Merge pull request #2301 from SchroerDev/master
add FBX Line Element support
2019-01-17 21:43:24 +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
Richard fe6b316695 Set MSVC projects to default to Unicode
MBCS is deprecated and shouldn't be used in new projects
2019-01-10 17:27:54 +00:00
Kim Kulling 3db78e1aa2
Merge pull request #2296 from kurtzmarc/fix_obj_progress_reporting
Fix progress reporting in ObjFileParser. Remove old unused code which…
2019-01-09 23:08:50 +01:00
Kim Kulling 19c3cea0db
Merge branch 'master' into fix_obj_progress_reporting 2019-01-09 22:09:25 +01:00
Kim Kulling 13ce4a6292
Merge pull request #2295 from kurtzmarc/add_progresshandler_support_jassimp
Add progresshandler support jassimp
2019-01-09 22:08:33 +01:00
Kim Kulling 64c40a576f
Merge branch 'master' into add_progresshandler_support_jassimp 2019-01-09 21:00:50 +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
Kim Kulling e26220c432
Merge pull request #2293 from rickomax/master
Various additions/fixes (FBX blend-shapes support added)
2019-01-08 21:53:53 +01:00
Marc Kurtz f384d1221a Make this public for JaiDebug and to pass quality checks. 2019-01-08 13:55:07 -05:00
Marc Kurtz d2f6c6d65e Add ProgressHandler support. 2019-01-08 11:19:25 -05:00
Marc Kurtz e06b1d0de2 Change access of getData() to package-private for access in JaiDebug.
Move private field to fix compile error.
2019-01-08 11:19:25 -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 455c4ceea4
Merge pull request #2291 from arkeon7/Branch_Clipper_correction
Correction on clipper crash on some IFC files when points are empty
2019-01-02 19:57:49 +01:00
Arkeon b59d931486 Correction on clipper crash on some IFC files when points are empty 2019-01-02 14:56:38 +01:00
Kim Kulling 0011c3b1aa
Merge pull request #2290 from assimp/Coverity-findings
fix finding: possible override.
2018-12-31 15:31:08 +01: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 0f6cdc84ed
Merge pull request #2288 from carasuca/patch-1
Fix: except `SyntaxError` for py3 viewer
2018-12-30 22:19:48 +01:00
Kim Kulling 21c162edf1
Merge branch 'master' into patch-1 2018-12-30 21:40:01 +01:00
Kim Kulling 85d3bcb826
Merge pull request #2289 from assimp/coverity_scan
Coverity scan
2018-12-30 17:59:36 +01:00
Kim Kulling ae31be1e23 next try. 2018-12-30 17:06:50 +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 ba80410c48 fix review findings. 2018-12-30 15:56:42 +01:00
Kim Kulling 7c23a6c5ca fix review findings. 2018-12-30 11:41:58 +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
carasuca 69ea55d180
Fix: except `SyntaxError` for py3 viewer
Following https://www.python.org/dev/peps/pep-3110/
2018-12-30 02:59:49 +01:00
Kim Kulling 5d483d8d80 Merge branch 'master' into coverity_scan 2018-12-29 23:22:14 +01:00
Kim Kulling 83c30effb9
Merge pull request #2287 from assimp/Coverity-findings
Coverity-findings
2018-12-29 23:22:10 +01:00