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

Timestamp:

08/20/08 13:08:09 (16 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/App/Demos/Vis/FriendlyCulling/src/FrameBufferObject.cpp (modified) (1 diff)

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

@@ -45 +45 @@
 
 ColorBufferObject::ColorBufferObject(int w, int h, 
-                                                                         COLOR_FORMAT c, 
-                                                                         int wrapType, 
-                                                                         int filterType, 
+                                                                         FORMAT c, 
+                                                                         WRAP_TYPE wrapType, 
+                                                                         FILTER_TYPE filterType, 
                                                                          bool useMipMap, 
                                                                          bool useMultiSampling)
 {
-/*      
-        glGenRenderbuffersEXT(1, &normalsBuffer);
-        glBindRenderbufferEXT(GL_RENDERBUFFER_EXT, normalsBuffer);
-        glRenderbufferStorageEXT(GL_RENDERBUFFER_EXT, GL_RGBA8, texWidth, texHeight);
+        glGenRenderbuffersEXT(1, &mId);
+        glBindRenderbufferEXT(GL_RENDERBUFFER_EXT, mId);
+        glRenderbufferStorageEXT(GL_RENDERBUFFER_EXT, GL_RGBA8, w, h);
         
-        glFramebufferRenderbufferEXT(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT2_EXT, GL_RENDERBUFFER_EXT, normalsBuffer);
+        glFramebufferRenderbufferEXT(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT2_EXT, GL_RENDERBUFFER_EXT, mId);
 
-        glGenTextures(1, &normalsTex);
-        glBindTexture(GL_TEXTURE_2D, normalsTex);
-        glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, texWidth, texHeight, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL);
-        glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT2_EXT, GL_TEXTURE_2D, normalsTex, 0);
+        glGenTextures(1, &mTexId);
+        glBindTexture(GL_TEXTURE_2D, mTexId);
+        glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, w, h, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL);
+        glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT2_EXT, GL_TEXTURE_2D, mTexId, 0);
 
-        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+        GLuint filterParam;
 
-        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+        switch (filterType)
+        {
+        case WRAP_NEAREST:
+                filterParam = GL_NEAREST; break;
+        case WRAP_LINEAR:
+                filterParam = GL_LINEAR; break;
+        case WRAP_MIPMAP_LINEAR: 
+                filterParam = GL_LINEAR_MIPMAP_LINEAR; break;
+        }
+
+        
+        GLuint wrapParam;
+
+        switch (wrapType)
+        {
+        case GL_REPEAT:
+                wrapParam = GL_NEAREST; break;
+        case GL_CLAMP_TO_EDGE:
+                wrapParam = GL_LINEAR; break;
+        }
+
+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, filterParam);
+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, filterParam);
+
+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, wrapParam);
+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, wrapParam);
 
         PrintFBOStatus(glCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT));
-*/
 }