Extend standard uniforms to cover skinningPalette

This requires obtaining the skinning palette uniform from the entity.
Up until now the standard uniforms only needed the entity's world
transform. Now we need more, refactor the affected functions to pass in
a pointer to the entity we are creating render commands for.

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

1 files changed, 16 insertions, 5 deletions

diff --git a/src/render/backend/renderview_p.h b/src/render/backend/renderview_p.h
index 1f4a920c8..1674db0a5 100644
--- a/src/render/backend/renderview_p.h
+++ b/src/render/backend/renderview_p.h
@@ -261,8 +261,12 @@ public:
     void setIsDownloadBuffersEnable(bool isDownloadBuffersEnable);
 
 private:
-    void setShaderAndUniforms(RenderCommand *command, RenderPass *pass, ParameterInfoList &parameters, const QMatrix4x4 &worldTransform,
-                              const QVector<LightSource> &activeLightSources, EnvironmentLight *environmentLight) const;
+    void setShaderAndUniforms(RenderCommand *command,
+                              RenderPass *pass,
+                              ParameterInfoList &parameters,
+                              Entity *entity,
+                              const QVector<LightSource> &activeLightSources,
+                              EnvironmentLight *environmentLight) const;
 
     mutable QThreadStorage<UniformBlockValueBuilder*> m_localData;
 
@@ -324,17 +328,24 @@ private:
         Time,
         Exposure,
         Gamma,
-        EyePosition
+        EyePosition,
+        SkinningPalette
     };
 
     typedef QHash<int, StandardUniform> StandardUniformsNameToTypeHash;
     static StandardUniformsNameToTypeHash ms_standardUniformSetters;
     static StandardUniformsNameToTypeHash initializeStandardUniformSetters();
 
-    UniformValue standardUniformValue(StandardUniform standardUniformType, const QMatrix4x4 &model) const;
+    UniformValue standardUniformValue(StandardUniform standardUniformType,
+                                      Entity *entity,
+                                      const QMatrix4x4 &model) const;
 
     void setUniformValue(ShaderParameterPack &uniformPack, int nameId, const UniformValue &value) const;
-    void setStandardUniformValue(ShaderParameterPack &uniformPack, int glslNameId, int nameId, const QMatrix4x4 &worldTransform) const;
+    void setStandardUniformValue(ShaderParameterPack &uniformPack,
+                                 int glslNameId,
+                                 int nameId,
+                                 Entity *entity,
+                                 const QMatrix4x4 &worldTransform) const;
     void setUniformBlockValue(ShaderParameterPack &uniformPack,
                               Shader *shader,
                               const ShaderUniformBlock &block,