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>

Allow setting MSAA level only up to level supported by the platform.
This means that if HW supports only 4x MSAA, High and VeryHigh MSAA
antialiasing settings give the same results. This is better than
potentially not rendering with VeryHigh at all.

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

Change-Id: Id463d2c33aeb702e1e4be90eb77a710c404fc928
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
(cherry picked from commit 33f435a4)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

* Add missing View3D specifics properties camera, environment,
  importScene
* Fix View3D specifics reference in pri and section

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

Just waiting can be done by QThread::msleep and we can get rid of ifdefery.
As an additional bonus the change removes the one single occurrence of winrt
code.

Task-number: QTBUG-84434
Change-Id: I2b75e20cec16abbd93064722943f8977c0267bee
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
(cherry picked from commit 8562b562)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

Custom materials didn't correctly detect the window in importScene
case. Also fixed the property detection in cases there is more than
one superclass on top of the custom material base class.

This isn't a complete fix for QTBUG-83889, but it at least makes it
possible to use custom materials in Design Studio without crashing
the QML puppet. Now the custom material shows up properly on either
form editor or in 3D edit view (the latter in cases where QML document
doesn't have View3D using the material to hijack the material shader).
Since you don't get both at the same time, editing the scene with
custom materials is still painful.

Task-number: QTBUG-83889
Change-Id: I05f23145dcdbf5c03dce5a612fdebf5b84eb0182
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Antti Määttä <antti.maatta@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
(cherry picked from commit 94cb41c1)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

Fixes: QDS-2258
Change-Id: Ifafe45ec0442c3c9125c9de891b809cc8998f113
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
(cherry picked from commit 5a45b4bb)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

Change-Id: I94a4511d8eb7f54bdab26de5ae3b0be88b82538a
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
(cherry picked from commit b33d5113)
Reviewed-by: Christian Strømme <christian.stromme@qt.io>

Added item library items for effects and enable the effects and light
probe properties of SceneEnvironment to be edited.

Change-Id: Iba83a23fda36075c30d2472368634aa749aed92e
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
(cherry picked from commit 741dc644)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

There could be multilayered inheritance structure on top of
QQuick3DEffect, so account for that when determining which properties
need to be added as uniforms.

Task-number: QDS-2114
Change-Id: I3f89bc1ff6070890829575d66c127d269de7edab
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>
(cherry picked from commit 5c0c79ea)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

Change-Id: I4f199bb8ea59a400bb5ee817c98f5e91df926956

The QtOpenGLExtensions was exposed in the public library
interface of QtQuick3D causing it to be linked into user applications,
the effect of this is that applications built (in debug mode) with Qt from
our binary installer will fail to build, as the build system will attempt
to pull in the debug version of QtOpenGLExtensions, which is not shipped
with the binary installed version of Qt (that is a separate issue).

Fixes: QTBUG-83184
Change-Id: Ib5c192fdf0c0297ae06920b39712f565a0bc2770
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Andy Nichols <andy.nichols@qt.io>

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

Fixes: QTBUG-83247
Change-Id: I35715b23c54b5582313de2f5623fe3a8a023594d
Reviewed-by: Antti Määttä <antti.maatta@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>

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

Apparently, the directGL code path does not enable ambient occlusion
for the first couple of frames.

Task-number: QTBUG-83364
Change-Id: I32c2ed37f39f08c7069f4025354f2ad7feffab43
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>

Instead of attempting to test odd cases with no usefulness in practice, like
wanting to clear in combination Inline or Overlay, switch those to "transparent"
(i.e. no clear). For Underlay we do what like in RenderModeUnderlay and use a color
matching the QQuickWindow color.

Task-number: QTBUG-83801
Change-Id: I6fa9622466e3c41f89fdc28f486cd439f91b904d
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>

Similarly to what we did with the examples: with the RHI-based rendering
path the View3D's clearColor has no effect when the renderMode is not
Offscreen. So just set that color to match the QQuickWindow's color.
That way the end result is the same regardless of who does the clear.

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

Remove unnecessary delete for the m_layer.

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

Licensing is explained on the landing page - in addition,
show the information on the navigation bar using 'buildversion'
as it's done with other GPLv3/Commercial modules.

Task-number: QTBUG-83752
Change-Id: Ib7508e07f1c59351d3517df2e3f72f8a6cc1d579
Reviewed-by: Paul Wicking <paul.wicking@qt.io>

There is no reason to cap area light dimensions to the default 100.

Change-Id: I07a3c933c2209182defa51aea690b640c6a66cc5
Fixes: QDS-1914
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>

Change-Id: I2a597dac9a5b69f4e3cb787a7cba33ef871603b4

Use fixed level coefficients and only sample 3 mip levels.

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

- Fix applying fresnel
- Apply material color also for specular lighting
- Fix applying material properties and metalness

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

- Apply base color to ambient lighting
- Do not apply diffuse base color twice.

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

Change-Id: I02ebca52585b523cbbbfa26355edef38b48a0b44

Task-number: QTBUG-83281
Change-Id: I3e1b46a3f5dc63f0fe890fb9852719a4f8e63d9f
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Andy Nichols <andy.nichols@qt.io>

The math was a bit busted, and QML needed to QQuick3DNode to be
registered.

Quaternion.lookAt(...)'s function signature changed a bit to accommodate
some default arguments.  The return of this function is the relative
transformation that needs to be made to get the correct lookat value, so
to use it you either need to use the default forward/up vectors to get
the global rotation, or the current forward/up vectors to get the
relative change.

Implement QQuick3DCamera::lookAt() using Euler angles to avoid
rolling the camera.

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