Changeset 10314 in orxonox.OLD for trunk/src/story_entities

Timestamp:

Jan 24, 2007, 12:45:39 AM (18 years ago)

Author:

patrick

Message:

merged branche mount_point to trunk. this will add mount point abilities, bsp transparency fix and some other smaller stuff to this trunk

Location:

trunk/src/story_entities

Files:

• game_world.cc (modified) (5 diffs)
• game_world.h (modified) (2 diffs)
• movie_loader.cc (modified) (4 diffs)

trunk/src/story_entities/game_world.cc

@@ -11 +11 @@
    ### File Specific:
    main-programmer: Patrick Boenzli
+   main-programmer: Benjamin Grauer
    co-programmer: Christian Meyer
-   co-programmer: Benjamin Grauer
+
 */
 
@@ -73 +74 @@
 SHELL_COMMAND(togglePNodeVisibility, GameWorld, togglePNodeVisibility);
 SHELL_COMMAND(showBVLevel, GameWorld, toggleBVVisibility);
+SHELL_COMMAND(showMountPoints, GameWorld, toggleMPVisibility);
 
 
@@ -88 +90 @@
   this->showBV = false;
   this->showBVLevel = 3;
+  this->showMPV = false;
 
   this->dataXML = NULL;
@@ -541 +544 @@
   ObjectManager::EntityList::const_iterator entity;
   for (entity = drawList.begin(); entity != drawList.end(); entity++)
+  {
     if ((*entity)->isVisible())
       (*entity)->draw();
+
+    if( unlikely( this->showMPV))
+      (*entity)->debugDrawMountPoints();
+  }
 }
 
@@ -666 +674 @@
     }
 
+
     if( unlikely(this->showPNodes))
       PNode::getNullParent()->debugDraw(0);

trunk/src/story_entities/game_world.h

@@ -62 +62 @@
   void togglePNodeVisibility();
   void toggleBVVisibility(int level);
+  inline void toggleMPVisibility() { this->showMPV = !this->showMPV; }
 
   inline void setSky(WorldEntity* sky) { this->dataTank->sky = sky; }
@@ -99 +100 @@
   bool                showBV;                       //!< if the Bounding Volumes should be visible.
   int                 showBVLevel;                  //!< the depth level of the displayed bounding volumes
+  bool                showMPV;                      //!< true if the mounting points should be drawn for debug purposes
 
   /* world timing */

trunk/src/story_entities/movie_loader.cc

@@ -63 +63 @@
 
 
-ErrorMessage MovieLoader::init() {}
+ErrorMessage MovieLoader::init() {  return ErrorMessage();}
 
 
-ErrorMessage MovieLoader::loadData() {}
+ErrorMessage MovieLoader::loadData() {  return ErrorMessage();}
 
 
@@ -72 +72 @@
 {
   this->unsubscribeEvents(ES_GAME);
+
+  return ErrorMessage();
 }
 
@@ -82 +84 @@
   this->bRunning = true;
   this->run();
+
+  return true;
 }
 
@@ -89 +93 @@
 
   this->bRunning = false;
+
+  return true;
 }
 
-bool MovieLoader::pause() { }
-bool MovieLoader::resume() { }
+bool MovieLoader::pause() { return false; }
+bool MovieLoader::resume() { return false; }
 
 void MovieLoader::run()