| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
| |
Updated license headers to use new GPL-EXCEPT header instead of LGPL3 one
(in those files which will be under GPL 3 with exceptions)
Change-Id: I930c6234bfe720d38c596bbc3d1f39be75a7328b
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
|
|
|
|
|
|
|
|
| |
Intersection (world and local) and distance added to pick event
Modified test so that it includes the event
Change-Id: I8631d626e5108d2e044374ee3425625f5588c38c
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Getting rid of set data and the refactoring on setting the surface implies
that:
- Given the FrameGraph configuration, there may be several RenderViews
each having a different RenderSurfaceSelector/Window
- This means that the Renderer/QRenderAspect can't know about the surface
before reading the scene
- This means that the Renderer may be dealing with more than 1 window
- This means that initialization, render and shutdown procedures will have to
be updated accordingly
Therefore the Renderer was refactored to:
- Be initialized without knowing about a surface
- For each RenderView, check the surface and if different from the previous
one:
* Make the context current with it
* Create the appropriate glHelpers (as Surfaces may have != formats)
TO DO:
- Fix picking
- Fix windows exposition
- Fix shutdown / detection of all windows beging closed
Change-Id: I49d070b05f46be4b26cfb57e494feba145d1da9c
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
|
|
|
|
|
|
| |
Change-Id: I553214d0ddf5ad618d759b2d1a4965d8950c80c3
Reviewed-by: Mauro Persano <mauro.persano@kdab.com>
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
|
|
|
|
|
| |
Change-Id: I7399008adb0f612c78738f58f168fa38cf6ae845
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
|
|
|
|
|
|
|
|
| |
Adding the surface pointer to the RenderView pushed us over the old
limit.
Change-Id: Ibc28ffc2d56e6f768294dad971c00822e6aaffb6
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
|
|
|
| |
Also get rid of Qt3DRender::QWindow and of the hard codes camera
controller.
Change-Id: I307735d01caf97b7a690b28de8dc99fc9866c35f
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
|
|
|
|
|
|
| |
This commit adds support for DDS textures.
It also adds QTextureLoader, a generic texture provider without a
texture target. The actual texture target will be based on the
properties of the texture loaded from its "source" property.
Change-Id: If89cce7a55b3d82355f2da35588a091b7188f36c
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|\
| |
| |
| |
| |
| |
| | |
Conflicts:
examples/qt3d/qgltf/main.qml
Change-Id: I03d4cc679a7812fb114461609e481d43a0bc5390
|
| |
| |
| |
| |
| | |
Change-Id: Idedf3cab5d8a30d1a417ceb10555170b53b00d26
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
|
| |
| |
| |
| |
| | |
Change-Id: I59a6461fd3e81d578af3cc33248fb21d8b503135
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
There are 3 ways blending can be configured, depending on GL version:
pre-3.0: Globally
3.0-3.3: Individual GL_BLEND for each Draw Buffer, one glBlendFunc
4.0- : Individual GL_BLEND and glBlendFunci for each DrawBuffer
QBlendStates now allow to specify whether the blend state should be
enabled or not, and what Draw Buffer it is specifying. Defaults are
global and enabled.
Removed backend BlendStateSeparate, BlendState is going to handle
both calls.
Task-number: QTBUG-50005
Change-Id: I0059a53db0d629ef9818d933c3f14e5662c1d3df
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
|
|/
|
|
|
| |
Change-Id: I4de1a5662b50781e06bcfc8474c895e77cbd8851
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
|
|
|
|
|
|
|
|
| |
It is used only once in the whole of Qt3D and looks rather foreign to
the rest of the nodes API.
Change-Id: I6d8d40590a1f8a5c2019a8d16a7abff4f19ae9bb
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
| |
Change-Id: I98454ea6ed5bd5bbfed550317fedbf8ee47a1f8f
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
| |
Change-Id: I0edb9fb0444d8a4a9b77550d5dd32d36d501683c
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
|
|
| |
We switch to a more resilient private virtual instead.
Change-Id: I90710c7873571ca0a40f7cc939282344b20a59f0
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
|
|
|
|
|
| |
The "clearNull" method is kind of surprising so make QAspectJob API more
usual. Also the "clearNull" method was only used twice so change the
idiom to go through removeDependency if that one receives a null
pointer.
Change-Id: Ib74e1054ba52754b1a19d6c3e9268fa9ff14edaf
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
| |
Change-Id: Id67338fa5cae61161674d9efb345a475a7ae93ac
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
| |
Change-Id: I373f57fc40f9f2d92de6b48126d6c84363ed6d28
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
|
|
|
| |
Hiding them in QAspectEnginePrivate and calling them when needed from
setRootEntity.
Change-Id: I4c3dfb19d84ae90cc15bbff29a4abd0705bb61dc
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
| |
Change-Id: I9da605c77c5489b9bef4f07079e05f8babb9559f
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Since refactoring the QTransform API to enable matrix decomposition, it
has become more inconvenient to apply rotation transforms through the
QML API. This is due to the need to set QQuaternion values for the
rotation property, which makes using the Qt Quick animation framework
difficult.
To remedy this, there are now some additional properties added to
Qt3DCore::QTransform which enable direct usage of Euler angles instead
of just QQuaternion. Internally the rotation property is still used by
translating the Euler angle transforms to a QQuaternion.
Change-Id: Iad48542a7b125f7615f7a69516fb10a973d8395b
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
| |
Change-Id: I871cbc57166493f30ea307305d8664e2f8a8873f
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
| |
Change-Id: Id69a161da691322184d8ec5ed7a1b375cf2038ed
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
Having a dedicated type field is required not just to make the shaders
cleaner but also to avoid incorrect results when lights get moved around in
the scene. Currently the shaders rely on the direction uniform to distinguish
directional lights from the others, but this cannot work when the elements
in the lights uniform array change, potentially leaving type-specific members
like direction set when a point light takes the same index.
Change-Id: I170e4b471c8cd9b4a23eca49690239c01944b3e6
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
|
|
| |
Needed to allow devices like keyboards which have more than 64 keys
Change-Id: Ia837285ba9c5b7c26d3d89046d7d9f7a4cddb2ba
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
|
|
| |
They do not need to be on the frontend node
Change-Id: I16cd5ad9a2d556916a3d8f4e6856eddf00fb7d3e
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
| |
Change-Id: Ie36f6f170b5b627d0ed371bcd1a8dc292e7226b3
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
| |
Change-Id: I79e0b0d62e07a269ebfce99edff56d30da28494c
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
| |
Change-Id: Id8639d437bd55de15dc924af49930c12a3489cea
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
|
| |
Change-Id: I5c3847a2779b691a2748083fb768b37d1f629274
Task-Id: QTBUG-49683
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
|
| |
Change-Id: Id41bd1acd5e9b1d272b13ec6e53cc34080df51fe
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
|
|
|
|
|
|
|
|
| |
It will make this test suite just easier to update.
Change-Id: I1d6df0f4bb7b0e36f1471c9ca29a2246d0795ffa
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
|
|
|
|
|
| |
Change-Id: Ib639eec6cfaa3839f43e09e9dd3ad31f0524e700
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
| |
Change-Id: I463d0b469aa78e42c2671b6d3798546328898786
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
| |
Change-Id: I58b95eea52d8e4cfe2d072eb51abfd29c07e11b5
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
| |
Change-Id: I49b22190422f32ead46f794fb785f7fbbb7531f8
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
| |
Change-Id: I6c7388352fd615d1a596b406dff63d783dbb14c3
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
| |
Change-Id: I9f56464d9e4cb6bc6f96528f7838c0cc1743f79b
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
| |
Change-Id: Ib72f56c57ef6e7ff1c9996c141a813c6e10b7ba6
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
| |
Change-Id: I7090ff89feaf0cf93f901a38827f00a331ccee9b
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
| |
Change-Id: I8f89eefb06e20943f7abb82d461b5e90fd9799f9
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
|
|
|
|
|
| |
Change-Id: I1639a3ee2e4aac177f1c7cf4252a1c65db7cf721
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
|
|
|
|
|
| |
Change-Id: I1301887b4572310eebc3086699447ff574e1345b
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
|
|
|
|
|
| |
Change-Id: Iefe3f3afb8281a2eb994bfc8b63ca81500f66934
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
|
|
|
|
|
| |
Change-Id: Iccc02982a165f8aa54cd68e4293f1b244802b5ae
Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
|
|
|
|
|
| |
Change-Id: I05f3450bbb037c2d8b9bf45a3d6eb66d1db846bd
Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
|
|
|
|
|
| |
Change-Id: Id8072015f153bebf3e44b9d0a6ad9e2e9254aa83
Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
|
|
|
|
|
| |
Change-Id: Iab3c5690a18edc652f314b6bf758eea7f73a1c50
Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
|