diff options
| author | Kevin Ottens <kevin.ottens@kdab.com> | 2017-08-03 17:42:15 +0200 |
|---|---|---|
| committer | Kevin Ottens <kevin.ottens@kdab.com> | 2017-10-13 06:12:14 +0000 |
| commit | 57252c036cd1f9c311310be574b664f059c84af6 (patch) | |
| tree | d666ff73ef7027cacb99493ef6930105d19adca7 /src/extras/extras.qrc | |
| parent | 8d566f2b1f6155c83964acf45c925cdfd8e53a18 (diff) | |
Have all the Phong variations based on a graph
This commit introduces a new layered graph file to deal with all the
Phong material variations. It ports all the materials to using it, then
of course it removes all the old frag implementations.
Change-Id: Ia519eaf4cea3b6e3ff4dd5aa1cca2bedbfcbe7cb
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/extras/extras.qrc')
| -rw-r--r-- | src/extras/extras.qrc | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/src/extras/extras.qrc b/src/extras/extras.qrc index f3619fdb7..bfb14f3f9 100644 --- a/src/extras/extras.qrc +++ b/src/extras/extras.qrc @@ -1,6 +1,7 @@ <RCC> <qresource prefix="/"> <file>shaders/graphs/metalrough.frag.json</file> + <file>shaders/graphs/phong.frag.json</file> <file>shaders/gl3/light.inc.frag</file> <file>shaders/es2/light.inc.frag</file> <file>shaders/es2/light.inc.frag100</file> @@ -10,16 +11,6 @@ <file>shaders/gl3/metalrough.inc.frag</file> <file>shaders/gl3/coordinatesystems.inc</file> <file>shaders/es2/coordinatesystems.inc</file> - <file>shaders/gl3/phong.frag</file> - <file>shaders/es2/phong.frag</file> - <file>shaders/gl3/normaldiffusespecularmap.frag</file> - <file>shaders/gl3/diffusemap.frag</file> - <file>shaders/es2/normaldiffusespecularmap.frag</file> - <file>shaders/es2/diffusemap.frag</file> - <file>shaders/es2/normaldiffusemap.frag</file> - <file>shaders/gl3/normaldiffusemap.frag</file> - <file>shaders/es2/diffusespecularmap.frag</file> - <file>shaders/gl3/diffusespecularmap.frag</file> <file>shaders/gl3/default.vert</file> <file>shaders/es2/default.vert</file> <file>shaders/gl3/pervertexcolor.frag</file> |