![(please configure the [header_logo] section in trac.ini)](/trac/gametools/chrome/site/your_project_logo.png){kind=logo}
Changeset 1177
- Timestamp:
- 08/02/06 15:22:19 (18 years ago)
- Files:
-
- 7 edited
-
GTP/trunk/App/Demos/Vis/KdTreeDemo/OGRE/include/TestKdTreeAppListener.h (modified) (6 diffs)
-
GTP/trunk/App/Demos/Vis/KdTreeDemo/OGRE/scripts/TestKdTree.vcproj (modified) (1 diff)
-
GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/include/OgreKdTree.h (modified) (2 diffs)
-
GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/include/OgreKdTreeSceneManager.h (modified) (2 diffs)
-
GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/src/OgreKdTree.cpp (modified) (2 diffs)
-
GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/src/OgreKdTreeSceneManager.cpp (modified) (7 diffs)
-
OGRE/trunk/resources/overlays/TestKdTree.overlay (modified) (6 diffs)
Legend:
- Unmodified
- Added
- Removed
-
GTP/trunk/App/Demos/Vis/KdTreeDemo/OGRE/include/TestKdTreeAppListener.h
r1170 r1177 215 215 String rm; 216 216 if (mSceneMgr->getOption("RenderMethod", &rm)) 217 value = " " + rm; 217 { 218 if (rm == "INT") 219 value = " Internal Frustum Culling"; 220 else if (rm == "VFC") 221 value = " View Frustum Culling"; 222 else if (rm == "SWC") 223 value = " Stop and Wait Culling"; 224 else if (rm == "CHC") 225 value = " Coherent Hierarchical Culling"; 226 else 227 value = na; 228 } 218 229 else 219 230 value = na; … … 278 289 279 290 // stuff for the kdtree overlay 291 static String sRM = "[SPACE] Algorithm: "; 292 static String sBM = "[X] Build Method: "; 280 293 static String sMaxDepth = "[1][2] Max Tree Depth: "; 281 294 static String sHL = "[3][4] Highlight: "; 282 295 static String sKT = "[5][6] KT: "; 283 296 static String sKI = "[7][8] KI: "; 284 static String sBM = "[Y] Build Method: ";285 static String sRM = "[X] Render Method: ";286 297 static String sMov = "[Q] Movement: "; 287 298 … … 291 302 292 303 //static String rmOptions[] = { "Recursive", "Stack", "StopAndWait", "CHC" }; 293 static String rmOptions[] = { "Recursive", "Stack" }; 304 static String rmOptions[] = { "INT", "VFC", "SWC", "CHC" }; 305 static String rmOptionCaptions[] = 306 { 307 "Internal Frustum Culling", 308 "View Frustum Culling", 309 "Stop and Wait Culling", 310 "Coherent Hierarchical Culling" 311 }; 294 312 static int rmOptionsSize = sizeof(rmOptions) / sizeof (String); 295 313 static int rmCurrent = 0; … … 400 418 } 401 419 402 if (mInputDevice->isKeyDown(KC_ Z) && mTimeUntilNextToggle <= 0)420 if (mInputDevice->isKeyDown(KC_X) && mTimeUntilNextToggle <= 0) 403 421 { 404 422 String bm; … … 417 435 } 418 436 419 if (mInputDevice->isKeyDown(KC_ X) && mTimeUntilNextToggle <= 0)437 if (mInputDevice->isKeyDown(KC_SPACE) && mTimeUntilNextToggle <= 0) 420 438 { 421 439 String rm; … … 424 442 rmCurrent = (rmCurrent + 1) % rmOptionsSize; 425 443 if (mSceneMgr->setOption("RenderMethod", &rmOptions[rmCurrent])) 426 OverlayManager::getSingleton().getOverlayElement("KdTree/RenderMethod")->setCaption(sRM + rmOption s[rmCurrent]);444 OverlayManager::getSingleton().getOverlayElement("KdTree/RenderMethod")->setCaption(sRM + rmOptionCaptions[rmCurrent]); 427 445 } 428 446 else -
GTP/trunk/App/Demos/Vis/KdTreeDemo/OGRE/scripts/TestKdTree.vcproj
r1163 r1177 103 103 LinkIncremental="1" 104 104 AdditionalLibraryDirectories=""$(OGRE_PATH)\OgreMain\lib\$(ConfigurationName)";"..\..\..\..\..\..\Lib\Vis\OnlineCullingCHC\IVReader\lib\$(ConfigurationName)"" 105 GenerateDebugInformation=" FALSE"105 GenerateDebugInformation="TRUE" 106 106 SubSystem="2" 107 107 OptimizeReferences="2" -
GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/include/OgreKdTree.h
r1173 r1177 429 429 enum RenderMethod 430 430 { 431 KDRM_RECURSE, 432 KDRM_STACK, 433 KDRM_SAW, 434 KDRM_CHC 431 KDRM_INTERNAL, 432 KDRM_GTP_VFC, 433 KDRM_GTP_SWC, 434 KDRM_GTP_CHC 435 435 436 }; 436 437 … … 488 489 void recQueueVisibleObjects(KdTree::Node * node, unsigned long currentFrame, 489 490 Camera* cam, RenderQueue* queue, bool onlyShadowCasters, bool showBoxes); 490 // stack based rendering function491 void stackQueueVisibleObjects(KdTree::Node * root, unsigned long currentFrame,492 Camera* cam, RenderQueue* queue, bool onlyShadowCasters, bool showBoxes);493 491 494 492 // the root node of the kdtree -
GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/include/OgreKdTreeSceneManager.h
r1175 r1177 32 32 virtual const String& getTypeName(void) const; 33 33 34 /** Override from SceneManager to create SceneNodes as instance of KdTreeSceneNode 35 */ 34 36 virtual SceneNode* createSceneNode(void); 37 /** Override from SceneManager to create SceneNodes as instance of KdTreeSceneNode 38 */ 35 39 virtual SceneNode* createSceneNode(const String& name); 40 36 41 /** Override from SceneManager so that sub entities can be assigned an id for item buffer. 37 42 */ … … 42 47 virtual void _updateNode(KdTreeSceneNode *node); // TODO: 43 48 44 //virtual void _updateSceneGraph(Camera* cam); 49 /** Override from scene manager to st up culling manager 50 */ 51 virtual void _updateSceneGraph(Camera* cam); 52 /** Override from Scenemanager, employ kd-tree based culling 53 or CHC 54 */ 45 55 virtual void _findVisibleObjects(Camera *cam, bool onlyShadowCasters); 46 56 //virtual void _renderVisibleObjects(); 47 57 58 /** Render a list of scenenodes 59 */ 48 60 virtual void _renderNodes(const KdRenderableList& nodelist, Camera * cam, 49 61 bool onlyShadowCasters, int leavePassesInQueue); -
GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/src/OgreKdTree.cpp
r1173 r1177 1278 1278 if (mKdRoot) 1279 1279 { 1280 //if (renderMethod == KdTree::KDRM_STACK) 1281 //{ 1282 // stackQueueVisibleObjects(mKdRoot, Root::getSingleton().getCurrentFrameNumber(), 1283 // cam, queue, onlyShadowCasters, showBoxes); 1284 //} 1285 //else 1286 //{ 1287 recQueueVisibleObjects(mKdRoot, Root::getSingleton().getCurrentFrameNumber(), 1288 cam, queue, onlyShadowCasters, showBoxes); 1289 //} 1280 recQueueVisibleObjects(mKdRoot, Root::getSingleton().getCurrentFrameNumber(), 1281 cam, queue, onlyShadowCasters, showBoxes); 1290 1282 } 1291 1283 } … … 1343 1335 } 1344 1336 1345 void KdTree::stackQueueVisibleObjects(KdTree::Node * root, unsigned long currentFrame, Camera* cam, RenderQueue* queue, bool onlyShadowCasters, bool showBoxes)1346 {1347 static NodeStack nodestack;1348 if (!nodestack.empty()) OGRE_EXCEPT(Exception::ERR_INTERNAL_ERROR,1349 "Stuff left in stack from previos frame", "KdTree::stackQueueVisibleObjects");1350 1351 nodestack.push(root);1352 1353 while (!nodestack.empty())1354 {1355 KdTree::Node * node = nodestack.top();1356 nodestack.pop();1357 1358 // test visibility1359 if (cam->isVisible(node->mAABB))1360 {1361 #ifdef KDTREE_DEBUG1362 WireBoundingBox * wbb = 0;1363 if (showBoxes)1364 wbb = node->getWireBoundingBox();1365 #endif1366 1367 if (node->isLeaf())1368 {1369 KdTree::Leaf * leaf = KDLEAFPTR_CAST(node);1370 KdRenderableList::iterator it = leaf->mKdRenderables.begin();1371 KdRenderableList::iterator end = leaf->mKdRenderables.end();1372 while (it != end)1373 {1374 if (!(*it)->isQueued(currentFrame, cam))1375 {1376 (*it)->queueObjects(cam, queue, onlyShadowCasters);1377 }1378 it++;1379 }1380 #ifdef KDTREE_DEBUG1381 if (wbb)1382 queue->addRenderable(wbb);1383 #else1384 if (showBoxes)1385 queue->addRenderable(leaf->getWireBoundingBox());1386 #endif1387 }1388 else1389 {1390 KdTree::Branch * branch = KDBRANCHPTR_CAST(node);1391 #ifdef KDTREE_DEBUG1392 if (wbb)1393 queue->addRenderable(wbb);1394 #else1395 if (showBoxes)1396 queue->addRenderable(branch->getWireBoundingBox());1397 #endif1398 1399 if (branch->mLeft)1400 nodestack.push(branch->mLeft);1401 if (branch->mRight)1402 nodestack.push(branch->mRight);1403 }1404 }1405 }1406 }1407 1408 1337 void KdTree::dump() 1409 1338 { -
GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/src/OgreKdTreeSceneManager.cpp
r1175 r1177 14 14 #include "OgreKdTree.h" 15 15 #include "OgreVisibilityOptionsManager.h" 16 #include <VisibilityEnvironment.h> 16 17 17 18 #include <OgreLogManager.h> … … 31 32 #endif 32 33 mBuildMethod(KdTree::KDBM_PRIORITYQUEUE), 33 mRenderMethod(KdTree::KDRM_ RECURSE),34 mRenderMethod(KdTree::KDRM_INTERNAL), 34 35 mLeavePassesInQueue(0), 35 36 mCurrentEntityId(1) … … 164 165 { 165 166 String rm = *static_cast<const String *>(pValue); 166 if (rm == "Recursive") 167 { 168 mRenderMethod = KdTree::KDRM_RECURSE; 169 return true; 170 } 171 else if (rm == "Stack") 172 { 173 mRenderMethod = KdTree::KDRM_STACK; 174 return true; 175 } 176 else if (rm == "StopAndWait") 177 { 178 mRenderMethod = KdTree::KDRM_SAW; 179 return true; 167 if (rm == "INT") 168 { 169 mRenderMethod = KdTree::KDRM_INTERNAL; 170 return true; 171 } 172 else if (rm == "VFC") 173 { 174 mRenderMethod = KdTree::KDRM_GTP_VFC; 175 int cmt = GtpVisibility::VisibilityEnvironment::FRUSTUM_CULLING; 176 return VisibilityOptionsManager(mVisibilityManager, mHierarchyInterface) 177 .setOption("Algorithm", &cmt); 178 } 179 else if (rm == "SWC") 180 { 181 mRenderMethod = KdTree::KDRM_GTP_SWC; 182 int cmt = GtpVisibility::VisibilityEnvironment::STOP_AND_WAIT_CULLING; 183 return VisibilityOptionsManager(mVisibilityManager, mHierarchyInterface) 184 .setOption("Algorithm", &cmt); 180 185 } 181 186 else if (rm == "CHC") 182 187 { 183 mRenderMethod = KdTree::KDRM_CHC; 184 return true; 185 } 186 else 187 { 188 return false; 189 } 188 mRenderMethod = KdTree::KDRM_GTP_CHC; 189 int cmt = GtpVisibility::VisibilityEnvironment::COHERENT_HIERARCHICAL_CULLING; 190 return VisibilityOptionsManager(mVisibilityManager, mHierarchyInterface) 191 .setOption("Algorithm", &cmt); 192 } 193 else 194 { 195 return false; 196 } 197 } 198 // little hack in case someone uses "Algorithm" option from VisOptMan directly 199 else if (strKey == "Algorithm") 200 { 201 bool success = VisibilityOptionsManager(mVisibilityManager, mHierarchyInterface) 202 .setOption(strKey, pValue); 203 // change setting only if change in VisOptMan was successful 204 if (success) 205 { 206 int val = *static_cast<const int *>(pValue); 207 if (val == GtpVisibility::VisibilityEnvironment::FRUSTUM_CULLING) 208 mRenderMethod = KdTree::KDRM_GTP_VFC; 209 else if (val == GtpVisibility::VisibilityEnvironment::STOP_AND_WAIT_CULLING) 210 mRenderMethod = KdTree::KDRM_GTP_SWC; 211 else if (val == GtpVisibility::VisibilityEnvironment::COHERENT_HIERARCHICAL_CULLING) 212 mRenderMethod = KdTree::KDRM_GTP_CHC; 213 // default, should never happen 214 else 215 mRenderMethod = KdTree::KDRM_INTERNAL; 216 } 217 return success; 190 218 } 191 219 else if (strKey == "ShowKdTree") … … 243 271 else if (strKey == "RenderMethod") 244 272 { 245 if (mRenderMethod == KdTree::KDRM_RECURSE) 246 { 247 *static_cast<String *>(pDestValue) = "Recursive"; 248 } 249 else if (mRenderMethod == KdTree::KDRM_STACK) 250 { 251 *static_cast<String *>(pDestValue) = "Stack"; 252 } 253 else if (mRenderMethod == KdTree::KDRM_SAW) 254 { 255 *static_cast<String *>(pDestValue) = "StopAndWait"; 256 } 257 else if (mRenderMethod == KdTree::KDRM_CHC) 258 { 259 *static_cast<String *>(pDestValue) = "CHC"; 273 if (mRenderMethod == KdTree::KDRM_INTERNAL) 274 { 275 *static_cast<String *>(pDestValue) = "INT"; 276 } 277 else if (mRenderMethod == KdTree::KDRM_GTP_VFC) 278 { 279 *static_cast<String *>(pDestValue) = "VFC"; 280 } 281 else if (mRenderMethod == KdTree::KDRM_GTP_SWC) 282 { 283 *static_cast<String *>(pDestValue) = "SWC"; 284 } 285 else if (mRenderMethod == KdTree::KDRM_GTP_CHC) 286 { 287 *static_cast<String *>(pDestValue) = "CHC"; 288 } 289 else 290 { 291 return false; 260 292 } 261 293 return true; … … 343 375 { 344 376 Entity *ent = SceneManager::createEntity(entityName, meshName); 345 377 #ifdef GTP_VISIBILITY_MODIFIED_OGRE 346 378 for (int i = 0; i < (int)ent->getNumSubEntities(); ++i) 347 379 { … … 351 383 // increase counter of entity id values 352 384 ++ mCurrentEntityId; 353 385 #endif 354 386 return ent; 355 387 } … … 398 430 } 399 431 432 void KdTreeSceneManager::_updateSceneGraph(Camera* cam) 433 { 434 mVisibilityManager->GetCullingManager()->SetHierarchyInterface(mHierarchyInterface); 435 mHierarchyInterface->SetRenderSystem(mDestRenderSystem); 436 437 SceneManager::_updateSceneGraph(cam); 438 } 439 400 440 void KdTreeSceneManager::_findVisibleObjects(Camera *cam, bool onlyShadowCasters) 401 441 { -
OGRE/trunk/resources/overlays/TestKdTree.overlay
r1172 r1177 11 11 top 5 12 12 // width 220 13 width 30013 width 430 14 14 height 120 15 15 material Core/StatsBlockCenter … … 34 34 // material Core/StatsBreak 35 35 // } 36 36 37 element TextArea(KdTree/RenderMethod) 38 { 39 metrics_mode pixels 40 left 5 41 top 5 42 width 90 43 height 30 44 font_name TrebuchetMSBold 45 char_height 16 46 caption [SPACE] Algorithm: 47 colour_top 0.5 0.7 0.5 48 colour_bottom 0.3 0.5 0.3 49 } 50 element TextArea(KdTree/BuildMethod) 51 { 52 metrics_mode pixels 53 left 5 54 top 20 55 width 90 56 height 30 57 font_name TrebuchetMSBold 58 char_height 16 59 caption [X] Build Method: 60 colour_top 0.5 0.7 0.5 61 colour_bottom 0.3 0.5 0.3 62 } 37 63 element TextArea(KdTree/Depth) 38 64 { 39 65 metrics_mode pixels 40 66 left 5 41 top 567 top 35 42 68 width 90 43 69 height 30 … … 54 80 metrics_mode pixels 55 81 left 5 56 top 2082 top 50 57 83 width 90 58 84 height 30 … … 67 93 metrics_mode pixels 68 94 left 5 69 top 3595 top 65 70 96 width 90 71 97 height 30 … … 80 106 metrics_mode pixels 81 107 left 5 82 top 50108 top 80 83 109 width 90 84 110 height 30 … … 86 112 char_height 16 87 113 caption [7][8] KI: 88 colour_top 0.5 0.7 0.589 colour_bottom 0.3 0.5 0.390 }91 element TextArea(KdTree/BuildMethod)92 {93 metrics_mode pixels94 left 595 top 6596 width 9097 height 3098 font_name TrebuchetMSBold99 char_height 16100 caption [Y] Build Method:101 colour_top 0.5 0.7 0.5102 colour_bottom 0.3 0.5 0.3103 }104 element TextArea(KdTree/RenderMethod)105 {106 metrics_mode pixels107 left 5108 top 80109 width 90110 height 30111 font_name TrebuchetMSBold112 char_height 16113 caption [X] Render Method:114 114 colour_top 0.5 0.7 0.5 115 115 colour_bottom 0.3 0.5 0.3
Note: See TracChangeset
for help on using the changeset viewer.
