summaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Collapse)AuthorAgeFilesLines
* Some fixes for examples.Wieland Hagen2016-03-0957-492/+310
| | | | | | | | Mostly insertion of RenderSurfaceSelector, FrameGraph->RendererSettings, remove parameter bindings Change-Id: I182092d43b0842da07e995387c0fe174d45345df Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* RenderSettings: add RenderPolicy propertyWieland Hagen2016-03-092-8/+8
| | | | | | | | Users may want to explicitly choose a rendering policy, e.g. RenderOnDemand or AlwaysRender. Change-Id: I465c5ac671134e7bf42fbd950e475f86edc3a321 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Drop QFrameGraph in favor of QRenderSettingsWieland Hagen2016-03-094-17/+17
| | | | | | | | | QFrameGraph did store just the Frame Graph Root, and was not configurable at runtime. This functionality has been moved to QRenderSettings. The renderer now gets the scene graph root directly from QRenderSettings. Change-Id: I3012eb96b8073717f96f5e42374859a3f4a89bfc Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Removed unneeded QFrameGraph imports in examplesWieland Hagen2016-03-0913-155/+0
| | | | | Change-Id: Ic5d1f04b365e43389b88862890b1d137c4f50ef9 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QAbstractSceneLoader enum renamingRobert Brock2016-03-082-2/+2
| | | | | | | | | | | added 'None' to the enum renamed Loaded to Ready in the enum As per API review Change-Id: I13b42460c5f080b904b5191e59b8a6e876cc4ee4 Task-number: QTBUG-51481 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>
* QTechnique renamingRobert Brock2016-03-088-11/+11
| | | | | | | | | | annotations -> filterKeys addPass -> addRenderPass removePass -> removeRenderPass Change-Id: Ica1731ee3100b249e4fef04f45c0e6326732d644 Task-number: QTBUG-51458 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>
* QPolygonOffset renamed units to depthStepsRobert Brock2016-03-082-3/+3
| | | | | | | | | 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-084-9/+8
| | | | | | | As per API review Change-Id: I85cb9b405e79d9062a80b6f0b0cbb1968c1c0664 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QDirectionalLight renamed direction to worldDirectionRobert Brock2016-03-082-2/+2
| | | | | | | As per API review Change-Id: Ida081aa126ec285c090b244b3bf6abf579108feb Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Class QSortMethod renamed to QSortPolicyFranck Arrecot2016-03-072-2/+2
| | | | | | Task-number: QTBUG-51471 Change-Id: I41e9c547a86ff0918ceb2f1e4f2eed75ac948662 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QBlendState cleanupPaul Lemire2016-03-056-24/+26
| | | | | | | | | * renamed to QBlendEquationArguments * property names expanded Change-Id: Id25f0181415b4f093f2054238dbf3be26e36ff32 Task-number: QTBUG-51509 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Follow API changes in QRenderAttachment.Volker Krause2016-03-052-2/+2
| | | | | Change-Id: I104367392c6b00b7d31cc900bd639cff9a4c08eb Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QComputeJob cleanupPaul Lemire2016-03-051-1/+1
| | | | | | | | | | | * Renamed to QComputeCommand * Removed protected ctor * Added x,y,z workgroup properties * Renamed backend elements to match frontend Change-Id: I3959ec671a7d6e86239f72336f02452ea58919ee Task-number: QTBUG-51514 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* QGeometry: move verticesPerPath to QGeometryRendererPaul Lemire2016-03-053-18/+6
| | | | | Change-Id: I6f86164eff9f0709f400c4404cf1d104e7632be5 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* QBlendEquation renamed mode to functionRobert Brock2016-03-055-8/+8
| | | | | | | | | | | 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-052-3/+3
| | | | | | | | | | | | 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>
* Renamed to QKeyboardHandlerMike Krus2016-03-054-8/+8
| | | | | | | | | | | 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>
* Rename to QMouseInput to QMouseHandlerMike Krus2016-03-051-3/+3
| | | | | | | | | | | also: - rename property controller to sourceDevice - remove protected ctor - move other protected methods to dpointer Change-Id: Ibce97ec4ab7927ec2bb758f3e872691d52e3c785 Task-Id: QTBUG-51443 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QRenderTargetOutput enumRobert Brock2016-03-034-10/+10
| | | | | | | | 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-035-20/+16
| | | | | | | As per API review Change-Id: Icaca9797c01100402e6d103be2a0425820a717ec Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Don't draw a black torus on top of a black background.Volker Krause2016-03-031-1/+1
| | | | | Change-Id: Iaa4f9a37d999e2c4b4252303eb40c89793f29142 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Follow API changes in PolygonOffset.Volker Krause2016-03-032-3/+3
| | | | | Change-Id: I3a279ec603bb69dec423a80db9ebb652bd458cce Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Port wave and wireframe examples away from ParameterMapping.Volker Krause2016-03-034-22/+10
| | | | | Change-Id: I2535623ffb1898a019f471876e0420e43b7d4a8e Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Fix "Must construct a QGuiApplication before a QPixmap" startup error.Volker Krause2016-03-021-1/+1
| | | | | | Change-Id: Ibe460df252601fa931721b9ef5df8f919db7c045 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>
* Follow API changes in TextureImage.Volker Krause2016-03-021-6/+6
| | | | | Change-Id: I0d8ca510a28a5e499befb533d93ab6d1d2b0dc4b Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QRenderAttachment renamed RenderAttachmentType to AttachmentPointRobert Brock2016-03-024-8/+12
| | | | | | | | | 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-025-6/+6
| | | | | | | | As per API review. Change-Id: Ib3565b6cce74803fcf4920f125c3444e4b44444e Task-number: QTBUG-51512 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Class QStateSet renamed to QRenderStateSetFranck Arrecot2016-03-013-6/+6
| | | | | | 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>
* QAttribute API changesPaul Lemire2016-02-293-14/+14
| | | | | | | | - rename dataType to vertexBaseType - rename dataSize to vertexSize Change-Id: I0eca7054dd69e8aac69bc1d7d5023a7ca6ca9da2 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QActionInput and QAxisInput keys to buttonsRobert Brock2016-02-293-25/+25
| | | | | | | | As per API review renamed keys to buttons as it is more descriptive Change-Id: If0907b382a863d64bd8d86e2796613767a1fd12b Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Inputs overhauledPaul Lemire2016-02-294-203/+55
| | | | | | | | | | | | - Remove QAxisActionHandler - Remove AxisAxtionHandler, AxisActionPayload, UpdateHandlerJob - Make QLogicalDevice a QComponent - QAction sending action active update to frontend - QAxis sending axis value update to frontend - QFirstPersonCameraController rewritten in a more efficient manner Change-Id: I09a83f95b97238e4393a88103f76d8ba93e1403d Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* QDepthTest rename func to depthFunctionRobert Brock2016-02-2610-16/+16
| | | | | | | As per API review Change-Id: Iea3cbdb16618b248e221817000b71822a588bf6a Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Remove ParameterMappingPaul Lemire2016-02-262-7/+0
| | | | | | | | | | | | | | * Bindings are now entirely deduced from shader introspection * Modified the BackendNodeDirtyFlags to remove the class at this prevents the operator~() to be called * Make the Renderer loop check for the ComputeDirty flag and don't unset it if set Note: uses a hack to reset m_changeSet in performCompute as right know we are sometimes missing the markDirty(ComputeDirty) set by the ComputeJob nodes. Will be sorted out later. Change-Id: Ic4fa71ecf01b625e885a58a66278387bf5b36339 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Rename the viewport rect property to normalizedRectRobert Brock2016-02-2612-18/+18
| | | | | | | As per API review Change-Id: I51caae419044a297e58745450d5893f2a27db8be Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Remove QRenderAttachment name propertyRobert Brock2016-02-252-12/+4
| | | | | | | | As per API review, name property is not needed as we can simply use the QObject::objectName property. Change-Id: I575c658a4af68145b50ad03e55971856479225e6 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* QComponentList -> QComponentVectorPaul Lemire2016-02-221-1/+1
| | | | | Change-Id: Ic4f60f7d035c561d68ea806c72607028c9e12160 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QNodeList -> QNodeVectorPaul Lemire2016-02-221-1/+1
| | | | | Change-Id: Ib968afbdfa95c6210c1a05b3e92e48f64a842799 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QAspectEngine::setRootEntity takes a QSharedPointerPaul Lemire2016-02-221-1/+1
| | | | | Change-Id: Ia1cb3f216a4a828890ac53d5a025ca0dd970dc85 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Set Context FormatMike Krus2016-02-191-4/+10
| | | | | | | | | | | | In the examples, defer the creation of the various qt3d bits until after the default format is set. This way it will be picked up by qt3d and all contexts will have the same format. Maybe the MacOS QPA should be changed to always create the highest possible OpenGL context rather than sticking to 2.0 by default. Change-Id: I33079c0328e0edd9c6c6b01fba7283d019880594 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Rename childrenNodes to childNodes for API consistency.Volker Krause2016-02-181-1/+1
| | | | | Change-Id: Ia30ea97d33d77f10bbc0d1d8195c221bd0885a0b Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Allow to tilt the camera as well as panSean Harmer2016-02-031-1/+1
| | | | | | Change-Id: Iebdc415cc8e5f02c2f6b8f03f36043c7b54d37a9 Reviewed-by: Robert Brock <robert.brock@kdab.com> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Increase speed from default in simple-cppSean Harmer2016-02-031-0/+2
| | | | | | Change-Id: I4a7023eb2bbca57661a3f041f138d29a047ad114 Reviewed-by: Robert Brock <robert.brock@kdab.com> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Take notice of the controller speedsSean Harmer2016-02-031-7/+7
| | | | | | Change-Id: I5b1150b30220ca3e1b396a8f1433a99f0b07a5a5 Reviewed-by: Robert Brock <robert.brock@kdab.com> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Set window as input event source for c++ examplesSean Harmer2016-02-032-0/+10
| | | | | | Change-Id: Ib99b7680893f8113a950ce01a1d6e85d39d9835b Reviewed-by: Robert Brock <robert.brock@kdab.com> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Examples: remove the usage of QAspectEngine::setData()Liang Qi2016-01-282-13/+0
| | | | | Change-Id: Ie96363eb83383e5dd3fb9198b2cb632f27838664 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Merge remote-tracking branch 'origin/5.6' into devLiang Qi2016-01-2629-21/+1668
|\ | | | | | | | | | | | | | | | | Conflicts: src/doc/src/qt3dcollision-module.qdoc src/render/frontend/qcamera.cpp src/render/frontend/qcameralens.cpp Change-Id: I8a0ae250a6b8e065a1ef3c817968ebb7ef23b20d