Changeset 96 for trunk


Ignore:
Timestamp:
05/13/05 08:23:30 (19 years ago)
Author:
mattausch
Message:
 
Location:
trunk/VUT
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/VUT/GtpVisibility/src/CoherentHierarchicalCullingManager.cpp

    r95 r96  
    88{ 
    99        InitFrame(); 
    10         Ogre::LogManager::getSingleton().logMessage("**** CHCULL ****\n"); 
    11  
     10         
    1211        QueryQueue queryQueue; 
    1312        unsigned int visiblePixels = 0; 
    … …  
    2524                        queryQueue.pop(); 
    2625 
    27                         if (1)//visiblePixels > mVisibilityThreshold) 
     26                        if (visiblePixels > mVisibilityThreshold) 
    2827                        { 
    2928                                mHierarchyInterface->PullUpVisibility(node); 

  • trunk/VUT/GtpVisibility/src/FrustumCullingManager.cpp

    r94 r96  
    88{ 
    99        InitFrame(); 
    10         Ogre::LogManager::getSingleton().logMessage("**** Frustum Culling ****\n"); 
     10         
    1111        while (!mHierarchyInterface->GetQueue()->empty()) 
    1212        { 

  • trunk/VUT/GtpVisibility/src/StopAndWaitCullingManager.cpp

    r94 r96  
    99{ 
    1010        InitFrame(); 
    11         Ogre::LogManager::getSingleton().logMessage("*** STOP AND WAIT CULL ****\n");    
    1211 
    1312        while (!mHierarchyInterface->GetQueue()->empty()) 

  • trunk/VUT/Ogre/src/OgrePlatformOcclusionQuery.cpp

    r87 r96  
    11#include "OgrePlatformOcclusionQuery.h" 
    2 #include <windows.h> 
     2 
    33namespace Ogre { 
    44 

  • trunk/VUT/Ogre/src/OgreVisibilityOctreeSceneManager.cpp

    r94 r96  
    2121        //mShowBoxes = true; 
    2222 
    23         mMaxDepth = 20; 
     23        // TODO: find reasonable value for max depth 
     24        mMaxDepth = 50; 
    2425} 
    2526//----------------------------------------------------------------------- 
    … …  
    3132void VisibilityOctreeSceneManager::_renderVisibleObjects() 
    3233{ 
    33         Camera *cullCam = NULL; 
    34  
    35         if(mCullCamera) cullCam = getCamera("CullCamera"); 
    36          
    37         mHierarchyInterface->InitFrame(mOctree, mCameraInProgress, cullCam); 
     34        // two cameras (one for culling, one for rendering) 
     35        mHierarchyInterface->InitFrame(mOctree, mCameraInProgress,  
     36                                                        mCullCamera ? getCamera("CullCamera") : NULL); 
    3837        mVisibilityManager->GetCullingManager()->InitFrame(); 
    3938 
     39        // standard scenemanager rendering without hierarchical culling 
    4040        if(!mUseCulling) 
    4141        {        

  • trunk/VUT/Ogre/src/OgreVisibilitySceneManager.cpp

    r94 r96  
    99 
    1010namespace Ogre { 
    11 //namespace GtpVisibility { 
     11 
    1212//----------------------------------------------------------------------- 
    1313VisibilitySceneManager::VisibilitySceneManager(GtpVisibility::VisibilityManager *visManager) 

  • trunk/VUT/Ogre/src/OgreVisibilityTerrainSceneManager.cpp

    r94 r96  
    2222        //mDisplayNodes = true; 
    2323        //mShowBoundingBoxes = true; 
    24         mMaxDepth = 20; 
     24        mMaxDepth = 50; 
    2525} 
    2626//----------------------------------------------------------------------- 
    … …  
    3232void VisibilityTerrainSceneManager::_renderVisibleObjects() 
    3333{ 
    34         Camera *cullCam = NULL; 
    35  
    36         // if two cameras (one for culling, one for visualization) 
    37         if(mCullCamera) 
    38                 cullCam = getCamera("CullCamera"); 
     34        // two cameras (one for culling, one for rendering) 
     35        mHierarchyInterface->InitFrame(mOctree, mCameraInProgress,  
     36                                                        mCullCamera ? getCamera("CullCamera") : NULL); 
     37        mVisibilityManager->GetCullingManager()->InitFrame(); 
    3938         
    40         if(cullCam && (mCameraInProgress != cullCam)) 
    41                 OutputDebugString("using cullcam\n"); 
    42         else 
    43                 OutputDebugString("not using cullcam\n"); 
    44  
    45         mHierarchyInterface->InitFrame(mOctree, mCameraInProgress, cullCam); 
    46         mVisibilityManager->GetCullingManager()->InitFrame(); 
    47  
     39        // standard scenemanager rendering without hierarchical culling 
    4840        if(!mUseCulling) 
    4941        {        
Note: See TracChangeset for help on using the changeset viewer.