summaryrefslogtreecommitdiffstats
path: root/examples/qt3d
Commit message (Collapse)AuthorAgeFilesLines
* Add missing import for Qt3DExtras.Volker Krause2016-05-011-0/+1
| | | | | Change-Id: I1ca89f0301df541a6ddcba52b12fbd842808cb18 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Handle case where rendersurfaceselector is root of the FGSean Harmer2016-04-281-2/+3
| | | | | Change-Id: I2ce7f177cb7a22a4af6013a325f493e51ddadb0d Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Fix wave exampleSean Harmer2016-04-281-0/+1
| | | | | Change-Id: I1ef71623b5865979885f4cc3413774476c1cc3ae Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Repair this exampleKevin Ottens2016-04-282-0/+2
| | | | | Change-Id: I8ecf1091d8e3d84a92589a61b8acbccabbb72e64 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QAbstractLight now inherits directly QComponentKevin Ottens2016-04-282-6/+7
| | | | | | | | | | | | | We are turning the relationship between QAbstractLight and QShaderData from a "is-a" to a "has-a". For that we relay all the properties of the light to its internal shader data dynamic properties. Interestingly it also removes a couple of special handling for lights which aren't needed anymore. Change-Id: Ia937b8934f94ce318e02901d90ac340e172cbc75 Task-number: QTBUG-51489 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Activate input handlingKevin Ottens2016-04-281-6/+10
| | | | | Change-Id: I5d195a0a1b988dbd9a87340645ada814bc3872fd Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Fix attenuation use in SpotLightKevin Ottens2016-04-281-1/+1
| | | | | Change-Id: Iac7b2389556edd9ccecb309ff6fb1f6cdce5a66b Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Fix static buildsMike Krus2016-04-272-5/+5
| | | | | | | Make sure right dependencies are built and resources are loaded Change-Id: Ia3693c2d0df8849c544a9b6d346168cd4569a26c Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Moves QSortCriterion flag to QSortPolicy and remove itFranck Arrecot2016-04-262-6/+4
| | | | | | Change-Id: I44f71671ead23256d5fdc621545492885ff940a5 Task-id: QTBUG-51486 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* QNode: make cleanup a private slotPaul Lemire2016-04-234-12/+0
| | | | | | | | | | QT3D_CLONEABLE now implements a default dtor that calls _q_ cleanup QT3D_CLONEABLE_CUSTOM_DTOR is used for classes that really need to implement their own dtor but they need to invoke _q_cleanup manually Change-Id: I2937a3b9edeb5a763749f0044360d78ab4461a5e Task-number: QTBUG-51464 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Move defaults and geometries out of Qt3DRender and into Qt3DExtrasPaul Lemire2016-04-2386-111/+163
| | | | | | | QBoundingVolumeDebug has been disabled for now. Will be re-enabled later on. Change-Id: Id6b0abab2ec2aa697330bd20d782f9d104d25d50 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Add new example to demonstrate dynamic component addition/removalSean Harmer2016-04-204-1/+204
| | | | | Change-Id: I9fbf2fbf14c205f834656bc2f16a525af4fdca20 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* QVectorize PointLightBlockRobert Brock2016-04-202-4/+4
| | | | | | | Replaced QList with QVector Change-Id: Iea1d5b1d755f79d9f26a3e0c8c0d3d46b0a5dd32 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Cleanup assimp example a littleSean Harmer2016-04-191-9/+7
| | | | | Change-Id: Ic20adb9969fcde8e303bbb47d1483302545535b2 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Simplify dynamicscene-cpp a littleSean Harmer2016-04-171-12/+5
| | | | | Change-Id: I26b1ac52402d58911dc6a502dbdee9ab05bce65e Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Merge branch '5.6' into 5.7Sean Harmer2016-04-1610-3/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/qt3d/examples-common/qorbitcontrol.h src/core/qnodecreatedchange.cpp src/core/qnodecreatedchange.h src/input/frontend/qaxisactionhandler.h src/input/frontend/qinputaspect.h src/input/frontend/qkeyboardhandler.h src/input/frontend/qmousedevice.h src/input/frontend/qmousehandler.h src/input/frontend/qphysicaldevicecreatedchange.h src/input/input.pro src/logic/qframeaction.h src/plugins/sceneparsers/assimp/assimp.pro src/quick3d/imports/input/importsinput.pro src/quick3d/imports/render/importsrender.pro src/render/backend/trianglesextractor.cpp src/render/framegraph/qclearbuffer.h src/render/framegraph/qlighting.h src/render/framegraph/qstateset.h src/render/frontend/qrenderattachment.h src/render/geometry/qabstractattribute.h src/render/geometry/qabstractbuffer.h src/render/geometry/qattribute.h src/render/geometry/qboundingvolumespecifier.h src/render/geometry/qbuffer.h src/render/materialsystem/qfilterkey.h src/render/materialsystem/qparameter.h src/render/materialsystem/qparametermapping.h src/render/renderstates/qblendstate.h src/render/renderstates/qdepthmask.h src/render/renderstates/qpointsize.cpp src/render/renderstates/qrenderstatecreatedchange.cpp src/render/renderstates/qstencilop.h src/render/renderstates/qstencilopseparate.h src/render/renderstates/qstenciltestseparate.h src/render/texture/qabstracttexture.h src/render/texture/qabstracttextureimage.h src/render/texture/qtextureproviders.h Change-Id: I894d7781042cabdaa0cac690c198b57a41127bd4
| * Fix macro that broke the build.Rafael Roquetto2016-03-301-2/+1
| | | | | | | | | | | | | | | | And remove Q_OS_BLACKBERRY, it no longer exists. Change-Id: Iad6d2faa5d9a3c13850d5699cc43caf197781473 Reviewed-by: Volker Krause <volker.krause@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| * Purge sRGB chunks from PNGs in examples.Edward Welbourne2016-03-228-0/+0
| | | | | | | | | | | | | | | | Subjects each *.png file that matched grep -law "sRGB" to: pngcrush -ow -brute -rem allb -reduce Change-Id: I78ae38f83ec7e5ad8da41de4eefc12d1df6ebfc0 Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
* | Remove dead code.v5.7.0-beta1Volker Krause2016-04-122-40/+0
| | | | | | | | | | | | | | | | Also, this was poorly duplicating code from the other ctor and would have crashed due to an uninitialized m_forwardRenderer. Change-Id: I5f4a04868362d07fe726931add986e1e2a415271 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Restore wave example to its former glorySean Harmer2016-04-112-0/+5
| | | | | | | | | | Change-Id: Ic12092391e5b5088ee182c8a5d58220eab1c24d0 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Fix syntax error in wave exampleSean Harmer2016-04-111-1/+1
| | | | | | | | | | | | | | | | Wave itself now shows but gradient background is missing Change-Id: I97c828a05eb1c76ecdf010762f1ca80995012835 Reviewed-by: Volker Krause <volker.krause@kdab.com> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Make the camera part of the scene hierarchySean Harmer2016-04-101-0/+2
| | | | | | | | | | Change-Id: Id5d796a988ce538f126d3c39461dd03d0ee94d60 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | QAbstractTextureProvider renamed to QAbstractTexturePaul Lemire2016-04-063-19/+19
| | | | | | | | | | | | Change-Id: If8ea2c9806e28f6d97eb3fb852686647c0c04d8f Task-number: QTBUG-51504 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Make examples work on ES2 builds on systems supporting desktop GL as well.Volker Krause2016-04-042-0/+8
| | | | | | | | | | | | | | | | | | In such a scenario we were creating desktop surfaces, which GraphicsContext is missing the code to handle in ES2 builds. It thus left parts of its internals uninitialized, and subsequently crashed. Change-Id: I359597d48287f0ac75acb8d875d55197da7fb8a2 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Fix OrbitController, KeyboardController does not exist.Volker Krause2016-03-291-1/+1
| | | | | | | | | | Change-Id: Ic698b708a2a17a4109eb78f1ae03c64233ae5975 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Follow QSpotlight API changes.Volker Krause2016-03-291-2/+2
| | | | | | | | | | Change-Id: I1b52c7c2f437a63738ae506e429e649e57768531 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Follow QRenderSurfaceSelector API changes.Volker Krause2016-03-293-3/+3
| | | | | | | | | | Change-Id: I3369147a6b3ce33f75c5fa88bff9d74bafce83b6 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | OrbitController Qml and Cpp for Qt3D CameraRobert Brock2016-03-248-5/+783
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding an Orbit control that will allow a user to orbit / pan in a 3D QML scene. --- QML - LMB translate - RMB orbit - RMB + LMB dolly - Arrow keys translate - Shift + Up/Down keys dolly - Alt + Arrow keys orbit --- CPP - LMB translate - RMB orbit - RMB + LMB dolly - Arrow keys translate - Shift + Up/Down keys dolly - Alt + Arrow keys orbit Both examples have their speed inputs clamped to -1 and 1 Zoom in can now be limited Change-Id: If24c45c7350767a1682dccfd2e4d49d95433fd5d Task-number: QTBUG-50660 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Class QRenderPassFilter renamingRobert Brock2016-03-236-14/+13
| | | | | | | | | | | | | | | | | | | | includes -> matchAny addInclude -> addMatch removeInclude -> removeMatch Change-Id: Ib9288ab79b3e76ae8a8aa2f7e3f20c5386438a25 Task-number: QTBUG-51456 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Remove QViewport::clearColorMike Krus2016-03-227-8/+10
| | | | | | | | | | | | Task-number: QTBUG-51460 Change-Id: I616f4506dffd649efb931824fab82efcdefaeee3 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | QDepthMask transformed into QNoDepthMaskPaul Lemire2016-03-214-7/+6
| | | | | | | | | | | | | | | | | | By default the absence of a QNoDepthMask node in a RenderStateSet implies depth mask is enabled. Its presence, disables it. Change-Id: Iaa22b6cee12ee76e64d66a00e97f8aadfa82398b Task-number: QTBUG-51433 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Rename QClearBuffer to QClearBuffersMike Krus2016-03-2016-44/+44
| | | | | | | | | | | | Task-number: QTBUG-51460 Change-Id: I3f522f5eaea7bf0f94dbcdc1e7463f2827c0fe3b Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | QRenderSurfaceSelector cleanupPaul Lemire2016-03-203-3/+3
| | | | | | | | | | | | Change-Id: Ic38c88d5e940f04667278015dc4f6c45f162e936 Task-number: QTBUG-51508 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Follow Annotation API changes.Volker Krause2016-03-205-5/+5
| | | | | | | | | | Change-Id: I9bb7fbe438d942d2cb776ab8cd3d8301a5862524 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | QStencilOpSeparate renamed to QStencilOperationArgumentsRobert Brock2016-03-181-2/+2
| | | | | | | | | | | | | | | | As per API review Change-Id: If0f4f5719508a41d786810c36051446b2c7a08db Task-number: QTBUG-51436 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | QAnnotation changesFranck Arrecot2016-03-1735-108/+108
| | | | | | | | | | | | Task-number: QTBUG-51454 Change-Id: Iee08f6b1be39894c40926afb20e003d46bc735f4 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Class QKeyboardController rename to QKeyboardDeviceFranck Arrecot2016-03-167-21/+21
| | | | | | | | | | | | Task-number: QTBUG-51441 Change-Id: I030d7d60be0c4d543f773090eb866e8f8729512c Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Make QBoundingVolumeDebug privateMike Krus2016-03-131-1/+1
| | | | | | | | | | | | | | | | QML type exported though, need to decide where/how to hide it Change-Id: I2d341456c3e09101da895ccd4a925f85a01089b0 Task-number: QTBUG-51449 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | QGeometryRenderer API changesMike Krus2016-03-133-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | - primitiveCount -> vertexCount - baseInstance -> firstInstance - restartIndex -> restartIndexValue - primitiveRestart -> primitiveRestartEnabled - baseVertex -> indexOffset Task-number: QTBUG-51515 Change-Id: I95e1e04e08b6441fcf8721db382f8f0c457f6faa Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Sync with scene3d/AnimatedEntity.qml.Volker Krause2016-03-121-16/+9
| | | | | | | | | | | | | | This makes at least the first scene in the example show up again. Change-Id: Ife23dc180cabd223ad824aa377f6631d58651890 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Fix a few QML errors in the examples.Volker Krause2016-03-122-4/+4
| | | | | | | | | | Change-Id: Ib148058a0e4779e45a5a81460cff722eb7a0483d Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Follow BlendEquation API changes.Volker Krause2016-03-122-2/+2
| | | | | | | | | | Change-Id: I7fa5b472a00c636581914b79dfb861e645af9f96 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Follow vertex shader rename from change 5e94c15ddc897.Volker Krause2016-03-121-2/+2
| | | | | | | | | | | | | | This shows the clip planes in the example again. Change-Id: I144e4b83595cd33f6b2d87dc31d892b6c8bf19da Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Follow ClipPlane API changes.Volker Krause2016-03-121-3/+3
| | | | | | | | | | Change-Id: I18ff0db3d1c664a737fd79fab83bde16c99265d2 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Follow KeyboardHandler API changes.Volker Krause2016-03-122-2/+2
| | | | | | | | | | | | Change-Id: I35b556a6180d975647069e1c7aff6d2273a099d5 Reviewed-by: Mike Krus <mike.krus@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Fix accidentally renamed RenderTarget.attachments properties.Volker Krause2016-03-123-3/+3
| | | | | | | | | | Change-Id: I69ea9e2fd357c663dd18ead74b6d3d99a50ed92f Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Fix accidentally renamed Technique.annotations properties.Volker Krause2016-03-126-7/+7
| | | | | | | | | | Change-Id: Ia1fbc14bc22555875ca9f8d2ab8ea781c614a447 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | QStencilOpSeparate property renamingRobert Brock2016-03-111-2/+2
| | | | | | | | | | | | | | | | | | | | stencilFail -> stencilTestFailureOperation depthFail -> depthTestFailureOperation stencilDepthPass -> allTestsPassOperation Change-Id: I30fc64fec81c873cacfdb3edeef834674140d9ce Task-number: QTBUG-51438 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Class QLogicComponent changesFranck Arrecot2016-03-116-17/+17
| | | | | | | | | | | | Task-number: QTBUG-51448 Change-Id: I1359cbfe61dbef291859d15b16bda61639493432 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | QMouseController changes and renameFranck Arrecot2016-03-115-22/+23
| | | | | | | | | | | | Task-number: QTBUG-51450 Change-Id: I7f2dbe9cf4afbd41450f42fbb6da10baa2ca7116 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-10 14:23:11 +0000