summaryrefslogtreecommitdiffstats
path: root/src/render/frontend/qrenderpass.cpp
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* Fix: Allow StateSet to not contain any Qt3D::QRenderStatePaul Lemire2015-05-101-0/+15
| | | | | | | | | This offers a way to explicitly request every render states to be disabled. Also updated the doc to be clear about how render states are defined. Change-Id: I91af58dd3ede7ffd7fc9cc022c5e007104791151 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QRenderPass: add/remove ParametersPaul Lemire2015-05-091-0/+42
| | | | | Change-Id: Ibccaa97c9cd1d9e8229ea59228ef2535b23b64b7 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QRenderPass use QNodePtr to send clonesPaul Lemire2015-04-251-1/+1
| | | | | | | and updated tst_renderrenderpass Change-Id: I9fae01de6c1c343cdc327cfed5ffa0cf16b01988 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Doc: Fix multiple C++ documentation issuesTopi Reinio2015-04-141-0/+5
| | | | | | | | | | | | | | | | | | | - 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>
* ChangeArbiter/SceneChange: use id as change subjectPaul Lemire2015-02-281-8/+8
| | | | | | | | | | | | Instead of having a QNode* or QObservable as the subject of a change, we use it's unique NodeId instead. That will prevent the ChangeArbiter from trying to distribute changes by looking at a QNode/QObservable id when the QNode/QObservable might have been destroyed in the meantime. Change-Id: Ia419d5b841434fd65522c8c65de552089cfe97cf Task-number: QTBUG-44628 Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Fix: remove QByteArrayLiteral used when setting SceneChange property namesPaul Lemire2015-02-281-8/+8
| | | | | | | | This was probably forgotten when the property name was changed fron QByteArray to char *. Change-Id: Idd6a988703a241519b3aba7b1d127adae5e1375e Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Copyright header change.Mika Salmela2015-02-091-20/+15
| | | | | | | | 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>
* Change uuid -> id as it really isn't universally unique any longerSean Harmer2014-12-191-6/+6
| | | | | Change-Id: If25d1f71dfff62009db1cd4f72a1b0725b4c6d14 Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
* Make cloning available to third party QNodesKevin Ottens2014-11-271-6/+6
| | | | | | | | | | | 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>
* QParameterMapper: renamed to QParameterMappingPaul Lemire2014-10-221-7/+6
| | | | | | Change-Id: I2137a22bdf35979ef300820a613db7d7bdc647e0 Task-number: QTBUG-41535 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Restored QParameter dynamic updatesPaul Lemire2014-10-181-1/+1
| | | | | | | | | | | | | | ParameterPack now just contains a list of parameters Uuid. Material, Technique, Effect, RenderPass frontend and backend classes modified to only send/receive the QParameter's uuid to signal that a parameter was updated. Use RenderParameter to monitor frontend QParameter. RenderView slighly corrected to retrieve RenderParameter from the list of QUuid and build the name-values hash from those. Registered QBackendNodeFunctor to create a RenderParameter from a QParameter. Change-Id: I715f194143a52d4e44519e73caf29516517f2b91 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* RenderRenderPass: renamed criterion to annotationPaul Lemire2014-10-171-2/+2
| | | | | Change-Id: I04322bd8e856d413665480f4d0d27cd4e15f2f5b Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QRenderPass: renamed criteria property to annotationsPaul Lemire2014-10-171-20/+13
| | | | | Change-Id: Id824323880a3cf310adb1c581c440eeff9451d4f Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Renamed QCriterion to QAnnotationPaul Lemire2014-10-171-8/+7
| | | | | | Change-Id: I4b40120807a60873b38687ba8ce0b6c2dfd77127 Task-number: QTBUG-41534 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Have copy() only on QNodeKevin Ottens2014-10-161-11/+11
| | | | | | | | | | 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-18/+14
| | | | | | | | | 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>
* QAbstract removed from corePaul Lemire2014-10-031-3/+46
| | | | | | Task-number: QTBUG-41530 Change-Id: I32ed3d9b819e4e9eafdd36adc30bed9156284777 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QNode refactoringPaul Lemire2014-10-031-22/+24
| | | | | | | | | | | | | | | | 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-6/+9
| | | | | | | | 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>
* Mark backend render classes as private and fix compilationSean Harmer2014-08-171-13/+0
| | | | | Change-Id: I1afb8408e03d4b5405e8ee82d1a3b6b4364d3f5d Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Avoid naming classes DrawStateLouai Al-Khanji2014-08-151-14/+15
| | | | | | | | | | | Since winuser.h contains a DrawState #define, this tends to wreck havoc on Windows. This patch respectively renames QDrawState, Qt3D::Render::DrawState and Qt3D::Render::DrawStateSet to QRenderState, Qt3D::Render::RenderState and Qt3D::Render::RenderStateSet. While this is more invasive than just undefining DrawState, it should be more foolproof too. Change-Id: I9fa86e5bf1fe41fb4839bd146822cc43e26019e6 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QRenderPass clone drawStates and bindings on doClonePaul Lemire2014-08-141-7/+5
| | | | | Change-Id: I8a804f9b65bfaa7f86f1ff41b3b93ad542a5eae1 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QRenderPass has a list of QDrawStatePaul Lemire2014-08-141-0/+38
| | | | | Change-Id: I874bc843c8288640180f60f2903653b3d4a3daa6 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QParameterMapper subclass of QNodePaul Lemire2014-08-141-2/+19
| | | | | | | RenderRenderPass modified accordingly and stores clone of the frontend QParameterMapper. Change-Id: Ic5ee9a693a689d627f71ca339d398d5a152bfae2 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QAbstractRenderPass / RenderRenderPass shaderProgram notificationsPaul Lemire2014-08-141-0/+2
| | | | | | | | RenderRenderPass references the shader program by its uuid. It also received shader program updates through NodeAdded / NodeRemoved notifications. Change-Id: Ibc80dc24a1a40676997666678da7be3982a25388 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QRenderPass criterion added as child if declared inlinePaul Lemire2014-08-141-10/+22
| | | | | Change-Id: I26243e23941ea3f512c0c4e83a2d973ba9e1d46a Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QRenderPass implements doClonePaul Lemire2014-08-131-0/+14
| | | | | Change-Id: Ie3335a385383c27340d1eb9bd9889ee56ce164a1 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QTechniqueCriterion renamed to QCriterionPaul Lemire2014-07-251-4/+4
| | | | | | | Fix : Sending update notification with ComponentUpdated instead of ComponentAdded Change-Id: Ie4cc90157b398e16344d21e792a125baab8d324c Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* RenderPass using QTechniqueCriterionPaul Lemire2014-07-251-10/+24
| | | | | | | | | | There is nothing different between QTechniqueCriterion and QRenderPassCriterion. In that sense, QRenderPassCriterion was removed and QRenderPass and QRenderPassFilter using QTechniqueCriterion. QTechniqueCriterion will later be renamed to QCriterion. Change-Id: I47b6d4385ccb70b2ce01d2b29b2de1e7715dd14f Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Renamed RenderPassCriterion to QRenderPassCriterionPaul Lemire2014-07-091-4/+4
| | | | | Change-Id: Idbe4651aacd5c988d59bc761a0314e45db2ba2d3 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Renamed ParameterMapper to QParameterMapperPaul Lemire2014-07-091-4/+4
| | | | | Change-Id: I21b02cd26a3181dca989028cfacc8f19ca3c8984 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Renamed Parameter to QParameterPaul Lemire2014-07-091-1/+1
| | | | | Change-Id: I1377b93ca06a838a625d38db8b77ebcee438b203 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Renamed Node to QNodePaul Lemire2014-07-051-2/+2
| | | | | Change-Id: I0a0ebde1c107db8831b596eab1e512a2062979f7 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QRenderPass renamed and d-pointeredPaul Lemire2014-07-051-0/+137
Change-Id: I73a7f64491392eb24d8f2c8eb5ad4c0590e572ce Reviewed-by: Sean Harmer <sean.harmer@kdab.com>