summaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Collapse)AuthorAgeFilesLines
...
* Correct shader typo for rendering and fix shader selectionMike Krus2017-05-032-4/+3
| | | | | | Task-number: QTBUG-60288 Change-Id: I320f787c3b245cc52df80d89c75f856aeacf649d Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* advancedcustommaterial: request proper GL formatPaul Lemire2017-04-252-2/+21
| | | | | | Change-Id: I9a4f1882805892248aa9f6a4cf8d83a49acaeb0b Task-number: QTBUG-60288 Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* simplecustommaterial: add GL2 shader variantPaul Lemire2017-04-252-0/+32
| | | | | | Change-Id: Ie55724be1872f98660093b0fd5cea54d7e0eae11 Task-number: QTBUG-60289 Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* Fix include capitalisation when using -no-pchSean Harmer2017-04-051-1/+1
| | | | | Change-Id: I05b9965f93f2a0e5e4c8a4e38e4f52dce1fa2f3d Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* Examples: Fix license headersKai Koehne2017-04-0533-655/+1054
| | | | | | | Use BSD for all sources, and FDL for all documentation files. Change-Id: Ifce7284d10947b4948be6ecf44fe3ff8be30f7f7 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Add a QQuickWidget-based Scene3D exampleLaszlo Agocs2017-04-046-1/+157
| | | | | | | | Shares the QML files with the scene3d example. Task-number: QTBUG-52132 Change-Id: I076284b66a8dfdc3308171f11528851a7e20bbce Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Improve documentation for shadowmap exampleSean Harmer2017-03-272-37/+42
| | | | | Change-Id: Ia71dcd616bc66e128250ae17a0ece7c9669209b7 Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* compute-particles: Update import version in ComputeFrameGraph.qmlPaul Lemire2017-03-231-1/+1
| | | | | Change-Id: If98fe65a863ee09e82053ada70c1b19d26d8e1f4 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Add simple custom material exampleAntti Määttä2017-02-2815-1/+521
| | | | | Change-Id: Ia1a706888ca3bb1eedcac34903afe7da0c168462 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Add advanced custom material exampleAntti Määttä2017-02-2822-1/+53566
| | | | | Change-Id: I6c5ae0e29960aaab2d0babfe325a9f6483729600 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Update multiviewport exampleAntti Määttä2017-02-274-29/+323
| | | | | | Change-Id: I57ea393e3abc5de2230f464d612d36a8075fa979 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Google Cardboard demoMike Krus2017-02-2219-1/+1552
| | | | | Change-Id: Iee998ffe7ddb67a03ed260db053f541e0138b837 Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
* Remove unnecessary widget dependencyMike Krus2017-02-191-1/+0
| | | | | | | | Found this when building for iOS using a custom build without widgets. Change-Id: If50e2d388aafacf9f8b3cfea20752c790e1fbc1d Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Doc: Corrected snippet quoting syntaxNico Vertriest2017-02-171-1/+2
| | | | | | | | Command '\snippet (//! [2])' failed at end of file 'planets-qml/PlanetsMain.qml' Change-Id: If30a8123aad2631de22731e5bbd51871166063c8 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
* Extruded Text cleanupPaul Lemire2017-02-161-8/+5
| | | | | | | | | | | | -rename QText3DGeometry to QExtrudedTextGeometry -rename QText3DMesh to QExtrudedTextMesh -rename the depth property to extrusionLength -removed the edgeSplitAngle property -updated the example Task-number: QTBUG-58880 Change-Id: Ib2d1a58e62b34949db12b9245f1474baf9cf9b91 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QMemoryBarrier cleanupPaul Lemire2017-02-161-1/+1
| | | | | | | | | | | -rename barriertypes to waitOperation -in QML introduce a waitFor property -remove the Barrier suffix for the enum values -rename BarrierType to Operation Task-number: QTBUG-58878 Change-Id: Idc65f44b09e632509cd74286de26fea02e6b6dee Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Merge branch '5.8' into 5.9Sean Harmer2017-02-061-1/+0
|\ | | | | | | | | | | | | Conflicts: src/core/nodes/qnode.cpp Change-Id: Id989bec6c54eee94651906d44ece752c10b7d0d1
| * Remove unneeded setAspectRatioWieland Hagen2017-02-021-1/+0
| | | | | | | | | | | | | | | | | | will get updated in Qt3DWindow::resizeEvent() Task-number: QTBUG-58327 Change-Id: I9464ba193a225af17cc4638902d0c68e82640d41 Reviewed-by: Guillermo A. Amaral <gamaral@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Resurect ForwardRenderer.qml in an exampleKevin Ottens2017-01-273-1/+79
| | | | | | | | | | | | | | | | | | Could be useful to have it around in an example still, so that people get an idea on how to make their own framegraph in QML from scratch. Some other examples have QML framegraphs too, but this one is simpler. Change-Id: I9065af920b1233d3f06cfee71c59afe98359cb7e Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Consolidate QML/C++ materials in extrasKevin Ottens2017-01-276-23/+21
| | | | | | | | | | | | | | | | | | | | | | We remove the qml implementation of materials in extras that were also implemented in C++. Note this is an API change for the materials having texture properties. The QML ones had mistakenly a string property instead of a texture one. This move also fixes this API issue on the QML end. Change-Id: Ibed14288cd7b8c5ab9615b74b949c6a73ac29329 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | ComputeParticles: use memory barrierPaul Lemire2017-01-251-0/+1
| | | | | | | | | | | | | | Make the synchronization explicit rather than relying on luck. Change-Id: I4291fd70701e784c70b3ad6d178d6fc9cc4ce0a5 Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
* | Merge remote-tracking branch 'origin/5.8' into devLiang Qi2017-01-241-6/+6
|\| | | | | | | | | | | | | | | Conflicts: src/plugins/sceneparsers/gltf/gltfio.cpp src/render/io/objloader.cpp Change-Id: I094c9310d56657ab19b4722b946c60d8cb490191
| * BasicShapes: use Entity::setEnabled instead of a parent changePaul Lemire2017-01-111-6/+6
| | | | | | | | | | | | Task-number: QTBUG-58057 Change-Id: Id078ad5f83a627112718a51ba85c5789bcae718d Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | 3D Text: created 3d text geometry and meshSven Erdem2017-01-133-1/+134
| | | | | | | | | | | | | | | | | | | | | | - Allows to extrude a 3D mesh from a text string - Added 3d-text example Triangulation fixes provided by Remi Faitout Task-number: QTBUG-19234 Change-Id: I767ffa11092d30945e3fc19f90f72a5965f5a776 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Merge remote-tracking branch 'origin/5.8' into devLiang Qi2016-12-1232-946/+2
|\| | | | | | | | | | | | | Conflicts: tests/auto/render/render.pro Change-Id: I3d0463dabae4fc78f334afc8f90d2d321ab71e03
| * Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-11-2819-944/+0
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/input/backend/updateaxisactionjob.cpp src/render/renderstates/qalphacoverage.cpp src/render/renderstates/qclipplane.cpp src/render/renderstates/qdithering.cpp src/render/renderstates/qseamlesscubemap.cpp src/render/renderstates/qstenciltest.cpp Change-Id: I5b279d30bbbb06af5e8ee9fc47e9794b78a567f5
| | * Remove old deferred-renderer-cppJoni Poikelin2016-11-1719-944/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | deferred-renderer-cpp example has been moved under tests/manual/, but old example was not completely removed. Task-number: QTBUG-55659 Change-Id: Ic8e934092879b05c4e04c5f70f0f3632cc8c3ec3 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| * | Revert "Temporarily invert the cubemap images"Paul Lemire2016-11-2312-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The mirror property on QTextureImage should now be used instead. This was a temporarily fix for 5.7. This reverts commit 5dc4c77408ff040dc4a50c3837f4b2a29e927cb8. Change-Id: Id98d139a747669b722ff8a1185659015808960a8 Reviewed-by: Paul Lemire <paul.lemire@kdab.com> Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
| * | Doc: various link errors qt3dNico Vertriest2016-10-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | assimpio.cpp:72: warning: Can't link to 'GLTFPIO' qpicktriangleevent.cpp:66: warning: Can't link to 'QPickSettings' qpicktriangleevent.cpp:76: warning: Can't link to 'PickSettings' shadow-map-qml.qdoc:28: warning: Can't link to 'RendererSettings' shadow-map-qml.qdoc:28: warning: Can't link to 'Techniques' Change-Id: I039a4134d18e2b2472554215a69e971650b29b64 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
* | | Fix capitalization of includeStephan Binner2016-11-151-1/+1
| | | | | | | | | | | | | | | Change-Id: I68a5e66f04403991288937cf239bb4c5f4321367 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | | planets-qml: write proper HTTP responses in command serverJake Petroules2016-11-011-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | This allows to see in a web browser that a command succeeded, for example, rather than reporting that the server dropped the connection. Change-Id: Ib6d34f8261112dd8c76d13dece542a6da229de03 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io>
* | | Add Apple Watch app to control Planets QML demoOleg Yadrov2016-10-2828-0/+1873
| | | | | | | | | | | | | | | Change-Id: I937f8ff83565f48da5d35055add794c607bb52e4 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* | | Port Planets QML example to Apple TVOleg Yadrov2016-10-2810-77/+758
|/ / | | | | | | | | Change-Id: I254cbc1643fcb5b67af8338c0b7adc8c25829f9d Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* | Merge branch '5.7' into 5.8Sean Harmer2016-10-103-0/+10
|\| | | | | | | | | | | | | Conflicts: tests/auto/input/input.pro Change-Id: I591202f144aeec915e18611dfce358d4f15faff6
| * Fix orientation of textures on planes in audio vis exampleSean Harmer2016-10-102-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to 44f1a92338859f1cc043ec22e0142037b5f87936 we need to correct the orientation of the textures applied to the plane meshes in this example. There is a variety of ways to do this including: * Adapting the texture coordinates * Rotate plane other direction about x axis and swap face culling mode * Flip textures on disk This patch goes for the 3rd option. This can be reverted in 5.8 when we get new API to control whether texture images are flipped upon loading. None of these are ideal but is an intermediate step in getting to a fully consistent usage with 5.8. This follows the same approach as was used with the anaglph-rendering example skybox textures. Change-Id: I7fda41204625d7b30ac295ef789b6dea6018c2b8 Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Mika Salmela <mika.salmela@qt.io> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| * Basic shapes example is dark with default lightKevin Ottens2016-09-261-0/+10
| | | | | | | | | | Change-Id: Ia5a7dfb860317b3fa4b5a56ad6e9351ddb979b3b Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-09-201-2/+2
|\| | | | | | | | | | | | | | | | | | | Conflicts: src/render/framegraph/qrendersurfaceselector.cpp src/render/frontend/qrendersettings.cpp src/render/jobs/renderviewjobutils_p.h tests/auto/render/render.pro Change-Id: Ibe9eb962e3990e07f01a5608a2d60c79bc4c160f
| * Remove excess slashes from include statementsMiikka Heikkinen2016-09-051-2/+2
| | | | | | | | | | Change-Id: I64f815587947ad2f63462bb38027c533c7aa4bdc Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Compute Particles example: was using wrong work group sizePaul Lemire2016-08-261-1/+1
| | | | | | | | | | Change-Id: Idf3c40274ff60ff3c856c2e61a0d782a916e0e19 Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
* | QSkyboxEntity: remove camera translation propertyPaul Lemire2016-08-261-1/+0
|/ | | | | | | | | | | | | | If we convert a mat4 matrix to a mat3 matrix, then back to a mat4, this removes the translation component from it. Making the skybox shaders use that property allows to remove references to the camera translation in QSkyboxEntity. This makes using a skybox neater as we don't need to care about the Camera position anymore. This also allows to render the same skybox with different cameras which required to have duplicate QSkyboxEntity previously. Change-Id: I1adddd17d151e4d26d0f19b048df88dbf738042b Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
* Qt3DWindow rename defaultFramegraph to defaultFrameGraphPaul Lemire2016-08-111-1/+1
| | | | | | | | | | For coherency with other function names. This kind of API change is allowed since Qt3DWindow is in the Extras module which is still in tech preview for 5.7 Change-Id: Ic67f96cfb2dfcb3b2d724c97f2cf472bfaf40a07 Task-number: QTBUG-54841 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Temporarily invert the cubemap imagesSean Harmer2016-08-0512-0/+0
| | | | | | | | | | | As a result of 44f1a92338859f1cc043ec22e0142037b5f87936 the cubemap texture images get mirrored. As we cannot add the api to control this until Qt 5.8, for now we temporarily mirror the textures on disk. We should revert this in 5.8 once the mirrored property is in. Task-number: QTBUG-54881 Change-Id: I675f4dc1576e076c63f8c592cdbc51707afb4cb7 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Compute-Particles: use vec4 in the ParticlesData structurePaul Lemire2016-07-192-8/+9
| | | | | | | | | | Since vec3-vec4 padding is not always correctly implemented in all OpenGL GPU implementations, use vec4 in the struct declaration. Also slightly improve readibility of the buffer construction code. Change-Id: I9dfbeb2bcdc0a713e1e0a872f6a5e8cfe50c52a3 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Lights: Fix animation in example and add anotherSean Harmer2016-07-121-6/+15
| | | | | | | | | | | | | Looks like QML doesn't like animating only a single element of a 3d vector. It seems to default the non-animating elements to 0. Instead use a Vector3DAnimation. Also added another animation to the transformation to make the spotlight move back and forth in addition to sweeping it's local direction angle. Change-Id: Ief490752107b2b618dcf8500cb87561b3baea0bb Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Lights: Use PhongMaterial now default material is goneSean Harmer2016-07-121-3/+9
| | | | | Change-Id: I51d8068d9f910981db89fc26e4bd29b928faad56 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Add some more interesting lighting to the materials exampleSean Harmer2016-07-123-10/+155
| | | | | | | Useful for testing more of the lighting shader code paths. Change-Id: Iae1403bbe8562cfc8a0d22784069080a421153f5 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Adjust some parameters in the materials exampleSean Harmer2016-07-123-3/+4
| | | | | Change-Id: I88344e2eabeb4a9598338d50b4a1874aeed6d522 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Doc: Add documentation for the Simple C++ exampleLeena Miettinen2016-06-092-0/+49
| | | | | | | | Without this change Qt Creator tags this example "broken" and hides it from the Examples tab in the Welcome mode. Change-Id: I276ddb3ea50f05695a6afa7fa34de682bdc944c2 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Doc: Add documentation for the Simple QML exampleLeena Miettinen2016-06-092-0/+52
| | | | | | | | Without this change Qt Creator tags this example "broken" and hides it from the Examples tab in the Welcome mode. Change-Id: I4f0faa6b18c3f1ec2de673e3f6ced7e23b46c094 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Doc: Add a skeleton for Scene 3D example docsLeena Miettinen2016-06-082-0/+24
| | | | | | | | Without this fix, Qt Creator tags the example as "broken" and hides it in the Examples tag in the Welcome screen. Change-Id: Ifebc926b17a7161abb49c61a2369f8c485532156 Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-26 15:09:52 +0000