Merge branch 'dev' into wip/animationwip/animation

Change-Id: I6e770609c90a7745d08fa4e2f424e865678c5d6f

1 files changed, 15 insertions, 0 deletions

diff --git a/examples/qt3d/simplecustommaterial/shaders/es2/simpleColor.vert b/examples/qt3d/simplecustommaterial/shaders/es2/simpleColor.vert
new file mode 100644
index 000000000..24934948c
--- /dev/null
+++ b/examples/qt3d/simplecustommaterial/shaders/es2/simpleColor.vert
@@ -0,0 +1,15 @@
+#define FP highp
+
+attribute FP vec3 vertexPosition;
+varying FP vec3 worldPosition;
+uniform FP mat4 modelMatrix;
+uniform FP mat4 mvp;
+
+void main()
+{
+    // Transform position, normal, and tangent to world coords
+    worldPosition = vec3(modelMatrix * vec4(vertexPosition, 1.0));
+
+    // Calculate vertex position in clip coordinates
+    gl_Position = mvp * vec4(worldPosition, 1.0);
+}