Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9,839 Commits 19 Branches 43 Tags
d1ef28fa523ee0a07628d9dec2494d5dfea8c209
Commit Graph
5318 Commits
Author SHA1 Message Date
Charlie Gettys 4efa3736ba Actually fix cmake this time 2019-03-27 12:03:39 -04:00
Charlie Gettys d718793163 Fix change to CMakeLists.txt 
change CMakeLists.txt to use add_definitions instead of add_compile_definitions on old versions of cmake
 2019-03-27 11:43:21 -04:00
Charlie Gettys 769dd42b73 Add compile definition to fix issue 
defines MINIZ_USE_UNALIGNED_LOADS_AND_STORES to be 0 to override default of 1 for x86 platforms.
 2019-03-27 11:29:40 -04:00
Matias ca08c4a209 FBX: Fix for loading taking a very long time on models with many duplicate names (issue_2390) 2019-03-27 11:20:16 +01:00
Kim Kulling 22f4667932 Merge branch 'master' into select_exporters 2019-03-17 23:44:35 +01:00
Kim Kulling 718b5b266b Merge branch 'master' into fix_vs107_warnings 2019-03-16 18:41:54 +01:00
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
Kim Kulling 6cc41d6be6 Merge branch 'master' into kimkulling-patch-3 2019-02-07 19:27:07 +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