summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Give access to FrameGraphNode as a grouping nodeKevin Ottens2016-10-144-5/+13
| | | | | | | | | | | This is convenient to allow creating (Q)FrameGraphNode and have them take part in the tree traversal even though they don't change any state. Allows for easy grouping of frame graph parts, and even needed in some situations in conjunction with NodeInstantiator. Change-Id: If33d48801781113a174971398b33c27d55fa1423 Task-Id: QTBUG-55908 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Add unit test for QTorusGeometrySean Harmer2016-10-101-41/+58
| | | | | | | | | | | | | | | Also fix up some more problems with the torus. We were drawing some triangles more than once due to problems in the indexing. Fixed this by factoring out the calculations of number of vertices and triangles and takign care about needing more vertices to handle the texture coordinate wrapping at the seams but not more indices. Also renamed some members in the functors to be more consistent. Now the torus geometry should be perfect. Change-Id: I1198469531a5fd5e4ec8b86d47c9e66850fe50c7 Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
* Fix off by one error in torus texture coordinate generationSean Harmer2016-10-101-1/+1
| | | | | | | | | Prevents interpolation from (1-dv) to 0 over the final ring of triangles of the torus. Now we only reach v = 1 at the same point in space where we began creating the torus. Change-Id: I68630c623483bf2993ef24dbef98cca5a9ae26fd Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
* Add tangent attribute to torus geometrySean Harmer2016-10-102-4/+25
| | | | | | | Needed for any kind of normal mapping. Change-Id: Iddc6c648808622e472e6c7a5254aa6769c67f8c1 Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
* Put uv seam on inner ring of torusSean Harmer2016-10-101-5/+5
| | | | | | | More common way to unwrap a torus as the seam is less visible. Change-Id: I4778766ad613162986955de8623def5e1e33a8ec Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
* Export AxisSetting for unit testsPaul Lemire2016-10-101-1/+1
| | | | | Change-Id: I9d1d8cbdb966d6e697d28e2a216f1283593beae9 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QAbstractPhysicalDeviceBackendNode: remove assert that conflicts with testsPaul Lemire2016-10-101-1/+0
| | | | | Change-Id: Ib69bbf9967da831b9a069ddce1424b7946c7f369 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QAbstractPhysicalDeviceBackendNode: fix bad erasePaul Lemire2016-10-101-1/+3
| | | | | | Change-Id: Ie222eb59a9bcf53cfaf1b417241933961034d010 Task-number: QTBUG-53639 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Merge 5.7 into 5.7.1Oswald Buddenhagen2016-10-0613-138/+1438
|\ | | | | | | Change-Id: Ic6d5cf08de0765d1555ef4e41a404af4b818c5a0
| * ShaderData: fix unnecessary cast between enumsMarc Mutz2016-10-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QVariant::Type and QMetaType::Type are in sync, but static checkers don't know this, so they complain about mixed-enum type conversions. It turns out that the code is overly complicated. Instead of casting QVariant::type()'s return value to QMetaType::Type and comparing it against QMetaType::QVector3D, simply compare directly to QVariant:: Vector3D instead. Introduced in 1e0fb6c74d81a5b6c17a7f127566e4fb8ed2f28b. Coverity-Id: 168163 Change-Id: I563bebcf869555238db0135125e221ba12ed41ae Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
| * Have sane default for QButtonAxisInput::scaleKevin Ottens2016-09-282-1/+5
| | | | | | | | | | | | | | | | | | It doesn't quite make sense to have a null scale by default. It basically forces to always touch the property to get something moving. Use a scale of 1 instead by default. Change-Id: I813997d23ffedf1a934f79868f1f71f886b0303f Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| * Lights should respect the enabled flagKevin Ottens2016-09-281-0/+3
| | | | | | | | | | | | | | | | Currently even disabled lights take part in the lighting. Just don't have them in the uniforms if they are in fact disabled. Change-Id: Id6c1da2132919c8bc1ec17a5949a2e32a85e0dbe Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| * FrameGraphNode: properly handle dynamic tree changesPaul Lemire2016-09-272-0/+35
| | | | | | | | | | | | Change-Id: Ifa2c7f3c33cb410938e484f023e965d5ca5220cb Task-number: QTBUG-55908 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| * Update QML type information for Qt CreatorKevin Ottens2016-09-266-135/+1393
| | | | | | | | | | Change-Id: I2766466a0068a528e6ed2b2313f7a3104e583a7e Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| * Add namespace to picking settings property typeKevin Ottens2016-09-261-1/+1
| | | | | | | | | | | | | | | | Needed so that QML and qmlplugindump process properly the type information of this property Change-Id: I8d4075f481176efa1a50d5d0e418529c893c49eb Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | QEntity::createNodeCreationChange fixPaul Lemire2016-10-054-47/+49
| | | | | | | | | | | | | | | | | | | | | | | | Was sending the dynamic metaobject of the QComponent which (in the case of the QComponent being destroyed while the change hasn't yet been processed) would result in crashes. Moved out the findStaticMetaObject function from QNodeCreatedChange and made it a static function of QNodePrivate. Use QNodePrivate::findStaticMetaObject in the QEntity::createNodeCreationChange. Change-Id: I15a63251d7f3aae25191fa4440d864f0c8234a61 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Fix initialization of loop variables in lighting shadersTim Blechmann2016-10-042-8/+4
|/ | | | | | | | | | The variables have to be declared in the for loop to be compliant with OpenGL ES 2.0. The OpenGL 3 shader is cleaned up as well, to keep the code similar. Change-Id: I9127e9e536e4ec9036e078aaf99955113e81878f Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* QTechnique fix: was sending wrong change typePaul Lemire2016-09-191-1/+1
| | | | | | Change-Id: Ide125bd292f10d2363cd0928af2513efe9f25eaf Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Update QClearbuffers docsAntti Määttä2016-09-091-25/+31
| | | | | Change-Id: I1209a4ec7c0775e16debbce864e965eb3df13771 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Fix QCameraLens moduleAntti Määttä2016-09-091-2/+2
| | | | | | | | | | It's in render module not in core. Change-Id: Ic42b65c365308915e38a42561f167f81d30c3b72 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Paul Lemire <paul.lemire@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Fix non-symmetric extents and resolutions for QCuboidMeshMiikka Heikkinen2016-09-081-17/+17
| | | | | | Task-number: QTBUG-55836 Change-Id: Ic5ee72f5ffb236fe15e46fa667159a139ad05b03 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* ShaderData: add getter to retrieve transform type of propertiesPaul Lemire2016-09-073-17/+20
| | | | | | | | Replaces isPropertyToBeTransformed by propertyTransformType which returns the TransformType (NoTransform) if the property isn't transformed. Change-Id: Ib7d91bdcfe18409e6ad6d6f5bc119c46dd7fb143 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* LoadSceneJob: set the status after the subtreePaul Lemire2016-09-071-7/+9
| | | | | | | Change-Id: I826e599bf188162eaa4b2bed1ce34741192d05b9 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
* Update QRenderPass docsAntti Määttä2016-09-062-41/+75
| | | | | Change-Id: I62bcba620c3d222fc6d26151b21c0de1e196fc8d Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* ShaderData: refactoringPaul Lemire2016-09-055-140/+88
| | | | | | | | | | | | | | | | | | | | Only store the original properties (does not store transformed values anymore as these can change on a per thread basis and lead to races in the ShaderData). Instead introduce a method to check if a property needs to be transformed and a method which given a viewMatrix returns the transformed value. This can then be used concurrently by each UniformBlockValueBuilder without introducing races. Also since building UBO from a ShaderData has been disabled since 5.7, remove all the nested ShaderData update logic. Unit tests updated. Change-Id: Id0e5956b9f7d93f8d019c3d8999268fc3ad68e79 Task-number: QTBUG-54818 Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
* Update QTechnique docsAntti Määttä2016-09-051-31/+59
| | | | | | Change-Id: I5345954047540ef1d03ba42841bfca221cc35b7e Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Update QMaterial docsMiikka Heikkinen2016-09-051-38/+42
| | | | | Change-Id: Ib1e5304f96f1d39615102f72584f54dba2586e6c Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Update QShaderProgram docsMiikka Heikkinen2016-09-051-65/+74
| | | | | | Change-Id: I733333e6c707d590218fd5b19722e08908e52b49 Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Update QFilterKey docsMiikka Heikkinen2016-09-051-16/+24
| | | | | | Change-Id: Id6bb471e11de2bf8b33cec603d382f079d0b0e79 Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Fix documentation of QRenderSettings and QPickingSettingsMiikka Heikkinen2016-09-052-52/+133
| | | | | | | Task-number: QTBUG-55697 Change-Id: I7a357f6f00b62c1ef2042f4088374dcd34005110 Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Update QEffect docsMiikka Heikkinen2016-09-051-11/+29
| | | | | Change-Id: I9266413eec2e23457198016cc63be8aaebab3db0 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Improve QInputSettings docsMiikka Heikkinen2016-09-051-34/+22
| | | | | Change-Id: I583cca3c0af117b97465f84190663908877d51b0 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Update QMouseDevice docsAntti Määttä2016-09-051-23/+40
| | | | | Change-Id: I6739fb95ed549fa02e9308d89e695f028fec4ed7 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Update QFrameAction docsAntti Määttä2016-09-051-8/+18
| | | | | | Change-Id: I4bcde9ed1e1ab8a9d127dd1d4c75d30f8c342641 Reviewed-by: Paul Lemire <paul.lemire@kdab.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Update QCameraSelector docsAntti Määttä2016-09-051-14/+24
| | | | | | Change-Id: I349f40e488465a147970f1d52696cf1fa9e22063 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Update QSortPolicy docsAntti Määttä2016-09-051-26/+37
| | | | | | Change-Id: I28f5d587d81b8c6f2263b68325847872df40e0c3 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Update QFrameGraphNode docsAntti Määttä2016-09-051-10/+99
| | | | | | Change-Id: I3d974b7ab1f5e0b829b139c71a1469fe35dd5ec1 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Update QCameraLens docsAntti Määttä2016-09-051-125/+162
| | | | | | Change-Id: I3e2cd85d5c85b066fdcf7793adbc969092fc7736 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Update QSceneLoader docsAntti Määttä2016-09-051-54/+76
| | | | | | Change-Id: Idb4210e9d455c9b8c87a6540d486992531778c0e Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Update QViewport docsAntti Määttä2016-09-051-22/+32
| | | | | | Change-Id: I9a81ddc741af8fb0f1126b431763ccf7a1f07e3a Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Fix QForwardRenderer docsMiikka Heikkinen2016-09-051-29/+70
| | | | | Change-Id: Ic9fcfa41caa8773a1fa12fa42c6345292ae6160e Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Fix camera controllersMiikka Heikkinen2016-09-055-16/+295
| | | | | | | | | | Fixed a few bugs and inconsistencies between qml and c++ implementations of the camera controllers. Also documented them. Task-number: QTBUG-55697 Change-Id: Ie490b0ca46f60a2a34c04f91572505e908ce65ba Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Update QLayerFilter docsAntti Määttä2016-09-051-15/+17
| | | | | | Change-Id: I4715d22a583f16444ea9f35c6f9352d53e63f114 Reviewed-by: Paul Lemire <paul.lemire@kdab.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Update QRenderSurfaceSelector docsAntti Määttä2016-09-051-33/+59
| | | | | | Change-Id: I8022413e6d6b7bcda469a7a5ec569f7af0cefd1f Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Update QEntity docsAntti Määttä2016-09-022-26/+45
| | | | | | Change-Id: I4a28761474d961d39074490e12f21b3d0c7ac911 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Update QTextureImage docsAntti Määttä2016-09-023-21/+137
| | | | | | | | Update QTextureImage docs and add documentation for QTextureImageDataGenerator and QAbstractFunctor Change-Id: Ia2067ee5ee9283727f4f37e342068a02eda4a901 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Remove unimplemented function from QBlendEquationArgumentsMiikka Heikkinen2016-09-021-1/+0
| | | | | | | | QBlendEquationArguments::specifiesAllDrawBuffers() has no implementation, so it shouldn't exist. Change-Id: I76a73d4712572e3b1cf675b195c675a033bdc670 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Qt3DExtra materials documentation fixesMiikka Heikkinen2016-09-0210-131/+747
| | | | | | | | | | Materials that were moved to Qt3DExtras were still part of Qt3DRender according to the documentation. Also added documentation for QML versions. Change-Id: Icd918599cf9a97a14e65f38a28309316a5f504dd Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Update QCamera docsAntti Määttä2016-09-021-81/+310
| | | | | | | Add missing docs Change-Id: I700e47f8e221034b12a165e9e5f0493d8e9d9960 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Improve QBlendEquationArguments and QBlendEquation docs a bitMiikka Heikkinen2016-09-022-16/+65
| | | | | Change-Id: Icb736b4cf4e1fcc44f9ad89ef69b678ce3ef36ab Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-14 05:42:04 +0000