From 4b3f368aba47d559040c3f038620883462b925ea Mon Sep 17 00:00:00 2001 From: Robert Brock Date: Mon, 9 Jan 2017 08:10:57 +0000 Subject: Replace undistributable files The texture files used were from a third party that didn't explicitly allow their distribution. All of them have been replaced by textures from NASA and another third party that do allow their distribution and editing. Task-number: QTBUG-57543 Change-Id: I69f1309424bba029cdce08689ea8670ed32d44ae Reviewed-by: Lars Knoll --- examples/qt3d/planets-qml/SolarSystem.qml | 42 +++++++++--------- .../planets-qml/images/earthcloudmapcolortrans.png | Bin 1041258 -> 0 bytes .../qt3d/planets-qml/images/earthcloudmapspec.jpg | Bin 102821 -> 0 bytes examples/qt3d/planets-qml/images/earthmap1k.jpg | Bin 341782 -> 0 bytes examples/qt3d/planets-qml/images/earthnormal1k.jpg | Bin 176666 -> 0 bytes examples/qt3d/planets-qml/images/earthspec1k.jpg | Bin 100936 -> 0 bytes .../qt3d/planets-qml/images/galaxy_starfield.png | Bin 670297 -> 0 bytes examples/qt3d/planets-qml/images/jupitermap.jpg | Bin 157780 -> 0 bytes examples/qt3d/planets-qml/images/marsmap1k.jpg | Bin 501328 -> 0 bytes examples/qt3d/planets-qml/images/marsnormal1k.jpg | Bin 226859 -> 0 bytes examples/qt3d/planets-qml/images/mercurymap.jpg | Bin 285975 -> 0 bytes examples/qt3d/planets-qml/images/mercurynormal.jpg | Bin 961068 -> 0 bytes examples/qt3d/planets-qml/images/moonmap1k.jpg | Bin 389305 -> 0 bytes examples/qt3d/planets-qml/images/moonnormal1k.jpg | Bin 847618 -> 0 bytes examples/qt3d/planets-qml/images/nasa/license.txt | 3 ++ .../planets-qml/images/nasa/qt_attribution.json | 13 ++++++ .../images/nasa/uranusringcolortrans.png | Bin 0 -> 341169 bytes examples/qt3d/planets-qml/images/neptunemap.jpg | Bin 48069 -> 0 bytes examples/qt3d/planets-qml/images/saturnmap.jpg | Bin 40837 -> 0 bytes .../planets-qml/images/saturnringcolortrans.png | Bin 311632 -> 0 bytes .../solarsystemscope/earthcloudmapcolortrans.png | Bin 0 -> 1830686 bytes .../images/solarsystemscope/earthcloudmapspec.jpg | Bin 0 -> 603331 bytes .../images/solarsystemscope/earthmap2k.jpg | Bin 0 -> 307630 bytes .../images/solarsystemscope/earthnormal2k.jpg | Bin 0 -> 584692 bytes .../images/solarsystemscope/earthspec2k.jpg | Bin 0 -> 185837 bytes .../images/solarsystemscope/galaxy_starfield.jpg | Bin 0 -> 521243 bytes .../images/solarsystemscope/jupitermap.jpg | Bin 0 -> 345203 bytes .../images/solarsystemscope/license.txt | 6 +++ .../images/solarsystemscope/marsmap2k.jpg | Bin 0 -> 489786 bytes .../images/solarsystemscope/marsnormal2k.jpg | Bin 0 -> 1073295 bytes .../images/solarsystemscope/mercurymap.jpg | Bin 0 -> 534775 bytes .../images/solarsystemscope/mercurynormal.jpg | Bin 0 -> 1397792 bytes .../images/solarsystemscope/moonmap2k.jpg | Bin 0 -> 641394 bytes .../images/solarsystemscope/moonnormal2k.jpg | Bin 0 -> 1473741 bytes .../images/solarsystemscope/neptunemap.jpg | Bin 0 -> 87217 bytes .../images/solarsystemscope/qt_attribution.json | 14 ++++++ .../images/solarsystemscope/saturnmap.jpg | Bin 0 -> 143493 bytes .../solarsystemscope/saturnringcolortrans.png | Bin 0 -> 355950 bytes .../planets-qml/images/solarsystemscope/sunmap.jpg | Bin 0 -> 563238 bytes .../images/solarsystemscope/uranusmap.jpg | Bin 0 -> 40631 bytes .../images/solarsystemscope/venusmap.jpg | Bin 0 -> 555402 bytes .../images/solarsystemscope/venusnormal.jpg | Bin 0 -> 1263138 bytes examples/qt3d/planets-qml/images/sunmap.jpg | Bin 281479 -> 0 bytes examples/qt3d/planets-qml/images/uranusmap.jpg | Bin 8942 -> 0 bytes .../planets-qml/images/uranusringcolortrans.png | Bin 300655 -> 0 bytes examples/qt3d/planets-qml/images/venusmap.jpg | Bin 255067 -> 0 bytes examples/qt3d/planets-qml/images/venusnormal.jpg | Bin 742335 -> 0 bytes examples/qt3d/planets-qml/planets-qml-images.qrc | 47 +++++++++++---------- examples/qt3d/planets-qml/planets-qml.pro | 3 +- .../qt3d/planets-qml/shaders/gl3/planetDSB.frag | 14 +++--- 50 files changed, 90 insertions(+), 52 deletions(-) delete mode 100644 examples/qt3d/planets-qml/images/earthcloudmapcolortrans.png delete mode 100644 examples/qt3d/planets-qml/images/earthcloudmapspec.jpg delete mode 100644 examples/qt3d/planets-qml/images/earthmap1k.jpg delete mode 100644 examples/qt3d/planets-qml/images/earthnormal1k.jpg delete mode 100644 examples/qt3d/planets-qml/images/earthspec1k.jpg delete mode 100644 examples/qt3d/planets-qml/images/galaxy_starfield.png delete mode 100644 examples/qt3d/planets-qml/images/jupitermap.jpg delete mode 100644 examples/qt3d/planets-qml/images/marsmap1k.jpg delete mode 100644 examples/qt3d/planets-qml/images/marsnormal1k.jpg delete mode 100644 examples/qt3d/planets-qml/images/mercurymap.jpg delete mode 100644 examples/qt3d/planets-qml/images/mercurynormal.jpg delete mode 100644 examples/qt3d/planets-qml/images/moonmap1k.jpg delete mode 100644 examples/qt3d/planets-qml/images/moonnormal1k.jpg create mode 100644 examples/qt3d/planets-qml/images/nasa/license.txt create mode 100644 examples/qt3d/planets-qml/images/nasa/qt_attribution.json create mode 100755 examples/qt3d/planets-qml/images/nasa/uranusringcolortrans.png delete mode 100644 examples/qt3d/planets-qml/images/neptunemap.jpg delete mode 100644 examples/qt3d/planets-qml/images/saturnmap.jpg delete mode 100644 examples/qt3d/planets-qml/images/saturnringcolortrans.png create mode 100755 examples/qt3d/planets-qml/images/solarsystemscope/earthcloudmapcolortrans.png create mode 100755 examples/qt3d/planets-qml/images/solarsystemscope/earthcloudmapspec.jpg create mode 100755 examples/qt3d/planets-qml/images/solarsystemscope/earthmap2k.jpg create mode 100755 examples/qt3d/planets-qml/images/solarsystemscope/earthnormal2k.jpg create mode 100755 examples/qt3d/planets-qml/images/solarsystemscope/earthspec2k.jpg create mode 100755 examples/qt3d/planets-qml/images/solarsystemscope/galaxy_starfield.jpg create mode 100755 examples/qt3d/planets-qml/images/solarsystemscope/jupitermap.jpg create mode 100644 examples/qt3d/planets-qml/images/solarsystemscope/license.txt create mode 100755 examples/qt3d/planets-qml/images/solarsystemscope/marsmap2k.jpg create mode 100755 examples/qt3d/planets-qml/images/solarsystemscope/marsnormal2k.jpg create mode 100755 examples/qt3d/planets-qml/images/solarsystemscope/mercurymap.jpg create mode 100755 examples/qt3d/planets-qml/images/solarsystemscope/mercurynormal.jpg create mode 100755 examples/qt3d/planets-qml/images/solarsystemscope/moonmap2k.jpg create mode 100755 examples/qt3d/planets-qml/images/solarsystemscope/moonnormal2k.jpg create mode 100755 examples/qt3d/planets-qml/images/solarsystemscope/neptunemap.jpg create mode 100644 examples/qt3d/planets-qml/images/solarsystemscope/qt_attribution.json create mode 100755 examples/qt3d/planets-qml/images/solarsystemscope/saturnmap.jpg create mode 100755 examples/qt3d/planets-qml/images/solarsystemscope/saturnringcolortrans.png create mode 100755 examples/qt3d/planets-qml/images/solarsystemscope/sunmap.jpg create mode 100755 examples/qt3d/planets-qml/images/solarsystemscope/uranusmap.jpg create mode 100755 examples/qt3d/planets-qml/images/solarsystemscope/venusmap.jpg create mode 100755 examples/qt3d/planets-qml/images/solarsystemscope/venusnormal.jpg delete mode 100644 examples/qt3d/planets-qml/images/sunmap.jpg delete mode 100644 examples/qt3d/planets-qml/images/uranusmap.jpg delete mode 100644 examples/qt3d/planets-qml/images/uranusringcolortrans.png delete mode 100644 examples/qt3d/planets-qml/images/venusmap.jpg delete mode 100644 examples/qt3d/planets-qml/images/venusnormal.jpg (limited to 'examples/qt3d') diff --git a/examples/qt3d/planets-qml/SolarSystem.qml b/examples/qt3d/planets-qml/SolarSystem.qml index 0cd2a4db5..f9353d6dc 100644 --- a/examples/qt3d/planets-qml/SolarSystem.qml +++ b/examples/qt3d/planets-qml/SolarSystem.qml @@ -503,7 +503,7 @@ Entity { effect: effectD ambientLight: ambientStrengthStarfield specularColor: Qt.rgba(0.0, 0.0, 0.0, 1.0) - diffuseMap: "qrc:/images/galaxy_starfield.png" + diffuseMap: "qrc:/images/solarsystemscope/galaxy_starfield.jpg" shininess: 1000000.0 } @@ -531,7 +531,7 @@ Entity { id: materialSun effect: sunEffect ambientLight: ambientStrengthSun - diffuseMap: "qrc:/images/sunmap.jpg" + diffuseMap: "qrc:/images/solarsystemscope/sunmap.jpg" } property Transform transformSun: Transform { @@ -567,8 +567,8 @@ Entity { effect: effectDB ambientLight: ambientStrengthPlanet specularColor: Qt.rgba(0.2, 0.2, 0.2, 1.0) - diffuseMap: "qrc:/images/mercurymap.jpg" - normalMap: "qrc:/images/mercurynormal.jpg" + diffuseMap: "qrc:/images/solarsystemscope/mercurymap.jpg" + normalMap: "qrc:/images/solarsystemscope/mercurynormal.jpg" shininess: shininessSpecularMap } @@ -601,8 +601,8 @@ Entity { effect: effectDB ambientLight: ambientStrengthPlanet specularColor: Qt.rgba(0.2, 0.2, 0.2, 1.0) - diffuseMap: "qrc:/images/venusmap.jpg" - normalMap: "qrc:/images/venusnormal.jpg" + diffuseMap: "qrc:/images/solarsystemscope/venusmap.jpg" + normalMap: "qrc:/images/solarsystemscope/venusnormal.jpg" shininess: shininessSpecularMap } @@ -635,9 +635,9 @@ Entity { id: materialEarth effect: effectDSB ambientLight: ambientStrengthPlanet - diffuseMap: "qrc:/images/earthmap1k.jpg" - specularMap: "qrc:/images/earthspec1k.jpg" - normalMap: "qrc:/images/earthnormal1k.jpg" + diffuseMap: "qrc:/images/solarsystemscope/earthmap2k.jpg" + specularMap: "qrc:/images/solarsystemscope/earthspec2k.jpg" + normalMap: "qrc:/images/solarsystemscope/earthnormal2k.jpg" shininess: shininessSpecularMap } @@ -670,8 +670,8 @@ Entity { id: materialEarthClouds effect: cloudEffect ambientLight: ambientStrengthClouds - diffuseMap: "qrc:/images/earthcloudmapcolortrans.png" - specularMap: "qrc:/images/earthcloudmapspec.jpg" + diffuseMap: "qrc:/images/solarsystemscope/earthcloudmapcolortrans.png" + specularMap: "qrc:/images/solarsystemscope/earthcloudmapspec.jpg" shininess: shininessClouds opacity: 0.2 } @@ -705,8 +705,8 @@ Entity { effect: effectDB ambientLight: ambientStrengthPlanet specularColor: Qt.rgba(0.2, 0.2, 0.2, 1.0) - diffuseMap: "qrc:/images/moonmap1k.jpg" - normalMap: "qrc:/images/moonnormal1k.jpg" + diffuseMap: "qrc:/images/solarsystemscope/moonmap2k.jpg" + normalMap: "qrc:/images/solarsystemscope/moonnormal2k.jpg" shininess: shininessSpecularMap } @@ -739,8 +739,8 @@ Entity { effect: effectDB ambientLight: ambientStrengthPlanet specularColor: Qt.rgba(0.2, 0.2, 0.2, 1.0) - diffuseMap: "qrc:/images/marsmap1k.jpg" - normalMap: "qrc:/images/marsnormal1k.jpg" + diffuseMap: "qrc:/images/solarsystemscope/marsmap2k.jpg" + normalMap: "qrc:/images/solarsystemscope/marsnormal2k.jpg" shininess: shininessSpecularMap } @@ -773,7 +773,7 @@ Entity { effect: effectD ambientLight: ambientStrengthPlanet specularColor: Qt.rgba(0.2, 0.2, 0.2, 1.0) - diffuseMap: "qrc:/images/jupitermap.jpg" + diffuseMap: "qrc:/images/solarsystemscope/jupitermap.jpg" shininess: shininessBasic } @@ -806,7 +806,7 @@ Entity { effect: shadowMapEffect ambientLight: ambientStrengthPlanet specularColor: Qt.rgba(0.2, 0.2, 0.2, 1.0) - diffuseMap: "qrc:/images/saturnmap.jpg" + diffuseMap: "qrc:/images/solarsystemscope/saturnmap.jpg" shininess: shininessBasic } @@ -840,7 +840,7 @@ Entity { effect: shadowMapEffect ambientLight: ambientStrengthRing specularColor: Qt.rgba(0.01, 0.01, 0.01, 1.0) - diffuseMap: "qrc:/images/saturnringcolortrans.png" + diffuseMap: "qrc:/images/solarsystemscope/saturnringcolortrans.png" shininess: shininessBasic opacity: 0.4 } @@ -874,7 +874,7 @@ Entity { effect: shadowMapEffect ambientLight: ambientStrengthPlanet specularColor: Qt.rgba(0.2, 0.2, 0.2, 1.0) - diffuseMap: "qrc:/images/uranusmap.jpg" + diffuseMap: "qrc:/images/solarsystemscope/uranusmap.jpg" shininess: shininessBasic } @@ -908,7 +908,7 @@ Entity { effect: shadowMapEffect ambientLight: ambientStrengthRing specularColor: Qt.rgba(0.01, 0.01, 0.01, 1.0) - diffuseMap: "qrc:/images/uranusringcolortrans.png" + diffuseMap: "qrc:/images/nasa/uranusringcolortrans.png" shininess: shininessBasic opacity: 0.4 } @@ -942,7 +942,7 @@ Entity { effect: effectD ambientLight: ambientStrengthPlanet specularColor: Qt.rgba(0.2, 0.2, 0.2, 1.0) - diffuseMap: "qrc:/images/neptunemap.jpg" + diffuseMap: "qrc:/images/solarsystemscope/neptunemap.jpg" shininess: shininessBasic } diff --git a/examples/qt3d/planets-qml/images/earthcloudmapcolortrans.png b/examples/qt3d/planets-qml/images/earthcloudmapcolortrans.png deleted file mode 100644 index ee2a89732..000000000 Binary files a/examples/qt3d/planets-qml/images/earthcloudmapcolortrans.png and /dev/null differ diff --git a/examples/qt3d/planets-qml/images/earthcloudmapspec.jpg b/examples/qt3d/planets-qml/images/earthcloudmapspec.jpg deleted file mode 100644 index 9970a3839..000000000 Binary files a/examples/qt3d/planets-qml/images/earthcloudmapspec.jpg and /dev/null differ diff --git a/examples/qt3d/planets-qml/images/earthmap1k.jpg b/examples/qt3d/planets-qml/images/earthmap1k.jpg deleted file mode 100644 index e1de9d3a9..000000000 Binary files a/examples/qt3d/planets-qml/images/earthmap1k.jpg and /dev/null differ diff --git a/examples/qt3d/planets-qml/images/earthnormal1k.jpg b/examples/qt3d/planets-qml/images/earthnormal1k.jpg deleted file mode 100644 index 491d430a1..000000000 Binary files a/examples/qt3d/planets-qml/images/earthnormal1k.jpg and /dev/null differ diff --git a/examples/qt3d/planets-qml/images/earthspec1k.jpg b/examples/qt3d/planets-qml/images/earthspec1k.jpg deleted file mode 100644 index 3de6fe7af..000000000 Binary files a/examples/qt3d/planets-qml/images/earthspec1k.jpg and /dev/null differ diff --git a/examples/qt3d/planets-qml/images/galaxy_starfield.png b/examples/qt3d/planets-qml/images/galaxy_starfield.png deleted file mode 100644 index 36a762e3c..000000000 Binary files a/examples/qt3d/planets-qml/images/galaxy_starfield.png and /dev/null differ diff --git a/examples/qt3d/planets-qml/images/jupitermap.jpg b/examples/qt3d/planets-qml/images/jupitermap.jpg deleted file mode 100644 index 69107dfe6..000000000 Binary files a/examples/qt3d/planets-qml/images/jupitermap.jpg and /dev/null differ diff --git a/examples/qt3d/planets-qml/images/marsmap1k.jpg b/examples/qt3d/planets-qml/images/marsmap1k.jpg deleted file mode 100644 index 64ebc538c..000000000 Binary files a/examples/qt3d/planets-qml/images/marsmap1k.jpg and /dev/null differ diff --git a/examples/qt3d/planets-qml/images/marsnormal1k.jpg b/examples/qt3d/planets-qml/images/marsnormal1k.jpg deleted file mode 100644 index af910cab4..000000000 Binary files a/examples/qt3d/planets-qml/images/marsnormal1k.jpg and /dev/null differ diff --git a/examples/qt3d/planets-qml/images/mercurymap.jpg b/examples/qt3d/planets-qml/images/mercurymap.jpg deleted file mode 100644 index 9bb2c0be0..000000000 Binary files a/examples/qt3d/planets-qml/images/mercurymap.jpg and /dev/null differ diff --git a/examples/qt3d/planets-qml/images/mercurynormal.jpg b/examples/qt3d/planets-qml/images/mercurynormal.jpg deleted file mode 100644 index d64512489..000000000 Binary files a/examples/qt3d/planets-qml/images/mercurynormal.jpg and /dev/null differ diff --git a/examples/qt3d/planets-qml/images/moonmap1k.jpg b/examples/qt3d/planets-qml/images/moonmap1k.jpg deleted file mode 100644 index 509d3f5a4..000000000 Binary files a/examples/qt3d/planets-qml/images/moonmap1k.jpg and /dev/null differ diff --git a/examples/qt3d/planets-qml/images/moonnormal1k.jpg b/examples/qt3d/planets-qml/images/moonnormal1k.jpg deleted file mode 100644 index b478ed484..000000000 Binary files a/examples/qt3d/planets-qml/images/moonnormal1k.jpg and /dev/null differ diff --git a/examples/qt3d/planets-qml/images/nasa/license.txt b/examples/qt3d/planets-qml/images/nasa/license.txt new file mode 100644 index 000000000..62a6d9ffd --- /dev/null +++ b/examples/qt3d/planets-qml/images/nasa/license.txt @@ -0,0 +1,3 @@ +Uranus Ring: +http://photojournal.jpl.nasa.gov/catalog/PIA00033 - Courtesy NASA/JPL-Caltech. +Used under the terms of the license at http://www.jpl.nasa.gov/imagepolicy/ diff --git a/examples/qt3d/planets-qml/images/nasa/qt_attribution.json b/examples/qt3d/planets-qml/images/nasa/qt_attribution.json new file mode 100644 index 000000000..174e092ef --- /dev/null +++ b/examples/qt3d/planets-qml/images/nasa/qt_attribution.json @@ -0,0 +1,13 @@ +{ + "Id": "nasa-jpl", + "Name": "Jet Propulsion Laboratory Photojournal", + "QDocModule": "qt3d", + "Description": "The NASA/JPL Photojournal provides high quality images related to space research and exploration", + "QtUsage": "Used in Qt 3D planets-qml example.", + + "DownloadLocation": "https://photojournal.jpl.nasa.gov/catalog/PIA00033", + "Homepage": "https://photojournal.jpl.nasa.gov/", + "License": "JPL Image Use Policy", + "LicenseFile": "license.txt", + "Copyright": "Copyright (c) 1996, Jet Propulsion Laboratory" +} diff --git a/examples/qt3d/planets-qml/images/nasa/uranusringcolortrans.png b/examples/qt3d/planets-qml/images/nasa/uranusringcolortrans.png new file mode 100755 index 000000000..b0953dec5 Binary files /dev/null and b/examples/qt3d/planets-qml/images/nasa/uranusringcolortrans.png differ diff --git a/examples/qt3d/planets-qml/images/neptunemap.jpg b/examples/qt3d/planets-qml/images/neptunemap.jpg deleted file mode 100644 index 0d0d3f06a..000000000 Binary files a/examples/qt3d/planets-qml/images/neptunemap.jpg and /dev/null differ diff --git a/examples/qt3d/planets-qml/images/saturnmap.jpg b/examples/qt3d/planets-qml/images/saturnmap.jpg deleted file mode 100644 index 767be39e4..000000000 Binary files a/examples/qt3d/planets-qml/images/saturnmap.jpg and /dev/null differ diff --git a/examples/qt3d/planets-qml/images/saturnringcolortrans.png b/examples/qt3d/planets-qml/images/saturnringcolortrans.png deleted file mode 100644 index 48a9a5911..000000000 Binary files a/examples/qt3d/planets-qml/images/saturnringcolortrans.png and /dev/null differ diff --git a/examples/qt3d/planets-qml/images/solarsystemscope/earthcloudmapcolortrans.png b/examples/qt3d/planets-qml/images/solarsystemscope/earthcloudmapcolortrans.png new file mode 100755 index 000000000..1aabde94e Binary files /dev/null and b/examples/qt3d/planets-qml/images/solarsystemscope/earthcloudmapcolortrans.png differ diff --git a/examples/qt3d/planets-qml/images/solarsystemscope/earthcloudmapspec.jpg b/examples/qt3d/planets-qml/images/solarsystemscope/earthcloudmapspec.jpg new file mode 100755 index 000000000..254b6fb6c Binary files /dev/null and b/examples/qt3d/planets-qml/images/solarsystemscope/earthcloudmapspec.jpg differ diff --git a/examples/qt3d/planets-qml/images/solarsystemscope/earthmap2k.jpg b/examples/qt3d/planets-qml/images/solarsystemscope/earthmap2k.jpg new file mode 100755 index 000000000..e90540c83 Binary files /dev/null and b/examples/qt3d/planets-qml/images/solarsystemscope/earthmap2k.jpg differ diff --git a/examples/qt3d/planets-qml/images/solarsystemscope/earthnormal2k.jpg b/examples/qt3d/planets-qml/images/solarsystemscope/earthnormal2k.jpg new file mode 100755 index 000000000..8215226fb Binary files /dev/null and b/examples/qt3d/planets-qml/images/solarsystemscope/earthnormal2k.jpg differ diff --git a/examples/qt3d/planets-qml/images/solarsystemscope/earthspec2k.jpg b/examples/qt3d/planets-qml/images/solarsystemscope/earthspec2k.jpg new file mode 100755 index 000000000..8e2b3f6c1 Binary files /dev/null and b/examples/qt3d/planets-qml/images/solarsystemscope/earthspec2k.jpg differ diff --git a/examples/qt3d/planets-qml/images/solarsystemscope/galaxy_starfield.jpg b/examples/qt3d/planets-qml/images/solarsystemscope/galaxy_starfield.jpg new file mode 100755 index 000000000..2be906a73 Binary files /dev/null and b/examples/qt3d/planets-qml/images/solarsystemscope/galaxy_starfield.jpg differ diff --git a/examples/qt3d/planets-qml/images/solarsystemscope/jupitermap.jpg b/examples/qt3d/planets-qml/images/solarsystemscope/jupitermap.jpg new file mode 100755 index 000000000..f5af80197 Binary files /dev/null and b/examples/qt3d/planets-qml/images/solarsystemscope/jupitermap.jpg differ diff --git a/examples/qt3d/planets-qml/images/solarsystemscope/license.txt b/examples/qt3d/planets-qml/images/solarsystemscope/license.txt new file mode 100644 index 000000000..40ff1c577 --- /dev/null +++ b/examples/qt3d/planets-qml/images/solarsystemscope/license.txt @@ -0,0 +1,6 @@ +www.solarsystemscope.com/textures distributed under the terms of +https://creativecommons.org/licenses/by/4.0/ + +Changes: +- Rings created from the reference rectangle file. +- earthcloudmapcolortrans.png was made from the earthcloudmapspec.jpg file diff --git a/examples/qt3d/planets-qml/images/solarsystemscope/marsmap2k.jpg b/examples/qt3d/planets-qml/images/solarsystemscope/marsmap2k.jpg new file mode 100755 index 000000000..ea77177fb Binary files /dev/null and b/examples/qt3d/planets-qml/images/solarsystemscope/marsmap2k.jpg differ diff --git a/examples/qt3d/planets-qml/images/solarsystemscope/marsnormal2k.jpg b/examples/qt3d/planets-qml/images/solarsystemscope/marsnormal2k.jpg new file mode 100755 index 000000000..44a2e2f9b Binary files /dev/null and b/examples/qt3d/planets-qml/images/solarsystemscope/marsnormal2k.jpg differ diff --git a/examples/qt3d/planets-qml/images/solarsystemscope/mercurymap.jpg b/examples/qt3d/planets-qml/images/solarsystemscope/mercurymap.jpg new file mode 100755 index 000000000..f69e947c0 Binary files /dev/null and b/examples/qt3d/planets-qml/images/solarsystemscope/mercurymap.jpg differ diff --git a/examples/qt3d/planets-qml/images/solarsystemscope/mercurynormal.jpg b/examples/qt3d/planets-qml/images/solarsystemscope/mercurynormal.jpg new file mode 100755 index 000000000..5e77923bf Binary files /dev/null and b/examples/qt3d/planets-qml/images/solarsystemscope/mercurynormal.jpg differ diff --git a/examples/qt3d/planets-qml/images/solarsystemscope/moonmap2k.jpg b/examples/qt3d/planets-qml/images/solarsystemscope/moonmap2k.jpg new file mode 100755 index 000000000..0e0c20d0a Binary files /dev/null and b/examples/qt3d/planets-qml/images/solarsystemscope/moonmap2k.jpg differ diff --git a/examples/qt3d/planets-qml/images/solarsystemscope/moonnormal2k.jpg b/examples/qt3d/planets-qml/images/solarsystemscope/moonnormal2k.jpg new file mode 100755 index 000000000..10797cf0a Binary files /dev/null and b/examples/qt3d/planets-qml/images/solarsystemscope/moonnormal2k.jpg differ diff --git a/examples/qt3d/planets-qml/images/solarsystemscope/neptunemap.jpg b/examples/qt3d/planets-qml/images/solarsystemscope/neptunemap.jpg new file mode 100755 index 000000000..250fce966 Binary files /dev/null and b/examples/qt3d/planets-qml/images/solarsystemscope/neptunemap.jpg differ diff --git a/examples/qt3d/planets-qml/images/solarsystemscope/qt_attribution.json b/examples/qt3d/planets-qml/images/solarsystemscope/qt_attribution.json new file mode 100644 index 000000000..35e9afe39 --- /dev/null +++ b/examples/qt3d/planets-qml/images/solarsystemscope/qt_attribution.json @@ -0,0 +1,14 @@ +{ + "Id": "solar_system_scope", + "Name": "Solar System Scope Texture Library", + "QDocModule": "qt3d", + "QtParts": ["examples"], + "Description": "Solar System Scope provides high quality, free to use textures for objects in the solar system.", + "QtUsage": "Used in Qt 3D planets-qml example.", + + "Homepage": "www.solarsystemscope.com/textures", + "License": "Creative Commons Attribution 4.0", + "LicenseId": "CC-BY-4.0", + "LicenseFile": "license.txt", + "Copyright": "Copyright (c) 2010-2017, Solar System Scope" +} diff --git a/examples/qt3d/planets-qml/images/solarsystemscope/saturnmap.jpg b/examples/qt3d/planets-qml/images/solarsystemscope/saturnmap.jpg new file mode 100755 index 000000000..981bb36c9 Binary files /dev/null and b/examples/qt3d/planets-qml/images/solarsystemscope/saturnmap.jpg differ diff --git a/examples/qt3d/planets-qml/images/solarsystemscope/saturnringcolortrans.png b/examples/qt3d/planets-qml/images/solarsystemscope/saturnringcolortrans.png new file mode 100755 index 000000000..aefd9f6c4 Binary files /dev/null and b/examples/qt3d/planets-qml/images/solarsystemscope/saturnringcolortrans.png differ diff --git a/examples/qt3d/planets-qml/images/solarsystemscope/sunmap.jpg b/examples/qt3d/planets-qml/images/solarsystemscope/sunmap.jpg new file mode 100755 index 000000000..46f2ce8c1 Binary files /dev/null and b/examples/qt3d/planets-qml/images/solarsystemscope/sunmap.jpg differ diff --git a/examples/qt3d/planets-qml/images/solarsystemscope/uranusmap.jpg b/examples/qt3d/planets-qml/images/solarsystemscope/uranusmap.jpg new file mode 100755 index 000000000..96cea14be Binary files /dev/null and b/examples/qt3d/planets-qml/images/solarsystemscope/uranusmap.jpg differ diff --git a/examples/qt3d/planets-qml/images/solarsystemscope/venusmap.jpg b/examples/qt3d/planets-qml/images/solarsystemscope/venusmap.jpg new file mode 100755 index 000000000..93bed3e47 Binary files /dev/null and b/examples/qt3d/planets-qml/images/solarsystemscope/venusmap.jpg differ diff --git a/examples/qt3d/planets-qml/images/solarsystemscope/venusnormal.jpg b/examples/qt3d/planets-qml/images/solarsystemscope/venusnormal.jpg new file mode 100755 index 000000000..0fc5ff703 Binary files /dev/null and b/examples/qt3d/planets-qml/images/solarsystemscope/venusnormal.jpg differ diff --git a/examples/qt3d/planets-qml/images/sunmap.jpg b/examples/qt3d/planets-qml/images/sunmap.jpg deleted file mode 100644 index 3e0b520e4..000000000 Binary files a/examples/qt3d/planets-qml/images/sunmap.jpg and /dev/null differ diff --git a/examples/qt3d/planets-qml/images/uranusmap.jpg b/examples/qt3d/planets-qml/images/uranusmap.jpg deleted file mode 100644 index aad43fb47..000000000 Binary files a/examples/qt3d/planets-qml/images/uranusmap.jpg and /dev/null differ diff --git a/examples/qt3d/planets-qml/images/uranusringcolortrans.png b/examples/qt3d/planets-qml/images/uranusringcolortrans.png deleted file mode 100644 index 13a5f1558..000000000 Binary files a/examples/qt3d/planets-qml/images/uranusringcolortrans.png and /dev/null differ diff --git a/examples/qt3d/planets-qml/images/venusmap.jpg b/examples/qt3d/planets-qml/images/venusmap.jpg deleted file mode 100644 index 699f2804e..000000000 Binary files a/examples/qt3d/planets-qml/images/venusmap.jpg and /dev/null differ diff --git a/examples/qt3d/planets-qml/images/venusnormal.jpg b/examples/qt3d/planets-qml/images/venusnormal.jpg deleted file mode 100644 index fea52cb47..000000000 Binary files a/examples/qt3d/planets-qml/images/venusnormal.jpg and /dev/null differ diff --git a/examples/qt3d/planets-qml/planets-qml-images.qrc b/examples/qt3d/planets-qml/planets-qml-images.qrc index 937e32de8..6b6b30ec4 100644 --- a/examples/qt3d/planets-qml/planets-qml-images.qrc +++ b/examples/qt3d/planets-qml/planets-qml-images.qrc @@ -1,34 +1,35 @@ - images/sunmap.jpg - images/mercurymap.jpg - images/mercurynormal.jpg - images/venusmap.jpg - images/venusnormal.jpg - images/earthmap1k.jpg - images/earthnormal1k.jpg - images/earthspec1k.jpg - images/moonmap1k.jpg - images/moonnormal1k.jpg - images/marsmap1k.jpg - images/marsnormal1k.jpg - images/jupitermap.jpg - images/saturnmap.jpg - images/uranusmap.jpg - images/neptunemap.jpg + images/nasa/uranusringcolortrans.png + images/solarsystemscope/earthcloudmapcolortrans.png + images/solarsystemscope/earthcloudmapspec.jpg + images/solarsystemscope/earthmap2k.jpg + images/solarsystemscope/earthnormal2k.jpg + images/solarsystemscope/earthspec2k.jpg + images/solarsystemscope/galaxy_starfield.jpg + images/solarsystemscope/jupitermap.jpg + images/solarsystemscope/license.txt + images/solarsystemscope/marsmap2k.jpg + images/solarsystemscope/marsnormal2k.jpg + images/solarsystemscope/mercurymap.jpg + images/solarsystemscope/mercurynormal.jpg + images/solarsystemscope/moonmap2k.jpg + images/solarsystemscope/moonnormal2k.jpg + images/solarsystemscope/neptunemap.jpg + images/solarsystemscope/saturnmap.jpg + images/solarsystemscope/saturnringcolortrans.png + images/solarsystemscope/sunmap.jpg + images/solarsystemscope/uranusmap.jpg + images/solarsystemscope/venusmap.jpg + images/solarsystemscope/venusnormal.jpg images/earth.png - images/mercury.png images/jupiter.png images/mars.png - images/neptune.png + images/mercury.png images/saturn.png images/sun.png images/uranus.png images/venus.png - images/earthcloudmapcolortrans.png - images/earthcloudmapspec.jpg - images/saturnringcolortrans.png - images/uranusringcolortrans.png - images/galaxy_starfield.png + images/neptune.png diff --git a/examples/qt3d/planets-qml/planets-qml.pro b/examples/qt3d/planets-qml/planets-qml.pro index 18175823f..de14ecc8a 100644 --- a/examples/qt3d/planets-qml/planets-qml.pro +++ b/examples/qt3d/planets-qml/planets-qml.pro @@ -31,6 +31,7 @@ RESOURCES += \ DISTFILES += \ PlanetsMain.qml \ - android/AndroidManifest.xml + android/AndroidManifest.xml \ + images/license.txt ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android diff --git a/examples/qt3d/planets-qml/shaders/gl3/planetDSB.frag b/examples/qt3d/planets-qml/shaders/gl3/planetDSB.frag index 507d1d208..bf6461191 100644 --- a/examples/qt3d/planets-qml/shaders/gl3/planetDSB.frag +++ b/examples/qt3d/planets-qml/shaders/gl3/planetDSB.frag @@ -70,13 +70,13 @@ in vec2 texCoord; out vec4 fragColor; -void dsbModel(const in vec3 norm, const in vec2 flipYTexCoord, out vec3 ambientAndDiff, out vec3 spec) +void dsbModel(const in vec3 norm, const in vec2 flipXTexCoord, out vec3 ambientAndDiff, out vec3 spec) { // Reflection of light direction about normal vec3 r = reflect(-lightDir, norm); - vec3 diffuseColor = texture(diffuseTexture, flipYTexCoord).rgb; - vec3 specularColor = texture(specularTexture, flipYTexCoord).rgb; + vec3 diffuseColor = texture(diffuseTexture, flipXTexCoord).rgb; + vec3 specularColor = texture(specularTexture, flipXTexCoord).rgb; // Calculate the ambient contribution vec3 ambient = lightIntensity * ka * diffuseColor; @@ -98,15 +98,15 @@ void dsbModel(const in vec3 norm, const in vec2 flipYTexCoord, out vec3 ambientA void main() { - vec2 flipYTexCoord = texCoord; - flipYTexCoord.y = 1.0 - texCoord.y; + vec2 flipXTexCoord = texCoord; + flipXTexCoord.x = 1.0 - texCoord.x; // Sample the textures at the interpolated texCoords - vec4 normal = 2.0 * texture(normalTexture, flipYTexCoord) - vec4(1.0); + vec4 normal = 2.0 * texture(normalTexture, flipXTexCoord) - vec4(1.0); // Calculate the lighting model, keeping the specular component separate vec3 ambientAndDiff, spec; - dsbModel(normalize(normal.xyz), flipYTexCoord, ambientAndDiff, spec); + dsbModel(normalize(normal.xyz), flipXTexCoord, ambientAndDiff, spec); vec3 result = ambientAndDiff + spec; // Combine spec with ambient+diffuse for final fragment color -- cgit v1.2.3