summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Complete QFirstPersonCameraControllerPaul Lemire2016-01-191-4/+16
| | | | | Change-Id: I2b0bef43daa7fe51f61e393efb6c27a2ac7e63b5 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Adapt Scene3D example to use automatic aspect ratio modeSean Harmer2016-01-192-16/+5
| | | | | Change-Id: Iba759f89d33779a85010a3a1dc915358b24ab033 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Add automatic aspect ratio support for camera in Scene3DSean Harmer2016-01-192-2/+72
| | | | | Change-Id: Ibb3378e2e1d495986f68902e368847e89d8fbdd6 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Automatically set the render surface on a Scene3D itemSean Harmer2016-01-192-1/+39
| | | | | Change-Id: Iebf8f8d681461a050a240777c7d6b602ba85ef06 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Protect against a null surface in the renderview processing logicSean Harmer2016-01-191-0/+8
| | | | | Change-Id: I31eab49aff2af5b9d2341709c506f9d5525994ac Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Expose QTextureLoader to QMLMauro Persano2016-01-181-0/+1
| | | | | Change-Id: Id6f86dddb1afa3884bdf20f30cd9b13eaa05baec Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Refactor the scene3d classes into one class per pair of filesSean Harmer2016-01-1812-546/+1144
| | | | | | | No functional changes. Change-Id: I5895e3bcaf65fb7524e6adb10bca1f8c6fdb6c44 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Allow for window to manage camera aspect ratioSean Harmer2016-01-182-1/+78
| | | | | Change-Id: I465811b8cce6b26614493f844829f9e1f0b1f3c9 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Have Qt3DQuickWindow manage window surfaceSean Harmer2016-01-1828-28/+48
| | | | | Change-Id: I3d034728781aa5b99868c92ea73ebf427ee88c5a Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Temporarily expose window to QML contextSean Harmer2016-01-1832-152/+228
| | | | | | | | | Allows to restore most of the QML examples using this approach until a more permanent solution can be developed (I have an idea on how to do this and will try it today). Change-Id: I9b9bb86a5323140be3ed2456cdfa91b1f93187b1 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Add a RenderSurfaceSelector to ForwardRendererSean Harmer2016-01-181-12/+16
| | | | | | | | In preparation for setting the window automatically from the convenience helper class for window + QML + Qt3D. Change-Id: I78fb3a874e900afe1097920f7ccda9f6aa26734f Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Add window convenience property to QRenderSurfaceSelectorSean Harmer2016-01-183-1/+30
| | | | | | | | | | Behind the scenes this just updates the QSurfaceProperty which is all we care about on the backend. This is for QML since QSurface is not a QObject subclass (even though all sub classes of QSurface are via MI, grrrrr). Change-Id: I248eb59a92ed3bc99361ff23a0cd20d3c191769b Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Always create a QFrameGraph component and forward rendererSean Harmer2016-01-188-78/+35
| | | | | | | | This will allow to easily set for e.g. clear color from a C++ app even before the window is shown. Change-Id: I343b68d2fd1a3a37f99f3437afb900597fe02390 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Add getter for frame graph to Qt3DWindowSean Harmer2016-01-182-0/+7
| | | | | Change-Id: I6ae1dc30f1bcf442724d39ca27f150fc5785fe3f Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Fix cylinder-cpp exampleSean Harmer2016-01-171-38/+25
| | | | | | | Use provided ForwardRenderer frame graph. Change-Id: I18af04301e3f568e28b6110126aded4c5563ed7c Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Add annotations to QNormalDiffuseMapAlphaMaterial defaultSean Harmer2016-01-171-1/+10
| | | | | Change-Id: Idac0899f153254c26ed5a07761179c01504fd49f Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Set surface on framegraph for C++ examples using Qt3DWindowSean Harmer2016-01-171-0/+1
| | | | | Change-Id: Ida750d593e925ba7021a5fb3c77177f436312255 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Make renderer us QSurface from RenderViewSean Harmer2016-01-171-16/+32
| | | | | Change-Id: I58180aea694de7a0c17e8ca9ba9f83755e3db419 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Increase frame allocator max object size a littleSean Harmer2016-01-172-4/+4
| | | | | | | | Adding the surface pointer to the RenderView pushed us over the old limit. Change-Id: Ibc28ffc2d56e6f768294dad971c00822e6aaffb6 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Add surface selector to forward renderer framegraphSean Harmer2016-01-173-1/+25
| | | | | Change-Id: I9c436d3f5b9181075bfc0121174d530406f45c69 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Store the surface to use in the RenderViewSean Harmer2016-01-173-0/+16
| | | | | Change-Id: I4dbdfe9315dc3b0bb89119372301d24a292520d9 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Export QRendererSettings to QMLSean Harmer2016-01-171-0/+4
| | | | | Change-Id: Ie1d4c0e6beb409047d634e6def15d80203dcf8a1 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Export QRenderTargetSelector to QMLSean Harmer2016-01-171-0/+4
| | | | | Change-Id: I783e9873d6be6475f7df52933fea3ff72da35aaf Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Register renderer settings and set on rendererSean Harmer2016-01-176-0/+83
| | | | | Change-Id: I7f4a0c7a51721e8425f9e32aa1a0609fc3e5ee14 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Add backend for renderer settingsSean Harmer2016-01-173-2/+162
| | | | | Change-Id: I7e87cb106681c384a1b431a362fa904afafb877a Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Add QRendererSettings frontend classSean Harmer2016-01-174-2/+279
| | | | | | | | | Now sure if we should fold QFrameGraph into this too so as to have one place to configure the renderer. Of course we can easily aggregate both a QRendererSettings and FrameGraph components into an entity. Change-Id: Id17c185de908eedbcc53afe726a14f0c6f91ffca Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Register render surface selector types with aspectSean Harmer2016-01-171-0/+3
| | | | | Change-Id: Ia628cf7cff8698ae1bd390ed248b99780e1fbd37 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Add "We mean it" warningSean Harmer2016-01-171-0/+11
| | | | | Change-Id: Id52b55412be4e5e27476e05d1d66d226fcf5601e Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Add RenderSurfaceSelectorNode to frame graph backendSean Harmer2016-01-174-3/+165
| | | | | Change-Id: Ibd50fe11628d766588097a684be9e46254a5371b Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Add QRenderSurfaceSelectorSean Harmer2016-01-174-2/+248
| | | | | Change-Id: I65fbfed5bcf244668021878c0cfddb75d530e56e Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Fix typo in creator template and adjust whitespaceSean Harmer2016-01-173-1/+3
| | | | | Change-Id: I4bee133d1babf86612e584f938938d59de7f422b Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Add obj file to resources in wireframe exampleSean Harmer2016-01-171-1/+2
| | | | | | | Not sure how this got removed from this and other examples. Change-Id: I0ecf88d48052d63dfe5bbac0767ace8e13e9b662 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Add annotations to transparency-qml example effectSean Harmer2016-01-171-0/+8
| | | | | | | Still doesn't fix the technique selection here. Change-Id: I4f27b4a082600b193bac8e03e8153d17d88d97c9 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Fix deprecation warningsSean Harmer2016-01-179-9/+9
| | | | | Change-Id: I1ec0536ba81c738fc330f7f4c615a4e216645ea0 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Fix annotations in QSkyboxEntity defaultSean Harmer2016-01-172-0/+12
| | | | | Change-Id: I31ac1aba277a472577e1ba03c766dc4f1bf01f30 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Fix annotations in QDiffuseMapMaterial defaultSean Harmer2016-01-172-1/+14
| | | | | Change-Id: I6400350e8cbb52095859508a900225ee2fd7108f Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Fix annotations in QDiffuseSpecularMapMaterial defaultSean Harmer2016-01-172-2/+14
| | | | | Change-Id: I42a2ef40d274dab27971a17611dd5dd058e67653 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Fix annotations for QGoochMaterial defaultSean Harmer2016-01-172-1/+12
| | | | | Change-Id: I5cb3fb08fd9208e7e452e04cb4976033d091202d Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Fix annotations in QNormalDiffuseMapMaterial defaultSean Harmer2016-01-172-2/+14
| | | | | Change-Id: I3da1cb2912efb6be8dc8dbacf3bae915199860ea Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Fix annotations in QNormalDiffuseSpecularMapMaterialSean Harmer2016-01-172-1/+14
| | | | | Change-Id: Id9cd5cacec76f342f5090eecba5f33cad6fd8007 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Fix annotations for QPerVertexColorMaterial defaultSean Harmer2016-01-172-1/+14
| | | | | Change-Id: I91e8cb7277bd5957f60a8176c4a01f1f2188c93c Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Fix annotations in QPhongAlphaMaterial defaultSean Harmer2016-01-172-1/+14
| | | | | Change-Id: Ie96e1276dad51536d42d7d01c59885a82431a033 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Fix annotations in DiffusMapMaterial QML defaultSean Harmer2016-01-171-0/+9
| | | | | Change-Id: Iefd0c460c0520699a7b4c847893b6b3fcde056ef Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Fix annotations on DiffuseSpecularMapMaterial QML defaultSean Harmer2016-01-171-0/+10
| | | | | Change-Id: I44ce148a372a2101cfec42bb8d88ecc9b738132a Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Fix annotations in GoochMaterial QML defaultSean Harmer2016-01-171-0/+10
| | | | | Change-Id: I4388c2b2656448666a53610f28ee576a1eda81b8 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Fix annotations in NormalDiffuseMapAlphaMaterial QML defaultSean Harmer2016-01-171-0/+9
| | | | | Change-Id: I18512f30e8a0569a7b8326a23ffb8ee9ac915f18 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Fix annotations in NormalDiffuseMapMaterial QML defaultSean Harmer2016-01-171-0/+10
| | | | | Change-Id: I9ab4999d7b262fbec1052fa7f9be83a8c6d90b84 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Fix annotations in NormalDiffuseSpecularMapMaterial QML defaultSean Harmer2016-01-171-0/+10
| | | | | Change-Id: I7c5cf66fdcb6ea3398ea7c6d6084f46db424f39a Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Fix annotations in PerVertexColorMaterial QML defaultSean Harmer2016-01-171-0/+10
| | | | | Change-Id: I9b2f441ee7c83cd097a89fcaf214a542e6921435 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Fix annotations in SkyBox QML defaultSean Harmer2016-01-171-0/+9
| | | | | Change-Id: Icce986e9cfb53fb2ccf4c06bc30dd31b54bd0a76 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>