summaryrefslogtreecommitdiffstats
path: root/examples/qt3d
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* Update simple-qml to use correct time deltaSean Harmer2015-12-071-10/+5
| | | | | Change-Id: Idc2d544d242c552033ad4826fad7a2fd48bf9672 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Add sensitivity property to QMouseControllerSean Harmer2015-12-071-0/+28
| | | | | | | | | | | | | | The sensitivity is defined as the recipricol of the number of pixels the mouse is required to move to obtain the extreme axis value (-1 or +1). That is if you set it to 0.1 you need to move the mouse 10 pixels to get an axis value of magnitude 1. If it is 0.01, 100 pixels gives an axis value of magnitude 1. The user is responsible for applying any additional transformations in a suitable handler. Change-Id: I51cd28a17d4fc0b8461ac3e49efb26b2c66081b3 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* simple-qml: CameraController implementation using the new Input APIPaul Lemire2015-12-075-3/+266
| | | | | Change-Id: I934a2b3b96db2be8d582059651338b69c4175320 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Add a directional light to the exampleLaszlo Agocs2015-12-071-0/+13
| | | | | Change-Id: Iecf4d0fcb42e41e486d8cd6bf943c09878c7bbb2 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Avoid using the name Light in the examplesLaszlo Agocs2015-11-3013-11/+11
| | | | | | | To prevent colliding with the standard Qt 3D type. Change-Id: Ibf7b8b744dd23f1ced231e90486729be894a1be7 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Enhance lights exampleLaszlo Agocs2015-11-301-3/+23
| | | | | | | | Two animated lights with the position of the lights represented as spheres. Change-Id: I5e337a4c2932e75dc4d676d4d9b9349249f6b227 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Lights phase 1: infrastructureLaszlo Agocs2015-11-265-1/+175
| | | | | | | | | | | | | | | | | | | | | | | | | | | | QAbstractLight becomes QLight and gets its own backend node. This way we can easily gather all lights for the scene and filter them when building render commands. Both the frontend and backend remain a subclass of (Q)ShaderData but will not be part of the ordinary ShaderData component list. This prevents mixing up ShaderDatas and Lights but allows reusing the same underlying infrastructure so that properties can automatically be transformed for example. It is worth noting that the position property for lights is now removed: the position is determined by the entity's (to which the light component belongs) position. A number of changes are made to ShaderData itself as backend subclassing with different managers is not straightforward. For now the distance between the rendered entity and the entity with the light component is calculated and lights will be chosen based on this distance. A framegraph node for controlling this will be added in future patches. No uniform setting or shader changes are included here. Task-number: QTBUG-48834 Change-Id: I43a6c5f9420d4254d798c558bd58680b2b09eceb Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Add a qgltf example.Laszlo Agocs2015-11-256-1/+236
| | | | | | | | | | | | This is like gltf but uses the original Collada asset and generates a glTF model at build time. Now that the qgltf rule is in qtbase we can freely use it in any examples. This does not have the limitations the gltf example has: this will function both with core profiles and ES. Change-Id: I9f04cf8b77337d397e1aecd1ffb22b7ce7e15ef7 Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
* Fixed planets-qml exampleTomi Korpipää2015-11-243-116/+100
| | | | | | | Earth clouds are in the correct place again. Change-Id: Ic4ca6683d0196a66463d578d6d1587a762156750 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Doc: Fix QDoc warnings and do further cleanupTopi Reinio2015-11-232-3/+3
| | | | | | | | | Fix the documentation issues that still remained broken after renaming the namespaces/QML modules. Do further cleanup and minor doc editing. Change-Id: Iff38c8c1b99e7f712dc3f9ad07ecd37a747b3a26 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
* Adapt examples to use new quaternion helpersSean Harmer2015-11-208-77/+26
| | | | | Change-Id: If9100fbc1870c09d90c9c1df102cf9c0503b96cb Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Adapt examples to use rotation property and quaternion helperSean Harmer2015-11-2017-166/+37
| | | | | | | | This covers all examples that can use the standard S, R, T order of transformations with a single rotation. Change-Id: Ief6741f9605742c545d8ef2be9bf8ab65164835d Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Adapt examples to use no args form of Qt.matrix4x4()Sean Harmer2015-11-2017-129/+38
| | | | | Change-Id: If289d74601e2244d4175ba6b1ea3eb95df0bd50b Reviewed-by: Paul Lemire <paul.lemire@kdab.com>