Changeset 84 for trunk/VUT/work


Ignore:
Timestamp:
05/03/05 22:56:32 (20 years ago)
Author:
mattausch
Message:
 
Location:
trunk/VUT/work
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/VUT/work/TestCulling/TestCullingApplication.cpp

    r82 r84  
    119119        mAlgorithmInfo = OverlayManager::getSingleton().getOverlayElement("Example/Visibility/AlgorithmInfo"); 
    120120        mThresholdInfo = OverlayManager::getSingleton().getOverlayElement("Example/Visibility/ThresholdInfo"); 
     121         
    121122        mFrustumCulledNodesInfo = OverlayManager::getSingleton().getOverlayElement("Example/Visibility/FrustumCulledNodesInfo"); 
    122123        mQueryCulledNodesInfo = OverlayManager::getSingleton().getOverlayElement("Example/Visibility/QueryCulledNodesInfo"); 
    … …  
    124125        mHierarchyNodesInfo = OverlayManager::getSingleton().getOverlayElement("Example/Visibility/HierarchyNodesInfo"); 
    125126        mRenderedNodesInfo = OverlayManager::getSingleton().getOverlayElement("Example/Visibility/RenderedNodesInfo"); 
     127        mNumObjectsInfo = OverlayManager::getSingleton().getOverlayElement("Example/Visibility/NumObjectsInfo"); 
    126128 
    127129        mAlgorithmInfo->setCaption(": " + mCurrentAlgorithmCaptions[mCurrentAlgorithm]); 
    … …  
    132134        mHierarchyNodesInfo->setCaption(": 0"); 
    133135        mRenderedNodesInfo->setCaption(": 0"); 
     136        mNumObjectsInfo->setCaption(": 0"); 
    134137 
    135138    pOver->show(); 
    … …  
    254257        mSceneMgr->getOption("NumRenderedNodes", &opt); sprintf(str,": %d", opt);  
    255258        mRenderedNodesInfo->setCaption(str); 
     259 
     260        sprintf(str,": %d", mTerrainContentGenerator->GetObjectCount());  
     261        mNumObjectsInfo->setCaption(str); 
    256262} 
    257263//----------------------------------------------------------------------- 

  • trunk/VUT/work/TestCulling/TestCullingApplication.h

    r79 r84  
    8181        OverlayElement *mHierarchyNodesInfo; 
    8282        OverlayElement *mRenderedNodesInfo; 
     83        OverlayElement *mNumObjectsInfo; 
    8384}; 
    8485 

  • trunk/VUT/work/TestCullingTerrain/TerrainContentGenerator.cpp

    r82 r84  
    8787        mMaxHeight = maxHeight; 
    8888} 
     89//----------------------------------------------------------------------- 
     90int TerrainContentGenerator::GetObjectCount() 
     91{ 
     92        return mCount; 
     93} 
    8994 
    9095} // namespace Ogre 

  • trunk/VUT/work/TestCullingTerrain/TerrainContentGenerator.h

    r81 r84  
    3434 
    3535        void SetMaxHeight(Real maxHeight); 
     36        int GetObjectCount(); 
    3637 
    3738protected: 

  • trunk/VUT/work/TestCullingTerrain/TestCullingTerrainApplication.cpp

    r82 r84  
    9797        mTerrainContentGenerator = new TerrainContentGenerator(mSceneMgr); 
    9898        mTerrainContentGenerator->GenerateScene(300, "robot.mesh"); 
    99         // no limitations now: the user can set objects also on peaks 
     99        // no limitations needed anymore: the user can set  
     100        // objects also on peaks of terrain 
    100101        mTerrainContentGenerator->SetMaxHeight(5000);  
    101102} 
    … …  
    165166        mAlgorithmInfo = OverlayManager::getSingleton().getOverlayElement("Example/Visibility/AlgorithmInfo"); 
    166167        mThresholdInfo = OverlayManager::getSingleton().getOverlayElement("Example/Visibility/ThresholdInfo"); 
     168         
    167169        mFrustumCulledNodesInfo = OverlayManager::getSingleton().getOverlayElement("Example/Visibility/FrustumCulledNodesInfo"); 
    168170        mQueryCulledNodesInfo = OverlayManager::getSingleton().getOverlayElement("Example/Visibility/QueryCulledNodesInfo"); 
    … …  
    170172        mHierarchyNodesInfo = OverlayManager::getSingleton().getOverlayElement("Example/Visibility/HierarchyNodesInfo"); 
    171173        mRenderedNodesInfo = OverlayManager::getSingleton().getOverlayElement("Example/Visibility/RenderedNodesInfo"); 
     174        mNumObjectsInfo = OverlayManager::getSingleton().getOverlayElement("Example/Visibility/NumObjectsInfo"); 
    172175 
    173176        mAlgorithmInfo->setCaption(": " + mCurrentAlgorithmCaptions[mCurrentAlgorithm]); 
    … …  
    178181        mHierarchyNodesInfo->setCaption(": 0"); 
    179182        mRenderedNodesInfo->setCaption(": 0"); 
    180                  
     183        mNumObjectsInfo->setCaption(": 0"); 
     184 
    181185    pOver->show(); 
    182186}  
    … …  
    332336        mSceneMgr->getOption("NumRenderedNodes", &opt); sprintf(str,": %d", opt);  
    333337        mRenderedNodesInfo->setCaption(str); 
     338 
     339        sprintf(str,": %d", mTerrainContentGenerator->GetObjectCount());  
     340        mNumObjectsInfo->setCaption(str); 
    334341} 
    335342//----------------------------------------------------------------------- 

  • trunk/VUT/work/TestCullingTerrain/TestCullingTerrainApplication.h

    r82 r84  
    7979    OverlayElement *mTraversedNodesInfo; 
    8080        OverlayElement *mHierarchyNodesInfo; 
    81         OverlayElement *mSceneNodesInfo; 
     81        //OverlayElement *mSceneNodesInfo; 
    8282        OverlayElement *mRenderedNodesInfo; 
     83        OverlayElement *mNumObjectsInfo; 
    8384 
    8485        SceneNode *mCurrentObject;         // The newly created object 
Note: See TracChangeset for help on using the changeset viewer.