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

Timestamp:

08/20/08 16:30:28 (16 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -66 +66 @@
         switch (filterType)
         {
-        case WRAP_NEAREST:
+        case FILTER_NEAREST:
                 filterParam = GL_NEAREST; break;
-        case WRAP_LINEAR:
+        case FILTER_LINEAR:
                 filterParam = GL_LINEAR; break;
-        case WRAP_MIPMAP_LINEAR: 
+        case FILTER_MIPMAP_LINEAR: 
                 filterParam = GL_LINEAR_MIPMAP_LINEAR; break;
         }
@@ -79 +79 @@
         switch (wrapType)
         {
-        case GL_REPEAT:
-                wrapParam = GL_NEAREST; break;
-        case GL_CLAMP_TO_EDGE:
-                wrapParam = GL_LINEAR; break;
+        case WRAP_REPEAT:
+                wrapParam = GL_REPEAT; break;
+        case WRAP_CLAMP_TO_EDGE:
+                wrapParam = GL_CLAMP_TO_EDGE; break;
         }
 
@@ -91 +91 @@
         glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, wrapParam);
 
+        // print status
         PrintFBOStatus(glCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT));
 }
@@ -124 +125 @@
                 glRenderbufferStorageEXT(GL_RENDERBUFFER_EXT, depthFormat, mWidth, mHeight);
                 glFramebufferRenderbufferEXT(GL_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT, GL_RENDERBUFFER_EXT, mDepthId);
+        }
 
-                PrintFBOStatus(glCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT));
-        }
+        // print status
+        PrintFBOStatus(glCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT));
 }
 
 
+ColorBufferObject *FrameBufferObject::AddColorBuffer(ColorBufferObject::FORMAT col, 
+                                                                                                         ColorBufferObject::WRAP_TYPE wrapType, 
+                                                                                                         ColorBufferObject::FILTER_TYPE filterType, 
+                                                                                                         bool useMipMap, 
+                                                                                                         bool useMultiSampling)
+{
+        ColorBufferObject *colorBuf = 
+                new ColorBufferObject(mWidth, mHeight, col, wrapType, filterType, useMipMap, useMultiSampling);
+        mColorBuffers.push_back(colorBuf);
+
+        return colorBuf;
+}
+
 } // namespace