summaryrefslogtreecommitdiffstats
path: root/examples/qt3d/wave
Commit message (Collapse)AuthorAgeFilesLines
* Be (somewhat more) consistent about the value of piEdward Welbourne2017-06-141-1/+1
| | | | | | | | | Use qmath.h's value for M_PI in shaders, rather than a value less precise than even float holds. Task-number: QTBUG-58083 Change-Id: I3cf30a0900216b1d7d6dc54d4c5676592ba503a0 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Doc: Add a skeleton for Wave example docsLeena Miettinen2016-06-082-0/+8
| | | | | | | | Without this fix, Qt Creator tags the example "broken" and hides it in the Examples tag in the Welcome mode. Change-Id: I96916d11327e066be10b15422d944d805a2ed988 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Get rid of QLayer::namesKevin Ottens2016-05-044-29/+30
| | | | | | | | | | | | | Don't reinvent a variable naming system (string based global variables even) and instead use pointer to QLayer instance everywhere, even with QLayerFilter. The wave and deferred-renderer-cpp examples have been ported to the new API. Change-Id: I82a858770954a8743a5c3d2ce0c463e62844871f Task-number: QTBUG-51440 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Add missing import Qt3D.Extras to wave exampleSean Harmer2016-05-031-0/+1
| | | | | | | Allows the example to run. Keyboard input not working yet. Change-Id: I2c152ba6b15878e1bbaad865a7147b66a7911e50 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Move last remaining pieces of examples-common to Qt3DExtrasPaul Lemire2016-05-012-3/+3
| | | | | | | Also created a Quick3DExtras for QML related extras (Qt3DQuickWindow) Change-Id: I1b95ea841e07ac8d68a07a1911d783b722e6fe03 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Fix wave exampleSean Harmer2016-04-281-0/+1
| | | | | Change-Id: I1ef71623b5865979885f4cc3413774476c1cc3ae Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Move defaults and geometries out of Qt3DRender and into Qt3DExtrasPaul Lemire2016-04-231-0/+1
| | | | | | | QBoundingVolumeDebug has been disabled for now. Will be re-enabled later on. Change-Id: Id6b0abab2ec2aa697330bd20d782f9d104d25d50 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Restore wave example to its former glorySean Harmer2016-04-112-0/+5
| | | | | Change-Id: Ic12092391e5b5088ee182c8a5d58220eab1c24d0 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Fix syntax error in wave exampleSean Harmer2016-04-111-1/+1
| | | | | | | | Wave itself now shows but gradient background is missing Change-Id: I97c828a05eb1c76ecdf010762f1ca80995012835 Reviewed-by: Volker Krause <volker.krause@kdab.com> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Follow QRenderSurfaceSelector API changes.Volker Krause2016-03-291-1/+1
| | | | | Change-Id: I3369147a6b3ce33f75c5fa88bff9d74bafce83b6 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QDepthMask transformed into QNoDepthMaskPaul Lemire2016-03-211-1/+0
| | | | | | | | | By default the absence of a QNoDepthMask node in a RenderStateSet implies depth mask is enabled. Its presence, disables it. Change-Id: Iaa22b6cee12ee76e64d66a00e97f8aadfa82398b Task-number: QTBUG-51433 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Rename QClearBuffer to QClearBuffersMike Krus2016-03-201-2/+2
| | | | | | Task-number: QTBUG-51460 Change-Id: I3f522f5eaea7bf0f94dbcdc1e7463f2827c0fe3b Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QAnnotation changesFranck Arrecot2016-03-173-3/+3
| | | | | | Task-number: QTBUG-51454 Change-Id: Iee08f6b1be39894c40926afb20e003d46bc735f4 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Class QKeyboardController rename to QKeyboardDeviceFranck Arrecot2016-03-161-1/+1
| | | | | | Task-number: QTBUG-51441 Change-Id: I030d7d60be0c4d543f773090eb866e8f8729512c Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Follow BlendEquation API changes.Volker Krause2016-03-121-1/+1
| | | | | Change-Id: I7fa5b472a00c636581914b79dfb861e645af9f96 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Follow KeyboardHandler API changes.Volker Krause2016-03-121-1/+1
| | | | | | Change-Id: I35b556a6180d975647069e1c7aff6d2273a099d5 Reviewed-by: Mike Krus <mike.krus@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Fix accidentally renamed Technique.annotations properties.Volker Krause2016-03-122-2/+2
| | | | | Change-Id: Ia1fbc14bc22555875ca9f8d2ab8ea781c614a447 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Some fixes for examples.Wieland Hagen2016-03-091-3/+3
| | | | | | | | Mostly insertion of RenderSurfaceSelector, FrameGraph->RendererSettings, remove parameter bindings Change-Id: I182092d43b0842da07e995387c0fe174d45345df Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QTechnique renamingRobert Brock2016-03-082-3/+3
| | | | | | | | | | annotations -> filterKeys addPass -> addRenderPass removePass -> removeRenderPass Change-Id: Ica1731ee3100b249e4fef04f45c0e6326732d644 Task-number: QTBUG-51458 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QBlendState cleanupPaul Lemire2016-03-051-3/+3
| | | | | | | | | * renamed to QBlendEquationArguments * property names expanded Change-Id: Id25f0181415b4f093f2054238dbf3be26e36ff32 Task-number: QTBUG-51509 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Renamed to QKeyboardHandlerMike Krus2016-03-051-1/+1
| | | | | | | | | | | Also: - rename property controller to sourceDevice - remove protected ctor - move keyEvent() to the dpointer class Change-Id: I0badbc4d0ef0bcc202866f8cbdbaea8d107374fa Task-Id: QTBUG-51439 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Port wave and wireframe examples away from ParameterMapping.Volker Krause2016-03-032-9/+4
| | | | | Change-Id: I2535623ffb1898a019f471876e0420e43b7d4a8e 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 usageAntti Kokko2016-01-261-5/+5
| | | | | | | Updated FDL license. Change-Id: If5b261a12d1fba0d317848d3710e45e83f992fdf Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* Unify license header usage.Antti Kokko2016-01-269-168/+294
| | | | | | | | 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>
* wave-qml: add QInputSettings componentPaul Lemire2016-01-231-1/+4
| | | | | Change-Id: I93fa1d7a31f761d944e997499d1227bfe6fa16db Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Have Qt3DQuickWindow manage window surfaceSean Harmer2016-01-181-1/+0
| | | | | Change-Id: I3d034728781aa5b99868c92ea73ebf427ee88c5a Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Temporarily expose window to QML contextSean Harmer2016-01-182-12/+18
| | | | | | | | | Allows to restore most of the QML examples using this approach until a more permanent solution can be developed (I have an idea on how to do this and will try it today). Change-Id: I9b9bb86a5323140be3ed2456cdfa91b1f93187b1 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Link examples against static libPaul Lemire2016-01-162-21/+7
| | | | | | | | | | | | | 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>
* Remove initialize/shutdown from APIv5.6.0-beta1Kevin Ottens2015-12-141-1/+0
| | | | | | | | Hiding them in QAspectEnginePrivate and calling them when needed from setRootEntity. Change-Id: I4c3dfb19d84ae90cc15bbff29a4abd0705bb61dc Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Adapt examples to use new quaternion helpersSean Harmer2015-11-201-8/+3
| | | | | Change-Id: If9100fbc1870c09d90c9c1df102cf9c0503b96cb Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Adapt examples to use rotation property and quaternion helperSean Harmer2015-11-201-8/+1
| | | | | | | | This covers all examples that can use the standard S, R, T order of transformations with a single rotation. Change-Id: Ief6741f9605742c545d8ef2be9bf8ab65164835d Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Adapt examples to use no args form of Qt.matrix4x4()Sean Harmer2015-11-201-4/+1
| | | | | Change-Id: If289d74601e2244d4175ba6b1ea3eb95df0bd50b Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Remove transforms property of QTransformSean Harmer2015-11-173-8/+20
| | | | | | | | 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>
* 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-032-6/+6
| | | | | | | | | | | | | | | | | | | | | | 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-1910-10/+10
| | | | | | | | 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-168-8/+8
| | | | | | | Makes the QML imports consistent with the C++ namespaces. Change-Id: I8c781a67a9010124bd22bb1fab16c4f1082fd962 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Move Qt3DCore into Qt3DCore namespaceSean Harmer2015-10-131-1/+1
| | | | | | | Update other aspects, tests and examples accordingly. Change-Id: Ib1bcf0bdf4f5aec4422dc0c80bfc32b27fb1a317 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Move Render aspect into the Qt3DRender namespaceSean Harmer2015-10-131-1/+1
| | | | | | | Updated examples and tests accordingly. Change-Id: I8848a88472de2302aa072fa11f21ea934672b7e6 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Move Input aspect to Qt3DInput namespaceSean Harmer2015-10-131-1/+1
| | | | | | | Also update examples accordingly. Change-Id: I8d19c3165899e4b7b791deb33098af4fb439f44a Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Move temporary window class to examplesSean Harmer2015-06-111-2/+2
| | | | | | | | | | | So as to avoid public header without a QPrefix. Real integration points will be added later. Also removed it from the Qt3D namespace and fixed linkage. Task-number: QTBUG-46617 Change-Id: I1bea09f45f5fdba3d658b57b86b907ab57164479 Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* Use Qt3D.Renderer rather than RenderSean Harmer2015-06-118-8/+8
| | | | | | | | | | | This should make the documentation and code terminology consistent throughout. We can rename the source directories at a later date if needed. Task-number: QTBUG-46622 Change-Id: I2737e54192341808f4a0270ad19ba70f6c4af589 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com> Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* Target path definition for examplesMika Salmela2015-05-241-1/+3
| | | | | | | Added examples.pri to examples folder to help deployment to devices. Change-Id: Ib7b6514d5b5a31dee9a3b7f6f79277550fb77502 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Examples: Remove shared resource library.Friedemann Kleint2015-05-202-6/+0
| | | | | | | | | | Split example-assets.qrc into smaller resource files per directory and add those to the examples as required. Task-number: QTBUG-45990 Change-Id: I0a5a6cee64dc23560e9e093f272ff0d90a6e2e97 Reviewed-by: Topi Reiniƶ <topi.reinio@digia.com> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Doc: Add skeleton documentation for the examplesTopi Reinio2015-03-171-0/+32
| | | | | | | | | | | | Add a skeleton version of the example documentation for each example, create a group page for them and link to it from the module landing pages. This allows browsing the example code from the docs and also enables listing them in Qt Creator's Welcome mode. Change-Id: I1ba16399b115bb8c5503bc91d2a8dee46417cd01 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Move the examples under a qt3d subdirLaszlo Agocs2015-03-0417-0/+1170
Modules cannot have their examples in the top-level examples directory because in the pre-built packages all modules' examples are merged together. Change-Id: I80fdbb8f1ec6f3d8fd793e4d856e705000237127 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>