summaryrefslogtreecommitdiffstats
path: root/examples/qt3d/planets-qml
Commit message (Collapse)AuthorAgeFilesLines
* Mark 3rd-party 'Jet Propulsion Laboratory Photojournal' as examples onlyKai Koehne2018-05-021-0/+1
| | | | | Change-Id: I0b26333e80f73a5f873afc21df893ee596443b51 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Doc: Fix link in Solar System Scope attribution documentationTopi Reinio2017-10-091-1/+1
| | | | | Change-Id: Ib412be382830b13d65167c36a6c2d918878504fa Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
* Fix planets-qml example for Qt 5.10Tomi Korpipaa2017-09-192-3/+8
| | | | | | Task-number: QTBUG-62321 Change-Id: I1df375c9a6a72049584eee118613bca72958e4f0 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Merge "Merge remote-tracking branch 'origin/5.9' into dev" into refs/staging/devSean Harmer2017-07-1121-0/+0
|\
| * Remove misguided execute permissions from image filesEdward Welbourne2017-06-1421-0/+0
| | | | | | | | | | Change-Id: I9079849c54deffbb15449d042ec0440e795c305b Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Use Math.hypot() in preference to sqrt(a sum of squares)Edward Welbourne2017-07-071-1/+1
|/ | | | | | | It's likely more accurate and may well be optimised, too. Change-Id: Iba38b80be16ca97a5f818e3dbc880a821cd9900a Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Replace undistributable filesRobert Brock2017-05-1650-52/+90
| | | | | | | | | | | 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 <lars.knoll@qt.io>
* Examples: Fix license headersKai Koehne2017-04-0521-425/+682
| | | | | | | Use BSD for all sources, and FDL for all documentation files. Change-Id: Ifce7284d10947b4948be6ecf44fe3ff8be30f7f7 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Remove unnecessary widget dependencyMike Krus2017-02-191-1/+0
| | | | | | | | Found this when building for iOS using a custom build without widgets. Change-Id: If50e2d388aafacf9f8b3cfea20752c790e1fbc1d Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Doc: Corrected snippet quoting syntaxNico Vertriest2017-02-171-1/+2
| | | | | | | | Command '\snippet (//! [2])' failed at end of file 'planets-qml/PlanetsMain.qml' Change-Id: If30a8123aad2631de22731e5bbd51871166063c8 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
* Fix capitalization of includeStephan Binner2016-11-151-1/+1
| | | | | Change-Id: I68a5e66f04403991288937cf239bb4c5f4321367 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* planets-qml: write proper HTTP responses in command serverJake Petroules2016-11-011-2/+8
| | | | | | | | | This allows to see in a web browser that a command succeeded, for example, rather than reporting that the server dropped the connection. Change-Id: Ib6d34f8261112dd8c76d13dece542a6da229de03 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io>
* Add Apple Watch app to control Planets QML demoOleg Yadrov2016-10-2828-0/+1873
| | | | | Change-Id: I937f8ff83565f48da5d35055add794c607bb52e4 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* Port Planets QML example to Apple TVOleg Yadrov2016-10-2810-77/+758
| | | | | Change-Id: I254cbc1643fcb5b67af8338c0b7adc8c25829f9d Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* Fix planets-qml inner planets shadingSean Harmer2016-06-0311-59/+185
| | | | | | | | | | | | | | | | | | | | | | * The shadow light was using the undefined matrix property which resulted in a matrix full of NaN's in the shader. This caused everything to be fully in shadows for the inner planets. Fixed to use the correct viewMatrix property. * After fixing the above, it became clear that the inner planets were being shadowed with lots of artifacts. The only shadow casters are the planets Saturn and Uranus and their rings. In this configuration it makes no sense to try to shadow the other planets as this leads to bad shadow acne due to the huge distances involved vs the limited precision of the shadow depth texture. Fixed these artifacts by only applying shadows to Saturn and Uranus. Task-number: QTBUG-53751 Change-Id: I96ab08117c9988c40f083a1345ec7f7d1b0f7ce6 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Fixed sun in planets-qmlTomi Korpipää2016-06-0313-526/+512
| | | | | | | Also removed duplicate code and made some rearrangements in entities. Change-Id: I7f588672a1694fc440318f66bcfbe33d5ebcf0ab Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Add RenderSurfaceSelector to FrameGraph in planets exampleMäättä Antti2016-05-131-38/+41
| | | | | | Change-Id: I4b3f63037d443586d0d280936cd12c91dd8a1f94 Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Add more missing Qt3D.Extras imports to the examples.Volker Krause2016-05-031-0/+1
| | | | | Change-Id: I855adca5554f5a1148e80c87bf76deaa0b909846 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Add missing import for Qt3DExtras.Volker Krause2016-05-011-0/+1
| | | | | Change-Id: I1ca89f0301df541a6ddcba52b12fbd842808cb18 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Merge branch '5.6' into 5.7Sean Harmer2016-04-166-0/+0
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/qt3d/examples-common/qorbitcontrol.h src/core/qnodecreatedchange.cpp src/core/qnodecreatedchange.h src/input/frontend/qaxisactionhandler.h src/input/frontend/qinputaspect.h src/input/frontend/qkeyboardhandler.h src/input/frontend/qmousedevice.h src/input/frontend/qmousehandler.h src/input/frontend/qphysicaldevicecreatedchange.h src/input/input.pro src/logic/qframeaction.h src/plugins/sceneparsers/assimp/assimp.pro src/quick3d/imports/input/importsinput.pro src/quick3d/imports/render/importsrender.pro src/render/backend/trianglesextractor.cpp src/render/framegraph/qclearbuffer.h src/render/framegraph/qlighting.h src/render/framegraph/qstateset.h src/render/frontend/qrenderattachment.h src/render/geometry/qabstractattribute.h src/render/geometry/qabstractbuffer.h src/render/geometry/qattribute.h src/render/geometry/qboundingvolumespecifier.h src/render/geometry/qbuffer.h src/render/materialsystem/qfilterkey.h src/render/materialsystem/qparameter.h src/render/materialsystem/qparametermapping.h src/render/renderstates/qblendstate.h src/render/renderstates/qdepthmask.h src/render/renderstates/qpointsize.cpp src/render/renderstates/qrenderstatecreatedchange.cpp src/render/renderstates/qstencilop.h src/render/renderstates/qstencilopseparate.h src/render/renderstates/qstenciltestseparate.h src/render/texture/qabstracttexture.h src/render/texture/qabstracttextureimage.h src/render/texture/qtextureproviders.h Change-Id: I894d7781042cabdaa0cac690c198b57a41127bd4
| * Purge sRGB chunks from PNGs in examples.Edward Welbourne2016-03-226-0/+0
| | | | | | | | | | | | | | | | Subjects each *.png file that matched grep -law "sRGB" to: pngcrush -ow -brute -rem allb -reduce Change-Id: I78ae38f83ec7e5ad8da41de4eefc12d1df6ebfc0 Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
* | Class QRenderPassFilter renamingRobert Brock2016-03-231-2/+2
| | | | | | | | | | | | | | | | | | | | includes -> matchAny addInclude -> addMatch removeInclude -> removeMatch Change-Id: Ib9288ab79b3e76ae8a8aa2f7e3f20c5386438a25 Task-number: QTBUG-51456 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Remove QViewport::clearColorMike Krus2016-03-221-2/+1
| | | | | | | | | | | | Task-number: QTBUG-51460 Change-Id: I616f4506dffd649efb931824fab82efcdefaeee3 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Rename QClearBuffer to QClearBuffersMike Krus2016-03-201-4/+4
| | | | | | | | | | | | Task-number: QTBUG-51460 Change-Id: I3f522f5eaea7bf0f94dbcdc1e7463f2827c0fe3b Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Follow Annotation API changes.Volker Krause2016-03-201-1/+1
| | | | | | | | | | Change-Id: I9bb7fbe438d942d2cb776ab8cd3d8301a5862524 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | QAnnotation changesFranck Arrecot2016-03-176-34/+34
| | | | | | | | | | | | Task-number: QTBUG-51454 Change-Id: Iee08f6b1be39894c40926afb20e003d46bc735f4 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Fix accidentally renamed RenderTarget.attachments properties.Volker Krause2016-03-121-1/+1
| | | | | | | | | | Change-Id: I69ea9e2fd357c663dd18ead74b6d3d99a50ed92f Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Class QLogicComponent changesFranck Arrecot2016-03-111-2/+2
| | | | | | | | | | | | Task-number: QTBUG-51448 Change-Id: I1359cbfe61dbef291859d15b16bda61639493432 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Some fixes for examples.Wieland Hagen2016-03-098-182/+5
| | | | | | | | | | | | | | | | Mostly insertion of RenderSurfaceSelector, FrameGraph->RendererSettings, remove parameter bindings Change-Id: I182092d43b0842da07e995387c0fe174d45345df Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | QPolygonOffset renamed units to depthStepsRobert Brock2016-03-081-1/+1
| | | | | | | | | | | | | | | | | | Carried changes into the QML examples (planets and shadow map) for both PolygonOffset name changes As per API review Change-Id: Idd2676d53794eb6025696a79ddb59a26ac98b085 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | QRenderTarget rename attachment to outputsRobert Brock2016-03-081-1/+1
| | | | | | | | | | | | | | As per API review Change-Id: I85cb9b405e79d9062a80b6f0b0cbb1968c1c0664 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Follow API changes in QRenderAttachment.Volker Krause2016-03-051-1/+1
| | | | | | | | | | Change-Id: I104367392c6b00b7d31cc900bd639cff9a4c08eb Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | QRenderTargetOutput enumRobert Brock2016-03-031-1/+1
| | | | | | | | | | | | | | | | As per API review renamed FooAttachment to just Foo Change-Id: Ifd977b2b8bdb6706a70dd10f2ea3ee6a381c26b8 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | QRenderAttachment renamed to QRenderTargetOutputRobert Brock2016-03-031-2/+2
| | | | | | | | | | | | | | As per API review Change-Id: Icaca9797c01100402e6d103be2a0425820a717ec Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Follow API changes in PolygonOffset.Volker Krause2016-03-031-1/+1
| | | | | | | | | | Change-Id: I3a279ec603bb69dec423a80db9ebb652bd458cce Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | QRenderAttachment renamed RenderAttachmentType to AttachmentPointRobert Brock2016-03-021-1/+1
| | | | | | | | | | | | | | | | | | As per API review New name was better fitting to the actual description/usage Renamed point to attachmentPoint Change-Id: Id14a312acabdcc9bda49a4d30efe490342105660 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Renaming QTechniqueFilter APIJanne Koskinen2016-03-021-1/+1
| | | | | | | | | | | | | | | | As per API review. Change-Id: Ib3565b6cce74803fcf4920f125c3444e4b44444e Task-number: QTBUG-51512 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | QDepthTest rename func to depthFunctionRobert Brock2016-02-261-1/+1
| | | | | | | | | | | | | | As per API review Change-Id: Iea3cbdb16618b248e221817000b71822a588bf6a Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Rename the viewport rect property to normalizedRectRobert Brock2016-02-261-1/+1
| | | | | | | | | | | | | | As per API review Change-Id: I51caae419044a297e58745450d5893f2a27db8be Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | 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>