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

7143 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kim Kulling
0a731a0bff closes https://github.com/assimp/assimp/issues/934: introduce material keys for shader types. 2019-03-13 19:32:13 +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
Kim Kulling
90dbd8f350 Merge branch 'master' into master 2019-03-13 08:40:34 +01:00
Kim Kulling
152cddedd3 Merge pull request #2369 from assimp/kimkulling-dev-1 
Reenable vs2015 and vs1017
 2019-03-13 00:21:11 +01:00
Kim Kulling
63afcf8267 Update appveyor.yml 
Fix cmake generation.
 2019-03-12 21:56:28 +01:00
Kim Kulling
ac80b116a9 Update appveyor.yml 
Fix build image.
 2019-03-12 21:42:32 +01:00
Kim Kulling
f0ed1702b9 Reenable vs2015 and vs1017 2019-03-12 20:49:14 +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
28c110af2e Initial pass 2019-03-10 13:15:15 -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
Kim Kulling
5c900d689a Merge pull request #2365 from assimp/kimkulling-dev-1 
Typo
v.5.0.0.rc1 		2019-03-10 12:05:27 +01:00
Kim Kulling
925ac6b372 Typo 
Fix a typo in a comment.
 2019-03-10 11:17:52 +01: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
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