v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,005 Commits
74 Branches
37 Tags
234 MiB
Commit Graph

7005 Commits (36bce5fa006176b623ea2bc4756cc54b50d9fc38)

Author SHA1 Message Date
Séverin Lemaignan 1ac86476fe [pyassimp] Bumped to 4.1.4 
Main changes:
- Support for metadata fields (Vincent Fazio, Wojciech Matyjewicz)
- added support for aiExportSceneToBlob (Vincent Fazio)
- a few bug fix + code beautification
 2019-01-30 22:41:01 +00:00
Kim Kulling 0801a62ef7
Merge branch 'master' into kimkulling-dev 2019-01-30 16:09:33 +01:00
Kim Kulling e878560b4b
Merge pull request #2312 from LoicFr/master 
Fix glTF2 export with no texture coordinates
 2019-01-30 16:09:10 +01:00
kimkulling de02fb2129 Fix review findings. 2019-01-30 16:07:40 +01:00
kimkulling a06133ab52 Update copyrights. 2019-01-30 09:41:39 +01:00
LoicFr 65e4dc89c0
Merge branch 'master' into master 2019-01-29 13:28:36 +01:00
Kim Kulling 5eed99da0a
Merge pull request #2311 from assimp/kimkulling-dev-1 
Update README.md
 2019-01-29 10:35:27 +01:00
FRICOTEAUX 38bebaf4d3 Fix glTF2 export with no texture coordinates 2019-01-28 16:02:09 +01:00
Kim Kulling 6b8514ba93
Merge branch 'master' into kimkulling-dev-1 2019-01-28 14:40:10 +01:00
Kim Kulling dc10f24df1
Merge pull request #2310 from assimp/issue_2251 
Closes https://github.com/assimp/assimp/issues/2251: introduce AI_CON…
 2019-01-28 14:39:48 +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 2432abacc7
Update README.md 
Update doc.
 2019-01-27 21:11:52 +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
Kim Kulling 6295e4dbc4
Merge pull request #2306 from AdrianAtGoogle/master 
MemoryIOSystem delegates to existing IOSystem
 2019-01-23 19:52:09 +01:00
Adrian Perez d602e2e2da Merge branch 'master' of github.com:AdrianAtGoogle/assimp 2019-01-22 17:23:50 -08:00
Kim Kulling b04ed67288 Update MemoryIOWrapper.h 
Make code more readable.
 2019-01-22 17:22:18 -08:00
Kim Kulling f8a23e128b
Update MemoryIOWrapper.h 
Make code more readable.
 2019-01-22 20:47:24 +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
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 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