Change-Id: I81f5367a391bc80f83ed4648a89cafc8ab379671
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>

Change-Id: If1f3b672700fe67099dc5e5f6eb554129c4a1b41

Initialize m_postConstructorInit before m_rootNode, fixing warning:
qscene.cpp: In constructor 'Qt3DCore::QScenePrivate::QScenePrivate(Qt3DCore::QAspectEngine*)':
qscene.cpp:75:12: warning: 'Qt3DCore::QScenePrivate::m_rootNode' will be initialized after [-Wreorder]
qscene.cpp:72:45: warning:   'QScopedPointer<Qt3DCore::NodePostConstructorInit> Qt3DCore::QScenePrivate::m_postConstructorInit' [-Wreorder]

Amends 985a6192

.

Task-number: QTBUG-74106
Task-number: QTBUG-73905
Change-Id: I53ced159cf86325d577464e6f5873eb83d1b2038
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>

Change-Id: I42affdd02bddb5205b9f2455f0c5e5efbd414dd8

Change-Id: Iea8a87a0da1b2143fa476ecb4d6184460d93e8a5

To allow Qt base QShaderGenerator changes to be merged

Change-Id: I26088ccf55b510b5eb845c583c0551ccfd817eb7
Task-number: QTBUG-75384
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>

Change-Id: Ibcf668adfc3d701bf2b27f9f25626f819e2445b3
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>

Fixes: QTBUG-72514
Change-Id: If6e1b36fef570a1acaa90223b431123b597dafd5
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>

Framegraph suffers from the same problem as Entities. When they are created
they pass their parent FrameGraph node, and not their parent QNode. When
reparenting them we need to make sure the same thing happens otherwise
you get backend FrameGraph nodes parented to non-framegraph nodes and
they are just dropped from backend.

Change-Id: I1b9cab2c9e869c690c4c43208e62a1044b3359a4
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>

This avoids running these jobs when lights / renderables have
not changed in a frame

Change-Id: I604180fe3442ab67648c4ba5d9effb8639c68ef7
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>

To allow Qt base QShaderGenerator changes to be merged

Change-Id: I0036215bc5f841246cc109f21c87a07563ec0f11
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>

Change-Id: Ib8792c702f1d8089480cee6404178626ccdcbed6
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>

This avoids scene traversal in the case there is no LoD /
skinning active

Change-Id: I502c38ffe3c23a11543034861778d74d80841744
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>

Task-number: QTBUG-74602
Change-Id: If9cf0795e887a0b3cdfed0a6f5e7798116ef137d
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>

Backend nodes should always be created from the top-most parent down
ensuring that every parent is created before its children. The original
way of creating backend nodes by calling _q_postConstructorInit
in a deferred manner from the QNode constructor breaks this because
backend node creation happens in the order that the nodes on the
front-end were created. This was often incorrect when reparenting
newly created nodes.

Fix by creating a queue of nodes needing a _q_postConstructorInit call
and only adding nodes to the queue if one of their ancestors is not
already in the queue. This ensures that _q_postConstructorInit is only
called for the top-most node in any subtree.  This behavior exactly
matches the creation behavior when building a subtree and reparenting
it to a node with a backend.

Doing silly things like creating a node with a parent that has a backend
then immediately reparenting is now safe. After this patch, it should
be safe to assume that backend nodes can always find their backend
parent.

Adding only the top-most nodes to the queue and processing the entire
queue at one time also ensures that all creation events get sent in
the same batch. This fixes the problem of having backend nodes referring
to other backend nodes that haven't been created yet.

Task-number: QTBUG-74106
Task-number: QTBUG-73905
Change-Id: Idcf38d6c3164f6be4394a3b25554547414061059
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>

Change-Id: I292b8b373e0f34dfc51f2a77f082fda920893e64
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Reviewed-by: James Turner <james.turner@kdab.com>

When the initial Entity backend node hierarchy is created it skips over
any non-entity nodes to ensure that Entities are only parented to
other Entities. Calling QNode::setParent breaks this when reparenting
Entities to non-entity nodes.

