Changeset 2845 for GTP/trunk

Timestamp:

07/17/08 21:40:33 (16 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/App/Demos/Vis/FriendlyCulling

Files:

• data/city/model/env.dem (modified) (previous)
• default.env (modified) (2 diffs)
• src/RenderQueue.cpp (modified) (2 diffs)
• src/RenderState.cpp (modified) (1 diff)
• src/ResourceManager.cpp (modified) (1 diff)
• src/Texture.cpp (modified) (1 diff)
• src/chcdemo.cpp (modified) (1 diff)

GTP/trunk/App/Demos/Vis/FriendlyCulling/default.env

@@ -4 +4 @@
 assumedVisibleFrames=10
 maxBatchSize=50
-trianglesPerVirtualLeaf=500
+trianglesPerVirtualLeaf=300
 keyForwardMotion=20.0f
 keyRotation=1.5f
@@ -17 +17 @@
 expFactor=0.1f
 #numSsaoSamples=8
+#0699/11384251

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

@@ -58 +58 @@
                 return false;
 
-        if (mat->IsCullFaceEnabled() != mBuckets[idx]->mAlphaTestEnabled)
+        if (mat->IsCullFaceEnabled() != mBuckets[idx]->mCullFaceEnabled)
                 return false;
 
@@ -140 +140 @@
         }
 
-        if (bucket->mMinDistance < -0.5f)
+        if (bucket->mMinDistance < .0f)
         {
                 // assume that the incoming nodes are ordered by distance 

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

@@ -134 +134 @@
         mCurrentVboId = -1;
 
-        SetState(false, false, false);
+        SetState(false, false, true);
         SetState(RENDER);
 }

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

@@ -164 +164 @@
         str.read(reinterpret_cast<char *>(&mat->mAlphaTestEnabled), sizeof(bool));
 
-        //str.read(reinterpret_cast<char *>(&mat->mCullFaceEnabled), sizeof(bool));
+        str.read(reinterpret_cast<char *>(&mat->mCullFaceEnabled), sizeof(bool));
 
         // material

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

@@ -66 +66 @@
         
         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);
+
+        //glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+        //glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
 
         glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
         glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
 
-        glTexImage2D(GL_RGBA, 0, GL_RGBA, mWidth, mHeight, 0, GL_RGBA, GL_UNSIGNED_BYTE, mImage);
+        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);
 

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

@@ -859 +859 @@
         glCullFace(GL_BACK);
         glEnable(GL_CULL_FACE);
-        //glDisable(GL_CULL_FACE);
+        glDisable(GL_CULL_FACE);
         glDisable(GL_TEXTURE_2D);