summaryrefslogtreecommitdiffstats
path: root/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Qtquick3drenderplugin: includemocsMike Krus2022-06-231-0/+2
| | | | | | | Task-number: QTBUG-103286 Pick-to: 6.3 6.2 5.15 Change-Id: Ie916f27ced030efec052121084e8e9d87105f015 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Use SPDX license identifiersLucie Gérard2022-06-221-39/+3
| | | | | | | | | | | Replace the current license disclaimer in files by a SPDX-License-Identifier. License files are organized under LICENSES directory. Pick-to: 6.4 Task-number: QTBUG-67283 Change-Id: I8105424281eed871037fa6c463871ca8829876b5 Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* Make DebugOverlay accessible from QMLMichael Brasser2020-10-021-0/+2
| | | | | | | | Register and document QDebugOverlay. Change-Id: I357918ce3448c451d796f88656ec287bf03ffcfd Reviewed-by: Mike Krus <mike.krus@kdab.com> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* QRenderTargetSelector: remove outputs/drawBuffers propertyPaul Lemire2020-08-131-2/+1
| | | | | | | | | | This cannot be handled with RHI and in practice nobody ever used that feature. [ChangeLog] QRenderTargetSelector remove outputs/drawBuffers property Change-Id: I6b02718733e5c05cee9074b0078ba2a544de95d6 Reviewed-by: Mike Krus <mike.krus@kdab.com>
* Use QList instead of QVector in implementation and docsJarek Kobus2020-07-091-1/+1
| | | | | | | | | Fix some const correctness. Use list-initialization. Task-number: QTBUG-84469 Change-Id: I9c56742581f48f89a3b02e4121fae414117c7a25 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Don't register Window typeMike Krus2020-06-161-2/+0
| | | | | | | Import QtQuick.Window instead. Change-Id: Ica99e295125b09f9489a80ed9c743dde9e97471a Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Introduce QPickingProxyMike Krus2020-04-231-0/+2
| | | | | | | Lets user provide a separate mesh for picking. Change-Id: I30a61920e1673d8bc3473ca85046b236bad0a2af Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Add ability to override bounding data and trigger calculationMike Krus2020-04-231-0/+1
| | | | | | | | | | With this, can set min and max extents of a geometry renderer which will avoid calculating it from the real geometry. Can also trigger the computation from user code (via public API) if user doesn't want to wait for next frame to get the data. Change-Id: I821bfb7c9d710a77a2b87ec607b4ed35a0c7f236 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Geometry refactoringMike Krus2020-02-271-12/+0
| | | | | | | Move QBuffer, QAttribute, QGeometry to Qt3DCore. Change-Id: I59dfd091eefadcada93350b3aba955f40b304385 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Merge remote-tracking branch 5.15 into devMike Krus2020-02-071-0/+4
|\ | | | | | | Change-Id: I731aa986e1cc45b3af920db1a23f256927beecf7
| * QShaderProgram: add a format propertyPaul Lemire2020-02-031-0/+1
| | | | | | | | | | | | | | | | | | Can be either GLSL (default) or SPIRV at the moment. This variable will be used by the rendering backend to know what type of shader code was provided (e.g with Vulkan, the GLSL could be internally converted to SPIRV) Change-Id: I1f9b734a675c581ef0721edc4464e466a18afbb0 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| * Add QRenderCapabilities to query GL about what is supportedMike Krus2020-01-201-0/+3
| | | | | | | | | | Change-Id: I7981e7e4b514e5d15d66c82351f1ab2fe160d20d Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Merge remote-tracking branch 'origin/wip/qt6' into devSimon Hausmann2019-10-041-2/+3
|\ \ | |/ |/| | | | | | | | | Conflicts: .qmake.conf Change-Id: I374bd16216ab6aa9406125c8a0c084eb9cfedb61
| * Fix Qt6 buildAlexandru Croitor2019-08-011-2/+3
| | | | | | | | | | | | | | | | | | | | | | Also modify all the qmlRegisterModule calls to use minor version 15 because minor version zero from 6.0.0 would make tests fail. This is similar to what was done in qtdeclarative in c147b20a2c1299b2d659fe7c9472ae3866b6a425. Change-Id: Ia01ebdcf84d2e3fdaefe5dcc144530cbd8f468f5 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | QDepthRange: fix doc/qml registration for 5.14Paul Lemire2019-09-191-1/+1
| | | | | | | | | | | | Task-number: QTBUG-77859 Change-Id: I413f2cc14da88596ae28996daa3d92124deb061e Reviewed-by: Mike Krus <mike.krus@kdab.com>
* | QPickEvent: add revisions and fix qml registrationPaul Lemire2019-09-191-0/+1
| | | | | | | | | | | | Task-number: QTBUG-77859 Change-Id: Ie6fb8ff528b0a8a095b4a49521c94e50de935833 Reviewed-by: Mike Krus <mike.krus@kdab.com>
* | QCamera: make lens and transform accessible to QMLPaul Lemire2019-08-291-0/+1
| | | | | | | | | | | | Change-Id: I0d5157586b2410fd23def457ade5b3894757965d Task-number: QTBUG-76703 Reviewed-by: Mike Krus <mike.krus@kdab.com>
* | Add SubtreeEnabler frame graph nodeMichael Brasser2019-08-141-0/+2
|/ | | | | | | | | | | SubtreeEnabler allows easy enabling and disabling of frame graph subtrees. [ChangeLog] Added SubtreeEnabler to allow easing enabling and disabling of frame graph subtrees. Change-Id: Ibd4dd305c41b2985225311a0cc49675e60a3727f Reviewed-by: Mike Krus <mike.krus@kdab.com>
* Register QShaderImage type with QMLPaul Lemire2019-06-051-0/+2
| | | | | | Change-Id: I8811308b9b6aced0561d507ad69379135ccb3176 Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Michael Brasser <michael.brasser@live.com>
* Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-03-091-1/+1
|\ | | | | | | Change-Id: I8daaee9c3a2667893be118613979bc7e07e26147
| * QML: Fix registration of ShaderProgramBuilderKai Koehne2019-03-071-1/+1
| | | | | | | | | | | | | | | | The registration was missing the revision number. This augments d403604d74780b. Change-Id: I730819a5a0135f490edde8667d23cd9c28f12afd Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Add QNoPicking FrameGraph nodePaul Lemire2019-02-281-0/+2
| | | | | | | | | | | | | | | | | | | | Allows to disable execution of picking computations for a specific FrameGraph branch. [ChangeLog][Qt3DRender] QNoPicking: control picking execution in the FrameGraph Change-Id: I5e82eeee9d04d48cfc39a6126d30d36eab61ea77 Reviewed-by: Mike Krus <mike.krus@kdab.com>
* | Add QRasterMode render stateJuan Jose Casafranca2019-02-121-0/+2
| | | | | | | | | | | | | | QRasterMode allows a user to change the raster mode from fill to lines or points Change-Id: If96848e38ac4b5a615040b3bae2dec38a03cb031 Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
* | Add support for glDepthRangeJim Albamont2019-02-111-0/+2
|/ | | | | | | | Added a new QRenderState to provide access to glDepthRange. Task-number: QTBUG-73059 Change-Id: I434b73e6e499307bfa58b2a1001e4c48328e9d5b Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-alpha1Qt Forward Merge Bot2019-02-021-0/+2
|\ | | | | | | Change-Id: I9b3faae3e87e1c68ae34bac278f08087dc6ac1a9
| * Add revisioned QML registrations for QAttributeMichael Brasser2019-01-311-0/+2
| | | | | | | | | | | | | | Without this the revisioned properties are unavailable from QML. Change-Id: I0075a08b7bd0c0c62cea680fa4eb529a844d3466 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Register revision 13 of QObjectPicker to QMLPaul Lemire2018-12-211-0/+1
| | | | | | | | | | | | | | Otherwise the priority property is not accessible Change-Id: Ia7a373ff7137b48cc859bdb6aec9639f21f4c556 Reviewed-by: Mike Krus <mike.krus@kdab.com>
* | QShaderProgramBuilder: add properties to access generated shader codePaul Lemire2018-12-141-0/+1
| | | | | | | | | | | | Change-Id: Ib4d448198b2f53850ff0c9b1f2ff4d2d905eea26 Reviewed-by: Mike Krus <mike.krus@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | QComputeCommand allow to control the run behaviorPaul Lemire2018-11-141-0/+1
| | | | | | | | | | | | | | | | | | It can either be Continuous, like it was until now or Manual. When in manual mode, the compute shader will only be executed by calling trigger() Change-Id: Icaae24f4691ccd821297f967d564e7a883fa60b5 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Register QWaitFence/QSetFence with QML modulePaul Lemire2018-10-111-0/+4
| | | | | | | | | | Change-Id: I14477a3ceb21fdcf2e1ba175fa828d4df4e81b6d Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | QAbstractTexture:: add handle and handleType propertiesPaul Lemire2018-10-101-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Will allow to retrieve the OpenGL texture id for textures created by Qt3D. Also completed tests along the way. [ChangeLog][Qt3DRender] QAbstractTexture: Expose raw texture handle and handleType to share with 3rdparty engines. Change-Id: I27d390c223303d9d11a418c2957aaae6ae1df850 Task-number: QTBUG-70055 Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
* | Register QSharedGLTexture to qmlPaul Lemire2018-10-081-0/+1
|/ | | | | | Change-Id: I332e90ed23a5ba0ef5980445ba84808562af530a Task-number: QTBUG-69918 Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
* Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-09-221-7/+7
|\ | | | | | | Change-Id: I1a1c178055502b1cd37ad1be30dcb2f5409ed7a8
| * Replace use of qmlRegisterRevisionKai Koehne2018-09-201-7/+7
| | | | | | | | | | | | | | | | | | | | | | qmlRegisterRevision was incorrectly used to actually expose the revision to QML; anyhow, it is only meant to registering revisions of a base class that the type depends upon. Also remove one duplicated registration. Change-Id: I0c743fc951954870f13a7e0e099fc16a4b7efa4f Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Automatically register the latest import versionKai Koehne2018-09-061-0/+3
|/ | | | | | | | | | | | | | | This follows what was done in d28c9f6a for Qt Quick Controls 2. The latest import version (e.g. 2.11 in Qt 5.11) will automatically be registered whenever the Qt version is bumped. This avoids needing to wait until a new type is added (or a new revision is added to an existing type) before being able to use the newest Qt Quick version. Task-number: QTBUG-70290 Change-Id: Id221b5879f8c50a20fe5e26f9e141b82e4a196cb Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QtQuick API for ray castingMike Krus2018-02-011-1/+5
| | | | | | | | Overrides hits property with QJSValue that can be interpreted from Javascript Change-Id: I8795b1fc9fdf4f36357c4bb5c8c5d0b7c5fd6c75 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* BlitFramebuffer framegraph nodeJuan José Casafranca2017-08-231-0/+2
| | | | | | | | This node allows to copy the content from one FBO to another or to screen Task-number: QTBUG-58162 Change-Id: I6016c46d9d538a012c2f641116ed766dd70ad021 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Add QProximityFilter FrameGraphNodePaul Lemire2017-08-181-0/+2
| | | | | | | Allows to filter entities based on their distance to another entity Change-Id: Id2486edc5ec49722308c4b94a87e61241e5bd932 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Introduce QShaderProgramBuilderKevin Ottens2017-07-051-0/+2
| | | | | | | | This is the frontend class for building ShaderProgram content from graph files. Change-Id: Iae43d745473737537052a533653beee72506ea49 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Add LineWidth render stateMauro Persano2017-06-081-0/+2
| | | | | | Task-number: QTBUG-58526 Change-Id: I131d77973e5f8176eb6868c795398446b22b77c1 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Merge branch '5.8' into 5.9Sean Harmer2017-04-021-68/+70
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/core/jobs/qthreadpooler.cpp src/core/nodes/qcomponent.cpp src/core/qpostman.cpp src/core/qscene_p.h src/core/services/qservicelocator_p.h src/input/frontend/qinputaspect.cpp src/plugins/sceneparsers/assimp/assimpimporter.cpp src/plugins/sceneparsers/assimp/assimpimporter.h src/plugins/sceneparsers/gltf/gltfimporter.h src/plugins/sceneparsers/gltf/gltfio.cpp src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp src/quick3d/imports/render/qt3dquick3drenderplugin.cpp src/quick3d/quick3dextras/qt3dquickwindow.cpp Change-Id: I3566708c6f74a34959e7bb64b64e93647ca3f699
| * Coding convention fix for Src/importscore, importsextras,5.8Robert Brock2017-04-011-63/+65
| | | | | | | | | | | | | | | | | | importsinput, importsrender, importsscene3d Reordering the header includes to comply with Qt coding conventions Task-number: QTBUG-56185 Change-Id: I3b2b3ee60e397772bbcebac09b07c059fbd922db Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Cleanup scene2d - remove event forwardAntti Määttä2017-03-151-2/+0
| | | | | | | | | | | | | | | | | | Remove event forward related stuff as they are no longer necessary after the mouse event changes. Task-number: QTBUG-58876 Change-Id: I2c9c52e41d5af3078d04ac9d5cc66753898e0ad9 Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
* | Move scene2d to own module and implement conditional plugin loadingAntti Määttä2017-02-281-4/+0
| | | | | | | | | | | | | | | | | | | | - Add quick3dscene2d module - Add importsscene2d qml module - Modify RenderAspect to load plugins conditionally - change autotests to match the module change Change-Id: If6596472acbd9a377561b2bfd2094a0585c781ac Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* | Expose QEnvironmentLight to QMLKevin Ottens2017-02-241-0/+2
| | | | | | | | | | Change-Id: I7925df5d4bec59c353e4a07bbbc57f5e0c4ff5ff Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | QBoundingSphere cleanupPaul Lemire2017-02-241-2/+2
| | | | | | | | | | | | | | | | | | | | Is now a Q_GADGET value type Added QBoundingSphere creator functions on QLevelOfDetails and Quick3DLevelOfDetailsLoader Note: cannot be a nested type on QLevelOfDetails as moc doesn't support it Task-number: QTBUG-58892 Change-Id: Ic7b6d68c6e1119c1f61a858f49379efc1e9c2104 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Clean up QRenderCapture(Reply) APIKevin Ottens2017-02-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't need the captureId in the public API so deprecate the functions which make it appear and create overloads with no such id when appropriate. Only a pointer to a QRenderCaptureReply is needed to represent a capture request. Also the "isCompleted" parameter is unneeded on the signal since it is always true anyway. If we'd want to do error management it would go via a status flag property or similar. Change-Id: I9571ece3e3f82f46db5b3993ccf035e770c9d55e Task-Id: QTBUG-58877 Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Start using REVISION on our propertiesKevin Ottens2017-02-231-0/+7
| | | | | | | | | | | | | | | | | | Adding REVISION 9 on all the new properties from this release. Also registering the extra revisions on the QML side. Change-Id: Ic7eda36bee8ca19508cd73b61cea534f956c6997 Task-Id: QTBUG-58895 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Fix QML version registration for 5.9 typesKevin Ottens2017-02-231-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | Put a couple of the types which ended up wrongly at 2.0 with the other ones. Also applies the decision to go from 2.1 straight to 2.9 to realign the minor version with the Qt one. Will make it easier to manage. Change-Id: I7088b6c493296924a1d313c83107d5755e548ede Task-Id: QTBUG-58890 Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Transfers gpu buffer data to cpuJuan José Casafranca2017-01-311-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added some code to retrieve the data in the gpu back to a cpu pointer in the opengl helpers. Added a framegraph node which specifies if any data must be downloaded from the gpu Added a flag in the buffer object to specify if the data from that buffer must be downloaded. Added a job to send the data back to the frontend. Added a path in the renderer to download the gpu data. Task number: QTBUG-57727 Change-Id: I315a9221e5116c7d07f818e00c654fe1901144f4 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-18 08:03:31 +0000