diff options
author | Tomi Korpipää <tomi.korpipaa@theqtcompany.com> | 2016-05-20 10:18:23 +0300 |
---|---|---|
committer | Jani Heikkinen <jani.heikkinen@qt.io> | 2016-06-03 06:26:28 +0000 |
commit | edc5b80b4e9bcd1d494c4dc92aff8316238ed8b8 (patch) | |
tree | fd164d6323a53e98a29c5dccd16294b1ca0dd80d /examples/qt3d/planets-qml/planets-qml.qrc | |
parent | a398469e66e3a953097857c60655c41bf291a06b (diff) |
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>
Diffstat (limited to 'examples/qt3d/planets-qml/planets-qml.qrc')
-rw-r--r-- | examples/qt3d/planets-qml/planets-qml.qrc | 14 |
1 files changed, 8 insertions, 6 deletions
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> |