From edc5b80b4e9bcd1d494c4dc92aff8316238ed8b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomi=20Korpip=C3=A4=C3=A4?= <tomi.korpipaa@theqtcompany.com>
Date: Fri, 20 May 2016 10:18:23 +0300
Subject: Fixed sun in planets-qml

Also removed duplicate code and made some rearrangements in entities.

Change-Id: I7f588672a1694fc440318f66bcfbe33d5ebcf0ab
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
---
 examples/qt3d/planets-qml/planets-qml.qrc | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'examples/qt3d/planets-qml/planets-qml.qrc')

diff --git a/examples/qt3d/planets-qml/planets-qml.qrc b/examples/qt3d/planets-qml/planets-qml.qrc
index dceaffeeb..4b6bd433d 100644
--- a/examples/qt3d/planets-qml/planets-qml.qrc
+++ b/examples/qt3d/planets-qml/planets-qml.qrc
@@ -9,16 +9,16 @@
         <file>Planet.qml</file>
         <file>Ring.qml</file>
         <file>PlanetsLight.qml</file>
-        <file>CloudEffectDS.qml</file>
-        <file>PlanetEffectD.qml</file>
-        <file>PlanetEffectDB.qml</file>
-        <file>PlanetEffectDSB.qml</file>
-        <file>PlanetMaterial.qml</file>
-        <file>PlanetShadowEffectD.qml</file>
+        <file>SunEffect.qml</file>
+        <file>PlanetEffect.qml</file>
+        <file>ShadowEffect.qml</file>
         <file>PlanetFrameGraph.qml</file>
+        <file>PlanetMaterial.qml</file>
         <file>planets.js</file>
         <file>meshes/starfield.obj</file>
         <file>meshes/ring.obj</file>
+        <file>shaders/gl3/sun.frag</file>
+        <file>shaders/gl3/sun.vert</file>
         <file>shaders/gl3/shadowmap.frag</file>
         <file>shaders/gl3/shadowmap.vert</file>
         <file>shaders/gl3/planetD.frag</file>
@@ -27,6 +27,8 @@
         <file>shaders/gl3/planetDB.vert</file>
         <file>shaders/gl3/planetDS.frag</file>
         <file>shaders/gl3/planetDSB.frag</file>
+        <file>shaders/es2/sun.frag</file>
+        <file>shaders/es2/sun.vert</file>
         <file>shaders/es2/planetD.frag</file>
         <file>shaders/es2/planetD.vert</file>
         <file>shaders/es2/planetDB.frag</file>
-- 
cgit v1.2.3