fixed fBO (disabled MipMap)

diff --git a/Weave/Graphix/Model/Model.cpp b/Weave/Graphix/Model/Model.cpp
index 4a286121c8e0dbfafe21108e44a9b0aa071552d9..5ea99ca84f2ca4d3194de2389dc6fd4c626e3a86 100644 (file)
--- a/Weave/Graphix/Model/Model.cpp
+++ b/Weave/Graphix/Model/Model.cpp
@@ -245,6 +245,7 @@ Model* Model::getPlaneModel()
                PlaneModel = new Plane();\r
                PlaneModel->bindModel();\r
                PlaneModel->bindShader(Shader::gBasicTexture());\r
+               PlaneModel->bindShader(Shader::gBlur());\r
        }\r
        return PlaneModel;\r
 }\r

diff --git a/Weave/Graphix/Model/Plane.cpp b/Weave/Graphix/Model/Plane.cpp
index fb07a86da96fead07bb836d192e5f4b6240f08d6..c34955d6c4c2181d11770a54dcda8f4ad26c6ecd 100644 (file)
--- a/Weave/Graphix/Model/Plane.cpp
+++ b/Weave/Graphix/Model/Plane.cpp
@@ -34,8 +34,8 @@ void Plane::drawModel() const
        Shader::gActive()->setUniformLocation("uPlain", 1);
        Shader::gActive()->setUniformLocation("uFar", 0);
 
-       glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
-       //glDrawArrays(GL_QUADS, 0, 4);
+       //glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
+       glDrawArrays(GL_QUADS, 0, 4);
        glBindVertexArray(0);
 }
 

diff --git a/Weave/Graphix/Textures/Texture.cpp b/Weave/Graphix/Textures/Texture.cpp
index 4276fd37e54bfcd5be43eb03c28739836c283c10..c08d34bd9b0b1b984f91b2b9309923fb75c96c61 100644 (file)
--- a/Weave/Graphix/Textures/Texture.cpp
+++ b/Weave/Graphix/Textures/Texture.cpp
@@ -11,7 +11,7 @@ using std::unordered_map;
 
 
 Texture::Texture() 
-       : texture_internal(GL_RGB16F), texture_format(GL_RGB),texture_target(GL_TEXTURE_2D),texture_type(GL_FLOAT)
+       : texture_internal(GL_RGB), texture_format(GL_RGB),texture_target(GL_TEXTURE_2D),texture_type(GL_UNSIGNED_BYTE)
 {
        glGenTextures(1, &handle);
 }
@@ -76,7 +76,11 @@ void Texture::bindTexture(unsigned int _width, unsigned int _height)
 
        glBindTexture(texture_target, handle);
 
-       glTexParameteri(texture_target, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
+       if(data!=nullptr)
+               glTexParameteri(texture_target, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
+       else
+               glTexParameteri(texture_target, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+
        glTexParameteri(texture_target, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
 
        glTexParameteri(texture_target, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);

diff --git a/Weave/Graphix/Textures/fBufferObject.cpp b/Weave/Graphix/Textures/fBufferObject.cpp
index 8ab4a66536dedcff51b6d4a38ec0a6ac7f643389..ea23db11fb1b58098d64ee7f6a972cd9fd1d140f 100644 (file)
--- a/Weave/Graphix/Textures/fBufferObject.cpp
+++ b/Weave/Graphix/Textures/fBufferObject.cpp
@@ -65,9 +65,10 @@ void fBufferObject::bindBuffer(unsigned int _width, unsigned int _height)
                rBO->bindBuffer(_width, _height);
                glFramebufferRenderbuffer(buffer_target, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER, *rBO);
        }
-       
 
-       //glDrawBuffers(dim, attachments);
+       //glDrawBuffers(1, attachments);
+       
+       glDrawBuffers(dim, attachments);
        if (glCheckFramebufferStatus(buffer_target) != GL_FRAMEBUFFER_COMPLETE)
                Message::error("fBufferObject: Framebuffer not complete!");
 

diff --git a/Weave/Scene/Scene.cpp b/Weave/Scene/Scene.cpp
index 9f136b0b71969526eeec388006af1612c1ee8a81..d0f1204e11cc68fad2ae0088002f50ac9c3cc9e3 100644 (file)
--- a/Weave/Scene/Scene.cpp
+++ b/Weave/Scene/Scene.cpp
@@ -59,9 +59,9 @@ lookat(_lookat)
 
        render = new fBufferObject(1);
 
-       blur = new fBufferObject(2,false);
+//     blur = new fBufferObject(2,false);
 
-       blur->bindBuffer(Graphix::getWindowWidth(), Graphix::getWindowHeight());
+//     blur->bindBuffer(Graphix::getWindowWidth(), Graphix::getWindowHeight());
        render->bindBuffer(Graphix::getWindowWidth(), Graphix::getWindowHeight());
 
        render->clearBuffer();
@@ -197,9 +197,9 @@ void Scene::draw() const
 
        render->clearBuffer();
        glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-       Shader::gBasicTexture()->useShader();
-       //render->getTexture()->useTexture();
-       SceneObjects.front()->gTexture()->useTexture();
+       Shader::gBlur()->useShader();
+       render->getTexture()->useTexture();
+       //SceneObjects.front()->gTexture()->useTexture();
        Model::getPlaneModel()->drawModel(mat4(1.f));
        
 }