Changeset 2850

Timestamp:

08/08/08 07:52:54 (16 years ago)

Author:

mattausch

Message:

debug version before siggraph

Location:

GTP/trunk/App/Demos/Vis/FriendlyCulling/src

Files:

• CHCPlusPlusTraverser.cpp (modified) (1 diff)
• RenderState.cpp (modified) (1 diff)
• ResourceManager.cpp (modified) (3 diffs)
• Texture.cpp (modified) (4 diffs)
• Texture.h (modified) (3 diffs)
• chcdemo.cpp (modified) (4 diffs)

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

@@ -27 +27 @@
                         {
                                 BvhNode *node = query->GetNodes()[i];
-#if 1
+
                                 mIQueue.push_back(node);
                                 node->SetLastQueriedFrame(mFrameId);
-#else
-                                OcclusionQuery *q = IssueOcclusionQuery(node);
-                                mQueryQueue.push(q);
-#endif
                         }
                 }

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

@@ -88 +88 @@
         {
                 mCullFaceEnabled = true;
-                glEnable(GL_CULL_FACE);
+                //glEnable(GL_CULL_FACE);
         }
 

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

@@ -68 +68 @@
                 str.read(reinterpret_cast<char *>(&distance), sizeof(float));
 
+                // hack
+                distance = i * 20;
+
                 int numShapes;
                 str.read(reinterpret_cast<char *>(&numShapes), sizeof(int));
@@ -80 +83 @@
                         str.read(reinterpret_cast<char *>(&shapeId), sizeof(int));
 
-                        //if (numLODs > 1) cout << " id " << shapeId;
-                        
                         Geometry *geom = mGeometryTable[shapeId];
                         Material *mat = mMaterialTable[shapeId];
@@ -128 +129 @@
                 tex->SetBoundaryModeS(boundS);
                 tex->SetBoundaryModeT(boundT);
-
-                //tex->SetBoundaryModeS(Texture::CLAMP);
-                //tex->SetBoundaryModeT(Texture::CLAMP);
 
                 tex->Create();

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

@@ -36 +36 @@
 mName(filename),
 mBoundaryModeS(REPEAT),
-mBoundaryModeT(REPEAT)
+mBoundaryModeT(REPEAT),
+mUseMipMap(true)
 {
         startil();
@@ -72 +73 @@
         glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
         
-        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
-
-        //glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-        //glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-
         glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, 4);
 
@@ -86 +81 @@
         glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, glWrapModeT);
 
+        if (mUseMipMap)
+        {
+                glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+                glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
+        }
+        else
+        {
+                glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+                glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+        }
+
         glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, mWidth, mHeight, 0, GL_RGBA, GL_UNSIGNED_BYTE, mImage);
-        gluBuild2DMipmaps(GL_TEXTURE_2D, GL_RGBA, mWidth, mHeight, GL_RGBA, GL_UNSIGNED_BYTE, mImage);
+        
+        if (mUseMipMap)
+                gluBuild2DMipmaps(GL_TEXTURE_2D, GL_RGBA, mWidth, mHeight, GL_RGBA, GL_UNSIGNED_BYTE, mImage);
 
         glBindTexture(GL_TEXTURE_2D, 0);
@@ -153 +161 @@
 }
 
+
+
+
 }

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/Texture.h

@@ -54 +54 @@
         void SetBoundaryModeT(int mode) { mBoundaryModeT = mode; }
 
+        //void SetUseMipMap(bool useMipMap) { mUseMipMap = useMipMap; }
+
         int GetBoundaryModeS() const { return mBoundaryModeS; }
         int GetBoundaryModeT() const { return mBoundaryModeT; }
@@ -60 +62 @@
         */
         void Create();
+        
 
 
@@ -77 +80 @@
         int mByteSize;
         void *mImage;
+
+        bool mUseMipMap;
 };
 

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

@@ -376 +376 @@
         glutInitWindowSize(winWidth, winHeight);
         glutInit(&argc, argv);
-        glutInitDisplayMode(GLUT_DOUBLE | GLUT_RGBA | GLUT_DEPTH);
+        glutInitDisplayMode(GLUT_DOUBLE | GLUT_RGBA | GLUT_DEPTH | GLUT_MULTISAMPLE);
+
+        //glutInitDisplayString("samples=2");
 
         if (!useFullScreen)
@@ -397 +399 @@
 
         // initialise gl graphics
-
         InitExtensions();
         InitGLstate();
-        
+
+        glEnable(GL_MULTISAMPLE_ARB);
+        glEnable(GL_SAMPLE_ALPHA_TO_COVERAGE_ARB);
+        glHint(GL_MULTISAMPLE_FILTER_HINT_NV, GL_NICEST);
+
         InitFBO();
         
@@ -665 +670 @@
         
         glRenderbufferStorageEXT(GL_RENDERBUFFER_EXT, GL_RGBA32F_ARB, texWidth, texHeight);
+
         int samples = 8;
         //glEnable(GL_MULTISAMPLE_ARB);
@@ -863 +869 @@
         glFrontFace(GL_CCW);
         glCullFace(GL_BACK);
-        glEnable(GL_CULL_FACE);
+        //glEnable(GL_CULL_FACE);
+        
         glDisable(GL_CULL_FACE);
         glDisable(GL_TEXTURE_2D);