v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,481 Commits
74 Branches
37 Tags
234 MiB
Commit Graph

7481 Commits (484eb999204d8b985d2f5be350347172bc4bedb1)

Author SHA1 Message Date
Marco Di Benedetto b15c93c726 Merge https://github.com/assimp/assimp 2019-03-07 14:35:41 +01:00
Rich ard c3c0f5028c Merge branch 'master' into ETC_Inc 2019-03-05 12:27:37 +00:00
RichardTea 762c09988c
Merge pull request #1 from assimp/master 
Fast forward to upstream
 2019-03-05 12:25:42 +00:00
RichardTea 7d7574f189
Merge branch 'master' into ETC_Inc 2019-03-05 12:07:10 +00:00
Kim Kulling e00d92ea84
Merge pull request #2354 from asmaloney/include_fix 
Ensure our include directories get added in the correct order
 2019-03-03 20:08:43 +01:00
Kim Kulling f75c39593c
Merge branch 'master' into include_fix 2019-03-02 09:16:09 +01:00
Kim Kulling b7906bcce9
Merge pull request #2353 from phr34k/fix-bug-autogenerated-names 
Fix automatic name assignment for ColladaLoader when using name based assignment
 2019-03-02 09:08:49 +01:00
Kim Kulling b9c8e0856f
Merge branch 'master' into fix-bug-autogenerated-names 2019-03-01 20:24:45 +01:00
Andy Maloney 99c3697d12 Ensure our include directories get added in the correct order 
If you have assimp installed already and in the include path (e.g. I have it via homebrew), it can pick up the wrong headers.

This forces the include order so our local ones are found first when building assimp.
 2019-03-01 12:38:59 -05: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
Kim Kulling a23aa70575
Merge pull request #2350 from appsforlife/issue-2349 
Obj: we can still import partially incorrect files
 2019-02-27 18:50:42 +01: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 d5a0a21f8c
Merge pull request #2348 from assimp/simple_skin_test 
Simple skin test
 2019-02-26 00:20:09 +01:00
Kim Kulling 262bbc0d5e fix compiler warnings. 2019-02-25 23:19:21 +01: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 bc0064d3b0
Merge pull request #2345 from assimp/issue_1593 
closes https://github.com/assimp/assimp/issues/1593: fix computation …
 2019-02-20 00:33:02 +01: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 873f77a48d
Merge pull request #2344 from assimp/issue_2115 
closes https://github.com/assimp/assimp/issues/2115: rollback setup o…
 2019-02-19 21:02:21 +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 cc8f91c24d
Merge pull request #2341 from BoneCrasher/issue_2340 
[Issue_2340] Added ASSIMP_ANDROID_JNIIOSYSTEM precheck to only remain…
 2019-02-19 14:31:29 +01:00
Kim Kulling 050430cae0
Merge branch 'master' into issue_2340 2019-02-19 13:14:59 +01:00
Kim Kulling ef35acc7db
Merge pull request #2342 from assimp/isue_305 
Isue 305
 2019-02-19 13:14:28 +01:00
Kim Kulling ebf9deb6e0
Update appveyor.yml 
Disable vs2017
 2019-02-19 11:28:15 +01:00
Kim Kulling b0f94c4620
Update appveyor.yml 
Disable vs2015-test
 2019-02-19 11:19:53 +01:00
Kim Kulling ea2e6936e5 Add test file. 2019-02-18 21:44:07 +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 fadfaf88db
Merge pull request #2326 from MalcolmTyrrell/topic/Bug2034_typeCodeC 
Fix for FBX binary tokenization of arrays of type 'c'
 2019-02-08 20:38:07 +01:00
Kim Kulling 4621bde985
Merge branch 'master' into topic/Bug2034_typeCodeC 2019-02-08 14:38:25 +01:00
Kim Kulling 2f69e4945c
Merge pull request #2330 from assimp/kimkulling-dev-1 
Update README
 2019-02-08 14:38:11 +01:00
Kim Kulling 6cc41d6be6
Merge branch 'master' into kimkulling-patch-3 2019-02-07 19:27:07 +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
Malcolm Tyrrell 56374666a7 Add two test files which require 'c' handling to be tokenized correctly. 2019-02-06 11:15:31 +00: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 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