diff options
author | Kevin Ottens <kevin.ottens@kdab.com> | 2017-05-31 16:46:41 +0200 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2017-07-05 16:13:38 +0000 |
commit | 63c30b44f475359afc0e27b31b040ba84996e1ad (patch) | |
tree | 7eb611779eb7b4a645d6ed14771f65b7e2a3c125 /src/extras/extras.qrc | |
parent | 4bb9b413f0c409fa7d5b59988dcb0da0f3a1456a (diff) |
Port Metal/Rough materials to shader graphs
This allows to validate the approach with a couple of functioning
materials using the new shader generation system. Also allows to have a
few prototypes in the default set of nodes.
Clearly the system is still cumbersome to use as can be seen from the
multiplication of prototypes, we shall improve that next by allowing
more expressivity in the graph JSON to allow more control (clearly
telling on the uniforms, return type for the functions, etc.).
Change-Id: I3edfef65af288faa339661f20d5e640cf00e9234
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/extras/extras.qrc')
-rw-r--r-- | src/extras/extras.qrc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/extras/extras.qrc b/src/extras/extras.qrc index 9fce08a9f..609f5b9ca 100644 --- a/src/extras/extras.qrc +++ b/src/extras/extras.qrc @@ -1,8 +1,12 @@ <RCC> <qresource prefix="/"> + <file>shaders/graphs/metalrough.frag.json</file> + <file>shaders/graphs/metalroughuniform.frag.json</file> <file>shaders/gl3/light.inc.frag</file> <file>shaders/es2/light.inc.frag</file> <file>shaders/es2/light.inc.frag100</file> + <file>shaders/gl3/metalrough.inc.frag</file> + <file>shaders/gl3/coordinatesystems.inc</file> <file>shaders/gl3/phong.vert</file> <file>shaders/gl3/phong.frag</file> <file>shaders/es2/phong.vert</file> @@ -40,8 +44,6 @@ <file>shaders/es2/unlittexture.frag</file> <file>shaders/es2/unlittexture.vert</file> <file>shaders/gl3/metalrough.vert</file> - <file>shaders/gl3/metalrough.frag</file> - <file>shaders/gl3/metalroughuniform.frag</file> <file>shaders/gl3/distancefieldtext.vert</file> <file>shaders/gl3/distancefieldtext.frag</file> <file>shaders/es2/distancefieldtext.frag</file> |