summaryrefslogtreecommitdiffstats
path: root/examples/qt3d/clip-planes-qml
Commit message (Collapse)AuthorAgeFilesLines
* Moved clip-planes-qml example to manual testRobert Brock2016-05-1516-1171/+0
| | | | | | | Part of an examples cleanup Change-Id: I5bb3d9a0bcc2c68167c3a8ce8175081274c62554 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Port missing examples to the new Layer(Filter) APIKevin Ottens2016-05-064-17/+20
| | | | | | | | Note that the deferred-renderer-qml example never worked for me so I can't completely confirm if it is repaired or not. Change-Id: I8d39e69b755b25cc018dbefc22244af9bb621735 Reviewed-by: Sean Harmer <sean.harmer@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>
* 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>
* Move defaults and geometries out of Qt3DRender and into Qt3DExtrasPaul Lemire2016-04-234-1/+5
| | | | | | | QBoundingVolumeDebug has been disabled for now. Will be re-enabled later on. Change-Id: Id6b0abab2ec2aa697330bd20d782f9d104d25d50 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Follow QRenderSurfaceSelector API changes.Volker Krause2016-03-291-1/+1
| | | | | Change-Id: I3369147a6b3ce33f75c5fa88bff9d74bafce83b6 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Class QRenderPassFilter renamingRobert Brock2016-03-231-3/+3
| | | | | | | | | | includes -> matchAny addInclude -> addMatch removeInclude -> removeMatch Change-Id: Ib9288ab79b3e76ae8a8aa2f7e3f20c5386438a25 Task-number: QTBUG-51456 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QDepthMask transformed into QNoDepthMaskPaul Lemire2016-03-211-2/+2
| | | | | | | | | 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-4/+4
| | | | | | Task-number: QTBUG-51460 Change-Id: I3f522f5eaea7bf0f94dbcdc1e7463f2827c0fe3b Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QStencilOpSeparate renamed to QStencilOperationArgumentsRobert Brock2016-03-181-2/+2
| | | | | | | | As per API review Change-Id: If0f4f5719508a41d786810c36051446b2c7a08db Task-number: QTBUG-51436 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* QAnnotation changesFranck Arrecot2016-03-174-8/+8
| | | | | | Task-number: QTBUG-51454 Change-Id: Iee08f6b1be39894c40926afb20e003d46bc735f4 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Follow BlendEquation API changes.Volker Krause2016-03-121-1/+1
| | | | | Change-Id: I7fa5b472a00c636581914b79dfb861e645af9f96 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Follow vertex shader rename from change 5e94c15ddc897.Volker Krause2016-03-121-2/+2
| | | | | | | This shows the clip planes in the example again. Change-Id: I144e4b83595cd33f6b2d87dc31d892b6c8bf19da Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Follow ClipPlane API changes.Volker Krause2016-03-121-3/+3
| | | | | Change-Id: I18ff0db3d1c664a737fd79fab83bde16c99265d2 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QStencilOpSeparate property renamingRobert Brock2016-03-111-2/+2
| | | | | | | | | | stencilFail -> stencilTestFailureOperation depthFail -> depthTestFailureOperation stencilDepthPass -> allTestsPassOperation Change-Id: I30fc64fec81c873cacfdb3edeef834674140d9ce Task-number: QTBUG-51438 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QStencilOp rename to QStencilOperationFranck Arrecot2016-03-111-1/+1
| | | | | | | | | Comment: code still hold a QStencilOpSeparate, might want to rename it to QStencilOperationSeparate ? Task-number: QTBUG-51422 Change-Id: I5caf4e26720647ddb9a8b596b9dd33561fb90a08 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Some fixes for examples.Wieland Hagen2016-03-091-1/+1
| | | | | | | | Mostly insertion of RenderSurfaceSelector, FrameGraph->RendererSettings, remove parameter bindings Change-Id: I182092d43b0842da07e995387c0fe174d45345df Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QStencilTestSeparate renamed to QStencilTestArgumentsRobert Brock2016-03-081-4/+4
| | | | | | Task-number: QTBUG-51423 Change-Id: I8612803b238ae6a3d9242983140745ef82babcd0 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QStencilOpSeparate enum renamingRobert Brock2016-03-081-3/+3
| | | | | | | | | | | | Removed stencil prefix from enums incr -> increment decr -> decrement op -> operation Change-Id: I24997b5c2d5d99197f889351592fb5c2e993f0f1 Task-number: QTBUG-51436 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QBlendState cleanupPaul Lemire2016-03-051-6/+6
| | | | | | | | | * renamed to QBlendEquationArguments * property names expanded Change-Id: Id25f0181415b4f093f2054238dbf3be26e36ff32 Task-number: QTBUG-51509 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QBlendEquation renamed mode to functionRobert Brock2016-03-051-2/+2
| | | | | | | | | | | BlendMode became BlendFunction mode became blendFunction removed Func prefix in enums As per API review Change-Id: I95271abc3ba4b8d04b3caf46845e1a5e47d47322 Reviewed-by: Paul Lemire <paul.lemire@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QColorMask properties renamedRobert Brock2016-03-051-1/+1
| | | | | | | | | | | | red -> redMasked green -> greenMasked blue -> blueMasked alpha -> alphaMasked Change-Id: I5df99a6cf79b77ee344c9b9e45c940b084b65ad7 Task-number: QTBUG-51437 Reviewed-by: Paul Lemire <paul.lemire@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Follow API changes in StencilTest.Volker Krause2016-03-021-4/+4
| | | | | Change-Id: I63b5c8f32b1373d6393639600b0227c9c46ab7de Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Class QStateSet renamed to QRenderStateSetFranck Arrecot2016-03-011-3/+3
| | | | | | Task-number: QTBUG-51470 Change-Id: Ibf2de3cc0027b5851fa663c590b9b2f181c3077c Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* QStencilTestSeparate renamed propertiesRobert Brock2016-02-291-8/+8
| | | | | | | | | | | func renamed to stencilFunction ref renamed to referenceValue mask renamed to comparisonMask As per API review Task-number: QTBUG-51423 Change-Id: Ic792e191767ffd88c96d6398536fbe83fc800d5b 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>
* Unify license header usage.Antti Kokko2016-01-268-146/+258
| | | | | | | | 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>
* clip-planes-qml: add QInputSettings componentPaul Lemire2016-01-231-6/+11
| | | | | Change-Id: Ica07a94d1467f8230400d7e862495268f95f9b6a 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-71/+77
| | | | | | | | | 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-16/+4
| | | | | | | | | | | | | 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 rotation property and quaternion helperSean Harmer2015-11-201-9/+2
| | | | | | | | 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>
* Remove transforms property of QTransformSean Harmer2015-11-173-8/+15
| | | | | | | | 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>
* Rename QOpenGLFilter to QGraphicsApiFilterAndy Nichols2015-11-033-12/+12
| | | | | | | | | | | | | | | | | | | | | | 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-199-9/+9
| | | | | | | | 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-167-7/+7
| | | | | | | 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>
* Fix clip-plane-qml on OS X and small tidy upSean Harmer2015-08-313-6/+4
| | | | | Change-Id: Ib1e6159a5fb44bfc167c63776bb878c73d043796 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* clip-planes-qml examplesPaul Lemire2015-07-2916-0/+1056
Demonstrates use of: -StencilOp / StencilTest -StateSet and nested StateSet -ClipPlane -Multiple render passes with different shaders -Use of layers Change-Id: I2d3f87e99e1fdbf9ed22e81838d6cc1744b6b8c1 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>