diff options
| author | Paul Lemire <paul.lemire.ecortex@kdab.com> | 2014-12-29 16:10:48 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2014-12-31 11:23:49 +0100 |
| commit | bee25daf9efaa688a6954a5b31a07c51db49b8ba (patch) | |
| tree | 5bc3f2982689c8908c9fbe440eff36cd1d15f6a1 /src/render/render.qrc | |
| parent | 2be97a74b23c66d385b1dd89df106c9be7be7696 (diff) | |
Default cpp materials + material-cpp example
QDiffuseMapMaterial
QDiffuseSpecularMapMaterial
QNormalDiffuseMapMaterial
QNormalDiffuseAlphaMapMaterial
QNormalDiffuseSpecularMapMaterial
material-cpp is mostly inspired from materials (QML) but nicer :).
Note: there seems to be an issue with qrc and QUrl. The behavior is different
between QML and C++.
-In C++ we need to prefix with have qrc:/ and convert that to :/ (passing :/
directly returns "" when QUrl toString is called)
-From QML no prefix is needed.
-For QImage path, :/ should be used.
Change-Id: Ib56fb9546c95c2872686a46ed048a290ab4a5b6f
Task-number: QTBUG-41548
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render/render.qrc')
| -rw-r--r-- | src/render/render.qrc | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/src/render/render.qrc b/src/render/render.qrc index 99d332339..68852b445 100644 --- a/src/render/render.qrc +++ b/src/render/render.qrc @@ -19,5 +19,23 @@ <file>shaders/gl3/phong.frag</file> <file>shaders/es2/phong.vert</file> <file>shaders/es2/phong.frag</file> + <file>shaders/gl3/normaldiffusespecularmap.vert</file> + <file>shaders/gl3/normaldiffusespecularmap.frag</file> + <file>shaders/gl3/diffusemap.vert</file> + <file>shaders/gl3/diffusemap.frag</file> + <file>shaders/es2/normaldiffusespecularmap.vert</file> + <file>shaders/es2/normaldiffusespecularmap.frag</file> + <file>shaders/es2/diffusemap.vert</file> + <file>shaders/es2/diffusemap.frag</file> + <file>shaders/es2/normaldiffusemap.vert</file> + <file>shaders/es2/normaldiffusemap.frag</file> + <file>shaders/es2/normaldiffusemapalpha.frag</file> + <file>shaders/gl3/normaldiffusemap.frag</file> + <file>shaders/gl3/normaldiffusemap.vert</file> + <file>shaders/gl3/normaldiffusemapalpha.frag</file> + <file>shaders/es2/diffusespecularmap.vert</file> + <file>shaders/es2/diffusespecularmap.frag</file> + <file>shaders/gl3/diffusespecularmap.vert</file> + <file>shaders/gl3/diffusespecularmap.frag</file> </qresource> </RCC> |