Revert "Merge remote-tracking branch 'origin/master' into SniperSprint"

This reverts commit 62653cf65d, reversing changes made to b81bb9eeea.
2016-03-02 16:58:24 +01:00
parent 4e68f9063b
commit a20ef0504a
195 changed files with 2303 additions and 6805 deletions
@@ -22,25 +22,25 @@ public:
    void Draw(RenderScene& scene);
    void ClearPicking();

-    void OnWindowResize();
-
    //Getters
    const ShaderProgram& PickingProgram() const { return *m_PickingProgram; }
    //const std::unordered_map<glm::ivec2, EntityID>& PickingColorsToEntity() const { return m_PickingColorsToEntity; }
    GLuint PickingTexture() const { return m_PickingTexture; }
-    GLuint* DepthBuffer() { return &m_DepthBuffer; }
+    GLuint DepthBuffer() const { return m_DepthBuffer; }
    const FrameBuffer& PickingBuffer() const { return m_PickingBuffer; }

    
    PickData Pick(glm::vec2 screenCoord);

 private:
+    void GenerateTexture(GLuint* texture, GLenum wrapping, GLenum filtering, glm::vec2 dimensions, GLint internalFormat, GLint format, GLenum type) const;
+
    EventBroker* m_EventBroker;

    const IRenderer* m_Renderer;

    ShaderProgram* m_PickingProgram;
-    ShaderProgram* m_PickingSkinnedProgram;
+	ShaderProgram* m_PickingSkinnedProgram;
    Camera* m_Camera;

    struct PickingInfo