summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * 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>
| * | Silence 'no such slot' connect warning on startupAntti Määttä2016-09-023-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | Add private slot for the function and use correct function name in the connect call. Change-Id: If27e3aa954ced1065fa8828efe156b6561c175ed Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| * | MSVC2015_64 "internal compiler error" fixesv5.8.0-alpha1Tomi Korpipää2016-08-313-7/+8
| | | | | | | | | | | | | | | | | | Change-Id: I8b67b6932eca7ada6ac44521b8a1a526eb0553e5 Reviewed-by: Paul Lemire <paul.lemire@kdab.com> Reviewed-by: Antti Määttä <antti.maatta@qt.io>
| * | Use full type in the return valueAntti Määttä2016-08-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Use full type in return value of requestRenderCapture so that QML can see it. Change-Id: I7ba123b64da8b4492d0b3267f8920cb882bfe7c0 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| * | Add unit tests for QRenderCapture frontend nodeAntti Määttä2016-08-303-1/+126
| | | | | | | | | | | | | | | | | | | | | Unit tests for the frontend node. Change-Id: I5cb97533da655771155815782e68d8ce2ff463aa Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
* | | Bump versionOswald Buddenhagen2016-08-291-1/+1
|/ / | | | | | | Change-Id: I60be5c9054806c715cc9b1b1798b88c539761361
* | Enable QRenderCapture usage in the backendAntti Määttä2016-08-297-2/+37
| | | | | | | | | | | | | | | | Add relevant changes to backend so that the render capture can be used. Change-Id: I0d4eaf0b1830c4a7c11a2ef1ec41167a429bfd1e Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
* | Add sendRenderCaptureJobAntti Määttä2016-08-296-3/+192
| | | | | | | | | | | | | | Implement job for sending render capture images to frontend nodes Change-Id: I39e9cc2f059f7a7528538b3bd0279cf001ed01c6 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | QInputAspect: slightly simplify createPhysicalDevicePaul Lemire2016-08-271-3/+4
| | | | | | | | | | Change-Id: Ibb21c59904bd7077e0e254fce5822241b2b9ee82 Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
* | OrbitCameraController: disable logical device when disabledPaul Lemire2016-08-271-0/+1
| | | | | | | | | | | | Change-Id: I51705fc223388e608820de8544bf67677a431594 Task-number: QTBUG-55469 Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
* | FirstPersonCameraController: disabled logical device when disabledPaul Lemire2016-08-271-0/+1
| | | | | | | | | | | | Change-Id: Ia720e3de334951eb64b6550fb078bcdda0995d69 Task-number: QTBUG-55469 Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
* | QOrbitCameraController: disable logical device when disabledPaul Lemire2016-08-271-0/+4
| | | | | | | | | | | | Change-Id: I924528efa760bed5c2d86e3a0233e1836ef003c0 Task-number: QTBUG-55469 Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
* | QFirstPersonCameraController: disable logical device when disabledPaul Lemire2016-08-271-0/+4
| | | | | | | | | | | | Change-Id: If5c9e381c4c07e3b2ce92a016cf6755ec799abf3 Task-number: QTBUG-55469 Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
* | UpdateAxisActionJob: only perform job if device enabledPaul Lemire2016-08-271-0/+4
| | | | | | | | | | | | Change-Id: Ie5b29563f5e88df6cce14655a0e3fb35fc8de1fa Task-number: QTBUG-55469 Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
* | QAbstractTextureImage: Remove unneeded friend classWieland Hagen2016-08-271-5/+0
| | | | | | | | | | Change-Id: I58030219da9cd7998cefef7bc0cfeb356ba0e166 Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
* | Calcboundingvolumejob: make run publicPaul Lemire2016-08-271-2/+0
| | | | | | | | | | | | | | Needed for unit testing and there's no real reason to make it protected Change-Id: I638786b5a536066fb5bfe4d5eed0d5b6b2b37176 Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
* | PickBoundingVolumeJob: only perform picking test when neededPaul Lemire2016-08-271-2/+32
| | | | | | | | | | | | | | | | | | Sometimes, dragEnabled may be disabled on an ObjectPicker. If the only mouse events we get for a frame are of that type, then we can just skip picking for the frame. Change-Id: Ia24d1b165b0f6a8b2fc7e4d7a909dfe1c5c683aa Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
* | GraphicsHelper: export for tests + fix missing typesPaul Lemire2016-08-272-1/+8
| | | | | | | | | | Change-Id: I72d48a24ac2388a93166416146f05eded0688559 Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
* | Improve robustness of QML plugin loadingSimon Hausmann2016-08-266-6/+6
| | | | | | | | | | | | | | | | | | Use a variable that expands to the latest plugin version instead of hard-coding the string. Change-Id: Ia933f761c6f91bc1cedeba9f7d6e1fb2ecb810d5 Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | LogicalDevice: make testablePaul Lemire2016-08-261-2/+1
| | | | | | | | | | | | | | | | By exporting it and making sceneChangeEvent public like in most other backend classes. Change-Id: I8d8a8c16c0ffebd79758f1021fb5ed5fe92e2571 Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
* | Compute Particles example: was using wrong work group sizePaul Lemire2016-08-261-1/+1
| | | | | | | | | | Change-Id: Idf3c40274ff60ff3c856c2e61a0d782a916e0e19 Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
* | QAbstractTexture::CubeMapFace: add a new entry AllFacesPaul Lemire2016-08-262-1/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | When rendering a cube map to an FBO, we may want to specify that we want to render to all the faces rather than a single one. This is indeed possible with a geometry shader and using gl_Layer. For such a case we need to be able to specify that in the QRenderTargetOutput face property. Note: gl_Layer can also be used with texture arrays but a neat api to specify which layers to use on QRenderTargetOuput seems a bit more tricky in that case. Change-Id: I6abf8667fd0905d78c22ef8d5f1f792a5973bbbe Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
* | QRenderTargetOutput: use full type in the face Q_PROPERTYPaul Lemire2016-08-261-1/+1
| | | | | | | | | | | | | | | | Otherwise this results in QML errors. This is needed since the enum is defined on another QObject subclass and not QRenderTargetOuput directly. Change-Id: I3d4be0e64f21b3128ae67342d60f6d32c960e81c Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
* | QSkyboxEntity: remove camera translation propertyPaul Lemire2016-08-268-51/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | If we convert a mat4 matrix to a mat3 matrix, then back to a mat4, this removes the translation component from it. Making the skybox shaders use that property allows to remove references to the camera translation in QSkyboxEntity. This makes using a skybox neater as we don't need to care about the Camera position anymore. This also allows to render the same skybox with different cameras which required to have duplicate QSkyboxEntity previously. Change-Id: I1adddd17d151e4d26d0f19b048df88dbf738042b Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
* | ForwardRenderer: allow to disable frustum cullingPaul Lemire2016-08-261-0/+2
| | | | | | | | | | Change-Id: I3e5ba52e5b42483cbf954c5ac40123c1ff896b29 Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
* | QForwardRenderer: use modern style connectPaul Lemire2016-08-261-5/+6
| | | | | | | | | | | | | | So that we can benefit from compile time check Change-Id: Idefd4f59d498255162a09aae0e5db372d258b242 Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
* | ExpandBoundingVolumeJob: make run publicPaul Lemire2016-08-261-2/+0
| | | | | | | | | | Change-Id: I50a65956460ae6791df2fe09aff84c81a667e17a Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
* | UpdateWorldBoundingVolume: make run publicPaul Lemire2016-08-261-2/+0
| | | | | | | | | | Change-Id: Ifc4b934baf7b7baf673dfe4f27f048076ef434dc Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
* | UpdateWorldTransformJob: make run publicPaul Lemire2016-08-261-2/+0
| | | | | | | | | | Change-Id: I0091f62cbcd7be787891099e0a7810e36907b49a Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
* | CalcGeometryTriangleVolume: make run publicPaul Lemire2016-08-261-2/+0
| | | | | | | | | | Change-Id: I95535083e1717f67c610efc1d2834b9937b0bcb7 Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
* | LoadBufferJob: make testablePaul Lemire2016-08-261-2/+2
| | | | | | | | | | Change-Id: Ic0b4aeb04a99747048f00c09dc18390c17849746 Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
* | Export RenderSettings for auto testsPaul Lemire2016-08-261-1/+1
| | | | | | | | | | Change-Id: Idcf4532d4660241db835033ce8a366e368469318 Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
* | GraphicsHelper: add glUniform* helper methodsPaul Lemire2016-08-2611-0/+677
| | | | | | | | | | Change-Id: I2532fcbf712d4a2194569d11891f0f3a7d7f7ae1 Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
* | Implement render capture backend nodeAntti Määttä2016-08-264-3/+198
| | | | | | | | | | | | | | | | Implementation for the render capture backend node. Change-Id: I1a3153f4fac8c6d2809ed0ae701a95d456c78c20 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
* | PlatformSurfaceFilter: remove assertPaul Lemire2016-08-251-1/+0
| | | | | | | | | | | | | | | | | | Needed so that we can have unit tests which unset the window before destruction. Otherwise we end up with crashed with the PlatformSurfaceFilter trying to unconnect itself for a destroyed window. Change-Id: If9fe61dea8e5e0e55401c67fcaabc3dd78c4284b Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
* | RenderViewInitializeJob: remove unused membersPaul Lemire2016-08-252-7/+0
| | | | | | | | | | | | | | surfaceSize and devicePixelRatio aren't used Change-Id: Ieaa811e1aa463dfda90fab9656f3781929678b21 Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
* | QRenderSurfaceSelector: fix code style & indentationPaul Lemire2016-08-251-3/+2
| | | | | | | | | | Change-Id: Id10633d705e407fbf7936896288300b088d93459 Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
* | QRenderSurfaceSelector: complete docPaul Lemire2016-08-251-0/+14
| | | | | | | | | | | | Change-Id: I66c6d7a2d6c171b34e63e1de5436ce299156734c Task-number: QTBUG-55333 Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
* | QRenderSurfaceSelector: fix externalRenderTargetSize propertyPaul Lemire2016-08-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Setter wasn't set on the Q_PROPERTY declaration fixed. Moved the setter to the Q_SLOT section to remain consistent with the rest of the setters. This should not affect binary compatibility. Change-Id: I63b7182b7dd6a00c78951f05e06ee86ea8e07d38 Task-number: QTBUG-55333 Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
* | Merge branch '5.7' into 5.8Sean Harmer2016-08-2549-116/+2869
|\| | | | | | | | | | | | | Conflicts: tests/auto/input/input.pro Change-Id: Ic89c7d9093c95bc1c5ca50f04ed34c00b5f261f4
| * 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-30 08:27:23 +0000