Commit Graph

3906 Commits (8dacbf49f90f027449d7931c92060f8979212ccf)

Author SHA1 Message Date
Andy Maloney df6d257633 Fix 3MF importer 2019-03-16 11:55:16 -04:00
Andy Maloney 5ccd7d8c39 Adds a way to select which exporters you want to compile
Mimics the ASSIMP_BUILD_ALL_IMPORTERS_BY_DEFAULT / ASSIMP_BUILD_XXX_IMPORTER code but for exporters.

This works exactly the same way with one exception - ASSIMP_NO_EXPORT still overrides everything and turns off all exporting.

Fixes #2377
2019-03-16 11:40:17 -04:00
Kim Kulling 581d06a7b7
Merge branch 'master' into issue_1650 2019-03-16 16:22:47 +01:00
Kim Kulling 64bcf56101
Merge branch 'master' into issue_1650 2019-03-16 16:13:52 +01:00
Kim Kulling a0c797a29e
Merge branch 'master' into fix_vs107_warnings 2019-03-16 16:09:14 +01:00
Kim Kulling 64a7a46406
Update MD3Loader.cpp
Fix typo.
2019-03-16 16:08:03 +01:00
Kim Kulling ba6a7383b2 closes https://github.com/assimp/assimp/issues/1650: build irrXml as shared lib. 2019-03-16 09:45:21 +01:00
Tomas Maly 9a533d826a fix loading 3D uvs from obj 2019-03-15 22:43:12 +01:00
Rich ard 07bbb2c000 Nicer name for Assimp Binary importer
.assbin is not a nice name to show a user
2019-03-15 10:18:43 +00:00
kimkulling 61ffe017e8 Fix some coverity findings. 2019-03-14 17:37:28 +01:00
Aidmx 170549559e fix: change ScaleProcess priority 2019-03-14 21:50:50 +08:00
Kim Kulling 04025f09cf
Merge branch 'master' into issue_934 2019-03-13 22:27:23 +01:00
Kim Kulling 145c3d1589 add missing changes. 2019-03-13 19:35:36 +01:00
kkulling 650fadebe9 Fix compiler warnings: var declarations hides other var. 2019-03-13 16:58:18 +01:00
kkulling 0dc2e9197a Fix compiler warnings. 2019-03-13 14:40:02 +01:00
Charlie Gettys 5fd9789fc3 remove last warning? 2019-03-12 02:51:37 -04:00
Charlie Gettys 4728c1bb68 remove 1 more of the warnings 2019-03-12 02:49:33 -04:00
Charlie Gettys 27dc922d09 Hopefully fix all warnings? 2019-03-12 01:06:54 -04:00
Charlie Gettys 7bb1303773 ValidateDataStructure.cpp:
* Fixed warnings introduced by last commit (hopefully)
* Fixed case fallthrough (due to exception flow, it didn't make a practical difference, but hopefully will remove a warning)
* Minor formatting consistency improvements
2019-03-10 13:12:56 -04:00
Charlie Gettys 2e262dbbc6 Make syntax used to call ReportError & ReportWarning a bit more consistent 2019-03-09 12:36:21 -05:00
Charlie Gettys 80dffb63e8 Add aiNode::mName to ValidateDataStructure error reporting to ease debugging 2019-03-09 12:01:45 -05:00
Rich ard 3a610d3d66 Embed version information under Windows 2019-03-08 15:49:18 +00:00
Marco Di Benedetto b15c93c726 Merge https://github.com/assimp/assimp 2019-03-07 14:35:41 +01:00
RichardTea 7d7574f189
Merge branch 'master' into ETC_Inc 2019-03-05 12:07:10 +00:00
Kim Kulling b9c8e0856f
Merge branch 'master' into fix-bug-autogenerated-names 2019-03-01 20:24:45 +01:00
Lawrence Kok e9eda062a1 In ColladaLoader in version 3.2.0 (release est. 2015) the name assignment was based on name attribute (xml) with optional fallbacks to id and sid. Over time this was changed to fix a bug and support for names was removed, only to be later (re)added using an optional `useColladaName` setting. We discovered a problem that with when using the name based assignment it doesn't assign automatically generated names like what it did in the logic in v3.2.0 and on the id based approach on current master.
We discovered this causes problems with matching the aiCamera and aiLight. So we rectified this problem by auto generating names also on the name based method.
2019-03-01 10:43:18 +07:00
Vitaly Ovchinnikov 7b01ff6b8d ignoring invalid normals and uvs indices instead of canceling the import completely 2019-02-27 12:15:03 +13:00
Kim Kulling 16080ba60c Merge branch 'master' into simple_skin_test 2019-02-25 22:06:56 +01:00
Kim Kulling 206004c7d6 introduce simple skin-test +some findings. 2019-02-25 22:06:24 +01:00
RichardTea c1c42023fa
Merge branch 'master' into ETC_Inc 2019-02-20 16:58:41 +00:00
Kim Kulling f59f3976c0 closes https://github.com/assimp/assimp/issues/1593: fix computation of percentf for 3DS. 2019-02-20 00:02:19 +01:00
Kim Kulling adbc7e8f70 closes https://github.com/assimp/assimp/issues/2115: rollback setup of FBX-camera. 2019-02-19 20:23:20 +01:00
Kim Kulling 050430cae0
Merge branch 'master' into issue_2340 2019-02-19 13:14:59 +01:00
Kim Kulling ae41ae3211 closes https://github.com/assimp/assimp/issues/305': fix viewer 2019-02-18 21:43:45 +01:00
Marc-Anton Boehm-von Thenen 4d0740a120 [Issue_2340] Proper closing endif()... 2019-02-18 14:15:39 +01:00
Marc-Anton Boehm-von Thenen a94c8bf3f6 [Issue_2340] Wrong precondition layout... missed ANDROID=ON and ASSIMP_ANDROID_JNIIOSYSTEM=OFFvalid constellation 2019-02-18 14:14:27 +01:00
Marc-Anton Boehm-von Thenen c3129e55d2 [Issue_2340] Added ASSIMP_ANDROID_JNIIOSYSTEM precheck to only remain set to ON in proper ANDROID enabled toolchain environment 2019-02-18 14:10:32 +01:00
Kim Kulling 0810b2d51b
Merge branch 'master' into ETC_Inc 2019-02-15 10:20:30 +01:00
Kim Kulling 4621bde985
Merge branch 'master' into topic/Bug2034_typeCodeC 2019-02-08 14:38:25 +01:00
Lassi Lääti cc276c3180 cast size_t to unsigned int 2019-02-06 21:14:22 +02:00
Malcolm Tyrrell 02a5f6b62f Remove unneeded newline. 2019-02-06 11:15:27 +00:00
Malcolm Tyrrell f9014d7410 Add tokenization of 'c' type arrays, both compressed and uncompressed. 2019-02-06 11:15:21 +00:00
Kim Kulling 6e39c22554 Fix potential security issues. 2019-02-05 22:05:52 +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 0801a62ef7
Merge branch 'master' into kimkulling-dev 2019-01-30 16:09:33 +01:00
kimkulling a06133ab52 Update copyrights. 2019-01-30 09:41:39 +01:00
FRICOTEAUX 38bebaf4d3 Fix glTF2 export with no texture coordinates 2019-01-28 16:02:09 +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 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 05ea039846
Merge branch 'master' into ETC_Inc 2019-01-22 20:10:50 +01:00
Adrian Perez 8191080986 Adapt MemoryIOSystem to delegate unhandled calls to shadowed IO system 2019-01-21 14:14:48 -08:00
Kim Kulling a04b96ef66 Disable step. 2019-01-20 20:29:23 +01:00
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