Fix by sending a new "parentEntityUpdated" property update that backend
Entity nodes listen for. They keep the id of their new parent and flag
the need to rebuild the entity hierarchy.  This triggers a new job to
clear the children and parents of every backend Entity, then rebuilds
the hierarchy using the stored parent ID in each Entity. This is much
more forgiving of creation/parenting ordering issues and shouldn't be
less performant because any Entity reparent was previously marking
everything dirty anyway.

Add a new test from QTBUG-73905 that creates 4 cylinders and manipulates
the parents in different ways.

Add a new test to tst_nodes to reparent a QEntity to a QNode and ensure
the entity finds it's correct QEntity parent.

Add a new test to tst_entity to ensure backend nodes correctly handle
the new parenting events.

Task-number: QTBUG-73905
Change-Id: Iab0203947d89bbed2868b3629fbde879675fe568
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>

For that we know determine the expected number of channel components for a
given property in the frontend where we have access to both the type and the
value rather than in the backend using the type only.

Change-Id: I75aca20d43dd1b3db316c303af041acd557c07e4
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>

+ a075f064 Set OptimalParallelJobCount to at most 4
+ 22c66fa9 Use slerp for animating rotation channels
+ f72c8abf Fix light attenuation for ES 2
+ 4af8fcdc tests/auto/render/render.pro: Remove duplicate entry "scene2d"
+ 31aa763b Make slerping safer
+ a7e8df28 Fix member overloads
+ e9868e15 Don't reset texture units at every frame
+ eb337567 Expand Scene3D documentation
+ 7a0d2416 Bump version
+ fa12f14b Scene3D: Call update on the item not the window
+ b79e4a8b Revert "Scene3D: Call update on the item not the window"
+ e84d8d2a

 Dont play animations that are disabled

Change-Id: I3badad7396927857bb4b5fedf46f1714dd992a27
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>

The mouse can't be in all viewports at once so the ray will not be
valid for all the viewports.

Cherry-picked from b68ebfde583dc5cec7ae60f752f1e05371e57dba

Change-Id: Id196f043c4f670cd2106993fc5c0a9dd468a491e
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>

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>

Change-Id: If17511da64dd666a536408aa3cb3178ef6db0403

Cherry-picked from da7e453d



Change-Id: I9cf18df56d501c7ea49727bc2d1da20371308d4a
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>

Share the code for this between QShaderBuilder and QShaderProgram. As a
side effect QShaderProgram gains support for absolute paths.

Change-Id: I71dbe0bff702806f0655992008c54bbaa9c4f2c9
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>

Change-Id: I5293ff8d16c511de79c4583783b238154af32f61
Task-number: QTBUG-69373
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>

This reverts commit fa12f14b

 which would
break rendering any dynamic scene when using Scene3D.

Change-Id: I3bc61975106aa75c24e3bddd38993e4809c557c3
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>

On scene change QQuickWindow::update was called to ask the QQ2Renderer
to rerender the scene. The problem here is, that calling
QQuickWindow::update is percieved as a call to rerender under all
circumstances, while QQuickItem::update only means update if the scene
graph actually changed in the end. Using QQuickWindow::update the scene
will be rerendered even if the Scene3D item is invisible, using
QQuickItem::update it won't.

Change-Id: I1ff455628d3e536349683b064acaeadd354ec864
Fixes: QTBUG-72923
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>

Change-Id: I62461afca838e2764b9f65d7b9be31c4d9f0b9c5

Change-Id: I2925920af001927ae9a843c7dde02ca48786834c
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>

Resetting texture to unit assignment at every frame seems to trigger
constant shader recompilation on macOS. Maybe GL driver is implemented
on top of Metal which has more restrictions.

Not resetting the assignment means the same texture units are used
for consecutive frames and fixes excessive recompilation.

Refactored the code to move the texture handling to separate class.

Change-Id: I480f76e7e7b0ea669c6acb039cc3d079937ff97f
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>

Change-Id: Idc824e1b8191e5fa624966e619075b1ec8c850c6

m_currentVAO and m_glHelper were hiding members in parent class.
Removed overloads and cleaned up initialization.

Change-Id: I174dffc63c812e0b4241018c86e560de48a31a0b
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>

