summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | Fix non-symmetric extents and resolutions for QCuboidMeshMiikka Heikkinen2016-09-082-29/+185
| | | | | | | | | | | | 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-074-21/+26
| | | | | | | | | | | | | | | | 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>
* | Add unit tests for LoadSceneJobPaul Lemire2016-09-073-1/+301
| | | | | | | | | | Change-Id: I6a570f16a303277b8305b36bef805991680ae1ea 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-056-140/+132
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Remove excess slashes from include statementsMiikka Heikkinen2016-09-053-5/+5
| | | | | | | | | | Change-Id: I64f815587947ad2f63462bb38027c533c7aa4bdc 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>
* | Update mesh and geometry documentationMiikka Heikkinen2016-09-0212-149/+422
| | | | | | | | | | | | | | | | | | | | Meshes and geometries that were moved to Qt3DExtras were still part of Qt3DRender according to the documentation. Also added some missing documentation and a few clarifications. Change-Id: I62216d718758b9f6b82df2ccc060b3c1e91b9ad4 Reviewed-by: Paul Lemire <paul.lemire@kdab.com> Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* | Reset bound fbo at the end of the renderingAntti Määttä2016-09-013-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | The last bound fbo must be reset at the end of the rendering if the bound fbo was changed due to render-to-texture. Otherwise offscreen rendering(in scene3d case) might have wrong bound fbo. Also in threaded mode, if the last renderview was rtt, the current fbo remains bound, and the next frame doesn't render to the surface as expected. Change-Id: I842040766aa6010740b008a36f7f9f2c935b0561 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Add fbx to supported file formats listAntti Määttä2016-08-311-0/+1
| | | | | | | | | | | | | | | | | | | | The assimp loader should support fbx files, so add it to the supported file formats list Task-number: QTBUG-55327 Change-Id: Ie7bb58e4fc216db7db7f35337a7780e6edf550e8 Reviewed-by: Paul Lemire <paul.lemire@kdab.com> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* | Add new multiplewindows-qml manual testAntti Määttä2016-08-306-1/+321
| | | | | | | | | | | | | | | | | | | | Add the new test, which renders to multiple windows simultaniously. Can be used to test that the resume/suspend of render thread works, among other things. Change-Id: I9ace3e833a701674d6021498fca6d8e837e94adf Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | LoadSceneJob: make testablePaul Lemire2016-08-292-2/+26
| | | | | | | | | | Change-Id: I45454defa83f240851192a87e900a2bab47d2acb Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
* | QPointSize: update docPaul Lemire2016-08-291-3/+28
| | | | | | | | | | Change-Id: Ifcd3e3fbe7198bd9191c16b8d570b240560e400d Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
* | Frontend is in ms but backend in nsKevin Ottens2016-08-257-50/+52
| | | | | | | | | | Change-Id: Id57a69a80f9eddb28fd2e75ea55baf98dcac452c Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Fix order handling in input sequencesKevin Ottens2016-08-242-1/+4
| | | | | | | | | | | | Change-Id: I79c159c70ed81345b58c6dabfd60437e20554e94 Task-Id: QTBUG-54585 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Fix spurious sequence trigger on first key pressKevin Ottens2016-08-242-7/+5
| | | | | | | | | | | | Change-Id: I2c8a34009d3bac400f5e156fe6321af744960de5 Task-Id: QTBUG-54585 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Fix timeout handling in input chordsKevin Ottens2016-08-242-11/+17
| | | | | | | | | | Change-Id: Ic4ab2d781403ada1206e7429ad1cd16ea2330aed Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Fix spurious chord trigger on first key pressKevin Ottens2016-08-242-4/+3
| | | | | | | | | | Change-Id: If5a28e670e8eef0a9b5a75dc3451ee584f22e72c Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Move input, chord and sequence logic out of jobKevin Ottens2016-08-249-63/+503
| | | | | | | | | | | | | | | | | | | | The bookkeeping and activation logic of ActionInput, InputChord and InputSequence now move outside of the job, which make them testable properly. The tests already show bugs which will be fixed in following commits. Change-Id: I4e434118a6ba285d08632c43d487b17ee5b4cb66 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Complete the test harness around physical devicesKevin Ottens2016-08-247-5/+110
| | | | | | | | | | | | | | | | Now it also comes with a backend node and a device integration implementation so that one can simulate button presses for instance. Change-Id: I87a3ecf9e68904fdd52f7c94f55abbfed28c6e9c Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Tests for ActionInput, InputChord & InputSequenceKevin Ottens2016-08-247-0/+463
| | | | | | | | | | Change-Id: I7e560a35f989890c2555808d0a86e0fa05b0e60b Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Add convenience to look for action inputs by idKevin Ottens2016-08-242-0/+14
| | | | | | | | | | | | | | | | It will look in all the possible resource managers for the corresponding id. Change-Id: I335099cd4d718cdebb9b9b3381f751f3001bfb1e Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Action input nodes inherit from the abstract classKevin Ottens2016-08-246-15/+36
| | | | | | | | | | | | | | | | ActionInput, InputChord and InputSequence all inherit from AbstractActionInput now. Their process method does nothing yet though. Change-Id: I0e3aee41b2c41aa4ee16144fa1e67de95466ea63 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Add an AbstractActionInput base classKevin Ottens2016-08-243-0/+139
| | | | | | | | | | | | | | | | | | | | | | This is needed for the coming refactoring improving testability in the input aspect. Right now we got some of the action input logic done inside the job and some inside the class. This is in part due to the lack of common interface between the different action input backend node. This is a first step toward solving that. Change-Id: I803ecd1f114f635d2b275d5dadc493733fc580e8 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | QInputAspect::jobToExcute: time is in fact usedKevin Ottens2016-08-241-1/+0
| | | | | | | | | | Change-Id: I63f19713c3c7b248b9e278f54201d6da2aba9d55 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-30 11:07:02 +0000