summaryrefslogtreecommitdiffstats
path: root/examples/qt3d/planets-qml
Commit message (Collapse)AuthorAgeFilesLines
* Unify license header usage.Antti Kokko2016-01-2619-365/+631
| | | | | | | | Updated license headers to use new BSD header instead of LGPL3 one (in those files which will be under BSD) Change-Id: I300c5840db3fd4708d5d85e84f7c6729cba326e5 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* Don't complain about missing stencil bufferSean Harmer2016-01-251-0/+1
| | | | | Change-Id: I084dbf2357468ca8c9b4e189cb5aeffaf3206825 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Link examples against static libPaul Lemire2016-01-161-3/+1
| | | | | | | | | | | | | Contains: Qt3DWindow Qt3DQuickWindow QFirstPersonCameraController FirstPersonCameraController.qml This will allow to get rid of the Camera configuration hack Change-Id: I55c5634aa4c162f9dd2852d3258073a6352b426c Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Avoid using the name Light in the examplesLaszlo Agocs2015-11-308-7/+7
| | | | | | | To prevent colliding with the standard Qt 3D type. Change-Id: Ibf7b8b744dd23f1ced231e90486729be894a1be7 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Fixed planets-qml exampleTomi Korpipää2015-11-243-116/+100
| | | | | | | Earth clouds are in the correct place again. Change-Id: Ic4ca6683d0196a66463d578d6d1587a762156750 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Adapt examples to use no args form of Qt.matrix4x4()Sean Harmer2015-11-201-52/+13
| | | | | Change-Id: If289d74601e2244d4175ba6b1ea3eb95df0bd50b Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Remove transforms property of QTransformSean Harmer2015-11-171-179/+133
| | | | | | | | Compound transformations are now built up using QMatrix4x4 in both QML and C++. Updating examples accordingly. Change-Id: I03c9abf1f6cdd1b56226dc0e16a7ad5ce84516dd Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Add resources_big for planets to make MSVC happyLaszlo Agocs2015-11-121-0/+1
| | | | | Change-Id: I5865e1250ad9e593d9abbcf33498d0c4a49e93e2 Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
* Doc: Documentation clean upVenugopal Shivashankar2015-11-061-1/+1
| | | | | | | | | | - Changed 'Qt3D' references to 'Qt 3D'. - Fixed incorrect \inqmlmodule instances. - Fixed broken \printuntil instances in the example docs. - Updated the namespace qualifier for a few class references. Change-Id: I250afe6843b10ed520f9ce5d7465203cc5c212c1 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* Rename QOpenGLFilter to QGraphicsApiFilterAndy Nichols2015-11-035-35/+35
| | | | | | | | | | | | | | | | | | | | | | This API change is part of an effort to remove anything specific to one graphics API (in this case OpenGL) from the public APIs. In addition to the name of the class being changed, the QGraphicsApiFilter::Api has been refactored to reference the Graphics API, rather than an OpenGL API. Now this list includes OpenGL, and OpenGLES, but could also include Vulkan, DirectX, or any other graphics rendering API we wish to support in the future. Right now the properties in this class are still reflective of the OpenGL APIs, and may need to be extended with other properties in the future for other rendering technologies. The QGraphicsApiFilter::Profile enum has also been changed to be more more clear. So for now there are enums NoProfile, CoreProfile, and CompatibilityProfile. Task-number:QTBUG-49078 Change-Id: Ib5f9c3b7adee5badec6bce8a12b23683eb43b4cb Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Rename Renderer -> Render throughoutSean Harmer2015-10-1911-11/+11
| | | | | | | | This is for consistency between the C++ namespaces and QML imports and with the other aspects. Change-Id: I73392f138b4e519b12888f52530123e3d0ba445e Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Change import name of Qt3D Core from Qt3D 2.0 to Qt3D.Core 2.0Sean Harmer2015-10-169-9/+9
| | | | | | | Makes the QML imports consistent with the C++ namespaces. Change-Id: I8c781a67a9010124bd22bb1fab16c4f1082fd962 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Fix planets example on LinuxLaszlo Agocs2015-08-241-2/+0
| | | | | | | | Not sure why the version is only set for OS X - requesting 2.0 core profile is not ideal (as it's pretty wrong). Change-Id: Ic82b9835e3057fa79ac246eb6e41481970ac9cd9 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Made planets-qml example scalable to small and hires screensTomi Korpipää2015-06-292-12/+18
| | | | | Change-Id: Iae85d9637eac8735837bcbced6b89dde158b22aa Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
* Fixed planets-qml after 5.5.0 -> 5.5 mergeTomi Korpipää2015-06-2921-864/+54
| | | | | Change-Id: Ib4bf6b5b90b633903037084daeb70799da23f30b Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Merge remote-tracking branch 'origin/5.5.0' into 5.5Paul Lemire2015-06-2731-57/+1778
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/qt3d/planets-qml/CloudEffectDS.qml examples/qt3d/planets-qml/PlanetButton.qml examples/qt3d/planets-qml/PlanetEffectD.qml examples/qt3d/planets-qml/PlanetEffectDB.qml examples/qt3d/planets-qml/PlanetEffectDS.qml examples/qt3d/planets-qml/PlanetEffectDSB.qml examples/qt3d/planets-qml/PlanetMaterial.qml examples/qt3d/planets-qml/PlanetsMain.qml examples/qt3d/planets-qml/SolarSystem.qml examples/qt3d/planets-qml/doc/src/planets-qml.qdoc examples/qt3d/planets-qml/main.cpp examples/qt3d/planets-qml/planets-qml.pro examples/qt3d/planets-qml/planets-qml.qrc Change-Id: I9f311f3104c8fcf9d49e12b14f8bfad9ca8cf199
| * Fix dynamic OpenGL ANGLE issue for planets-qml examplev5.5.0Tomi Korpipää2015-06-251-9/+7
| | | | | | | | | | | | Change-Id: I2d645189ed50567195f4fc1df8ec3e468037fb92 Reviewed-by: Pasi Keränen <pasi.keranen@digia.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
| * Fixed planets-qml example for OS XTomi Korpipää2015-06-241-0/+11
| | | | | | | | | | | | | | Change-Id: Iee3f1dc54231a8cf67d934025c1a8ff72dcc8b28 Task-number: QTBUG-46699 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
| * Add ES2 support to planets-qml exampleMika Salmela2015-06-2333-96/+1025
| | | | | | | | | | Change-Id: Ic5208d2149efbd03b82417ce3af17747375663f5 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
| * Added documentation for the planets-qml exampleTomi Korpipää2015-06-235-2/+87
| | | | | | | | | | | | | | | | | | Change-Id: I07734c6a30f49b05cd7815d3c3412cd867a09836 Task-number: QTBUG-46602 Reviewed-by: Mika Salmela <mika.salmela@theqtcompany.com> Reviewed-by: Titta Heikkala <titta.heikkala@theqtcompany.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> (cherry picked from commit fc662e5a4597b568561c3a19abb24151086a229d)
| * Planets QML example for Qt3DTomi Korpipää2015-06-2362-0/+8608
| | | | | | | | | | | | + Improved earth clouds - Some weirdness with alpha, easily visible with rings. Might be the textures, although the alpha on them seems fine with image viewer. - Earth clouds seem to have the alpha issue as well. Change-Id: Ibdfa49472790d3fc797e269b52986b71d93876f2 Reviewed-by: Pasi Keränen <pasi.keranen@digia.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> (cherry picked from commit 30f9015933957eaf9533229f94b1bcd48a8ce3ed)
* Doc: edit Planets example docsLeena Miettinen2015-06-251-4/+6
| | | | | | | | | | | | | | Move the image to the top. Use standard phrasing to introduce the example. Add a reference to an include file from qtbase/doc/global/includes that describes building and running examples from Qt Creator. Add an Oxford comma. Change-Id: I2595b4901754ad0181a607f74e31a56673bf5259 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Merge branch '5.5.0' into 5.5Sean Harmer2015-06-2111-11/+11
| | | | | | | Conflicts: src/input/qkeyboardcontroller.cpp Change-Id: Ifb0b5af165fb11dbe07849f34d3b93d9cc78eeaa
* Added documentation for the planets-qml exampleTomi Korpipää2015-06-115-2/+87
| | | | | | | | Change-Id: I07734c6a30f49b05cd7815d3c3412cd867a09836 Task-number: QTBUG-46602 Reviewed-by: Mika Salmela <mika.salmela@theqtcompany.com> Reviewed-by: Titta Heikkala <titta.heikkala@theqtcompany.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
* Planets QML example for Qt3DTomi Korpipää2015-06-1162-0/+8608
+ Improved earth clouds - Some weirdness with alpha, easily visible with rings. Might be the textures, although the alpha on them seems fine with image viewer. - Earth clouds seem to have the alpha issue as well. Change-Id: Ibdfa49472790d3fc797e269b52986b71d93876f2 Reviewed-by: Pasi Keränen <pasi.keranen@digia.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>