Remove the calls as 6158b4ae


states that it no longer has any effect, fixing:

gltfgeometryloader.cpp:333:18: warning: 'void Qt3DRender::QBuffer::setType(Qt3DRender::QBuffer::BufferType)' is deprecated [-Wdeprecated-declarations]
gltfgeometryloader.cpp:371:54: warning: 'Qt3DRender::QBuffer::QBuffer(Qt3DRender::QBuffer::BufferType, Qt3DCore::QNode*)' is deprecated [-Wdeprecated-declarations]
basegeometryloader.cpp:155:39: warning: 'void Qt3DRender::QBuffer::setType(Qt3DRender::QBuffer::BufferType)' is deprecated [-Wdeprecated-declarations]
basegeometryloader.cpp:202:46: warning: 'void Qt3DRender::QBuffer::setType(Qt3DRender::QBuffer::BufferType)' is deprecated [-Wdeprecated-declarations]
instancebuffer.cpp:61:39: warning: 'Qt3DRender::QBuffer::QBuffer(Qt3DRender::QBuffer::BufferType, Qt3DCore::QNode*)' is dep
tst_qbuffer.cpp:79:96: warning: ‘Qt3DRender::QBuffer::QBuffer(Qt3DRender::QBuffer::BufferType, Qt3DCore::QNode*)’ is deprecated [-Wdeprecated-declarations]
tst_qbuffer.cpp:85:100: warning: ‘Qt3DRender::QBuffer::QBuffer(Qt3DRender::QBuffer::BufferType, Qt3DCore::QNode*)’ is deprecated [-Wdeprecated-declarations]
tst_qbuffer.cpp:128:109: warning: ‘Qt3DRender::QBuffer::QBuffer(Qt3DRender::QBuffer::BufferType, Qt3DCore::QNode*)’ is deprecated [-Wdeprecated-declarations]
tst_qbuffer.cpp:132:57: warning: ‘void Qt3DRender::QBuffer::setType(Qt3DRender::QBuffer::BufferType)’ is deprecated [-Wdeprecated-declarations]
tst_attribute.cpp:56:68: warning: ‘Qt3DRender::QBuffer::QBuffer(Qt3DRender::QBuffer::BufferType, Qt3DCore::QNode*)’ is deprecated [-Wdeprecated-declarations]
tst_attribute.cpp:108:68: warning: ‘Qt3DRender::QBuffer::QBuffer(Qt3DRender::QBuffer::BufferType, Qt3DCore::QNode*)’ is deprecated [-Wdeprecated-declarations]
tst_buffer.cpp:74:68: warning: ‘Qt3DRender::QBuffer::QBuffer(Qt3DRender::QBuffer::BufferType, Qt3DCore::QNode*)’ is deprecated [-Wdeprecated-declarations]
tst_buffer.cpp:271:68: warning: ‘Qt3DRender::QBuffer::QBuffer(Qt3DRender::QBuffer::BufferType, Qt3DCore::QNode*)’ is deprecated [-Wdeprecated-declarations]
tst_buffer.cpp:297:68: warning: ‘Qt3DRender::QBuffer::QBuffer(Qt3DRender::QBuffer::BufferType, Qt3DCore::QNode*)’ is deprecated [-Wdeprecated-declarations]
tst_gltfplugins.cpp:519:95: warning: 'Qt3DRender::QBuffer::QBuffer(Qt3DRender::QBuffer::BufferType, Qt3DCore::QNode*)' is deprecated [-Wdeprecated-declarations]
tst_gltfplugins.cpp:574:95: warning: 'Qt3DRender::QBuffer::QBuffer(Qt3DRender::QBuffer::BufferType, Qt3DCore::QNode*)' is deprecated [-Wdeprecated-declarations]
tst_gltfplugins.cpp:967:83: warning: 'Qt3DRender::QBuffer::QBuffer(Qt3DRender::QBuffer::BufferType, Qt3DCore::QNode*)' is deprecated [-Wdeprecated-declarations]
tst_gltfplugins.cpp:969:82: warning: 'Qt3DRender::QBuffer::QBuffer(Qt3DRender::QBuffer::BufferType, Qt3DCore::QNode*)' is deprecated [-Wdeprecated-declarations]
tst_trianglesextractor.cpp:56:118: warning: 'Qt3DRender::QBuffer::QBuffer(Qt3DRender::QBuffer::BufferType, Qt3DCore::QNode*)' is deprecated [-Wdeprecated-declarations]
tst_trianglesextractor.cpp:57:116: warning: 'Qt3DRender::QBuffer::QBuffer(Qt3DRender::QBuffer::BufferType, Qt3DCore::QNode*)' is deprecated [-Wdeprecated-declarations]
tst_trianglesextractor.cpp:199:118: warning: 'Qt3DRender::QBuffer::QBuffer(Qt3DRender::QBuffer::BufferType, Qt3DCore::QNode*)' is deprecated [-Wdeprecated-declarations]

