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

6828 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kim Kulling
2f69e4945c Merge pull request #2330 from assimp/kimkulling-dev-1 
Update README
 2019-02-08 14:38:11 +01:00
Kim Kulling
54c5f3f2d0 Update README 
- Update the readme for the exampes.
 2019-02-07 19:22:47 +01:00
Kim Kulling
cd7a9fdcb3 Merge pull request #2329 from assimp/remove_the_devil 
Devil: replace this by header-only lib.
 2019-02-07 19:18:36 +01:00
kimkulling
3f9a25df5a Devil: replace this by header-only lib. 2019-02-07 17:09:05 +01:00
Kim Kulling
06392394ab Merge pull request #2328 from lerppana/bugfix/ambiguous_calls 
Bugfix issue: #2327 Build broken on clang-7.0.1
 2019-02-07 10:10:59 +01:00
Lassi Lääti
cc276c3180 cast size_t to unsigned int 2019-02-06 21:14:22 +02:00
Kim Kulling
cfeb0060a2 Merge pull request #2325 from assimp/sec_issues 
Fix potential security issues.
 2019-02-06 13:24:38 +01:00
Kim Kulling
1e35ea3bc8 Merge branch 'master' into sec_issues 2019-02-06 11:27:53 +01:00
Kim Kulling
502f59ccbc Merge pull request #2323 from assimp/fix_ofd 
remove dead code
 2019-02-06 11:27:07 +01:00
Kim Kulling
6e39c22554 Fix potential security issues. 2019-02-05 22:05:52 +01:00
Kim Kulling
28622d25bf Merge branch 'master' into fix_ofd 2019-02-05 21:10:07 +01:00
Kim Kulling
103fb5d3eb Merge pull request #2324 from assimp/kimkulling-patch-4 
Update Readme.md
 2019-02-05 21:09:55 +01:00
Kim Kulling
216008d230 Update Readme.md 
closes https://github.com/assimp/assimp/issues/2248: Add lgtm badge.
 2019-02-05 20:16:53 +01:00
Kim Kulling
963c892862 Merge branch 'master' into fix_ofd 2019-02-05 00:36:59 +01:00
Kim Kulling
afb779e59d remove dead code 2019-02-05 00:36:07 +01:00
Kim Kulling
0f8f1449a1 Merge pull request #2322 from assimp/fix_ofd 
fix openfiledialog in modelviewer.
 2019-02-05 00:06:10 +01:00
Kim Kulling
daad5b4ee9 Merge branch 'master' into fix_ofd 2019-02-04 22:17:38 +01:00
Kim Kulling
ae15228703 Merge pull request #2319 from muxanick/topic/large_gltf_files_support 
glTF/glTF2 Buffer grow changes and large files support
 2019-02-04 22:17:09 +01:00
Kim Kulling
f5ef078834 fix openfiledialog in modelviewer. 2019-02-04 22:15:15 +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
6c4fde73e6 Merge pull request #2318 from assimp/issue_2297 
closes https://github.com/assimp/assimp/issues/2297: introduce obj-un…
 2019-02-03 21:21:35 +01:00
Kim Kulling
acc8826b02 Merge branch 'master' into issue_2297 2019-02-03 11:34:07 +01:00
Kim Kulling
996fb4aae7 closes https://github.com/assimp/assimp/issues/2297: introduce obj-unittest to validate working importer. 2019-02-03 11:32:56 +01:00
Kim Kulling
475e51d157 Merge pull request #2316 from assimp/kimkulling-dev 
Kimkulling dev
 2019-02-02 08:25:06 +01:00
Kim Kulling
d25654c8c4 Merge branch 'master' into kimkulling-dev 2019-02-01 16:08:01 +01:00
Kim Kulling
2fd10a37ee Merge pull request #2317 from severin-lemaignan/master 
[pyassimp] Bumped to 4.1.4
 2019-02-01 16:07:47 +01:00
kimkulling
0a0ac06285 Merge branch 'kimkulling-dev' of https://github.com/assimp/assimp into kimkulling-dev 2019-01-31 17:24:29 +01:00
kimkulling
4347ce4311 Some more findings. 2019-01-31 17:24:08 +01:00
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