Changeset 87 for trunk/VUT/work


Ignore:
Timestamp:
05/09/05 01:24:02 (20 years ago)
Author:
mattausch
Message:
 
Location:
trunk/VUT/work
Files:
6 edited

Legend:

Unmodified
Added
Removed

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

    r86 r87  
    2121mMinAngle(Vector3(0.0f, 0.0f, 0.0f)), 
    2222mMaxAngle(Vector3(360, 360, 360)), 
    23 mScale(0.05, 0.05, 0.05) 
     23mScale(0.1, 0.1, 0.1) 
    2424{ 
    2525} 

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

    r86 r87  
    110110mSceneContentGenerator(sceneContentGenerator), 
    111111mVisibilityThreshold(0), 
    112 mCurrentAlgorithm(GtpVisibility::VisibilityEnvironment::COHERENT_HIERARCHICAL_CULLING) 
     112mCurrentAlgorithm(GtpVisibility::VisibilityEnvironment::COHERENT_HIERARCHICAL_CULLING), 
     113mShowOctree(true), 
     114mUseCulling(false) 
    113115{ 
    114116    // Reduce move speed 
    … …  
    132134        mHierarchyNodesInfo = OverlayManager::getSingleton().getOverlayElement("Example/Visibility/HierarchyNodesInfo"); 
    133135        mRenderedNodesInfo = OverlayManager::getSingleton().getOverlayElement("Example/Visibility/RenderedNodesInfo"); 
    134         mNumObjectsInfo = OverlayManager::getSingleton().getOverlayElement("Example/Visibility/NumObjectsInfo"); 
     136        mObjectsInfo = OverlayManager::getSingleton().getOverlayElement("Example/Visibility/ObjectsInfo"); 
    135137        mUseOptimizationInfo = OverlayManager::getSingleton().getOverlayElement("Example/Visibility/UseOptimizationInfo"); 
     138        mQueriesIssuedInfo = OverlayManager::getSingleton().getOverlayElement("Example/Visibility/QueriesIssuedInfo"); 
    136139 
    137140        mAlgorithmInfo->setCaption(": " + mCurrentAlgorithmCaptions[mCurrentAlgorithm]); 
    … …  
    142145        mHierarchyNodesInfo->setCaption(": 0"); 
    143146        mRenderedNodesInfo->setCaption(": 0"); 
    144         mNumObjectsInfo->setCaption(": 0"); 
     147        mObjectsInfo->setCaption(": 0"); 
    145148        mUseOptimizationInfo->setCaption(": true"); 
     149        mQueriesIssuedInfo->setCaption(": 0"); 
    146150 
    147151        setAlgorithm(mCurrentAlgorithm); 
    … …  
    226230        KEY_PRESSED(KC_ADD, 0, changeThreshold(10)); 
    227231        KEY_PRESSED(KC_O, 0.3, toggleUseOptimization()); 
    228         //KEY_PRESSED(KC_T, 1, change); 
    229        
    230         changeStats(); 
     232        KEY_PRESSED(KC_C, 0.3, toggleUseCulling()); 
     233               
     234        updateStats(); 
    231235 
    232236    return ExampleFrameListener::frameStarted(evt) && ExampleFrameListener::frameEnded(evt);         
    … …  
    271275} 
    272276//----------------------------------------------------------------------- 
     277void MouseQueryListener::toggleUseCulling() 
     278{ 
     279        mUseCulling = !mUseCulling; 
     280 
     281        mSceneMgr->setOption("UseCulling", &mUseCulling); 
     282} 
     283//----------------------------------------------------------------------- 
    273284void MouseQueryListener::setAlgorithm(int algorithm) 
    274285{ 
    … …  
    277288} 
    278289//----------------------------------------------------------------------- 
    279 void MouseQueryListener::changeStats() 
     290void MouseQueryListener::updateStats() 
    280291{ 
    281292        unsigned int opt = 0; 
    … …  
    285296        mFrustumCulledNodesInfo->setCaption(str); 
    286297         
     298        mSceneMgr->getOption("NumQueriesIssued", &opt); sprintf(str,": %d", opt);  
     299        mQueriesIssuedInfo->setCaption(str); 
     300 
    287301        mSceneMgr->getOption("NumQueryCulledNodes", &opt); sprintf(str,": %d", opt);  
    288302        mQueryCulledNodesInfo->setCaption(str); 
    … …  
    298312 
    299313        sprintf(str,": %d", mSceneContentGenerator->GetObjectCount());  
    300         mNumObjectsInfo->setCaption(str); 
     314        mObjectsInfo->setCaption(str); 
    301315} 
    302316//----------------------------------------------------------------------- 

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

    r86 r87  
    6363        void setAlgorithm(int algorithm); 
    6464        void changeThreshold(int incr); 
    65         void changeStats(); 
     65        void updateStats(); 
    6666        void toggleUseOptimization(); 
    6767        void toggleShowOctree(); 
     68        void toggleUseCulling(); 
    6869 
    6970protected: 
    … …  
    8485        OverlayElement *mHierarchyNodesInfo; 
    8586        OverlayElement *mRenderedNodesInfo; 
    86         OverlayElement *mNumObjectsInfo; 
     87        OverlayElement *mObjectsInfo; 
    8788        OverlayElement *mUseOptimizationInfo; 
     89        OverlayElement *mQueriesIssuedInfo; 
    8890 
    8991        SceneContentGenerator *mSceneContentGenerator; 
    … …  
    9193        bool mUseOptimization; 
    9294        bool mShowOctree; 
     95        bool mUseCulling; 
    9396}; 
    9497 

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

    r85 r87  
    5050//----------------------------------------------------------------------- 
    5151TerrainContentGenerator::TerrainContentGenerator(SceneManager *sm): 
    52 SceneContentGenerator(sm), mMaxHeight(100) 
     52SceneContentGenerator(sm), mMaxHeight(50) 
    5353{ 
    5454        mMinPos = Vector3(0.0f, 5000.0f, 0.0f); 

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

    r86 r87  
    9696 
    9797        mTerrainContentGenerator = new TerrainContentGenerator(mSceneMgr); 
    98          
    99         mTerrainContentGenerator->GenerateScene(500, "ninja.mesh"); 
    100         mTerrainContentGenerator->GenerateScene(500, "robot.mesh"); 
     98//      mTerrainContentGenerator->GenerateScene(500, "ninja.mesh"); 
     99        mTerrainContentGenerator->GenerateScene(1000, "robot.mesh"); 
    101100 
    102101        // no limitations needed anymore: the user can set  
    … …  
    150149mTerrainContentGenerator(sceneGenerator), 
    151150mVisibilityThreshold(0), 
    152 mCurrentAlgorithm(GtpVisibility::VisibilityEnvironment::COHERENT_HIERARCHICAL_CULLING) 
     151mCurrentAlgorithm(GtpVisibility::VisibilityEnvironment::COHERENT_HIERARCHICAL_CULLING), 
     152mShowOctree(true), 
     153mUseCulling(false) 
    153154{ 
    154155        // Reduce move speed 
    … …  
    174175        mHierarchyNodesInfo = OverlayManager::getSingleton().getOverlayElement("Example/Visibility/HierarchyNodesInfo"); 
    175176        mRenderedNodesInfo = OverlayManager::getSingleton().getOverlayElement("Example/Visibility/RenderedNodesInfo"); 
    176         mNumObjectsInfo = OverlayManager::getSingleton().getOverlayElement("Example/Visibility/NumObjectsInfo"); 
     177        mObjectsInfo = OverlayManager::getSingleton().getOverlayElement("Example/Visibility/ObjectsInfo"); 
    177178        mUseOptimizationInfo = OverlayManager::getSingleton().getOverlayElement("Example/Visibility/UseOptimizationInfo"); 
    178  
     179        mQueriesIssuedInfo = OverlayManager::getSingleton().getOverlayElement("Example/Visibility/QueriesIssuedInfo"); 
     180         
    179181        mAlgorithmInfo->setCaption(": " + mCurrentAlgorithmCaptions[mCurrentAlgorithm]); 
    180182        mThresholdInfo->setCaption(": 0"); 
    … …  
    184186        mHierarchyNodesInfo->setCaption(": 0"); 
    185187        mRenderedNodesInfo->setCaption(": 0"); 
    186         mNumObjectsInfo->setCaption(": 0"); 
     188        mObjectsInfo->setCaption(": 0"); 
    187189        mUseOptimizationInfo->setCaption(": true"); 
     190        mQueriesIssuedInfo->setCaption(": 0"); 
    188191 
    189192        setAlgorithm(mCurrentAlgorithm); 
    190193        toggleUseOptimization(); 
    191194        toggleShowOctree(); 
     195        toggleUseCulling(); 
    192196 
    193197    pOver->show(); 
    … …  
    301305        KEY_PRESSED(KC_O, 0.3, toggleUseOptimization()); 
    302306        KEY_PRESSED(KC_S, 0.3, toggleShowOctree()); 
    303         //KEY_PRESSED(KC_T, 1, change); 
    304        
    305         changeStats(); 
     307        KEY_PRESSED(KC_C, 0.3, toggleUseCulling()); 
     308               
     309        updateStats(); 
    306310 
    307311    return ExampleFrameListener::frameStarted(evt) && ExampleFrameListener::frameEnded(evt);         
    … …  
    329333void MouseQueryListener::setAlgorithm(int algorithm) 
    330334{ 
    331         //OutputDebugString("changing algorithm\n"); 
    332335        mAlgorithmInfo->setCaption(": " + mCurrentAlgorithmCaptions[mCurrentAlgorithm]); 
    333336        mSceneMgr->setOption("Algorithm", &mCurrentAlgorithm); 
    334337} 
    335338//----------------------------------------------------------------------- 
    336 void MouseQueryListener::changeStats() 
     339void MouseQueryListener::updateStats() 
    337340{ 
    338341        unsigned int opt = 0; 
    … …  
    342345        mFrustumCulledNodesInfo->setCaption(str); 
    343346         
     347        mSceneMgr->getOption("NumQueriesIssued", &opt); sprintf(str,": %d", opt);  
     348        mQueriesIssuedInfo->setCaption(str); 
     349         
    344350        mSceneMgr->getOption("NumQueryCulledNodes", &opt); sprintf(str,": %d", opt);  
    345351        mQueryCulledNodesInfo->setCaption(str); 
    … …  
    355361 
    356362        sprintf(str,": %d", mTerrainContentGenerator->GetObjectCount());  
    357         mNumObjectsInfo->setCaption(str); 
     363        mObjectsInfo->setCaption(str); 
    358364} 
    359365//----------------------------------------------------------------------- 
    … …  
    375381 
    376382        mSceneMgr->setOption("ShowOctree", &mShowOctree); 
     383} 
     384//----------------------------------------------------------------------- 
     385void MouseQueryListener::toggleUseCulling() 
     386{ 
     387        mUseCulling = !mUseCulling; 
     388 
     389        mSceneMgr->setOption("UseCulling", &mUseCulling); 
    377390} 
    378391//----------------------------------------------------------------------- 

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

    r86 r87  
    6262        void setAlgorithm(int algorithm); 
    6363        void changeThreshold(int incr); 
    64         void changeStats(); 
     64        void updateStats(); 
    6565        void toggleUseOptimization(); 
    6666        void toggleShowOctree(); 
     67        void toggleUseCulling(); 
    6768 
    6869protected: 
    … …  
    8485        OverlayElement *mUseOptimizationInfo; 
    8586        OverlayElement *mRenderedNodesInfo; 
    86         OverlayElement *mNumObjectsInfo; 
     87        OverlayElement *mObjectsInfo; 
     88        OverlayElement *mQueriesIssuedInfo; 
    8789 
    8890        SceneNode *mCurrentObject;         // The newly created object 
    … …  
    9496        bool mUseOptimization; 
    9597        bool mShowOctree; 
     98        bool mUseCulling; 
    9699}; 
    97100 
Note: See TracChangeset for help on using the changeset viewer.