From bfb00b29b47b143a3d0eb238ec069f0d6cc44f35 Mon Sep 17 00:00:00 2001
From: Peter Schaefer <schaeferpm@gmail.com>
Date: Wed, 27 Apr 2016 08:08:00 +0200
Subject: [PATCH] bugFix clearBuffer -> static

---
 Weave/Graphix/Textures/BufferObject.h    | 1 -
 Weave/Graphix/Textures/fBufferObject.cpp | 4 ++--
 Weave/Graphix/Textures/fBufferObject.h   | 2 +-
 Weave/Graphix/Textures/rBufferObject.cpp | 4 ++--
 Weave/Graphix/Textures/rBufferObject.h   | 2 +-
 Weave/Scene/Scene.cpp                    | 8 ++++----
 6 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/Weave/Graphix/Textures/BufferObject.h b/Weave/Graphix/Textures/BufferObject.h
index 99843cf..1eda417 100644
--- a/Weave/Graphix/Textures/BufferObject.h
+++ b/Weave/Graphix/Textures/BufferObject.h
@@ -8,7 +8,6 @@ public:
 	virtual void bindBuffer(unsigned int width = 0, unsigned int height = 0) = 0;
 	virtual void unbindBuffer() = 0;
 	virtual void useBuffer() const = 0;
-	virtual void clearBuffer() const = 0;
 
 	virtual void updateSize(unsigned int _width, unsigned int _height) = 0;
 
diff --git a/Weave/Graphix/Textures/fBufferObject.cpp b/Weave/Graphix/Textures/fBufferObject.cpp
index 67a8ae3..5c4dac2 100644
--- a/Weave/Graphix/Textures/fBufferObject.cpp
+++ b/Weave/Graphix/Textures/fBufferObject.cpp
@@ -97,9 +97,9 @@ void fBufferObject::useBuffer() const
 
 }
 
-void fBufferObject::clearBuffer() const
+void fBufferObject::clearBuffer()
 {
-	glBindFramebuffer(buffer_target, 0);
+	glBindFramebuffer(GL_FRAMEBUFFER, 0);
 }
 
 void fBufferObject::updateSize(unsigned int _width, unsigned int _height)
diff --git a/Weave/Graphix/Textures/fBufferObject.h b/Weave/Graphix/Textures/fBufferObject.h
index 0f62429..92654d3 100644
--- a/Weave/Graphix/Textures/fBufferObject.h
+++ b/Weave/Graphix/Textures/fBufferObject.h
@@ -17,7 +17,7 @@ public:
 
 	virtual void useBuffer() const override;
 
-	virtual void clearBuffer() const override;
+	static void clearBuffer();
 
 	virtual void updateSize(unsigned int _width, unsigned int _height) override;
 
diff --git a/Weave/Graphix/Textures/rBufferObject.cpp b/Weave/Graphix/Textures/rBufferObject.cpp
index e96ffdf..4658944 100644
--- a/Weave/Graphix/Textures/rBufferObject.cpp
+++ b/Weave/Graphix/Textures/rBufferObject.cpp
@@ -42,9 +42,9 @@ void rBufferObject::useBuffer() const
 
 }
 
-void rBufferObject::clearBuffer() const
+void rBufferObject::clearBuffer()
 {
-	glBindRenderbuffer(buffer_target, 0);
+	glBindRenderbuffer(GL_RENDERBUFFER, 0);
 }
 
 void rBufferObject::updateSize(unsigned int _width, unsigned int _height)
diff --git a/Weave/Graphix/Textures/rBufferObject.h b/Weave/Graphix/Textures/rBufferObject.h
index 31f07c2..e00af53 100644
--- a/Weave/Graphix/Textures/rBufferObject.h
+++ b/Weave/Graphix/Textures/rBufferObject.h
@@ -14,7 +14,7 @@ public:
 
 	virtual void useBuffer() const override;
 
-	virtual void clearBuffer() const override;
+	static void clearBuffer();
 
 	void updateSize(unsigned int _width, unsigned int _height) override;
 
diff --git a/Weave/Scene/Scene.cpp b/Weave/Scene/Scene.cpp
index bb11227..a39bbaa 100644
--- a/Weave/Scene/Scene.cpp
+++ b/Weave/Scene/Scene.cpp
@@ -76,7 +76,7 @@ lookat(_lookat)
 	postRender = new fBufferObject(2, false);
 	postRender->bindBuffer(Graphix::getWindowWidth(), Graphix::getWindowHeight());
 
-	render->clearBuffer();
+	fBufferObject::clearBuffer();
 
 	Graphix::disableEffects(EF_BLOOM);
 }
@@ -235,7 +235,7 @@ void Scene::draw() const
 	}
 	else
 	{
-		render->clearBuffer();
+		fBufferObject::clearBuffer();
 	}
 
 	/*DRAW SCENE*/
@@ -295,7 +295,7 @@ void Scene::draw() const
 	{
 		/* BLEND BRIGHTNESS TO ORIGINAL*/
 		Shader::getShader(SH_BLEND)->useShader();
-		render->clearBuffer();
+		fBufferObject::clearBuffer();
 		glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 		//SceneObjects.front()->gTexture()->useTexture();
 		//shadowdir->getTexture()->useTexture();
@@ -364,7 +364,7 @@ void Scene::setView(unsigned int x, unsigned int y, unsigned int width, unsigned
 void Scene::bindShader()
 {
 	/*SceneObject*/
-	ShaderTarget shader[] = {SH_BASIC,SH_BASICTEXTURE,SH_LIGHTING, SH_SHADOWDIR, SH_NORMALS};
+	ShaderTarget shader[] = {SH_BASIC,SH_BASICTEXTURE,SH_LIGHTING, SH_SHADOWDIR};
 	for (int s = 0; s < NELEMS(shader); s++)
 	{
 		for (auto i = SceneObjects.cbegin(); i != SceneObjects.cend(); ++i)
-- 
2.47.3