summaryrefslogtreecommitdiffstats
path: root/src/render/frontend/framegraph-components/qframegraph.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Final batch of file moves for nowSean Harmer2015-10-131-144/+0
| | | | | Change-Id: I0c9e83e3142e6b083feb2cbcabcc4279de64b95b Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Move Render aspect into the Qt3DRender namespaceSean Harmer2015-10-131-7/+7
| | | | | | | Updated examples and tests accordingly. Change-Id: I8848a88472de2302aa072fa11f21ea934672b7e6 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Merge remote-tracking branch 'origin/5.5' into devLiang Qi2015-06-291-3/+8
|\ | | | | | | | | | | | | | | | | Conflicts: .qmake.conf src/render/defaults/qforwardrenderer.cpp src/render/doc/qt3drender.qdocconf Change-Id: I1c4a15d2b57980dca82fa420ab6ef8c48c049a2c
| * Merge branch '5.5.0' into 5.5Sean Harmer2015-06-211-3/+3
| |\ | | | | | | | | | | | | | | | | | | Conflicts: src/input/qkeyboardcontroller.cpp Change-Id: Ifb0b5af165fb11dbe07849f34d3b93d9cc78eeaa
| | * Doc: Fix multiple documentation issuesv5.5.0-rc1Topi Reinio2015-06-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Restore qt3d-index.html as the main landing page. Needed for external linking. - Fix \inmodule commands for Renderer classes - Add proper group so that all three modules are listed on the landing page, both C++ and QML modules - Remove qt3drenderer-index.html (to be consistent with Qt3DCore), copy contents over to the module page and to a new file, qt3d-examples.qdoc. - Fix indexTitles in qdocconf files, and subprojects for Renderer QML types and Qt3D examples Change-Id: I0e2497771d0525d120ffa9d7d6338b01fdfa6963 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
| | * Use Qt3D.Renderer rather than RenderSean Harmer2015-06-111-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | QNode parent changesPaul Lemire2015-06-111-0/+5
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | - introduce QNode::setParent(QNode *) - QNode created with explicit parent now invoke QNodePrivate::_q_addChild - QNode::cleanup introduces, need to be added to the dtor of every QT3D_CLONABLE QNode subclass. Handles proper destruction. - QNode::cleanup added to all classes that should have it. - Updated unit tests of Nodes, Entity, Scene Change-Id: Id2c2784122a78edaae5580fe5976d88be5a1921c Task-number: QTBUG-45947 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Merge branch '5.5' into devSean Harmer2015-06-051-24/+49
|\| | | | | | | Change-Id: I8b3235703b7ceeb23de0b07753bed5f29436da31
| * Doc: Add Qt3D QML and C++ skeleton comments for qdocMartin Smith2015-05-281-14/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add documentation structure and qdoc comments for \class, \qmltype, \property, and \qmlproperty, etc, for the Qt3DRender C++ and QML modules. The actual documentation (descriptions) are still missing, but this allows the QML type documentation to be generated and reduces the qdoc error count. Change-Id: I9e96241f07ca2388f1a8cc2a3677fa6d02a2404d Task-number: QTBUG-46037 Reviewed-by: Martin Smith <martin.smith@digia.com>
| * Do not pass `this` to Private c-torKonstantin Ritt2015-05-201-3/+3
| | | | | | | | | | | | | | For classes derived from QNodePrivate, it is not used anymore. Change-Id: I9573042500c2c7533687d251e72bac14cb793525 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| * QFrameGraph: small fixPaul Lemire2015-05-121-5/+2
| | | | | | | | | | | | | | | | | | Check if the FrameGraph root node has a parent, if not set it to trigger a NodeCreated notification. Then set it as the current activeFrameGraph. Change-Id: Ife652391bc8520b42d35a8469b55bf067e1e08a2 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| * Doc: Fix multiple C++ documentation issuesTopi Reinio2015-04-141-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Remove multiple \namespace commands for namespace Qt3D. QDoc in 5.5 is now able to collate namespace members from multiple modules. - Mark 'Q...Private' classes and functions taking private arguments as \internal - Use correct \qtvariable for Qt 3D Core and Render - Add src/plugins directory to Qt 3D Core documentation build to correctly generate Assimp-related documentation. - Ensure documentation for C++ properties is visible by using the \property command instead of documenting the setter/getter functions. - Add export and logging macros to qdoc ignore directives - Remove unnecessary use of \fn command - Language and styling fixes Change-Id: I2481fa30ad2f6869b85c038c20ff1730b8522d46 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Doc: link and qdoc errors Qt3DNico Vertriest2015-03-111-3/+2
|/ | | | | | | Task-number: QTBUG-44180 Change-Id: Ic798dee5d33dbf18dbc9d978a0f07217895a30ee Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Martin Smith <martin.smith@digia.com>
* Copyright header change.Mika Salmela2015-02-091-19/+14
| | | | | | | | As for preparation for Qt5.5 release the copyright header is updated to correspond the current license requirements. Change-Id: I36632918b66f455539453b42c369689fb11298ec Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Make cloning available to third party QNodesKevin Ottens2014-11-271-1/+1
| | | | | | | | | | | Third party QNode subclasses won't have access to QNodePrivate, so move the clone() operation as a protected static method on QNode itself. This way third party nodes can implement deep copy in their copy() implementation as expected. Change-Id: I59d0414f4ea9c679f2b7e197ea90e36bd8a915a4 Reviewed-by: Paul Lemire <paul.lemire@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QFrameGraphItem: renamed to QFrameGraphNodePaul Lemire2014-10-201-5/+5
| | | | | | Change-Id: I4024d13acd019752544ec20a71e8a00440085846 Task-number: QTBUG-41539 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Have copy() only on QNodeKevin Ottens2014-10-161-4/+4
| | | | | | | | | | It was previously both on QNode and QNodePrivate. The one on QNodePrivate didn't give us much as it didn't eliminate the virtual of QNode. Change-Id: Ia1ea9dd831674109c84bd7005abe7fde3b1223fa Reviewed-by: Paul Lemire <paul.lemire@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Hide doClone implementations behind a macroKevin Ottens2014-10-151-11/+7
| | | | | | | | | This way we will avoid inconsistencies. It also means making some of the copy() implementations more clever. Change-Id: Ic79c9ec7c9c32f8951d5d9f5184592880bf8d5fd Reviewed-by: James Turner <james.turner@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QNode refactoringPaul Lemire2014-10-031-6/+6
| | | | | | | | | | | | | | | | Move almost everything to private classes. Assimp loading restored. All examples working. QNode hierachy is now handled through QObject::setParent, addChild, removeChild are part of the private api. Note: commented QChangeArbiter unit tests as they can no longer work with this patch and will restore them when QChangeArbiter will have been made private. Task-number: QTBUG-41470 Task-number: QTBUG-41523 Change-Id: I4430974b3aa7f3744c38714b451b122e0cb4d0c9 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Improved/Refactored cloning and doClone off all subclassesPaul Lemire2014-09-301-3/+5
| | | | | | | | Note: As we are using QScene during cloning, it is important that node hierarchy be created and added in the proper order (parent then child). Change-Id: I8fd53f7ca696ec9aca19cc70dc116ccba4154911 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QFrameGraph adds activeFrameGraph as a child if declared inlinePaul Lemire2014-08-141-0/+7
| | | | | Change-Id: I8bf7890a1ad19f04a7d1f1a58ac8e401160a46ec Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QFrameGraph implements doClonePaul Lemire2014-08-131-0/+11
| | | | | Change-Id: I95f1a296d4a2d00a88623f394f9a75d8ba1d19b9 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Force activeFrameGraph to be a QFrameGraphItem instead of QNodePaul Lemire2014-07-251-2/+2
| | | | | Change-Id: I0b0e8cae27c61fa4c093c1cdbfbaede57dbfb38c Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Renamed Component to QComponentPaul Lemire2014-07-051-3/+3
| | | | | Change-Id: Ifd585f5883e446d0569c38219d26ba581455e857 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Renamed Entity to QEntityPaul Lemire2014-07-051-1/+1
| | | | | Change-Id: I16b3d967e1244e3d47bffd36f6284a0e9ef0a89f Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Renamed Node to QNodePaul Lemire2014-07-051-4/+4
| | | | | Change-Id: I0a0ebde1c107db8831b596eab1e512a2062979f7 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Added Q prefix to all frontend framegraph itemsPaul Lemire2014-07-051-0/+104
Change-Id: I8b8d0e3fc221e8e5dc05938fe0e00f83d72c637d Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-23 08:23:50 +0000