summaryrefslogtreecommitdiffstats
path: root/examples/qt3d/advancedcustommaterial/shaders
Commit message (Collapse)AuthorAgeFilesLines
* Move phongFunction in its own include fileKevin Ottens2017-09-272-2/+2
| | | | | | | | | Makes it cleaner overall since the light structs were shared with the metalrough includes and the gooch fragment shader but they didn't use the functions in there. Change-Id: I459ff0fc2d751a5be9296dc33dda0efcb06b917c Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Wrap adsModel into phongFunctionKevin Ottens2017-09-252-18/+13
| | | | | | | This way the use is more similar to the one for metal/rough. Change-Id: I143df910f43e29ef622f24bd97a23c90a2c8ef68 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Get rid of adsModelNormalMappedKevin Ottens2017-09-224-46/+30
| | | | | | | | | | | | All materials and examples are ported away from it. It was really not related to normal mapping at all, somehow it was an implementation of adsModel working in tangent space instead of world space. Now we got it all in world space, just like for the metal/rough implementation. Change-Id: I3346277ce9b91328d70d914b319ac25f947fff0e Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Correct shader typo for rendering and fix shader selectionMike Krus2017-05-031-1/+1
| | | | | | Task-number: QTBUG-60288 Change-Id: I320f787c3b245cc52df80d89c75f856aeacf649d Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Add advanced custom material exampleAntti Määttä2017-02-284-0/+322
Change-Id: I6c5ae0e29960aaab2d0babfe325a9f6483729600 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>