summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | LoadTextureDataJob: No crash on null texture dataKevin Ottens2016-08-241-1/+2
| | | | | | | | | | | | | | | | This way we issue a warning but don't crash when a texture didn't load properly. Change-Id: Iec83fbfcdc77990a7350f1d2cbf75c69f8705fbe Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Use trilinear filtering for normal mapsKevin Ottens2016-08-242-2/+4
| | | | | | | | | | | | | | | | | | Porting over fixes from Sean which were only done in the QML variants of the default materials (1791e4b and 17d5edb). Change-Id: Id347066aa56b896c9e044850f55267e348f47db8 Reviewed-by: Paul Lemire <paul.lemire@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | SceneManager: small improvementsPaul Lemire2016-08-241-4/+3
| | | | | | | | | | Change-Id: I8e06a7f061d64a5d65e88663ea0974152775fd2f Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Move tests for QCuboidGeometry into extrasPaul Lemire2016-08-245-5/+6
| | | | | | | | | | Change-Id: I6ffb9e0a743dfad78624b2edcfa2d93d69d685dd Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Register the metatype for QFrameGraphNodeAndy Shaw2016-08-231-0/+1
| | | | | | | | | | | | | | | | Since QFrameGraphNode is used for the notifier signal then it needs to registered so that it can be passed across threads if necessary. Change-Id: Ia66b444bb18d02faa04883bba809cb14c3b3036b Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Add unit tests for QComputeCommandPaul Lemire2016-08-233-1/+296
| | | | | | | | | | Change-Id: Ia600d227a2511b15f9305b69c135dc09188fbf68 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Unit Tests for QCameraLensPaul Lemire2016-08-233-1/+731
| | | | | | | | | | Change-Id: I2e580ea9cd382aff0224b38a9a1431c67661666b Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | QRenderTargetOuput: add unit testsPaul Lemire2016-08-233-1/+421
| | | | | | | | | | Change-Id: I8a598a0edad751d3e92c7e6893f5761d5b553070 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | QSceneLoader: status is updated from the backendPaul Lemire2016-08-234-11/+92
| | | | | | | | | | | | Change-Id: I52159b0fa78ab915e73c2dc84bda9bccc3dbd0ef Task-number: QTBUG-54889 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Scene: add a setStatus methodPaul Lemire2016-08-233-0/+34
| | | | | | | | | | | | | | | | Will allow to set the status in the backend and update the frontend with it. Change-Id: Iac47e9960b8ef56c4e45ea31c616c4bc2a8f3444 Task-number: QTBUG-54889 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Add unit tests for QSceneLoaderPaul Lemire2016-08-223-1/+138
| | | | | | | | | | Change-Id: I6f92482750e5e013dc951a3028b5aab7c1c7de4c Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Add unit tests for scene loaderPaul Lemire2016-08-223-1/+171
| | | | | | | | | | Change-Id: I9cbb718347605b5ea048e9f37251817339b42412 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | SceneManager: export for unit testsPaul Lemire2016-08-221-5/+6
| | | | | | | | | | Change-Id: I2e0ff8b13810af09cfc08d04620d8adf6b324689 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Doc: add a section about common rendering issuesPaul Lemire2016-08-222-0/+136
| | | | | | | | | | Change-Id: I8c4d03df80d022db2f7d32330d41d7f24bae40d2 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | QPhongAlphaMaterial: allow to specify the blending argumentsPaul Lemire2016-08-192-0/+94
| | | | | | | | | | | | Change-Id: I4448e59f52ab8101c26448de5e0b8d3832461c53 Task-number: QTBUG-54591 Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
* | QSceneLoader: mark setStatus as deprecatedPaul Lemire2016-08-191-1/+1
| | | | | | | | | | | | | | The setter shouldn't be publicly available Change-Id: I1e08734722fe6a30b89af7cfbe0ad175620cb904 Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
* | Scene: add cleanup method and export for testsPaul Lemire2016-08-193-1/+10
| | | | | | | | | | Change-Id: Ib4dd476078e993b0b61366772c1a9ae9319f919a Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
* | QBlendEquationArguments: update doc for enumsPaul Lemire2016-08-191-19/+19
| | | | | | | | | | Change-Id: I4ef9f6b7dfffb2bba6ace21de368d609628c3004 Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
* | transparency-qml-scene3d: updated to use cubemap as backgroundPaul Lemire2016-08-193-5/+12
| | | | | | | | | | | | | | | | | | Help reveal potential issues. Also adjusted blending arguments to work properly. Change-Id: I86687aefe3bbc24cd9de559fa813d7c815e321e0 Task-number: QTBUG-54591 Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
* | PhongAlphaMaterial: allow to specify the blending argumentsPaul Lemire2016-08-191-1/+7
| | | | | | | | | | | | | | | | | | These is needed as when used with Scene3D you might want different arguments than when used with a pure Qt3D application Change-Id: Ieb3c8c07954ea082fae51948a3f3b6652aaf2f7a Task-number: QTBUG-54591 Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
* | Doc: Remove references to Windows CEVenugopal Shivashankar2016-08-171-1/+0
| | | | | | | | | | | | | | | | | | The platform is not supported since in Qt 5.7. Task-number: QTBUG-55331 Change-Id: Iada84e6c63ed2e7dba4c14c9533f98f847a19f18 Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | QConeGeometryPrivate: initialize m_positionBufferEdward Welbourne2016-08-161-0/+1
| | | | | | | | | | | | | | Coverity (CID 161408) justly grumbles. Change-Id: Icac4b5bc4740a8716072d554c70cd3600c4a9e02 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | MouseDevice: initialize m_inputHandlerEdward Welbourne2016-08-161-0/+1
| | | | | | | | | | | | | | Coverity (CID 161407) grumbles justly. Change-Id: Iec204dfc305c70d54d292893d26a8191038449d1 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | QComputeCommand: fix was returning wrong dimensions for Y and ZPaul Lemire2016-08-161-2/+2
| | | | | | | | | | Change-Id: I96cf1aac80f6176235d45e82ee931e81cb21b4f4 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | QCameraLens: block notifications that shouldn't be sentPaul Lemire2016-08-161-0/+36
| | | | | | | | | | Change-Id: If2b8cf60aac69d800657073be12a7f3d6038c41e Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | QRenderTargetOuput: check texture is not null when setting parentPaul Lemire2016-08-161-1/+1
| | | | | | | | | | Change-Id: I666c8825582748ea1b9c582b41dacaf6e2d3a66e Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Entity: fix -> properly clear childrenHandles vectorPaul Lemire2016-08-162-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | When cleanup is called that means an Entity needs to be recycled for reuse later on. The children handles vector wasn't cleared which resulted in it containing invalid handles when the Entity element was reused. In turn that eventually resulted in asserts in the handle manager when that Entity was released again (which explains crashes with the QSceneLoader changing sources). Change-Id: Ic2e69132e4a5186f92936593ddcf3da72a7e1446 Task-number: QTBUG-54889 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | QNode: fix commentPaul Lemire2016-08-161-1/+1
| | | | | | | | | | Change-Id: Id1a8b55a473b59f579d7274054a764880cfda956 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-08-131-1/+1
|\| | | | | | | Change-Id: I59c900a19313370efd8c57659e544073a6fb2d9e
| * Doc: Change instances of 'OS X' to 'macOS'v5.6.2Topi Reinio2016-08-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | As of version 10.12 (Sierra), the name of Apple's desktop operating system will be macOS. Change all occurrences where the Mac platform is discussed to use the macro \macos (defined in the documentation configuration in qtbase). Change-Id: I0a7da987b0322b622a34f6735210bfdf708479ab Reviewed-by: Paul Lemire <paul.lemire@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Introduce GraphicsHelperES3, allow multiple color attachmentsSvenn-Arne Dragly2016-08-126-30/+276
| | | | | | | | | | | | | | | | | | | | | | | | | | | | GraphicsHelperES2 only allows one attachment, but OpenGL ES 3.0 supports at least 4 attachments. Support for this is added by testing for ES 3.0 and using the new GraphicsHelperES3. It currently also reports reporting MRT support and propertly calls glDrawBuffers. Later more functions need to be implemented and tested to extend ES 3.0 support. Change-Id: I84f52b3de26a29b3327b99df2d1d1cf8217ab072 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | tst_renderviewutils.cpp: add comments to make things easier to readPaul Lemire2016-08-111-0/+32
| | | | | | | | | | Change-Id: I5f8c7f0d1de5e54964d54711daa39703a003736d Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Qt3DWindow rename defaultFramegraph to defaultFrameGraphPaul Lemire2016-08-116-6/+6
| | | | | | | | | | | | | | | | | | | | For coherency with other function names. This kind of API change is allowed since Qt3DWindow is in the Extras module which is still in tech preview for 5.7 Change-Id: Ic67f96cfb2dfcb3b2d724c97f2cf472bfaf40a07 Task-number: QTBUG-54841 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Doc: QSceneLoader add detailed descriptionPaul Lemire2016-08-111-4/+50
| | | | | | | | | | Change-Id: Ida051e80dcd76c687fe8bf475df2934449d3dd4a Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | LoadSceneJob: always call Scene::setSubTree()Paul Lemire2016-08-111-11/+17
| | | | | | | | | | | | | | | | | | Even if the subTree is null as that is needed for the frontend to destroy any previous subtree that may have been created. Change-Id: I27171ab0dc8576af2f3c8b7499265b52c2649c67 Task-number: QTBUG-54889 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | HandleManager: do not allow counter to overflowPaul Lemire2016-08-112-1/+104
| | | | | | | | | | | | | | | | This could otherwise have happened if an element was acquired and released repeatedly. Change-Id: I29a327f32fdd9d9a02460bff26c9ff56fdd3dd61 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Doc: Remove 'Technology Preview' from the landing pageTopi Reinio2016-08-111-1/+1
| | | | | | | | | | Change-Id: I3586c12a32607416bdc519d7a8c974fd2ac1523c Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Fix regression: remove disabled entities from the renderingPaul Lemire2016-08-102-7/+33
| | | | | | | | | | Change-Id: I40bbe3cb61e6ee825401a1ae55a12f3362b1a95f Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | QLayer: update the documentationPaul Lemire2016-08-101-2/+74
| | | | | | | | | | Change-Id: I9fb5af3c6ef748db961e52aed958c500fd233401 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | tst_qgraphicsapifilter: add a few more test casesPaul Lemire2016-08-101-0/+26
| | | | | | | | | | Change-Id: I16c60a9cce1b003847a60b0f3e4a0f3f5127c70b Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | deferred-renderer-qml: fix debug layer techniquesPaul Lemire2016-08-106-40/+92
| | | | | | | | | | Change-Id: I3602e2c837d351966d7b4216ecde458f80ba53a2 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | deferred-renderer-qml: properly handle window size changesPaul Lemire2016-08-101-2/+7
| | | | | | | | | | | | Change-Id: If3f9e1e240f6323bf505f81424cba319c912c03a Task-number: QTBUG-55163 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | deferred-renderer-cpp: properly handle window size changesPaul Lemire2016-08-102-8/+31
| | | | | | | | | | | | Change-Id: I8e89a6c0adc2b99e5fe2af61629df2f2a6ae3ccd Task-number: QTBUG-55163 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Fix deferred-renderer-cppPaul Lemire2016-08-101-2/+2
| | | | | | | | | | | | | | | | | | The window size needs to be set as a QSizeF and not a QSize as the shader expects a vec2. int to float conversion was failing and giving unexpected values to the shader. Change-Id: Ide4b4a884011e320bc909da27633e6adee1956c1 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | deferred-renderer-cpp: fix technique to use proper profile/versionPaul Lemire2016-08-101-2/+2
| | | | | | | | | | Change-Id: Ieb2fe26d46279ef29a00194429889c0987f6ad40 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | QMaterial: fix warning about unregistered metatypePaul Lemire2016-08-101-0/+1
| | | | | | | | | | Change-Id: I5927beab2ff9208f3fd9e5addaf286cccb67aa10 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | QAttribute: fix warning about unregistered metatypePaul Lemire2016-08-101-0/+2
| | | | | | | | | | Change-Id: Ibe8627a75676b181881dfb12b0278df3e30966a8 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | QAttribute: use target constructorPaul Lemire2016-08-101-2/+2
| | | | | | | | | | Change-Id: Ifc3f57ce96a2d0462eea5d174f6d50316380695e Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Doc: add doc for Qt3DExtras modulePaul Lemire2016-08-104-4/+170
| | | | | | | | | | Change-Id: I4850cd747416b37fe88675099d9b405c2d9e173e Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Doc: add section about GeometryPaul Lemire2016-08-102-1/+155
| | | | | | | | | | Change-Id: Ia3967259d0b54ba326b7ae92388bf2a530719f01 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-21 04:41:13 +0000