summaryrefslogtreecommitdiffstats
path: root/src/render/frontend/qmaterial.h
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* QTexture renamed to QAbstractTextureProviderPaul Lemire2015-02-081-3/+3
| | | | | | | | | | This is done prior to the whole texture API refactoring. Doc was also added, might need improvement later on but a base is present at least. Change-Id: I75589f14dfbfba7bc4250b2e0960670e020ed38a 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>
* Have copy() only on QNodeKevin Ottens2014-10-161-0/+1
| | | | | | | | | | 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-1/+1
| | | | | | | | | 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-5/+8
| | | | | | Task-number: QTBUG-41530 Change-Id: I32ed3d9b819e4e9eafdd36adc30bed9156284777 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QNode refactoringPaul Lemire2014-10-031-4/+4
| | | | | | | | | | | | | | | | 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>
* Removed TagPaul Lemire2014-09-301-1/+0
| | | | | Change-Id: Iba40f33e67d3c96ac0d0801c2f496a2a3d3bf57d Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Improved/Refactored cloning and doClone off all subclassesPaul Lemire2014-09-301-1/+1
| | | | | | | | 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>
* Texture renamed to QTexturePaul Lemire2014-08-191-3/+3
| | | | | Change-Id: I6f5570ce042b8d3ef44aa76c1fd8ce3a1dde4d3c Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QMaterial implements doClone and copy methodsPaul Lemire2014-08-131-0/+3
| | | | | Change-Id: I96782e2a458454f2e13bd6ddced1b7be8bb1375a Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Renamed Parameter to QParameterPaul Lemire2014-07-091-4/+4
| | | | | Change-Id: I1377b93ca06a838a625d38db8b77ebcee438b203 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Renamed Component to QComponentPaul Lemire2014-07-051-1/+1
| | | | | Change-Id: Ifd585f5883e446d0569c38219d26ba581455e857 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>
* QMaterial updated d-pointerPaul Lemire2014-07-051-2/+2
| | | | | Change-Id: I2149139f075f644999b646f9a5249637011a58cf Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Renamed Material to QMaterialPaul Lemire2014-07-051-0/+89
Change-Id: I6a3a980411a31ab26dd17a8bc2aa65f67a5209ea Reviewed-by: Sean Harmer <sean.harmer@kdab.com>