Merge remote-tracking branch 'origin/master' into Menu

# Conflicts: # include/Engine/Rendering/RenderSystem.h # resources/Schema/Entities/RenderingWorld.xml # resources/Shaders/ForwardPlus.frag.glsl # src/Engine/Rendering/RenderSystem.cpp
2016-01-24 20:48:17 +01:00
parent aa3b8cd652 f80fb5eda8
commit ada1bac2a7
105 changed files with 4323 additions and 861 deletions
@@ -24,6 +24,10 @@ struct ModelJob : RenderJob
        DiffuseTexture = matGroup.Texture.get();
        NormalTexture = matGroup.NormalMap.get();
        SpecularTexture = matGroup.SpecularMap.get();
+        IncandescenceTexture = matGroup.IncandescenceMap.get();
+        DiffuseColor = matGroup.DiffuseColor;
+        SpecularColor = matGroup.SpecularColor;
+        IncandescenceColor = matGroup.IncandescenceColor;
        StartIndex = matGroup.StartIndex;
        EndIndex = matGroup.EndIndex;
        Matrix = matrix;
@@ -47,9 +51,13 @@ struct ModelJob : RenderJob
    const Texture* DiffuseTexture;
    const Texture* NormalTexture;
    const Texture* SpecularTexture;
+    const Texture* IncandescenceTexture;
    float Shininess = 0.f;
    glm::vec4 Color;
    const ::Model* Model = nullptr;
+    glm::vec4 DiffuseColor;
+    glm::vec4 SpecularColor;
+    glm::vec4 IncandescenceColor;
    unsigned int StartIndex = 0;
    unsigned int EndIndex = 0;
    World* World;