Changeset 7739 in orxonox.OLD

Timestamp:

May 20, 2006, 11:24:22 AM (18 years ago)

Author:

patrick

Message:

trunk: tried to add the command for bvvisibility toggling with depth level. execution results in segfault

Location:

trunk/src

Files:

• lib/collision_detection/cd_engine.cc (modified) (1 diff)
• lib/collision_detection/cd_engine.h (modified) (1 diff)
• story_entities/game_world.cc (modified) (4 diffs)
• story_entities/game_world.h (modified) (2 diffs)

trunk/src/lib/collision_detection/cd_engine.cc

@@ -131 +131 @@
 
 
-void CDEngine::drawBV(const ObjectManager::EntityList& drawList ) const
+void CDEngine::drawBV(const ObjectManager::EntityList& drawList, int level) const
 {
   ObjectManager::EntityList::const_iterator entity;
   for (entity = drawList.begin(); entity != drawList.end(); entity++)
-    (*entity)->drawBVTree(3, 226);
+    (*entity)->drawBVTree(level, 226);
 }
 

trunk/src/lib/collision_detection/cd_engine.h

@@ -53 +53 @@
   void checkCollisions(std::list<WorldEntity*>& list1, std::list<WorldEntity*>& list2);
 
-  void drawBV(const std::list<WorldEntity*>& drawList ) const;
+  void drawBV(const std::list<WorldEntity*>& drawList, int level) const;
   void debug();
 

trunk/src/story_entities/game_world.cc

@@ -67 +67 @@
 ->completionPlugin(0, OrxShell::CompletorStringArray(Playable::playmodeNames, Playable::PlaymodeCount));
 
-SHELL_COMMAND(togglePNodeVisibility, GameWorld, GameWorld::togglePNodeVisibility);
-SHELL_COMMAND(toggleBVVisibility, GameWorld, GameWorld::toggleBVVisibility);
+SHELL_COMMAND(togglePNodeVisibility, GameWorld, togglePNodeVisibility);
+SHELL_COMMAND(showBVLevel, GameWorld, toggleBVVisibility);
 
 
@@ -84 +84 @@
   this->showPNodes = false;
   this->showBV = false;
+  this->showBVLevel = 3;
 
   this->dataXML = NULL;
@@ -484 +485 @@
     CDEngine* engine = CDEngine::getInstance();
     for (unsigned int i = 0; i < this->dataTank->drawLists.size(); ++i)
-      engine->drawBV(State::getObjectManager()->getObjectList(this->dataTank->drawLists[i]));
+      engine->drawBV(State::getObjectManager()->getObjectList(this->dataTank->drawLists[i]), this->showBVLevel);
   }
 
@@ -533 +534 @@
  * @brief toggles the bounding volume (BV) visibility
 */
-void GameWorld::toggleBVVisibility()
-{
-  this->showBV = !this->showBV;
+void GameWorld::toggleBVVisibility(int level)
+{
+  if( level < 1)
+    this->showBV = false;
+  else
+  {
+    this->showBV = true;
+    this->showBVLevel = level;
+  }
+
 };
 

trunk/src/story_entities/game_world.h

@@ -55 +55 @@
 
     void togglePNodeVisibility();
-    void toggleBVVisibility();
+    void toggleBVVisibility(int level);
 
     inline void setSky(WorldEntity* sky) { this->dataTank->sky = sky; }
@@ -86 +86 @@
     bool                showPNodes;                   //!< if the PNodes should be visible.
     bool                showBV;                       //!< if the Bounding Volumes should be visible.
+    int                 showBVLevel;                  //!< the depth level of the displayed bounding volumes
 
     /* world timing */