Changeset 94 for trunk/VUT/GtpVisibility


Ignore:
Timestamp:
05/12/05 18:55:25 (20 years ago)
Author:
mattausch
Message:
 
Location:
trunk/VUT/GtpVisibility/src
Files:
4 edited

Legend:

Unmodified
Added
Removed

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

    r87 r94  
    11#include "CoherentHierarchicalCullingManager.h" 
    2 #include <windows.h> 
     2#include <OgreLogManager.h> 
    33 
    44namespace GtpVisibility { 
    … …  
    88{ 
    99        InitFrame(); 
     10        Ogre::LogManager::getSingleton().logMessage("**** CHCULL ****\n"); 
    1011 
    1112        QueryQueue queryQueue; 
    … …  
    2021                                                                        mHierarchyInterface->GetQueue()->empty())) 
    2122                { 
    22             //if (mHierarchyInterface->GetQueue()->empty())OutputDebugString("empty\n"); 
    23                                                                  
    24                         HierarchyNode *node = queryQueue.front().first; 
     23                HierarchyNode *node = queryQueue.front().first; 
    2524                                                 
    2625                        queryQueue.pop(); 

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

    r87 r94  
    11#include "FrustumCullingManager.h" 
    2 #include <windows.h> 
     2#include <OgreLogManager.h> 
    33 
    44namespace GtpVisibility { 
    … …  
    88{ 
    99        InitFrame(); 
    10  
     10        Ogre::LogManager::getSingleton().logMessage("**** Frustum Culling ****\n"); 
    1111        while (!mHierarchyInterface->GetQueue()->empty()) 
    1212        { 

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

    r92 r94  
    11#include "StopAndWaitCullingManager.h" 
    2 #include <windows.h> 
     2#include <OgreLogManager.h> 
     3 
    34 
    45namespace GtpVisibility { 
    … …  
    89{ 
    910        InitFrame(); 
    10                          
     11        Ogre::LogManager::getSingleton().logMessage("*** STOP AND WAIT CULL ****\n");    
     12 
    1113        while (!mHierarchyInterface->GetQueue()->empty()) 
    1214        { 

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

    r92 r94  
    99//----------------------------------------------------------------------- 
    1010VisibilityManager::VisibilityManager(VisibilityEnvironment *visEnvironment): 
    11 mVisibilityThreshold(0) 
     11mVisibilityThreshold(0), mCullingManager(NULL)  
    1212{ 
    1313        mVisibilityEnvironment = visEnvironment; 
    1414         
    15         mCullingManagerType = VisibilityEnvironment::STOP_AND_WAIT_CULLING; 
    16         mCullingManager = new StopAndWaitCullingManager(); 
     15        SetCullingManager(VisibilityEnvironment::COHERENT_HIERARCHICAL_CULLING); 
     16        //SetCullingManager(VisibilityEnvironment::FRUSTUM_CULLING); 
    1717 
    1818        mQueryManager = new DummyQueryManager(0); 
    … …  
    2828        VisibilityEnvironment::CullingManagerType ocmType) 
    2929{ 
    30         if (mCullingManagerType != ocmType) 
     30        // change only if necessary 
     31        if (!mCullingManager || (mCullingManagerType != ocmType)) 
    3132        { 
    3233                // delete old culling manager 
    33                 delete mCullingManager; 
     34                if(mCullingManager) 
     35                        delete mCullingManager; 
    3436 
    3537                mCullingManagerType = ocmType; 
Note: See TracChangeset for help on using the changeset viewer.