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
ce691d383f
Merge branch 'master' into kimkulling-patch-3
2019-02-02 15:21:31 +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
3aa5a61516
Merge branch 'master' into ETC_Inc
2019-01-23 19:53:43 +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
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