summaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* | Port all the pure C++ examples to Qt3DRender::QWindowKevin Ottens2016-01-139-116/+46
| | | | | | | | | | Change-Id: I43b4a5fcfb4ec00ccaec013cb31d00ca92d3c224 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Camera moved - scene3d-loaderRobert Brock2016-01-121-1/+1
| | | | | | | | | | | | | | | | From: z: -20 to z: 20 Change-Id: Ifbae72c295f04875499b09c3609c4a8e8e7e2f33 Task-number: QTBUG-49800 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Camera moved - controlsRobert Brock2016-01-122-4045/+4072
| | | | | | | | | | | | | | | | | | | | From : -12 / -4 to 4 / 12. Obj file updated and rotated 90deg on the X axis. Rotation sliders for x, y and z corrected to all start on 0. Change-Id: I43850a421029d1aef8f2f65526ce507ab22fef2b Task-number: QTBUG-49800 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Merge branch '5.6' into devSean Harmer2016-01-122-2/+4
|\| | | | | | | Change-Id: I6780d81672de7c81c9085bddbe481e689ca25132
| * Disable the qgltf example to keep the CI runningLaszlo Agocs2016-01-111-1/+3
| | | | | | | | | | Change-Id: Ic8383e39f368e293d5d97fe7bb78b435538249af Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| * Use .qgltf extension for qgltf-generated glTF filesLaszlo Agocs2016-01-071-1/+1
| | | | | | | | | | | | | | | | | | | | Let's avoid future confusion by using a custom extension for the main JSON document. In case assimp gets upgraded to a future version supporting glTF files for example, confusion can arise due to the conflicting file extensions in the scene parser plugins. Change-Id: I370cc45cc399cae4f425d86574ccea9cd6c59d4f Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
* | Camera moved - torus-qmlRobert Brock2016-01-051-1/+1
| | | | | | | | | | | | | | | | From z: -20 to z: 20 Change-Id: I99e1b725a2cf3118cd0d8d0713a90b2f6a85904d Task-number: QTBUG-49800 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Camera moved - skyboxRobert Brock2016-01-051-1/+1
| | | | | | | | | | | | | | | | From z: -40 to z: 40 Change-Id: Ifd4f3f9f21ef8d82255d7514976297b494adcbe7 Task-number: QTBUG-49800 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Camera moved - simple-shaders-qmlRobert Brock2016-01-051-1/+1
| | | | | | | | | | | | | | | | From z: -40 to z: 40 Change-Id: Ie7f3fed84a8b92d9a09d5c46110d1b75e2a928b6 Task-number: QTBUG-49800 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Camera moved - simple-qmlRobert Brock2016-01-051-1/+1
| | | | | | | | | | | | | | | | From z: -40 to z: 40 Change-Id: I56b18119d3f4afcfa7f51ca331aaa4693a78435d Task-number: QTBUG-49800 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Camera moved - simple-cppRobert Brock2016-01-051-1/+1
| | | | | | | | | | | | | | | | From z: -40 to z: 40 Change-Id: I67506d849dd80043109a7aeb431348b09c21755a Task-number: QTBUG-49800 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Camera moved - scene3dRobert Brock2016-01-051-1/+1
| | | | | | | | | | | | | | | | From z: -40 to z: 40 Change-Id: Ibca8b082a76e93149676c44d9236f7a86c18f9af Task-number: QTBUG-49800 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Camera and model moved - qgltfRobert Brock2016-01-051-4/+3
| | | | | | | | | | | | | | | | | | | | | | From y: -100 to y: 80, z: -120 to z: 120 upVector Y changed to positive Wine: z: -50 to z: 50 and removed angleX rotation which was initially needed due to negative upVector Change-Id: I054d1c18c5a3e6f68c9a3ddf4ea7d2a7f28c90a5 Task-number: QTBUG-49800 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Camera moved - picking-qmlRobert Brock2016-01-051-1/+1
| | | | | | | | | | | | | | | | From z: -40 to z: 40 Change-Id: I4f9459beea8dd492834499714ad3066a5fef7b08 Task-number: QTBUG-49800 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Camera moved - mouseinput-qmlRobert Brock2016-01-051-1/+1
| | | | | | | | | | | | | | | | From z: -40 to z: 40 Change-Id: I5ca5c301de75f1688097a79594486d91b1425cb8 Task-number: QTBUG-49800 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Camera moved - loader-qmlRobert Brock2016-01-051-1/+1
| | | | | | | | | | | | | | | | From z: -40 to z: 40 Change-Id: Id1a0cd76816bca52d0cb87569e843f88d40f1f37 Task-number: QTBUG-49800 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Camera moved - instanced-arrays-qmlRobert Brock2016-01-051-2/+2
| | | | | | | | | | | | | | | | | | | | From x: 10 to x: 9.5, z: 35 to z: 45 View from x: 10 to x: 9.5 This was to have the instanced items centered Change-Id: I79c2f71f3e171932c015a6e911ccaee73d3e4ebe Task-number: QTBUG-49800 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Camera moved - enabled-qmlRobert Brock2016-01-051-1/+1
| | | | | | | | | | | | | | | | From z: -10 to z: 10 Change-Id: I82537e802e9d3b45fdf2cbf3d7a95fdbfae50d4c Task-number: QTBUG-49800 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Camera moved - cylinder-qmlRobert Brock2016-01-051-1/+1
| | | | | | | | | | | | | | | | From z: -20 to z: 20 Change-Id: Icd629edb48ecadbd7cfe01d0be3aff7eb2cb0b0c Task-number: QTBUG-49800 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Camera moved - cylinder-cppRobert Brock2016-01-051-1/+1
| | | | | | | | | | | | | | | | From z: -20 to z: 20 Change-Id: Ib416bd0d29b3ed4ee7fd37c4127119419ffe79d0 Task-number: QTBUG-49800 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Camera moved - custom-mesh-qmlRobert Brock2016-01-051-1/+1
| | | | | | | | | | | | | | | | From z: -40 to z: 40 Change-Id: I7709857dfb55dea587a3dcdb29fbdf7628462e37 Task-number: QTBUG-49800 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Camera moved - custom-mesh-cppRobert Brock2016-01-051-1/+1
| | | | | | | | | | | | | | | | From z: -40 to z: 40 Change-Id: Ic764678ffd12c9ded39bed6a8e04a8fd6b382f59 Task-number: QTBUG-49800 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Camera moved - cpp_exampleRobert Brock2016-01-051-1/+1
| | | | | | | | | | | | | | | | From z: -20 to z: 20, y: -5 to y: 5 Change-Id: I195843e4f42f2b40a56b379a101c6c73b1018575 Task-number: QTBUG-49800 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Camera moved - bigscene-instanced-qmlRobert Brock2016-01-051-1/+1
| | | | | | | | | | | | | | | | From z: -50 to z: 50, y: -250 to y: -300. Change-Id: I35140599dde1d9075bce11936e15465def5d9317 Task-number: QTBUG-49800 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Camera moved - bigscene_cppRobert Brock2016-01-051-2/+2
| | | | | | | | | | | | | | | | From z: -50 to z: 50, y: -250 to y: 250. Model then made to appear on negative Y axis to keep displaying correctly. Change-Id: I6b2bc97d16c6b6a318f2f1fde49cfbc994287e05 Task-number: QTBUG-49800 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Camera moved - basicshapes-cppRobert Brock2016-01-051-1/+1
| | | | | | | | | | | | | | | | From z: -20 to z: 20 Change-Id: I5823541ee6a062f457595bc28101fb33809f8e7f Task-number: QTBUG-49800 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Moved the camera from Z: -40 to Z: 40Robert Brock2016-01-051-1/+1
| | | | | | | | | | | | Task-number: QTBUG-49800 Change-Id: I5ea57a174fed19687e66aa1be16b7c5430053f27 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | tvOS supportMike Krus2015-12-302-4/+4
|/ | | | | | Change-Id: I117648fe179fff981d0c19e610da6ba08e4c891e Reviewed-by: Jake Petroules <jake.petroules@theqtcompany.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Exercise the new rotation properties in materialsLaszlo Agocs2015-12-151-1/+2
| | | | | Change-Id: I7e5ddf7b2effd676f177081ccc2440433df1bd22 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Remove initialize/shutdown from APIv5.6.0-beta1Kevin Ottens2015-12-1440-40/+0
| | | | | | | | Hiding them in QAspectEnginePrivate and calling them when needed from setRootEntity. Change-Id: I4c3dfb19d84ae90cc15bbff29a4abd0705bb61dc Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Reduce specular reflectivity defaultsLaszlo Agocs2015-12-102-4/+1
| | | | | | | | 0.95 -> 0.01 to prevent eye-poppingly white specular highlights. Change-Id: I3e765bad13afe991053932e73cea13b95c950c1c Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
* Do lighting calculation in world spaceLaszlo Agocs2015-12-101-1/+4
| | | | | | | | | | | | | | | | As opposed to (mostly) camera space. Oops. While somewhat hidden with point lights, the problem became apparent with directional lights. Now that we have proper directional lights, change the default light, that is used when no light components are specified at all, from point to directional since this is cheaper and provides less surprises with arbitrary scenes. Also remove the duplicate phongalpha vertex shader in the process. Change-Id: I295660a1400b16b69e1516672e31794312ee48d1 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Add support for spotlightsLaszlo Agocs2015-12-094-5/+106
| | | | | Change-Id: I61a4e072c1a2e00cdbcee917aa557e56fb8cb7c0 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Added parameters to signals and made setters Q_SLOTSTomi Korpipää2015-12-092-2/+3
| | | | | | Change-Id: Icec2f9f207221e35ffdeeb594bb9b4dc6ef890f1 Task-number: QTBUG-49797 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-06 12:14:22 +0000