summaryrefslogtreecommitdiffstats
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
* Drop QFrameGraph in favor of QRenderSettingsWieland Hagen2016-03-095-201/+4
| | | | | | | | | 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>
* Class QGeometryFunctor renamed to QGeometryFactoryFranck Arrecot2016-03-094-49/+49
| | | | | | Task-number: QTBUG-51475 Change-Id: I4d679b1001df2e8a4d57f0aa5511b3c49812cfa0 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QBufferFunctor renamed to QBufferDataGeneratorRobert Brock2016-03-084-31/+31
| | | | | | | | | | bufferFunctor -> dataGenerator As per API review Change-Id: Ie67fff2fd6b75574ca840bd43836028c0726ec5e Task-number: QTBUG-51469 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QStencilTestSeparate renamed to QStencilTestArgumentsRobert Brock2016-03-081-1/+1
| | | | | | Task-number: QTBUG-51423 Change-Id: I8612803b238ae6a3d9242983140745ef82babcd0 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QTechnique renamingRobert Brock2016-03-081-1/+1
| | | | | | | | | | annotations -> filterKeys addPass -> addRenderPass removePass -> removeRenderPass Change-Id: Ica1731ee3100b249e4fef04f45c0e6326732d644 Task-number: QTBUG-51458 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QRenderTargetSelector renamed drawBuffers to outputsRobert Brock2016-03-081-14/+14
| | | | | | | As per API review Change-Id: Ifaf926705d51fa17ceb3c187f6cf2d10db81dbda Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QDirectionalLight renamed direction to worldDirectionRobert Brock2016-03-081-4/+4
| | | | | | | As per API review Change-Id: Ida081aa126ec285c090b244b3bf6abf579108feb Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Class QSortMethod renamed to QSortPolicyFranck Arrecot2016-03-073-29/+29
| | | | | | Task-number: QTBUG-51471 Change-Id: I41e9c547a86ff0918ceb2f1e4f2eed75ac948662 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Move QRay3D to Qt3DRender and make privateMike Krus2016-03-056-49/+49
| | | | | | Change-Id: I30f328e1d71d1c27b6647b63cbf480ea0937dd68 Task-Id: QTBUG-51500 Reviewed-by: Paul Lemire <paul.lemire@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>
* QComputeJob cleanupPaul Lemire2016-03-051-5/+5
| | | | | | | | | | | * 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-054-33/+17
| | | | | Change-Id: I6f86164eff9f0709f400c4404cf1d104e7632be5 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* QBackendNode::peerUuid() renamed to peerId()Paul Lemire2016-03-0510-27/+27
| | | | | Change-Id: I72471d0b22d16bbbee33610e30a06daadffedbd9 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* QAxis: remove name propertyPaul Lemire2016-03-052-31/+2
| | | | | Change-Id: I8149f0eafbac565470bd69c8382e8e78aa9bb3f6 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Class QRendererSettings rename to QRenderSettingsFranck Arrecot2016-03-041-2/+2
| | | | | | Task-number: QTBUG-51459 Change-Id: Id304a16f81d310345792cf13c95fde7741246f5c Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QObjectPicker API changesMike Krus2016-03-042-5/+5
| | | | | | | | | | mouseTrackingEnabled renamed to isDragEnabled hoverEnabled renamed to isHoverEnabled private methods should move to the pimpl class Change-Id: I65ba98ce6be11540f73292e24fe3f76f4fd8f02c Task-Id: QTBUG-51498 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* QRenderTargetOutput enumRobert Brock2016-03-031-2/+2
| | | | | | | | 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-10/+10
| | | | | | | 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-11/+11
| | | | | | | | | 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-7/+7
| | | | | | | | 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-15/+15
| | | | | | Task-number: QTBUG-51470 Change-Id: Ibf2de3cc0027b5851fa663c590b9b2f181c3077c Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Fix uses of inefficient QList<QNodeId>Marc Mutz2016-03-013-5/+5
| | | | | | | | | | | | | QNodeId is a 64-bit type, so holding it in QList on 32-bit platforms is horribly inefficient. Fix by porting to QVector instead. [ChangeLog][Important Behavior Changes] QNodeIds are now passed and accepted in QVectors, not QLists. Change-Id: I3cbe35d639eb2ddf9d106294f542f65b431dc4a4 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QAction: remove name propertyPaul Lemire2016-02-292-31/+2
| | | | | Change-Id: I77acc4a91067525eab4a32a64efd810a9b5863ac Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* QAttribute API changesPaul Lemire2016-02-292-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-21/+21
| | | | | | | | 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-0/+68
| | | | | | | | | | | | - 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>
* QAxis: add value propertyPaul Lemire2016-02-291-2/+21
| | | | | Change-Id: Ibfa241029b3906b4cbe94789c4b12565aec2a335 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* QAction: add an active propertyPaul Lemire2016-02-291-1/+20
| | | | | | | | | And remove the started and finished signals. The property will allow to do bindings or use the activeChanged signal for imperative logic. Change-Id: I05236ac7d2925c694c25582d83f9f462f62e95d2 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* QBuffer rename sync to syncDataRobert Brock2016-02-263-7/+7
| | | | | | | As per API review Change-Id: Ibb4fe23483ddf6d8fdeb9f8eea4112eb652d54a9 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Remove ParameterMappingPaul Lemire2016-02-264-66/+11
| | | | | | | | | | | | | | * 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>
* QAttribute: merge with QAbstractAttributePaul Lemire2016-02-262-10/+10
| | | | | | | remove asVector and dump functions Change-Id: I0c4e4e240ed4b69f72b3de6379c6866743d48b17 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QBuffer merged with QAbstractBufferPaul Lemire2016-02-261-1/+1
| | | | | Change-Id: I1e0c25ec01115569af59b53ec4d447a1fd55d8b3 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Rename the viewport rect property to normalizedRectRobert Brock2016-02-261-10/+10
| | | | | | | As per API review Change-Id: I51caae419044a297e58745450d5893f2a27db8be Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Propagate backend node changes to Renderer; render-on-demandWieland Hagen2016-02-2418-6/+246
| | | | | | | | | | | | Each sceneChangeEvent marks a dirty bit in the AbstractRenderer. If no changes were accumulated during one frame, the renderer decides not to render the frame, by returning false from shouldRender(). We still need to go through each backend node and see what flags to set exactly, and to make sure we also react on backend-initiated changes. Change-Id: I80588bc5c4ebeb5d57b45ddfbd4d79ec268968b1 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Dedicated QRenderBackendNodeWieland Hagen2016-02-241-2/+1
| | | | | | | | | Render aspect Backend nodes now subclass from QRenderBackendNode, which is a subclass of QBackendNode. We may want to store aspect- related data in each backend node Change-Id: I4f00de09c8cc31d2347d919151d359ad44cf03a9 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* const QNodeId & -> QNodeIdPaul Lemire2016-02-221-1/+1
| | | | | Change-Id: Ia672918cbae3b950e20e68bfbfd6982676a5981e Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QAspectEngine::setRootEntity takes a QSharedPointerPaul Lemire2016-02-221-2/+2
| | | | | Change-Id: Ia1cb3f216a4a828890ac53d5a025ca0dd970dc85 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* RenderViews: use int comparison rather than string for uniforms filteringPaul Lemire2016-02-211-11/+12
| | | | | | | Provides a non negligible gain in performance. Change-Id: I1165d1fcd044e3bdebf286539da2f5316f764540 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Move meta type registration out of the QNode ctor.Volker Krause2016-02-191-1/+4
| | | | | | | | That's called way too often. Also, actually register the metatype with the correct fully-qualified name. Change-Id: I6bd68e48908ebeb9b53e62ff04215851abdb98c5 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>
* Cache RenderStateNodes, so we don't have to look them up every frameWieland Hagen2016-02-051-127/+20
| | | | | | | | Backend nodes for QRenderPass und QStateSet cache nodes, update only if necessary. Change-Id: Ib04ba9f1632ad531705f40886dcfc87979cf2a0e Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Merge remote-tracking branch 'origin/5.6' into devLiang Qi2016-01-261-0/+6
|\ | | | | | | | | | | | | | | | | Conflicts: src/doc/src/qt3dcollision-module.qdoc src/render/frontend/qcamera.cpp src/render/frontend/qcameralens.cpp Change-Id: I8a0ae250a6b8e065a1ef3c817968ebb7ef23b20d
| * Fix resource leaks in ArrayAllocatingPolicy.Volker Krause2016-01-191-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously we ended up with default constructed elements in the bucket, and were constructing new ones for every allocation. As some of the types used in here allocate resources in their ctors themselves we were leaking those resources. Now we only construct each element at most once, and we don't construct any element that is never used. The resulting re-use of elements exposed the missing cleanup method in tst_ArrayResource. Change-Id: Ie875fea3ebc9b6f96d0239a6064474fbea798814 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Unify license header usageAntti Kokko2016-01-2695-1561/+833
| | | | | | | | | | | | | | | | Updated license headers to use new GPL-EXCEPT header instead of LGPL3 one (in those files which will be under GPL 3 with exceptions) Change-Id: I930c6234bfe720d38c596bbc3d1f39be75a7328b Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* | Expose picking details to front endMike Krus2016-01-253-8/+36
| | | | | | | | | | | | | | | | Intersection (world and local) and distance added to pick event Modified test so that it includes the event Change-Id: I8631d626e5108d2e044374ee3425625f5588c38c Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | QAspectEngine/QAbstractAspects: get rid of setDataPaul Lemire2016-01-223-6/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Getting rid of set data and the refactoring on setting the surface implies that: - Given the FrameGraph configuration, there may be several RenderViews each having a different RenderSurfaceSelector/Window - This means that the Renderer/QRenderAspect can't know about the surface before reading the scene - This means that the Renderer may be dealing with more than 1 window - This means that initialization, render and shutdown procedures will have to be updated accordingly Therefore the Renderer was refactored to: - Be initialized without knowing about a surface - For each RenderView, check the surface and if different from the previous one: * Make the context current with it * Create the appropriate glHelpers (as Surfaces may have != formats) TO DO: - Fix picking - Fix windows exposition - Fix shutdown / detection of all windows beging closed Change-Id: I49d070b05f46be4b26cfb57e494feba145d1da9c Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Fix unit test for srcdir != builddirTobias Koenig2016-01-211-1/+1
| | | | | | | | | | | | Change-Id: I553214d0ddf5ad618d759b2d1a4965d8950c80c3 Reviewed-by: Mauro Persano <mauro.persano@kdab.com> Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* | Port FrameGraphManager away from QResourceManagerTobias Koenig2016-01-201-36/+42
| | | | | | | | | | Change-Id: I7399008adb0f612c78738f58f168fa38cf6ae845 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Increase frame allocator max object size a littleSean Harmer2016-01-171-3/+3
| | | | | | | | | | | | | | | | Adding the surface pointer to the RenderView pushed us over the old limit. Change-Id: Ibc28ffc2d56e6f768294dad971c00822e6aaffb6 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>