Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,143 Commits 19 Branches 43 Tags
b87f4c03bab4df875d5ec05be15809bbec73d342
Commit Graph

3951 Commits

Author SHA1 Message Date
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