Fixed a bugg with RenderState.

Renderstate now also handles the Frambuffer binding.
This commit is contained in:
Tleety
2015-12-11 16:07:12 +01:00
parent 433331e752
commit 53d5736420
10 changed files with 100 additions and 63 deletions
+2 -2
View File
@@ -6,10 +6,10 @@
class PickingPassState : public RenderState
{
public:
PickingPassState();
PickingPassState(GLuint frameBuffer);
~PickingPassState();
private:
private:
};
#endif
+2 -1
View File
@@ -14,9 +14,10 @@ public:
bool CullFace(GLenum GlFaceToCull);
bool ClearColor(glm::vec4 color);
bool Clear(GLbitfield mask);
bool BindBuffer(GLint buffer);
private:
std::vector<GLenum> m_Enables;
float m_preClearColor[4];
GLenum m_preCullFace;
int m_preBuffer;
};
#endif
+1 -1
View File
@@ -52,8 +52,8 @@ private:
Model* m_UnitQuad;
Model* m_UnitSphere;
PickingPass* m_PickingPass;
DrawScenePass* m_DrawScenePass;
PickingPass* m_PickingPass;
//----------------------Functions----------------------//
void InitializeWindow();