Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"

12 files changed, 53 insertions, 27 deletions

diff --git a/src/animation/frontend/qclipblendvalue.cpp b/src/animation/frontend/qclipblendvalue.cpp
index c20609050..72a7dd796 100644
--- a/src/animation/frontend/qclipblendvalue.cpp
+++ b/src/animation/frontend/qclipblendvalue.cpp
@@ -59,10 +59,21 @@ QClipBlendValuePrivate::QClipBlendValuePrivate()
    \brief Class used for including a clip in a blend tree.
 */
 /*!
+   \qmltype ClipBlendValue
+   \instantiates QClipBlendValue
+   \inqmlmodule Qt3D.Animation
+   \brief Type used for including a clip in a blend tree.
+*/
+/*!
    \property Qt3DAnimation::QClipBlendValue::clip
 
    The animation clip that needs to be included in the blend tree.
 */
+/*!
+   \qmlproperty AbstractAnimationClip ClipBlendValue::clip
+
+   The animation clip that needs to be included in the blend tree.
+*/
 QClipBlendValue::QClipBlendValue(Qt3DCore::QNode *parent)
     : QAbstractClipBlendNode(*new QClipBlendValuePrivate(), parent)
 {
diff --git a/src/animation/frontend/qlerpclipblend.cpp b/src/animation/frontend/qlerpclipblend.cpp
index fd9dd248c..89ce3ca6f 100644
--- a/src/animation/frontend/qlerpclipblend.cpp
+++ b/src/animation/frontend/qlerpclipblend.cpp
@@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE
 namespace Qt3DAnimation {
 
 /*!
-    \qmltype LerpBlend
+    \qmltype LerpClipBlend
     \instantiates Qt3DAnimation::QLerpClipBlend
     \inqmlmodule Qt3D.Animation
 
@@ -52,7 +52,7 @@ namespace Qt3DAnimation {
 
     \since 5.9
 
-    LerpBlend can be useful to create advanced animation effects based on
+    LerpClipBlend can be useful to create advanced animation effects based on
     individual animation clips. For instance, given a player character,, lerp
     blending could be used to combine a walking animation clip with an injured
     animation clip based on a blend factor that increases the more the player
@@ -118,7 +118,7 @@ Qt3DCore::QNodeCreatedChangeBasePtr QLerpClipBlend::createNodeCreationChange() c
 }
 
 /*!
-    \qmlproperty real LerpBlend::blendFactor
+    \qmlproperty real LerpClipBlend::blendFactor
 
     Specifies the blending factor between 0 and 1 to control the blending of
     two animation clips.
diff --git a/src/extras/defaults/qmetalroughmaterial.cpp b/src/extras/defaults/qmetalroughmaterial.cpp
index 572bfecfd..a969593db 100644
--- a/src/extras/defaults/qmetalroughmaterial.cpp
+++ b/src/extras/defaults/qmetalroughmaterial.cpp
@@ -212,7 +212,7 @@ QMetalRoughMaterial::~QMetalRoughMaterial()
     color value or a texture. By default the value of this property is "grey".
 */
 /*!
-    \qmlproperty color Qt3D.Extras::MetalRoughMaterial::baseColor
+    \qmlproperty variant Qt3D.Extras::MetalRoughMaterial::baseColor
 
     Holds the current base color of the material. This can be either a plain
     color value or a texture. By default the value of this property is "grey".
@@ -232,7 +232,7 @@ QVariant QMetalRoughMaterial::baseColor() const
     property is 0.
 */
 /*!
-    \qmlproperty real Qt3D.Extras::MetalRoughMaterial::metalness
+    \qmlproperty variant Qt3D.Extras::MetalRoughMaterial::metalness
 
     Holds the current metalness level of the material, as a value between
     0 (purely dielectric, the default) and 1 (purely metallic). This can be
@@ -253,7 +253,7 @@ QVariant QMetalRoughMaterial::metalness() const
     0.
 */
 /*!
-    \qmlproperty real Qt3D.Extras::MetalRoughMaterial::roughness
+    \qmlproperty variant Qt3D.Extras::MetalRoughMaterial::roughness
 
     Holds the current roughness level of the material. This can be either a
     plain uniform value or a texture. By default the value of this property is
diff --git a/src/extras/defaults/qskyboxentity.cpp b/src/extras/defaults/qskyboxentity.cpp
index e82a30950..8d01e8d82 100644
--- a/src/extras/defaults/qskyboxentity.cpp
+++ b/src/extras/defaults/qskyboxentity.cpp
@@ -240,7 +240,7 @@ void QSkyboxEntityPrivate::reloadTexture()
 /*!
  * \qmltype SkyboxEntity
  * \instantiates Qt3DExtras::QSkyboxEntity
-   \inqmlmodule Qt3D.Extras
+ * \inqmlmodule Qt3D.Extras
  *
  * \brief SkyboxEntity is a convenience Entity subclass that can be used to
  * insert a skybox in a 3D scene.
diff --git a/src/extras/defaults/qspritegrid.cpp b/src/extras/defaults/qspritegrid.cpp
index 31d4dd5c0..15016a891 100644
--- a/src/extras/defaults/qspritegrid.cpp
+++ b/src/extras/defaults/qspritegrid.cpp
@@ -57,7 +57,7 @@ QSpriteGridPrivate::QSpriteGridPrivate()
 
 int QSpriteGridPrivate::maxIndex() const
 {
-    return m_numColumns * m_numRows;
+    return m_numColumns * m_numRows - 1;
 }
 
 void QSpriteGridPrivate::updateSizes()
@@ -65,10 +65,10 @@ void QSpriteGridPrivate::updateSizes()
     Q_Q(QSpriteGrid);
     if (m_texture && m_numColumns && m_numRows) {
         m_textureSize = QSize(m_texture->width(), m_texture->height());
-        m_cellSize = QSize(m_texture->width() / m_numColumns, m_texture->height() / m_numRows);
+        m_cellSize = QSizeF((float) m_texture->width() / m_numColumns, (float) m_texture->height() / m_numRows);
     } else {
         m_textureSize = QSize();
-        m_cellSize = QSize();
+        m_cellSize = QSizeF();
     }
 
     if (m_cellSize.isEmpty() || m_numColumns == 0 || m_numRows == 0) {
diff --git a/src/extras/defaults/qspritegrid_p.h b/src/extras/defaults/qspritegrid_p.h
index 6135ebf0d..8d05b2bcc 100644
--- a/src/extras/defaults/qspritegrid_p.h
+++ b/src/extras/defaults/qspritegrid_p.h
@@ -69,7 +69,7 @@ class QSpriteGridPrivate : public QAbstractSpriteSheetPrivate
 
     int m_numColumns;
     int m_numRows;
-    QSize m_cellSize;
+    QSizeF m_cellSize;
 
     Q_DECLARE_PUBLIC(QSpriteGrid)
 };
diff --git a/src/extras/defaults/qspritesheet.cpp b/src/extras/defaults/qspritesheet.cpp
index 87f664ce4..8eb1e33e6 100644
--- a/src/extras/defaults/qspritesheet.cpp
+++ b/src/extras/defaults/qspritesheet.cpp
@@ -56,7 +56,7 @@ QSpriteSheetPrivate::QSpriteSheetPrivate()
 
 int QSpriteSheetPrivate::maxIndex() const
 {
-    return m_sprites.count();
+    return m_sprites.count() - 1;
 }
 
 void QSpriteSheetPrivate::updateSizes()
@@ -77,7 +77,7 @@ void QSpriteSheetPrivate::updateSizes()
         return;
     }
 
-    if (m_currentIndex < 0 || m_currentIndex > m_sprites.size()) {
+    if (m_currentIndex < 0 || m_currentIndex >= m_sprites.size()) {
         m_currentIndex = 0;
         emit q->currentIndexChanged(m_currentIndex);
     }
diff --git a/src/render/renderers/opengl/jobs/renderviewjobutils.cpp b/src/render/renderers/opengl/jobs/renderviewjobutils.cpp
index c2d75b499..d8f27d1cd 100644
--- a/src/render/renderers/opengl/jobs/renderviewjobutils.cpp
+++ b/src/render/renderers/opengl/jobs/renderviewjobutils.cpp
@@ -197,7 +197,7 @@ void setRenderViewConfigFromFrameGraphLeafNode(RenderView *rv, const FrameGraphN
                 // Add states from new stateSet we might be missing
                 // but don' t override existing states (lower StateSetNode always has priority)
                 if (rStateSet->hasRenderStates())
-                    addUniqueStatesToRenderStateSet(stateSet, rStateSet->renderStates(), manager->renderStateManager());
+                    addStatesToRenderStateSet(stateSet, rStateSet->renderStates(), manager->renderStateManager());
                 break;
             }
 
@@ -432,13 +432,13 @@ void parametersFromMaterialEffectTechnique(ParameterInfoList *infoList,
 }
 
 // Only add states with types we don't already have
-void addUniqueStatesToRenderStateSet(RenderStateSet *stateSet,
-                                     const QVector<Qt3DCore::QNodeId> stateIds,
-                                     RenderStateManager *manager)
+void addStatesToRenderStateSet(RenderStateSet *stateSet,
+                               const QVector<Qt3DCore::QNodeId> stateIds,
+                               RenderStateManager *manager)
 {
     for (const Qt3DCore::QNodeId &stateId : stateIds) {
         RenderStateNode *node = manager->lookupResource(stateId);
-        if (node->isEnabled() && !stateSet->hasStateOfType(node->type())) {
+        if (node->isEnabled() && stateSet->canAddStateOfType(node->type())) {
             stateSet->addState(node->impl());
         }
     }
diff --git a/src/render/renderers/opengl/jobs/renderviewjobutils_p.h b/src/render/renderers/opengl/jobs/renderviewjobutils_p.h
index bd2e12534..b2fa59785 100644
--- a/src/render/renderers/opengl/jobs/renderviewjobutils_p.h
+++ b/src/render/renderers/opengl/jobs/renderviewjobutils_p.h
@@ -150,9 +150,9 @@ void parametersFromParametersProvider(ParameterInfoList *infoList,
 Q_AUTOTEST_EXPORT ParameterInfoList::const_iterator findParamInfo(ParameterInfoList *infoList,
                                                                   const int nameId);
 
-Q_AUTOTEST_EXPORT void addUniqueStatesToRenderStateSet(RenderStateSet *stateSet,
-                                                       const QVector<Qt3DCore::QNodeId> stateIds,
-                                                       RenderStateManager *manager);
+Q_AUTOTEST_EXPORT void addStatesToRenderStateSet(RenderStateSet *stateSet,
+                                                 const QVector<Qt3DCore::QNodeId> stateIds,
+                                                 RenderStateManager *manager);
 
 typedef QHash<int, QVariant> UniformBlockValueBuilderHash;
 
diff --git a/src/render/renderers/opengl/renderer/renderview.cpp b/src/render/renderers/opengl/renderer/renderview.cpp
index 9bbf966c8..4bb3ba2f8 100644
--- a/src/render/renderers/opengl/renderer/renderview.cpp
+++ b/src/render/renderers/opengl/renderer/renderview.cpp
@@ -603,7 +603,7 @@ QVector<RenderCommand *> RenderView::buildDrawRenderCommands(const QVector<Entit
                 RenderPass *pass = passData.pass;
                 if (pass->hasRenderStates()) {
                     command->m_stateSet = new RenderStateSet();
-                    addUniqueStatesToRenderStateSet(command->m_stateSet, pass->renderStates(), m_manager->renderStateManager());
+                    addStatesToRenderStateSet(command->m_stateSet, pass->renderStates(), m_manager->renderStateManager());
                     if (m_stateSet != nullptr)
                         command->m_stateSet->merge(m_stateSet);
                     command->m_changeCost = m_renderer->defaultRenderState()->changeCost(command->m_stateSet);
@@ -728,7 +728,7 @@ QVector<RenderCommand *> RenderView::buildComputeRenderCommands(const QVector<En
 
                 if (pass->hasRenderStates()) {
                     command->m_stateSet = new RenderStateSet();
-                    addUniqueStatesToRenderStateSet(command->m_stateSet, pass->renderStates(), m_manager->renderStateManager());
+                    addStatesToRenderStateSet(command->m_stateSet, pass->renderStates(), m_manager->renderStateManager());
 
                     // Merge per pass stateset with global stateset
                     // so that the local stateset only overrides
diff --git a/src/render/renderers/opengl/renderstates/renderstateset.cpp b/src/render/renderers/opengl/renderstates/renderstateset.cpp
index b14695c77..d667d9c76 100644
--- a/src/render/renderers/opengl/renderstates/renderstateset.cpp
+++ b/src/render/renderers/opengl/renderstates/renderstateset.cpp
@@ -112,17 +112,28 @@ void RenderStateSet::merge(RenderStateSet *other)
 
     // We only add states which are new (different type)
     for (const StateVariant &otherState : otherStates) {
-        const bool hasFoundStateOfSameType = hasStateOfType(otherState.type);
-        if (!hasFoundStateOfSameType)
+        const bool canAdd = canAddStateOfType(otherState.type);
+        if (canAdd)
             m_states.push_back(otherState);
     }
 }
 
+bool RenderStateSet::canAddStateOfType(StateMask type) const
+{
+    return !hasStateOfType(type) || allowMultipleStatesOfType(type);
+}
+
 bool RenderStateSet::hasStateOfType(StateMask type) const
 {
     return (type & stateMask());
 }
 
+bool RenderStateSet::allowMultipleStatesOfType(StateMask type) const
+{
+    return (type == BlendEquationArgumentsMask) ||
+           (type == ClipPlaneMask);
+}
+
 bool RenderStateSet::contains(const StateVariant &ds) const
 {
     // trivial reject using the state mask bits
diff --git a/src/render/renderers/opengl/renderstates/renderstateset_p.h b/src/render/renderers/opengl/renderstates/renderstateset_p.h
index 29be4d2f1..c2f3a0219 100644
--- a/src/render/renderers/opengl/renderstates/renderstateset_p.h
+++ b/src/render/renderers/opengl/renderstates/renderstateset_p.h
@@ -93,8 +93,7 @@ public:
 
     QVector<StateVariant> states() const { return m_states; }
 
-    bool hasStateOfType(StateMask type) const;
-
+    bool canAddStateOfType(StateMask type) const;
 
     /**
      * @brief contains - check if this set contains a matching piece of state
@@ -102,6 +101,11 @@ public:
      * @return
      */
     bool contains(const StateVariant &ds) const;
+
+private:
+    bool hasStateOfType(StateMask type) const;
+    bool allowMultipleStatesOfType(StateMask type) const;
+
 private:
     StateMaskSet m_stateMask;
     QVector<StateVariant> m_states;