summaryrefslogtreecommitdiffstats
path: root/examples/qt3d
Commit message (Collapse)AuthorAgeFilesLines
* Unify license header usageAntti Kokko2016-01-2627-133/+133
| | | | | | | Updated FDL license. Change-Id: If5b261a12d1fba0d317848d3710e45e83f992fdf Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* 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>
* Refactor picking to use one thread per entityMike Krus2016-01-252-1/+7
| | | | | | | | | | | | | | 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>
* 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>
* QAspectEngine/QAbstractAspects: get rid of setDataPaul Lemire2016-01-222-13/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* Updated picking-qml examplePaul Lemire2016-01-213-109/+261
| | | | | | | handle device pixel ratio and none full-window Scene3D Change-Id: Iadc504a00816d9363847bf9ec1e09d4b7c631666 Reviewed-by: Paul Lemire <paul.lemire@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>
* 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>
* 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-1826-28/+42
| | | | | Change-Id: I3d034728781aa5b99868c92ea73ebf427ee88c5a Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Temporarily expose window to QML contextSean Harmer2016-01-1831-152/+224
| | | | | | | | | 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>
* 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>
* 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>
* 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>
* Remove usage of Configuration elementSean Harmer2016-01-171-4/+0
| | | | | Change-Id: Ifdbc14687b17f04269af31e73737eceedb793d0a Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Move QCamera/QCameraLens to Qt3DRenderPaul Lemire2016-01-1615-103/+122
| | | | | | | | Also get rid of Qt3DRender::QWindow and of the hard codes camera controller. Change-Id: I307735d01caf97b7a690b28de8dc99fc9866c35f Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Merge "Merge branch '5.6' into dev" into refs/staging/devBogDan Vatra2016-01-164-35/+40
|\
| * Merge branch '5.6' into devSean Harmer2016-01-154-35/+40
| |\ | | | | | | | | | | | | | | | | | | Conflicts: examples/qt3d/qgltf/main.qml Change-Id: I03d4cc679a7812fb114461609e481d43a0bc5390
| | * Make the qgltf example use other assetsLaszlo Agocs2016-01-134-38/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | Wine is complex and not ideal for a getting started example. Instead, use three of the simpler scenes. Change-Id: I6859714e14c47c4907e85a48cde27d0ea5748ffa Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
* | | Link examples against static libPaul Lemire2016-01-1679-732/+1604
|/ / | | | | | | | | | | | | | | | | | | | | | | | | Contains: Qt3DWindow Qt3DQuickWindow QFirstPersonCameraController FirstPersonCameraController.qml This will allow to get rid of the Camera configuration hack Change-Id: I55c5634aa4c162f9dd2852d3258073a6352b426c Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | instanced examples: Add proper annotations to techniquePaul Lemire2016-01-142-0/+2
| | | | | | | | | | | | | | | | This wasn't needed before because the TechniqueFiltering was broken. This is now needed to respect the intended behavior. Change-Id: I4f28e9757a6e726ab45a7806a74b34553e700aea Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Add a compute shader examplePaul Lemire2016-01-1411-1/+719
| | | | | | | | | | Change-Id: I956b647e2218ad3e604bd9e8260b3ea0a90dc84e Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | RenderView/GraphicsContext: support SSBO/UBO with buffer used as ParametersPaul Lemire2016-01-131-2/+2
| | | | | | | | | | Change-Id: I347aa5deea6521b43b9033e2200ab2f8b272f671 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>