Change-Id: I6835598a1771a0ec3a0b080911fa4cada210a01a
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>

Now handles case where the two bounding keyframe quaternions are
equal by returning the first as the interpolated value.

Change-Id: I43d0dfb1e20afafd690817d30aeac2d510847422
Reviewed-by: Mike Krus <mike.krus@kdab.com>

The properties added in  5149ff8c

 are new in 5.13, not 5.12

Change-Id: I6780583bc2cfcc7ca846ea68d44c2e14d9a85f27
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>

Task-number: QTBUG-73484
Change-Id: I77bae973a9be7e01c674fd6bbccc0feb0c35e0f1
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>

The registration was missing the revision number.
This augments d403604d

.

Change-Id: I730819a5a0135f490edde8667d23cd9c28f12afd
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>

All new signals, slots, ... available in QML should
be revisioned.

Change-Id: Ib91c65b2bcd64f93d8f536c6cb534390b8689d05
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>

Replace by new API, fixing:
tst_gltfplugins.cpp:590:67: warning: 'void Qt3DRender::QAttribute::setDataType(Qt3DRender::QAttribute::VertexBaseType)' is deprecated [-Wdeprecated-declarations]
tst_gltfplugins.cpp:591:39: warning: 'void Qt3DRender::QAttribute::setDataSize(uint)' is deprecated [-Wdeprecated-declarations]
tst_gltfplugins.cpp:623:60: warning: 'void Qt3DRender::QAttribute::setDataType(Qt3DRender::QAttribute::VertexBaseType)' is deprecated [-Wdeprecated-declarations]
tst_gltfplugins.cpp:624:32: warning: 'void Qt3DRender::QAttribute::setDataSize(uint)' is deprecated [-Wdeprecated-declarations]
tst_gltfplugins.cpp:639:70: warning: 'void Qt3DRender::QAttribute::setDataType(Qt3DRender::QAttribute::VertexBaseType)' is deprecated [-Wdeprecated-declarations]
tst_gltfplugins.cpp:640:34: warning: 'void Qt3DRender::QAttribute::setDataSize(uint)' is deprecated [-Wdeprecated-declarations]
tst_gltfplugins.cpp:654:62: warning: 'void Qt3DRender::QAttribute::setDataType(Qt3DRender::QAttribute::VertexBaseType)' is deprecated [-Wdeprecated-declarations]
tst_gltfplugins.cpp:655:34: warning: 'void Qt3DRender::QAttribute::setDataSize(uint)' is deprecated [-Wdeprecated-declarations]

Change-Id: Ie5e379db148edf1853d1a7a2661e328612b35bae
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>

The entry is added unconditionally and in a scope
qtConfig(qt3d-input). Remove the first entry, fixing:

 Makefile:3343: warning: overriding recipe for target 'sub-scene2d-qmake_all'
 Makefile:2918: warning: ignoring old recipe for target 'sub-scene2d-qmake_all'
 Makefile:3347: warning: overriding recipe for target 'sub-scene2d'
 Makefile:2922: warning: ignoring old recipe for target 'sub-scene2d'
 Makefile:3350: warning: overriding recipe for target 'sub-scene2d-make_first'

Change-Id: I6e702cdea2e31eb0de64c7efb7d39b56265fa6ef
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>