diff options
| author | Laszlo Agocs <laszlo.agocs@theqtcompany.com> | 2015-02-02 14:03:09 +0100 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@theqtcompany.com> | 2015-02-02 15:33:35 +0000 |
| commit | 43bb067fc3ec8217ba1064169d9ffdc7e21af7d5 (patch) | |
| tree | aae78d3fc5845b3e0220c3a2f3e04dd8d3476e16 /src/render/defaults/qdiffusemapmaterial.h | |
| parent | 75832ffd01c64e30d43e5ff4d13a879750e00cbb (diff) | |
Remove default uniform values for lightPosition and intensity
The ES2 variants of the shaders have a default uniform value of 0.
To be compatible with the other versions, start specifying the
values for lightPosition and Intensity from C++, just like we already
do from QML. This way the default values are coming from one single
unified place regardless of the shader version in use, and examples
like simple-cpp will work identically to simple-qml, even on ES2.
Change-Id: If60185d0d3039e4354da8cc6e6b21a0db0bae963
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/render/defaults/qdiffusemapmaterial.h')
| -rw-r--r-- | src/render/defaults/qdiffusemapmaterial.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/render/defaults/qdiffusemapmaterial.h b/src/render/defaults/qdiffusemapmaterial.h index 00c1f4f2d..69eb0d33f 100644 --- a/src/render/defaults/qdiffusemapmaterial.h +++ b/src/render/defaults/qdiffusemapmaterial.h @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#ifndef QT3D_RENDER_QDIFFUSEGMAPMATERIAL_H +#ifndef QT3D_RENDER_QDIFFUSEMAPMATERIAL_H #define QT3D_RENDER_QDIFFUSEMAPMATERIAL_H #include <Qt3DRenderer/qmaterial.h> |