diff options
author | Laszlo Agocs <laszlo.agocs@theqtcompany.com> | 2015-06-11 16:37:42 +0200 |
---|---|---|
committer | Pasi Keränen <pasi.keranen@digia.com> | 2015-06-11 15:33:52 +0000 |
commit | ff8aa856a0ec5aee207d292414eacfa6e951d2f0 (patch) | |
tree | eb643cf83995aa306d9ff7b95f3a9f29c67f5f64 /examples | |
parent | bea6d68fbe9106b51bf28c03f0c2ee79614fce26 (diff) |
Remove qrc prefix from Planets example
This breaks when including the demo in a pure QML environment (like the
Boot2Qt demo launcher). Omitting the prefix is the best since it works both
with and without a QRC.
Change-Id: I31f0f9f074d7c5656e7fc44680e7327aa3456c11
Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
Diffstat (limited to 'examples')
-rw-r--r-- | examples/canvas3d/canvas3d/threejs/planets/planets.js | 40 | ||||
-rw-r--r-- | examples/canvas3d/canvas3d/threejs/planets/planets.qml | 18 |
2 files changed, 29 insertions, 29 deletions
diff --git a/examples/canvas3d/canvas3d/threejs/planets/planets.js b/examples/canvas3d/canvas3d/threejs/planets/planets.js index 72c4575..5d51b92 100644 --- a/examples/canvas3d/canvas3d/threejs/planets/planets.js +++ b/examples/canvas3d/canvas3d/threejs/planets/planets.js @@ -233,30 +233,30 @@ function createPlanets() { mesh.position.set(0, 0, 0); break; case MERCURY: - mesh = createPlanet(planets[i]["radius"], 0.005, 'qrc:/images/mercurymap.jpg', - 'qrc:/images/mercurybump.jpg'); + mesh = createPlanet(planets[i]["radius"], 0.005, 'images/mercurymap.jpg', + 'images/mercurybump.jpg'); break; case VENUS: - mesh = createPlanet(planets[i]["radius"], 0.005, 'qrc:/images/venusmap.jpg', - 'qrc:/images/venusbump.jpg'); + mesh = createPlanet(planets[i]["radius"], 0.005, 'images/venusmap.jpg', + 'images/venusbump.jpg'); break; case EARTH: - mesh = createPlanet(planets[i]["radius"], 0.05, 'qrc:/images/earthmap1k.jpg', - 'qrc:/images/earthbump1k.jpg', 'qrc:/images/earthspec1k.jpg'); + mesh = createPlanet(planets[i]["radius"], 0.05, 'images/earthmap1k.jpg', + 'images/earthbump1k.jpg', 'images/earthspec1k.jpg'); var cloud = createEarthCloud(); mesh.add(cloud); break; case MARS: - mesh = createPlanet(planets[i]["radius"], 0.05, 'qrc:/images/marsmap1k.jpg', - 'qrc:/images/marsbump1k.jpg'); + mesh = createPlanet(planets[i]["radius"], 0.05, 'images/marsmap1k.jpg', + 'images/marsbump1k.jpg'); break; case JUPITER: - mesh = createPlanet(planets[i]["radius"], 0.02, 'qrc:/images/jupitermap.jpg', - 'qrc:/images/jupitermap.jpg'); + mesh = createPlanet(planets[i]["radius"], 0.02, 'images/jupitermap.jpg', + 'images/jupitermap.jpg'); break; case SATURN: - mesh = createPlanet(planets[i]["radius"], 0.05, 'qrc:/images/saturnmap.jpg', - 'qrc:/images/saturnmap.jpg'); + mesh = createPlanet(planets[i]["radius"], 0.05, 'images/saturnmap.jpg', + 'images/saturnmap.jpg'); innerRadius = (planets[i]["radius"] + 6.630) / planets[i]["radius"]; outerRadius = (planets[i]["radius"] + saturnOuterRadius) / planets[i]["radius"]; ring = createRing(innerRadius, outerRadius, ringSegments, @@ -266,8 +266,8 @@ function createPlanets() { mesh.add(ring); break; case URANUS: - mesh = createPlanet(planets[i]["radius"], 0.05, 'qrc:/images/uranusmap.jpg', - 'qrc:/images/uranusmap.jpg'); + mesh = createPlanet(planets[i]["radius"], 0.05, 'images/uranusmap.jpg', + 'images/uranusmap.jpg'); innerRadius = (planets[i]["radius"] + 2) / planets[i]["radius"]; outerRadius = (planets[i]["radius"] + uranusOuterRadius) / planets[i]["radius"]; ring = createRing(innerRadius, outerRadius, ringSegments, @@ -277,12 +277,12 @@ function createPlanets() { mesh.add(ring); break; case NEPTUNE: - mesh = createPlanet(planets[i]["radius"], 0.05, 'qrc:/images/neptunemap.jpg', - 'qrc:/images/neptunemap.jpg'); + mesh = createPlanet(planets[i]["radius"], 0.05, 'images/neptunemap.jpg', + 'images/neptunemap.jpg'); break; case MOON: - mesh = createPlanet(planets[i]["radius"], 0.05, 'qrc:/images/moonmap1k.jpg', - 'qrc:/images/moonbump1k.jpg'); + mesh = createPlanet(planets[i]["radius"], 0.05, 'images/moonmap1k.jpg', + 'images/moonbump1k.jpg'); break; } @@ -294,7 +294,7 @@ function createPlanets() { function createSun(radius) { - var texture = THREE.ImageUtils.loadTexture('qrc:/images/sunmap.jpg'); + var texture = THREE.ImageUtils.loadTexture('images/sunmap.jpg'); var material = new THREE.MeshBasicMaterial({ map: texture, bumpMap: texture, @@ -367,7 +367,7 @@ function createRing(radius, width, height, texture) { function createStarfield(radius) { - var texture = THREE.ImageUtils.loadTexture('qrc:/images/galaxy_starfield.png') + var texture = THREE.ImageUtils.loadTexture('images/galaxy_starfield.png') var material = new THREE.MeshBasicMaterial({ map: texture, side: THREE.BackSide diff --git a/examples/canvas3d/canvas3d/threejs/planets/planets.qml b/examples/canvas3d/canvas3d/threejs/planets/planets.qml index abb21c7..f1fb19f 100644 --- a/examples/canvas3d/canvas3d/threejs/planets/planets.qml +++ b/examples/canvas3d/canvas3d/threejs/planets/planets.qml @@ -131,7 +131,7 @@ Item { temperature: "5 778 K" orbitalPeriod: "" distance: "" - planetImageSource: "qrc:/images/sun.png" + planetImageSource: "images/sun.png" planetNumber: 0 } ListElement { @@ -140,7 +140,7 @@ Item { temperature: "80-700 K" orbitalPeriod: "87.969 d" distance: "0.387 098 AU" - planetImageSource: "qrc:/images/mercury.png" + planetImageSource: "images/mercury.png" planetNumber: 1 } ListElement { @@ -149,7 +149,7 @@ Item { temperature: "737 K" orbitalPeriod: "224.701 d" distance: "0.723 327 AU" - planetImageSource: "qrc:/images/venus.png" + planetImageSource: "images/venus.png" planetNumber: 2 } ListElement { @@ -158,7 +158,7 @@ Item { temperature: "184-330 K" orbitalPeriod: "365.256 d" distance: "149598261 km (1 AU)" - planetImageSource: "qrc:/images/earth.png" + planetImageSource: "images/earth.png" planetNumber: 3 } ListElement { @@ -167,7 +167,7 @@ Item { temperature: "130-308 K" orbitalPeriod: "686.971 d" distance: "1.523679 AU" - planetImageSource: "qrc:/images/mars.png" + planetImageSource: "images/mars.png" planetNumber: 4 } ListElement { @@ -176,7 +176,7 @@ Item { temperature: "112-165 K" orbitalPeriod: "4332.59 d" distance: "5.204267 AU" - planetImageSource: "qrc:/images/jupiter.png" + planetImageSource: "images/jupiter.png" planetNumber: 5 } ListElement { @@ -185,7 +185,7 @@ Item { temperature: "84-134 K" orbitalPeriod: "10759.22 d" distance: "9.5820172 AU" - planetImageSource: "qrc:/images/saturn.png" + planetImageSource: "images/saturn.png" planetNumber: 6 } ListElement { @@ -194,7 +194,7 @@ Item { temperature: "49-76 K" orbitalPeriod: "30687.15 d" distance: "19.189253 AU" - planetImageSource: "qrc:/images/uranus.png" + planetImageSource: "images/uranus.png" planetNumber: 7 } ListElement { @@ -203,7 +203,7 @@ Item { temperature: "55-72 K" orbitalPeriod: "60190.03 d" distance: "30.070900 AU" - planetImageSource: "qrc:/images/neptune.png" + planetImageSource: "images/neptune.png" planetNumber: 8 } ListElement { |