Changeset 2845 for GTP


Ignore:
Timestamp:
07/17/08 21:40:33 (16 years ago)
Author:
mattausch
Message:
 
Location:
GTP/trunk/App/Demos/Vis/FriendlyCulling
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • GTP/trunk/App/Demos/Vis/FriendlyCulling/default.env

    r2838 r2845  
    44assumedVisibleFrames=10 
    55maxBatchSize=50 
    6 trianglesPerVirtualLeaf=500 
     6trianglesPerVirtualLeaf=300 
    77keyForwardMotion=20.0f 
    88keyRotation=1.5f 
     
    1717expFactor=0.1f 
    1818#numSsaoSamples=8 
     19#0699/11384251 
  • GTP/trunk/App/Demos/Vis/FriendlyCulling/src/RenderQueue.cpp

    r2844 r2845  
    5858                return false; 
    5959 
    60         if (mat->IsCullFaceEnabled() != mBuckets[idx]->mAlphaTestEnabled) 
     60        if (mat->IsCullFaceEnabled() != mBuckets[idx]->mCullFaceEnabled) 
    6161                return false; 
    6262 
     
    140140        } 
    141141 
    142         if (bucket->mMinDistance < -0.5f) 
     142        if (bucket->mMinDistance < .0f) 
    143143        { 
    144144                // assume that the incoming nodes are ordered by distance  
  • GTP/trunk/App/Demos/Vis/FriendlyCulling/src/RenderState.cpp

    r2844 r2845  
    134134        mCurrentVboId = -1; 
    135135 
    136         SetState(false, false, false); 
     136        SetState(false, false, true); 
    137137        SetState(RENDER); 
    138138} 
  • GTP/trunk/App/Demos/Vis/FriendlyCulling/src/ResourceManager.cpp

    r2844 r2845  
    164164        str.read(reinterpret_cast<char *>(&mat->mAlphaTestEnabled), sizeof(bool)); 
    165165 
    166         //str.read(reinterpret_cast<char *>(&mat->mCullFaceEnabled), sizeof(bool)); 
     166        str.read(reinterpret_cast<char *>(&mat->mCullFaceEnabled), sizeof(bool)); 
    167167 
    168168        // material 
  • GTP/trunk/App/Demos/Vis/FriendlyCulling/src/Texture.cpp

    r2825 r2845  
    6666         
    6767        glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); 
     68         
    6869        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); 
    6970        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR); 
     71 
     72        //glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); 
     73        //glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); 
     74 
     75        //glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); 
     76        //glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); 
    7077 
    7178        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT); 
    7279        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT); 
    7380 
    74         glTexImage2D(GL_RGBA, 0, GL_RGBA, mWidth, mHeight, 0, GL_RGBA, GL_UNSIGNED_BYTE, mImage); 
     81        glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, mWidth, mHeight, 0, GL_RGBA, GL_UNSIGNED_BYTE, mImage); 
    7582        gluBuild2DMipmaps(GL_TEXTURE_2D, GL_RGBA, mWidth, mHeight, GL_RGBA, GL_UNSIGNED_BYTE, mImage); 
    7683 
  • GTP/trunk/App/Demos/Vis/FriendlyCulling/src/chcdemo.cpp

    r2844 r2845  
    859859        glCullFace(GL_BACK); 
    860860        glEnable(GL_CULL_FACE); 
    861         //glDisable(GL_CULL_FACE); 
     861        glDisable(GL_CULL_FACE); 
    862862        glDisable(GL_TEXTURE_2D); 
    863863 
Note: See TracChangeset for help on using the changeset viewer.