summaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Collapse)AuthorAgeFilesLines
...
* | Add a simple example showing all phong variantsKevin Ottens2017-09-226-1/+322
| | | | | | | | | | Change-Id: Idcbb8a42658c6525f852e2f226ce816d779ee9c7 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Fix planets-qml example for Qt 5.10Tomi Korpipaa2017-09-192-3/+8
| | | | | | | | | | | | Task-number: QTBUG-62321 Change-Id: I1df375c9a6a72049584eee118613bca72958e4f0 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Extend skinned mesh example to show a simple model tooSean Harmer2017-08-103-0/+541
| | | | | | | | | | Change-Id: Ife2a5c1906e9a66858fa1bf5b8a5bcff3cb61feb Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Add manual test for skinned mesh renderingSean Harmer2017-08-086-0/+2739
| | | | | | | | | | Change-Id: I904e3f41a44dd549334c884c2dc96ff6fb928a45 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Allow to disable aspects at configure timePaul Lemire2017-08-021-1/+4
| | | | | | | | | | | | | | | | | | This allows to remove dependencies and reduce deployment size when a given aspect is not required. Change-Id: I5aa90e4825b375cd446c47727aa11d03c40703c9 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Merge "Merge remote-tracking branch 'origin/5.9' into dev" into refs/staging/devSean Harmer2017-07-1121-0/+0
|\ \
| * | Merge remote-tracking branch 'origin/5.9' into devAndy Nichols2017-07-1121-0/+0
| |\| | | | | | | | | | Change-Id: I4ceccd338a937a2ada231f568ed02c7a87bd6e80
| | * Remove misguided execute permissions from image filesEdward Welbourne2017-06-1421-0/+0
| | | | | | | | | | | | | | | Change-Id: I9079849c54deffbb15449d042ec0440e795c305b Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | | Use Math.hypot() in preference to sqrt(a sum of squares)Edward Welbourne2017-07-071-1/+1
|/ / | | | | | | | | | | | | It's likely more accurate and may well be optimised, too. Change-Id: Iba38b80be16ca97a5f818e3dbc880a821cd9900a Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Be (somewhat more) consistent about the value of piEdward Welbourne2017-06-141-1/+1
| | | | | | | | | | | | | | | | | | Use qmath.h's value for M_PI in shaders, rather than a value less precise than even float holds. Task-number: QTBUG-58083 Change-Id: I3cf30a0900216b1d7d6dc54d4c5676592ba503a0 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Add support to move the camera so that the entire model is visibleMike Krus2017-05-232-2/+21
|/ | | | | | | | | | | | | | Adds QCamera::viewAll(), QCamera::viewEntity() and QCamera::viewSphere() to move and rotate the camera so that the view center is the center of the sphere and the sphere fits inside the viewport Only works in perspective projection. Introduces a job to compute the bounding sphere of the scene excluding the camera. Change-Id: Id9d67787ea91c354009d5358d5db63a1c9480c70 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Replace undistributable filesRobert Brock2017-05-1650-52/+90
| | | | | | | | | | | The texture files used were from a third party that didn't explicitly allow their distribution. All of them have been replaced by textures from NASA and another third party that do allow their distribution and editing. Task-number: QTBUG-57543 Change-Id: I69f1309424bba029cdce08689ea8670ed32d44ae Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Write docs for advanced custom material exampleMäättä Antti2017-05-102-0/+84
| | | | | | | | Also add it to highlighted items. Task-number: QTBUG-60287 Change-Id: I87a6074bed171970b287c6cd934e6550d86e27e0 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Scene2D example: highlight that QtQuick is a Texture on a MeshPaul Lemire2017-05-103-23/+40
| | | | | | Change-Id: Ibc78cc120ceed26c8521fa116e1794500b47c2dd Task-number: QTBUG-60695 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Call setSurfaceFormat after QQuiApplication instance initiationMäättä Antti2017-05-092-2/+2
| | | | | | | | | | The setSurfaceFormat function calls QOpenGLContext::openGLModuleType function which can only be called after QQuiApplication istance is initiated. Task-number: QTBUG-60617 Change-Id: I7cbf48f325de9c3cbbb5d8addb78bf55ae1b5d07 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* Add documentation for Scene2D exampleSean Harmer2017-05-093-1/+136
| | | | | Change-Id: I2d47b9224e4f26b342cd8a9bbe3c9c5a5e410dc1 Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* Add scene 2d example to showcase new featureSean Harmer2017-05-097-1/+4577
| | | | | Change-Id: Ife2ead8fc2f0e0cb6dea18f8a74593847e25ff98 Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* Add documentation for simplecustommaterial exampleMäättä Antti2017-05-053-0/+97
| | | | | | Task-number: QTBUG-60287 Change-Id: Id167ddd190b7aa5468bc6590c9f9f4fea234430b Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Update multiviewport example imageMäättä Antti2017-05-053-1/+1
| | | | | | | | Rendered content has changed so change the example image to reflect that. Task-number: QTBUG-60287 Change-Id: I5d06ed980ffddfec150b7e3914a79fb4c597cf73 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-06 00:09:27 +0000