Revert "Revert "Merge pull request #75 from teamfisk/NormalSpecularMapping""

This reverts commit b56824786c.
2016-02-03 16:30:00 +01:00
parent b56824786c
commit bd2da7bc9f
29 changed files with 2029 additions and 145 deletions
@@ -26,6 +26,7 @@ struct RenderScene
    std::list<std::shared_ptr<RenderJob>> DirectionalLightJobs;
    Rectangle Viewport;
    bool ClearDepth = false;
+    glm::vec4 AmbientColor;

 	void Clear()
 	{
@@ -40,6 +41,9 @@ struct RenderScene
 struct RenderFrame
 {
 public:
+    //TODO: Getters
+    GLfloat Gamma = 2.2f;
+    GLfloat Exposure = 1.f;

    void Add(RenderScene &scene)
    {