bugFix

clearBuffer -> static

diff --git a/Weave/Graphix/Textures/BufferObject.h b/Weave/Graphix/Textures/BufferObject.h
index 99843cf43d0752b1b3b0296692831b11cb9b6558..1eda41736a85b0e2351bacb217f0cf950277261b 100644 (file)
--- 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 67a8ae3d4f2d5085f488a4e6e524f67c9c44a240..5c4dac2697ec21d3858aa3577ece27dcbcfdb4a4 100644 (file)
--- 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 0f6242966bd40437827d5930504486e9d0a811eb..92654d337f2d37d64b7892567a97dfd0488cdb99 100644 (file)
--- 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 e96ffdfeff7b5903ccc237a5e82e674d434fb73e..46589449151b4c3cd9a547814a8a8a3f0b4f48de 100644 (file)
--- 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 31f07c2127f42abed7b82943a1afb4deeaf409dd..e00af5387316fa6d1a64fdb93d212014bb2e779b 100644 (file)
--- 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 bb112272f40b878f20d1ee2cc270cd1661b4bd9a..a39bbaaa910af1443fd901ac7cccc6e29163c0ea 100644 (file)
--- 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)