summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Unify license header usage.Antti Kokko2016-01-26227-4194/+7316
| | | | | | | | Updated license headers to use new BSD header instead of LGPL3 one (in those files which will be under BSD) Change-Id: I300c5840db3fd4708d5d85e84f7c6729cba326e5 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* Unify license header usageAntti Kokko2016-01-26104-1698/+1610
| | | | | | | | Updated license headers to use new GPL-EXCEPT header instead of LGPL3 one (in those files which will be under GPL 3 with exceptions) Change-Id: I930c6234bfe720d38c596bbc3d1f39be75a7328b Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* Unify license header usageAntti Kokko2016-01-26870-9625/+13404
| | | | | | | Update old header.LGPL3 to header.LGPL Change-Id: I8eac0cd6bbc276a56df487249cc459c0d4fab165 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
* Refactor picking to use one thread per entityMike Krus2016-01-2517-679/+943
| | | | | | | | | | | | | | Added triangle visitor by refactor the triangle volume extractor Added ability to do a ray intersection with a single volume without using a thread Added entity collector Use one thread for each entity Ignore entities that don’t have a pick object Removed list of triangle volumes stored on each entity Use triangle visitor to test each triangle by creating a single volume on the stack Added triangle and 3 vertex index to the pick event Change-Id: Id3fd53549bf3ea07805426ef868df174f30e176b Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Expose picking details to front endMike Krus2016-01-2517-86/+202
| | | | | | | | Intersection (world and local) and distance added to pick event Modified test so that it includes the event Change-Id: I8631d626e5108d2e044374ee3425625f5588c38c Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Don't complain about missing stencil bufferSean Harmer2016-01-251-0/+1
| | | | | Change-Id: I084dbf2357468ca8c9b4e189cb5aeffaf3206825 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* scene3d-loader: remove deprecated Configuration elementPaul Lemire2016-01-231-4/+0
| | | | | Change-Id: I7fec04f677f30bb0e52f660c06e965537809de6a Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* wireframe: add QInputSettings componentPaul Lemire2016-01-231-1/+4
| | | | | Change-Id: I7f419e06125ef963e254e55555727f4f46d78040 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* transparency-qml: Add QInputSettings componentPaul Lemire2016-01-231-6/+11
| | | | | Change-Id: Ifcd32a03b789295a7cfbcd16cf298a01cc5a9125 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* wave-qml: add QInputSettings componentPaul Lemire2016-01-231-1/+4
| | | | | Change-Id: I93fa1d7a31f761d944e997499d1227bfe6fa16db Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* torus-qml: Add QInputSettings componentPaul Lemire2016-01-231-1/+5
| | | | | Change-Id: I416632ce9bf60ce6a494ee35c9a895ebf1a0ea5b Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* tessellation-modes: add QInputSettings componentPaul Lemire2016-01-231-1/+4
| | | | | Change-Id: I01104a56bb1ece1ca3b77a728720a596323a5386 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* skybox: add QInputSettings componentPaul Lemire2016-01-231-31/+36
| | | | | Change-Id: I23d4cec1951d7fce3387198d1043e3da3bfe3e55 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* simple-shaders-qml: add QInputSettings componentPaul Lemire2016-01-231-1/+4
| | | | | Change-Id: I30398143e3260ec56fe90afd7b6b7d8f1ef8232b Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* shadow-map-qml: add QInputSettings componentPaul Lemire2016-01-231-1/+4
| | | | | Change-Id: I9b6fc713b72f9dc202e6d1122a0e84299711fcaa Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* multiviewport: add QInputSettings componentPaul Lemire2016-01-231-1/+5
| | | | | Change-Id: I9b8f4529018d227f58e511de62801bf9504e278d Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* materials-qml: add QInputSettings componentPaul Lemire2016-01-231-1/+4
| | | | | Change-Id: Ice6dead127b81b6089a6aa4d72f46b7337d5851b Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* loader-qml: Add QInputSettings componentPaul Lemire2016-01-231-1/+4
| | | | | Change-Id: I8a79d1e048b432d373312bc484db19e0c5af680b Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* keyboardinput-qml: Add QInputSettings componentPaul Lemire2016-01-231-5/+9
| | | | | Change-Id: I4af1677d98f7f877c72c46226ae11afaa57ae705 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* instanced-arrays-qml: add QInputSettings componentPaul Lemire2016-01-231-1/+4
| | | | | Change-Id: I094c423997dbdeb427886b33b3d53aab69a6ac65 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* gooch-qml: Add QInputSettings componentPaul Lemire2016-01-231-1/+4
| | | | | Change-Id: I597bfbeb53a1fd451352888ddb49a518125f801c Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* cylinder-qml: Add QInputSettings componentPaul Lemire2016-01-231-1/+5
| | | | | Change-Id: I677e5df83484dbb24afff15ceaa80b83df137e39 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* custom-mesh-qml: Add QInputSettings componentPaul Lemire2016-01-231-1/+4
| | | | | Change-Id: I9993f861b7136c643f308293cf4ef13014a2d9f8 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* compute-particles: add RenderSurfaceSelector in FrameGraphPaul Lemire2016-01-231-20/+24
| | | | | Change-Id: I05882ed1d626e2990dd404f69c440c61ae40f379 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* clip-planes-qml: add QInputSettings componentPaul Lemire2016-01-231-6/+11
| | | | | Change-Id: Ica07a94d1467f8230400d7e862495268f95f9b6a Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* bigscene-instanced-qml: Add QInputSettings componentPaul Lemire2016-01-231-1/+4
| | | | | | | Input now working without setData Change-Id: Ifa80e8c59dae91a7133c12520845c7a3fca4e281 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* bigmodel-qml: Add QInputSettings componentPaul Lemire2016-01-231-1/+3
| | | | | | | Inputs now working without setData Change-Id: I2f287d23ef446d6955a7e0429a79b9f395cd33a9 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* assimp: Add QInputSettings componentPaul Lemire2016-01-231-6/+11
| | | | | | | Inputs now working without setData Change-Id: I5aba21a7f2d29090106df50a679f7933d84003bd Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* simple-qml: add InputSettings componentPaul Lemire2016-01-231-1/+3
| | | | | | | Inputs are now working without setData Change-Id: I564b09532d9daf10503d689012545e9c1a4c08c2 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* QInputAspect: create EventSourceSetterHelper in main threadPaul Lemire2016-01-227-16/+42
| | | | | | | | | | | | Turns out that on initialize is called in the AspectThread. Since event filters objects need to be created in the same thread as the event source (the main thread), code has to be corrected. Now the eventSourceHelper is created directly by the InputHandler when it is created (as it's created in the main thread). Then onInitialize only takes care of setting the eventFilterService which isn't available before. Change-Id: I2cb18372337793230625f699a2ed51c7331af971 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* QAspectEngine/QAbstractAspects: get rid of setDataPaul Lemire2016-01-2226-331/+198
| | | | | | | | | | | | | | | | | | | | | | | | | | | Getting rid of set data and the refactoring on setting the surface implies that: - Given the FrameGraph configuration, there may be several RenderViews each having a different RenderSurfaceSelector/Window - This means that the Renderer/QRenderAspect can't know about the surface before reading the scene - This means that the Renderer may be dealing with more than 1 window - This means that initialization, render and shutdown procedures will have to be updated accordingly Therefore the Renderer was refactored to: - Be initialized without knowing about a surface - For each RenderView, check the surface and if different from the previous one: * Make the context current with it * Create the appropriate glHelpers (as Surfaces may have != formats) TO DO: - Fix picking - Fix windows exposition - Fix shutdown / detection of all windows beging closed Change-Id: I49d070b05f46be4b26cfb57e494feba145d1da9c Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Renderer/Scene3D: fixes to make it work without setDataPaul Lemire2016-01-225-16/+41
| | | | | Change-Id: Iec1d3bab2e3a5a25d1cbb5129addebd83b225580 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Fix unit test for srcdir != builddirTobias Koenig2016-01-211-1/+1
| | | | | | Change-Id: I553214d0ddf5ad618d759b2d1a4965d8950c80c3 Reviewed-by: Mauro Persano <mauro.persano@kdab.com> Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* Updated picking-qml examplePaul Lemire2016-01-2116-122/+351
| | | | | | | handle device pixel ratio and none full-window Scene3D Change-Id: Iadc504a00816d9363847bf9ec1e09d4b7c631666 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Port FrameGraphManager away from QResourceManagerTobias Koenig2016-01-209-107/+170
| | | | | Change-Id: I7399008adb0f612c78738f58f168fa38cf6ae845 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Register QInputSettings to QMLPaul Lemire2016-01-191-0/+2
| | | | | Change-Id: Ic97a780c56e748648108413c91fe4ad4142de8bc Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QInputSettings: add missing export and clone macrosPaul Lemire2016-01-191-1/+3
| | | | | Change-Id: I2edf49248cff1bc8087f6ea5398e11f5fd7965c4 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Cone and Plane added to Basic shapesRobert Brock2016-01-193-5/+81
| | | | | | | | | Existing shapes have been moved outward to 5 and -5 x. Cone and plane were then added at x: 0 Task-number: QTBUG-41548 Change-Id: I65a3a1998b010179e4171686f71d52ce42e112ec Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Cone geometry addedRobert Brock2016-01-197-0/+1054
| | | | | | | | | | | | | | | | | A cone that takes: - topRadius - bottomRadius - hasTopEndcap - hasBottomEndcap as well as the usual Cylinder arguments of: - length - rings - slices Task-number: QTBUG-41548 Change-Id: Id6b7352491be16146722c480a82b926ecb9c9c24 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QInputAspect: hookup EventSourceHelper/InputSetingsPaul Lemire2016-01-197-6/+30
| | | | | Change-Id: Idab8e24f80ae2be457bbc790f6784db8e02d5a2f Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QInputAspect/InputHandler: add EventSourceSetterHelper memberPaul Lemire2016-01-194-16/+32
| | | | | Change-Id: I4445f150016db8a79997ecc5324e42b024b489b8 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Add EventSourceHelperSetterPaul Lemire2016-01-193-2/+169
| | | | | Change-Id: I91b76f1206fa0b6c398f0913586757c6419936b4 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QInputAspect: register backend type for QInputSettingsPaul Lemire2016-01-191-0/+4
| | | | | Change-Id: I6fae57e8d76f464be3bfcd0cc4e63b7ca5fe3e48 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* InputSettings: add creator functorPaul Lemire2016-01-192-0/+52
| | | | | | | Takes care of setting the settings on the InputHandler at most once. Change-Id: Ie674f778aec9ccd81d1a41ebbfec3cf61fb21bc4 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Add InputSettings member on InputHandlerPaul Lemire2016-01-192-0/+12
| | | | | Change-Id: I33be7349d5c61554402d9373ff04547b186d2d8e Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* InputSettings: backend for QInputSettings addedPaul Lemire2016-01-193-2/+156
| | | | | Change-Id: I4f8ba75e95ab479c816a9f6eca341edd45c01e3c Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QInputSettings addedPaul Lemire2016-01-194-2/+224
| | | | | | | | Will be used to specify the event source for mouse/keyboard to be used by the QInputAspect as a replacement for setData Change-Id: Icd3ab33f5e2d7a198c4747683da5bc902de62221 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Aggregate action functionalityColin Ogilvie2016-01-197-18/+173
| | | | | Change-Id: Iac5e6bfd2ad67b3c1c9a794ea528204eff238d20 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QAxisActionHandler: properly set parent on QLogicalDevicePaul Lemire2016-01-192-4/+7
| | | | | | | Otherwise the backend node for the logical device may not be created Change-Id: I90e8185b4e1f1cf4333d7f8b06e654e1e2b6de57 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Complete QFirstPersonCameraControllerPaul Lemire2016-01-191-4/+16
| | | | | Change-Id: I2b0bef43daa7fe51f61e393efb6c27a2ac7e63b5 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>