Change-Id: Iec9c47de819dc9337a4f31aa073ccf9e4989aa33
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
(cherry picked from commit c2201f05)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

In QDS, the first update is triggered by blank object creation
(looks like this happens inside Qt, so we can't easily change that),
and things like dynamic properties are set afterwards. This led to
custom material and effect objects being incomplete at the time
updateSpatialNode was called.

Fixed by waiting for component completion in View3D before synchorizing
renderer.

Task-number: QDS-2637
Fixes: QDS-2636
Change-Id: I052ff37e13b7d2b1ddfcbd31d7297a985c824944
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
(cherry picked from commit 3ac25d4a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

'shaderInfo' as id causes issues in QDS, as it conflicts with with
propertyName it's assigned to.

Task-number: QDS-2636
Change-Id: I592da8db353966ab9818ab8463c82b6ac4aed34f
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>

When custom material or effect was defined in the currently open qml
document in QDS, the uniforms could not be properly parsed, because
QDS wraps all dynamic properties in QVariant type. Fixed by digging
for the actual type from the value.

Task-number: QDS-2637
Change-Id: I1039408fb1826db2f40aeaa744669687c1aadaf1
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Andy Nichols <andy.nichols@qt.io>

Change-Id: Id5f7967a5b38e83ce6a91430b6acbe6780bdeef1
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Andy Nichols <andy.nichols@qt.io>

Fixes: QDS-2609
Change-Id: Id81e610b9426dfdad213c5e812ca72abbe5e7c86
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>

Tooling is bit picky about the import statement order, so to ensure
things work properly, QtQuick import is generated before QtQuick3D
import. Also added QtQuick import generation for files that lacked it.

Task-number: QDS-2648
Change-Id: I601aa22e423e3ce89b9b07d0c1f5c34c72dcae52
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
(cherry picked from commit 1717e915)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

Change-Id: Iaed5dc96c2ec4547eb396ac03c96f16edece7897
Reviewed-by: Christian Strømme <christian.stromme@qt.io>

This avoids madness with assignment operators and copy constructors that
shouldn't be used anyway on the graph objects.

Fixes: QTBUG-86070
Change-Id: Ic7e8d50a9fb710a1ad3bf0d7676bc41800e5ae00
Reviewed-by: Christian Strømme <christian.stromme@qt.io>

Change-Id: Ia4c07be32fc2e88ca864b267f6ddf4c20b6772c2
Fixes: QDS-2604
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>

Inho Lee authored 4 years ago and Andy Nichols committed 4 years ago

This patch will fix NormalTangentMirrorTest

Task-number: QTBUG-78840
Change-Id: I4af026b47fccab8dbdb8a822f42cf0ec21709d95
Reviewed-by: Andy Nichols <andy.nichols@qt.io>

Change-Id: Ia05dfb5c940e39d2b2546c1183da1014ae015e53
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Andy Nichols <andy.nichols@qt.io>

Change-Id: I753c802bef590c58b31d9b9d85616b759263f9f7
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Andy Nichols <andy.nichols@qt.io>

Also fixes a few other minor icon related issues.

Fixes: QDS-2603
Change-Id: I23793eab2e0ef3aeac27d95cb798d540ac982ecd
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Andy Nichols <andy.nichols@qt.io>

Andy Nichols authored 4 years ago and Andy Nichols committed 4 years ago

Fixes: QTBUG-86070
Change-Id: I5e71341179db2ee35394f6296626595faac5325e
Reviewed-by: Inho Lee <inho.lee@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>

Inho Lee authored 4 years ago and Christian Strømme committed 4 years ago

Task-number: QTBUG-78838
Change-Id: Ie903fd15e10a210cb169e234e9c5cef21694904a
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Antti Määttä <antti.maatta@qt.io>
Reviewed-by: Christian Strømme <christian.stromme@qt.io>
(cherry picked from commit 298c91c4)

All supported file types are single-extensions, so use suffix()
instead of completeSuffix(). Also support uppercase in all places.

Task-number: QTBUG-85999
Change-Id: I2a3f948b1d1edcdc16ec422c20aa3cdb35634f55
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
(cherry picked from commit 0ede19a3)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

Custom materials by default do not directly output frag color in
fragment shaders, so for a few passes of the FrostedGlass material the
output needs to be defined explicitly.

Change-Id: I2197d894e3e13f8988feafeab19bf40320f36bc4
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>

Task-number: QTBUG-85229
Change-Id: Id8c3040eb883ca91204c5aba6fdc3cc0196c95c4
Reviewed-by: Inho Lee <inho.lee@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>

Previously, a plain file name would be attempted to load only from
resources. Now, if it is not found from resources, we also try to
load from a local file relative to QML context. This allows using
same relative filenames during development in QDS and in final
deployment.

Change-Id: I4f7f5104df82f64b4a4427eef9af9adb5e530285
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Antti Määttä <antti.maatta@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>

Change-Id: I0bdfdf2d9490716b35c92d2af548970bb85739b1
Fixes: QTBUG-85979
Reviewed-by: Andy Nichols <andy.nichols@qt.io>

Task-number: QDS-2404
Change-Id: I9bcfa210cacbe61b5e3c1983b9a6a84059d672fa
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>

Andy Nichols authored 4 years ago and Andy Nichols committed 4 years ago

When we register CustomMaterial shaders in updateSpatialNode it requires
that we get a handle the the renderInterface which is unique to each
Window. That means we end up in a situtation where only one Window will
have the necessary shader registration if we share CustomMaterial nodes
between Windows.

Instead we store the necessary state information of the CustomMaterial
shaders in the CustomMaterial backend node.  That means that no which
renderer references the CustomMaterial it has all the information
necessary to create the shader.

The downside is that this means that there is additional overhead when
using CustomMaterials because each time we prep a layer for rendering we
need to register the CustomMaterial shaders being used with the dynamic
object system.  It will only do it once per shader, but not as ideal as
doing it once each time the shader data changes.

This makes it possible to share CustomMaterials between windows though.

This patch is made directly for 5.15 because CustomMaterials work very
differntly in 6.0 and this only makes sense in 5.15.

Fixes: QTBUG-83889
Change-Id: I57c72af12e55581874f66b8bd190ccbc918caf4d
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>

Andy Nichols authored 4 years ago and Christian Strømme committed 4 years ago

A new VAO is created each time we create a new Input Assembler, which
itself is not an issue. However by not deleting the previous VAO that
referenced the vertex buffers associated with it, the graphics driver
does not release that buffer data, leading to huge leaks of GPU memory.

So now we make sure to call glDeleteVertexArrays for the backends that
use VertexArrays.

This change is for 5.15 only because 6.0 uses RHI which does not have
this issue.

Fixes: QTBUG-83808
Change-Id: I30a660c11f3aa89d9b5d0a9d4fdb8d1108d20702
Reviewed-by: Christian Strømme <christian.stromme@qt.io>

We only released a sub-set CustomMaterials that we ported from Qt 3D
Studio to QtQuick3D's material library, but did not clean up the
textures they were using. This makes the MaterialLibrary larger than it
needs to be. Previously when building statically on Windows 32 bit it was
so large the QRC crashed. This can be avoided by just not shiping files
that are not being used.

This is only being done for 5.15 because the Material Library in 6.0 is
being change significantly enough to make backporting difficult.

Fixes: QTBUG-84188
Change-Id: I974282dfb0adb98c4b931abeaad895a16705939f
Reviewed-by: Christian Strømme <christian.stromme@qt.io>

Inho Lee authored 4 years ago and Miikka Heikkinen committed 4 years ago

This commit is a back-port of 3d110052 from dev branch.

Fixes: QDS-2532
Change-Id: Icd92da77c00090e0f327f08a73b978d479e39b51
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Andy Nichols <andy.nichols@qt.io>

And turn it off by default since this can lead to very deep QML files
that are slow to load and edit.  The only time these are necessary is
with certain types of animations. So only turn this on when needed.

Fixes: QTBUG-85147
Change-Id: I98b9c2e25b9811fe729afc30b37d2e626fc71a05
Reviewed-by: Christian Strømme <christian.stromme@qt.io>
(cherry picked from commit 171406ff)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

Andy Nichols authored 4 years ago and Andy Nichols committed 4 years ago

Before the picking did not consider Models that uses geometry instead of
static meshes.  Now we make sure to at least check for ray casts against
the bounding volume set for the custom geometry.

This is for 5.15 only since there is a better way to do this in that is
not compatible with 5.15.

Fixes: QTBUG-84157
Change-Id: I08d0de80131d01dd97a6a0fb35da77ca7d97855e
Reviewed-by: Christian Strømme <christian.stromme@qt.io>

Change-Id: Id809703dbeffe26baa0d11345447c253563115c9
Fixes: QTBUG-85862
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Andy Nichols <andy.nichols@qt.io>

Change-Id: I603c598dcb9852666fd8e98d9d9ca74c35260cd8

This is a partial back-port of dev. RHI already has this feature.
When the user provides different inputs with same shader states and
some inputs are missing, Quick3D makes warnings and can fall into
an unexpected state.
For CustomMaterial, the inputs should be guaranteed by the user.

Change-Id: I53123f1040ae1535e72e20e0769f59b020b696a2
Reviewed-by: Andy Nichols <andy.nichols@qt.io>

This is a back-port of 4d2fba88 and c6806ac5 from dev branch

Fixes: QTBUG-84158
Change-Id: I8247ba919143aead7581eebcb57495ca0d93bb96
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Andy Nichols <andy.nichols@qt.io>

This commit is a back-port of d18b04fb from dev branch

Change-Id: I6f296d2f3d414ef84c141f9760c839f9aec23954
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Andy Nichols <andy.nichols@qt.io>

Some recent shader generation routines require the information of
the existence of attributes. It will be used for checking if the mesh
has a specific attribute or not.

Change-Id: I09249a24ccf460a90492ac849e4cf47557e493e8
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Andy Nichols <andy.nichols@qt.io>

g_renderContexts global static caches the render context interface
for each window. However, there was no mechanism to clear the cache
in case the interface gets deleted, leading to corrupted interface
being returned from the cache in the future. Now the interface is
cleared from the cache upon its deletion.

This fixes QML Designer live preview crash.

Change-Id: Id019027cc5ff6b7a47bcd46fd76c5a78e6520d53
Fixes: QTBUG-83751
Reviewed-by: Andy Nichols <andy.nichols@qt.io>

The decision to remove mesh bvh data, which presumably is only used
for picking, can't be based on whether a single model is pickable or
not, as the same mesh can be used by multiple models.

Change-Id: I489725f8a416232236e27286ca66a206bb81af72
Fixes: QDS-2446
Reviewed-by: Andy Nichols <andy.nichols@qt.io>

Task-number: QTBUG-84546
Change-Id: I851d72c35bdb90f5b2ffa610cd407552a6a1da7e
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>

Task-number: QDS-2357
Change-Id: Iff8985094201d918a0f09e833c958711a52bc214
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
(cherry picked from commit 6aa47c79)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

Changed the stepping for adjusting property value from default one
to something more sensible for properties where stepping of one didn't
make sense, usually due to very restricted value range.

Also fixed a couple of miscellaneous issues in designer pages.

Change-Id: I0c1c6ebe2561eca3908647f8738539332d0a376c
Fixes: QDS-2287
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
(cherry picked from commit c50c02e4)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

Task-number: QDS-2188
Change-Id: I921b56669cc7b604c7761df618a52b055205ca87
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
(cherry picked from commit f28645fd)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>