Changeset 10449 in orxonox.OLD

Timestamp:

Jan 28, 2007, 5:46:16 PM (17 years ago)

Author:

patrick

Message:

drawing track is now loadable, merge from branche playability

Location:

trunk/src

Files:

• util/hud.cc (modified) (3 diffs)
• util/track/track.cc (modified) (1 diff)
• world_entities/camera.cc (modified) (1 diff)
• world_entities/npcs/npc.cc (modified) (1 diff)
• world_entities/space_ships/space_ship.cc (modified) (1 diff)
• world_entities/world_entity.cc (modified) (2 diffs)
• world_entities/world_entity.h (modified) (2 diffs)

trunk/src/util/hud.cc

@@ -129 +129 @@
     //dynamic_cast<OrxGui::GLGuiEnergyWidgetVertical*> (this->energyWidget)->setStandardSettings();
     this->energyWidget->setParent2D(this->leftRect);
+    dynamic_cast<OrxGui::GLGuiEnergyWidgetVertical*> (this->energyWidget)->setDisplayedImage("textures/gui/gui_electronics_icon.png");
     this->energyWidget->show();
     /*    this->energyWidget->frontMaterial().setDiffuseMap("hud_energy_bar.png");
@@ -157 +158 @@
     //dynamic_cast<OrxGui::GLGuiEnergyWidgetVertical*> (this->shieldWidget)->setStandardSettings();
     this->shieldWidget->setParent2D(this->leftRect);
+    dynamic_cast<OrxGui::GLGuiEnergyWidgetVertical*> (this->shieldWidget)->setDisplayedImage("textures/gui/gui_shield_icon.png");
     this->shieldWidget->show();
     /*    this->shieldWidget->frontMaterial().setDiffuseMap("hud_energy_bar.png");
@@ -187 +189 @@
     //dynamic_cast<OrxGui::GLGuiEnergyWidgetVertical*> (this->armorWidget)->setStandardSettings();
     this->armorWidget->setParent2D(this->leftRect);
+    dynamic_cast<OrxGui::GLGuiEnergyWidgetVertical*> (this->armorWidget)->setDisplayedImage("textures/gui/gui_health_icon.png");
     this->armorWidget->show();
     /*    this->armorWidget->frontMaterial().setDiffuseMap("hud_energy_bar.png");

trunk/src/util/track/track.cc

@@ -93 +93 @@
            LoadParam_CYCLE(element, "mode", this, Track, setMode)
              .describe("Sets mode of track behavior");
-
      }
      LOAD_PARAM_END_CYCLE(element);

trunk/src/world_entities/camera.cc

@@ -231 +231 @@
 void Camera::draw() const
 {
-  if( this->entityTrack != NULL)
+  if( this->entityTrack != NULL && this->isDrawTrack())
     this->entityTrack->drawGraph();
 }

trunk/src/world_entities/npcs/npc.cc

@@ -271 +271 @@
 void NPC::draw() const
 {
+ if( this->entityTrack != NULL && this->isDrawTrack())
+  this->entityTrack->drawGraph();
+
  WorldEntity::draw();
-  if( this->entityTrack != NULL)
-    this->entityTrack->drawGraph();
-}
+}

trunk/src/world_entities/space_ships/space_ship.cc

@@ -490 +490 @@
 void SpaceShip::draw () const
 {
-  if( this->entityTrack != NULL)
+  if( this->entityTrack != NULL && this->isDrawTrack())
     this->entityTrack->drawGraph();
 

trunk/src/world_entities/world_entity.cc

@@ -94 +94 @@
   // Track of this entity
   this->entityTrack = NULL;
+  this->bDrawTrack = false;
 
   // registering default reactions:
@@ -168 +169 @@
   LoadParam(root, "list", this, WorldEntity, toListS);
 
+  LoadParam(root, "drawTrack", this, WorldEntity, drawDebugTrack)
+      .describe("draws the track for debugging purposes");
 
   // Track

trunk/src/world_entities/world_entity.h

@@ -185 +185 @@
     //  CharacterAttributes*    charAttr;         //!< the character attributes of a world_entity
 
+  inline void drawDebugTrack(int flag) { this->bDrawTrack = (bool)flag; }
+  inline bool isDrawTrack() const { return this->bDrawTrack; }
+
 
 private:
@@ -240 +243 @@
   Vector                  velocity;                        //!< speed of the entity
   Track*                  entityTrack;                     //!< this is the track this entity follows (or NULL if none)
+  bool                    bDrawTrack;                      //!< if true draws the debug track
 
 };