Changeset 2867 for GTP/trunk/App/Demos/Vis/FriendlyCulling/src/FrameBufferObject.cpp

Timestamp:

08/26/08 13:30:31 (16 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/App/Demos/Vis/FriendlyCulling/src/FrameBufferObject.cpp (modified) (5 diffs)

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/FrameBufferObject.cpp

@@ -50 +50 @@
                                                                          FILTER_TYPE filterType, 
                                                                          bool useMipMap, 
-                                                                         bool useMultiSampling,
                                                                          int attachment_idx)
 {
@@ -81 +80 @@
         glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, color_attachment[attachment_idx], GL_TEXTURE_2D, mTexId, 0);
 
-        GLuint filterParam;
+        GLuint minfilterParam;
+        GLuint magfilterParam;
 
         switch (filterType)
         {
         case FILTER_NEAREST:
-                filterParam = GL_NEAREST; break;
+                minfilterParam = GL_NEAREST;
+                magfilterParam = GL_NEAREST; break;
         case FILTER_LINEAR:
-                filterParam = GL_LINEAR; break;
+                minfilterParam = GL_LINEAR;
+                magfilterParam = GL_LINEAR; break;
         case FILTER_MIPMAP_LINEAR: 
-                filterParam = GL_LINEAR_MIPMAP_LINEAR; break;
+                //minfilterParam = GL_LINEAR_MIPMAP_LINEAR;
+                minfilterParam = GL_NEAREST_MIPMAP_NEAREST;
+                //minfilterParam = GL_NEAREST_MIPMAP_LINEAR;
+                magfilterParam = GL_NEAREST; break;
         default:
-                filterParam = GL_NEAREST;
+                minfilterParam = GL_NEAREST;
+                magfilterParam = GL_NEAREST;
+
                 cerr << "should not come here" << endl;
         }
@@ -107 +114 @@
         }
 
-        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, filterParam);
-        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, filterParam);
+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, magfilterParam);
+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, minfilterParam);
 
         glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, wrapParam);
         glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, wrapParam);
+
+        if (useMipMap) glGenerateMipmapEXT(GL_TEXTURE_2D);
 
         // print status
@@ -178 +187 @@
 
 
-int FrameBufferObject::AddColorBuffer(int w, int h,
-                                                                          ColorBufferObject::FORMAT col, 
+int FrameBufferObject::AddColorBuffer(ColorBufferObject::FORMAT col, 
                                                                           ColorBufferObject::WRAP_TYPE wrapType, 
                                                                           ColorBufferObject::FILTER_TYPE filterType, 
-                                                                          bool useMipMap, 
-                                                                          bool useMultiSampling)
+                                                                          bool useMipMap)
 {
         cout << "adding color buffer" << endl;
@@ -189 +196 @@
         Bind();
 
-        int idx = (int)mColorBuffers.size();
+        const int idx = (int)mColorBuffers.size();
+
         ColorBufferObject *colorBuf = 
-                new ColorBufferObject(w, h, col, wrapType, filterType, useMipMap, useMultiSampling, idx);
+                new ColorBufferObject(mWidth, mHeight, col, wrapType, filterType, useMipMap, idx);
 
         mColorBuffers.push_back(colorBuf);