summaryrefslogtreecommitdiffstats
path: root/src/extras/defaults
Commit message (Collapse)AuthorAgeFilesLines
* Reset input axis changes when enabling camera controllerMike Krus2019-09-301-0/+4
| | | | | | | | | | | When input axis are enabled or disable, we now reset the value to 0. And enabling or disabling the camera controller, we now do the same for the axis. This prevents residual movement when re-enabling the controller due to the asynchronous updates. Task-number: QTBUG-77996 Change-Id: I5ac016d5b708e1f8d8eaa996bbd28c00c0f05e79 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Disable frame action when camera controller is disabledMike Krus2019-09-041-1/+2
| | | | | | | | | | | | | If a camera controller gets disabled while a movement is in progress, it may start moving indefinitely without any mouse events, or not respond to mouse events to stop the movement. Disabling the frame action will prevent this. Task-number: QTBUG-77996 Change-Id: I0120436a8ff9ff8b4306c41053aa494ac2ec3f42 Reviewed-by: Akihito Izawa <akihito.izawa@qt.io> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-08-315-10/+10
|\ | | | | | | Change-Id: Iae9a2903afd5da09cfd9288ff6cf74d7f069c83b
| * Minor fixes for QSprite* classesMichael Brasser2019-08-303-6/+6
| | | | | | | | | | | | | | | | * Fix off-by-one errors * Allow non-integer cell sizes Change-Id: I081cb5050a6805cbc9183fb2a7a1ee07b5594187 Reviewed-by: Mike Krus <mike.krus@kdab.com>
| * Update MetalRoughMaterial documentionMichael Brasser2019-08-291-3/+3
| | | | | | | | | | | | | | | | These properties are not strongly typed. Change-Id: I02c8b793cc7b7f9e88a8b8598ea27efa93fa0468 Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| * Add missing * for SkyboxEntity QML type documentationMats Honkamaa2019-08-261-1/+1
| | | | | | | | | | | | Task-number: QTBUG-77789 Change-Id: I3dcee435562c86ea9db98ee7c50a42d06bd576f9 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-07-301-0/+45
|\| | | | | | | Change-Id: Id2885cdbb45f8aa701e218b6201f0a3732b7ef11
| * Add QML documentation to QSkyboxEntityPaul Lemire2019-07-241-0/+45
| | | | | | | | | | | | Change-Id: Id82777c111827e8db8924d2d39b5844386344b69 Task-number: QTBUG-76767 Reviewed-by: Mike Krus <mike.krus@kdab.com>
* | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-07-166-0/+31
|\| | | | | | | Change-Id: I0f68ab1277617c32b1c31f29d8793d23d9909208
| * Document an example of how textureScale might be usedMichael Brasser2019-07-156-0/+31
| | | | | | | | | | Change-Id: Iead857526a06b104080ab843b26c49efc22f05cc Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-06-271-1/+8
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Iae5fa92dfdf8012315c043e20950368e42451e20
| * Doc: Extend Qt3D documentationPaul Wicking2019-06-071-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change adds missing C++ and/or QML documentation for: * enum QBuffer::AccessType * QBuffer::accessType() * QBuffer::dataAvailable() * ForwardRenderer::externalRenderTargetSize * enumeration Qt3D.Render.Light::type * Qt3D.Render.Light::color * Qt3D.Render.Light::intensity Fixes: QTBUG-73071 Change-Id: I48b13cb8001558b20bd801b6f96f5b5933144d82 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-05-261-1/+50
|\| | | | | | | Change-Id: I4a35126d98e04ed228e5b3a4ed9157995bef3a0a
| * Doc: Add MetalRoughMaterial QML documentationPaul Wicking2019-05-161-1/+50
| | | | | | | | | | | | Fixes: QTBUG-73072 Change-Id: Ifea7152c77c4f6f1759e4872001336bae6d3d2c3 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* | Switch export macros to standard formKai Koehne2019-04-0224-24/+24
|/ | | | | | | | | | | | Qt expects the export macros to have Q_ prefixes, otherwise the symbol versioning script won't find them and mark them. Also remove non-exising QT3DLOGIC_PRIVATE_EXPORT macro from src/doc/qt3d.qdocconf Task-number: QTBUG-74752 Change-Id: I71b9e85ff09c002fb283824aa51a5a8f50e937f4 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Doc: clarify some propertiesJoni Poikelin2019-02-143-17/+36
| | | | | | | Change-Id: Ie0e9183ec4fe1730018f695374d32cb78d0e77ed Reviewed-by: Andy Maloney <asmaloney@gmail.com> Reviewed-by: Michael Brasser <michael.brasser@live.com> Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* Document that QMetalRoughMaterial has an ES 3 techniqueMichael Brasser2019-01-281-1/+1
| | | | | Change-Id: Ia8467962fae689498a1f48c8784cf58d22c6a7a7 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* Fix env-map less renderingMike Krus2019-01-092-28/+0
| | | | | | | | | Assign texture units to env map samplers even if they are not used. Remove previous work around from pbr material. Change-Id: I5060bfb61c4658339d2b74df71574c39cddfeb18 Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Enable ES3 rendering of MetalRoughMaterialMichael Brasser2018-12-052-1/+32
| | | | | | Change-Id: I1cc6700c9d16db1ad3e17f63a89d65c02bd8a202 Task-number: QTBUG-64390 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Doc: Fix various documentation warningsTopi Reinio2018-11-071-0/+2
| | | | | Change-Id: I3eecd06bba9438b5aa472f3ba7ecaecdeda985e2 Reviewed-by: Martin Smith <martin.smith@qt.io>
* Qt3DWindow: Redraw scene on expose events when using OnDemand renderingChristian Andersen2018-11-062-0/+16
| | | | | | | | | | | | This adds an InvalidateFrame QNodeCommand in QRenderSettings that is sent to the RenderSettings backend node. The command will mark the current frame as dirty. This ensures that whenever an expose event is received, a redraw happens some time in the future. Task-number: QTBUG-70885 Fixes: QTBUG-59785 Change-Id: I9fd2e19dbc282300479131d95ff8320269f95f24 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Fix QMorphPhongMaterialMäättä Antti2018-10-012-6/+23
| | | | | | | | Replace the removed phong.frag with graph-based fragment shader. Task-number: QTBUG-69751 Change-Id: I196be25aff656d6934d6179e4f082430b109b2a1 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* QOrbitCameraController: make zoom work when pressing shift keyPaul Lemire2018-09-261-1/+1
| | | | | | | Was mistakenly using yAxis instead of zAxis input value. Change-Id: Id91d04565c503ae5f286f6b433e246a1b94d6e12 Reviewed-by: Mike Krus <mike.krus@kdab.com>
* Qt3DWindow/Qt3DQuickWindow base custom surface format on default onePaul Lemire2018-08-291-1/+1
| | | | | Change-Id: I52620326d7ee79be86419e55b186470689b02950 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Doc: Fix incorrect ForwardRenderer properties typeTakumi ASAKI2018-08-171-2/+2
| | | | | Change-Id: I1b02b6920b9525f4ced75271d36f07890a77f7fc Reviewed-by: Martin Smith <martin.smith@qt.io>
* QSkyboxEntity fixes:Paul Lemire2018-07-181-3/+3
| | | | | | | | | | Was setting the major version instead of minor version thus potentially never allowing technique/pass filtering to ever succeed. Update shaders/technique to target 3.3 as 3.0/3.1 might not work on mac. Change-Id: I48c0ee54aac4a017cf8ac5ff3219b788a15bbcdd Task-number: QTBUG-69522 Reviewed-by: Mike Krus <mike.krus@kdab.com>
* Doc: Fix documentation warnings related to Clang QDoc parserTopi Reinio2018-04-201-8/+8
| | | | | | | | | | | | | | | | | | | | | Since Qt 5.11, QDoc uses Clang to parse C++ documentation. Clang requires a module header, as well as proper include paths, to build a precompiled header and process the sources. To do this, add a custom module header that pulls in all Qt 3D modules - this way, we can continue using a single documentation project to covers all of Qt 3D. Fix all documentation warnings are caused by missing namespaces, QML module/type names and typos, as well as a number of linking problems and other minor issues. After this change, the remaining documentation issues consist of 'No documentation for ...' warnings. Task-number: QTBUG-67790 Change-Id: I38b91163c475a00cc1893e793240470c5409eb57 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* Add support for Escape key in camera controllersMike Krus2018-04-204-0/+23
| | | | | | | Hitting the escape key does a view all on the active camera Change-Id: I19be96565358674958a193a96a0b487f36c085ba Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Enable alpha blending on QTextureMaterialMike Krus2018-03-083-0/+62
| | | | | Change-Id: I8466ccd47f8bda9fec184f548a2df7807d456ac7 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Revert "CameraControllers: use the Camera's upVector"Sean Harmer2018-02-192-2/+2
| | | | | | | | | | | | | | This reverts commit 627167bd4a2e1dc12ffee813e82f9b33bff19a22. There was a reason to use the y axis as the up vector here which is to keep the camera controller oriented correctly. Without this restriction it's far too easy to end up with a twisted camera. If we want a fully free trackball type controller, let's add that as a new type, or perhaps as an option on these. Change-Id: I56c8708535d4ccd05ccb5f2ddea732bb27abda58 Reviewed-by: Mike Krus <mike.krus@kdab.com>
* Merge remote-tracking branch 'origin/5.10' into 5.11Sean Harmer2018-02-151-0/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/animation/doc/src/qt3danimation-module.qdoc src/render/backend/abstractrenderer_p.h src/render/backend/buffervisitor_p.h src/render/backend/renderer.cpp src/render/backend/renderer_p.h src/render/backend/triangleboundingvolume_p.h src/render/backend/trianglesextractor_p.h src/render/frontend/sphere_p.h src/render/jobs/calcboundingvolumejob.cpp src/render/jobs/job_common_p.h src/render/jobs/pickboundingvolumejob.cpp src/render/jobs/pickboundingvolumejob_p.h src/render/jobs/pickboundingvolumeutils.cpp src/render/jobs/renderviewjobutils_p.h tests/auto/render/boundingsphere/tst_boundingsphere.cpp tests/auto/render/commons/testrenderer.h tests/auto/render/raycasting/tst_raycasting.cpp tests/auto/render/render.pro tests/auto/render/renderer/tst_renderer.cpp Change-Id: I76633bc5a5a065e5f9ea62cc16563377e5c693a3
| * QAbstractCameraController: Make struct InputState publicFriedemann Kleint2018-02-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | For generating Python bindings, the struct InputState needs to be public since a Python binding needs to be created for it so that a wrapper of QAbstractCameraController can be generated that calls into Python for an implementation of moveCamera(). Task-number: PYSIDE-487 Change-Id: Ib410b19a9e886ad06335dac05fd56206a72220bf Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | CameraControllers: use the Camera's upVectorPaul Lemire2018-02-022-2/+2
| | | | | | | | | | | | | | Instead of assuming +Y everywhere Change-Id: Ie0ddc40a4b3cdc60df02cffd11f899e1c32caaa3 Reviewed-by: Mike Krus <mike.krus@kdab.com>
* | Merge branch '5.10' into devSean Harmer2018-01-175-9/+9
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I248aa369ba98659a61e563fd29cc811c76ea1e2d
| * Fix includes of Qt classesFriedemann Kleint2018-01-153-6/+6
| | | | | | | | | | | | | | | | | | Add the module name, which is required for PySide2 to build. Complements 1129ff731fca6aff5849cafe1f434f1882342cd7. Task-number: PYSIDE-487 Change-Id: Icb6057f6849825536aac4c8f340d722b87b77857 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| * Merge branch '5.9' into 5.10Sean Harmer2018-01-122-3/+3
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf src/animation/backend/handle_types_p.h src/extras/defaults/qtexturematerial.h src/render/backend/entity_p.h src/render/backend/handle_types_p.h src/render/backend/renderview.cpp src/render/io/scenemanager.cpp Change-Id: Ic145062cc98360e9067fd60f0992c7a6b51e41bb
| | * Fix includes of Qt classesFriedemann Kleint2017-11-232-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | The convention <QtModule/QClass> should be used. Among other things, this makes generating Python bindings possible. Task-number: PYSIDE-487 Change-Id: I32f114377dd70d27dee71a44b05c81474eb5dac3 Reviewed-by: Andy Nichols <andy.nichols@qt.io>
* | | Merge remote-tracking branch 'origin/5.10' into devLaszlo Agocs2017-12-1320-20/+54
|\| | | | | | | | | | | Change-Id: Ib51c8311ce78b2fec62dd0c09cb943a85a7d0b2b
| * | Merge remote-tracking branch 'origin/5.10.0' into 5.10Liang Qi2017-12-082-0/+18
| |\ \ | | | | | | | | | | | | Change-Id: I58cb37d5de618ad5e9b9a6f0598a0d790d3694f9
| | * \ Merge 5.10 into 5.10.0Oswald Buddenhagen2017-11-2011-0/+742
| | |\ \ | | | | | | | | | | | | | | | Change-Id: I1d59f6d4f69c5ab33efe1a00a983a2af880ef79a
| | * | | Fix resource init namespace issuesLaszlo Agocs2017-11-142-6/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Follow the pattern from other modules and put Q_INIT_RESOURCES in a static function outside all namespaces. INTEGRITY reportedly has linking issues without this. Task-number: QTBUG-64468 Change-Id: Iccdd03f5384765251a94502766a445a6c6d732b0 Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io> Reviewed-by: Kimmo Ollila <kimmo.ollila@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io>
| | * | | Fix material system qrc in static buildsLaszlo Agocs2017-11-082-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Qt3DRender part is clear and we have a good global place to do the Q_INIT_RESOURCE call. Extras is debatable since there is no good place. Quick is already handled via the import plugins, but pure C++ applications also need this in static builds. For now add it to QForwardRenderer and Qt3DWindow. This should cover the common use cases for the materials in extras. Task-number: QTBUG-64279 Change-Id: I276e8d4265f4527736d415b07dbf03e9d8904adf Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| * | | | Doc: Qt 3D Extras: Fix information on deprecated classesTopi Reinio2017-12-0516-9/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QDoc has no \see command. Further, Qt 3D Extras module page still listed the deprecated classes. To fix these and make it easier to maintain, assign (non-deprecated) classes to groups and list the group members on the module page. Change-Id: I6bb2ff9855c2c481b33c7d0d142a173a5e0b3fd8 Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Nico Vertriest <nico.vertriest@qt.io>
| * | | | QSkyboxEntity: try to reload texture only oncePaul Lemire2017-11-212-11/+20
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By using a queued invocation and a flag. This prevent cases where the basename would be set by a first call, with an extension not yet being set which would result in warnings. Change-Id: I385cffaf9ee262535c759109335bb3c150cc7525 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | | | Merge remote-tracking branch 'origin/5.10' into devAndy Nichols2017-11-2011-0/+742
|\| | | | | | | | | | | | | | | Change-Id: Ia6496e1ea22f2393a28e37cdd9f6e34f7613db49
| * | | Replace all phong variants with QDiffuseSpecularMaterialKevin Ottens2017-11-1511-0/+742
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | This one reconfigures its graph layers and render states properly based on it properties. As such it covers all the features coming from the various phong materials we had in the past. That's why they are all marked as deprecated. Change-Id: I9a74639d4cff5170b496d475c8a74b1e4e163b03 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | | Merge remote-tracking branch 'origin/5.10' into devAndy Nichols2017-11-1318-26/+172
|\| | | | | | | | | | | Change-Id: I2d373d538df3a65ac2d41238e5c6a214a151be68
| * | Remove qfirstpersoncameracontroller_p.h from defaults.priFriedemann Kleint2017-10-201-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | Fixing warning: WARNING: Failure to find: defaults\qfirstpersoncameracontroller_p.h Change-Id: I81d38b43c41fbca22ad8d4cffc73fc4b2c6679c9 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
| * | Connect the normal parameter to the right signalKevin Ottens2017-10-131-1/+1
| | | | | | | | | | | | | | | Change-Id: I62f1d637f595d576bd1c4df48ef32a0002e6aa18 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| * | Have all the Phong variations based on a graphKevin Ottens2017-10-1313-21/+142
| | | | | | | | | | | | | | | | | | | | | | | | | | | This commit introduces a new layered graph file to deal with all the Phong material variations. It ports all the materials to using it, then of course it removes all the old frag implementations. Change-Id: Ia519eaf4cea3b6e3ff4dd5aa1cca2bedbfcbe7cb Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-01 19:46:18 +0000