Changeset 7779 in orxonox.OLD for trunk/src/world_entities

Timestamp:

May 23, 2006, 10:04:17 PM (19 years ago)

Author:

bensch

Message:

3088 linews changed : trunk: namespaces

Location:

trunk/src/world_entities

Files:

• weapons/weapon.cc (modified) (1 diff)
• weapons/weapon.h (modified) (3 diffs)
• world_entity.cc (modified) (2 diffs)
• world_entity.h (modified) (3 diffs)

trunk/src/world_entities/weapons/weapon.cc

@@ -307 +307 @@
 }
 
-GLGuiWidget* Weapon::getEnergyWidget()
+OrxGui::GLGuiWidget* Weapon::getEnergyWidget()
 {
   if (this->energyWidget == NULL)
   {
-    this->energyWidget = new GLGuiBar;
+    this->energyWidget = new OrxGui::GLGuiBar;
     this->energyWidget->setSize2D( 20, 100);
     this->energyWidget->setMaximum(this->getEnergyMax());

trunk/src/world_entities/weapons/weapon.h

@@ -25 +25 @@
 class TiXmlElement;
 class FastFactory;
+namespace OrxGui{ class GLGuiWidget; }
 template<class T> class tFastFactory;
-class GLGuiWidget;
 
 //! An enumerator defining Actions a Weapon can take
@@ -156 +156 @@
     Animation3D* copyAnimation(WeaponState from, WeaponState to);
 
-    GLGuiWidget* getEnergyWidget();
+    OrxGui::GLGuiWidget* getEnergyWidget();
 
     // FLOW
@@ -211 +211 @@
     float                maxCharge;                        //!< The maximal energy to be loaded onto one projectile (this is only availible if chargeable is enabled)
 
-    GLGuiBar*            energyWidget;
+    OrxGui::GLGuiBar*    energyWidget;
 
     PNode*               defaultTarget;                    //!< A target for targeting Weapons.

trunk/src/world_entities/world_entity.cc

@@ -406 +406 @@
   if (this->healthWidget == NULL)
   {
-    this->healthWidget = new GLGuiBar();
+    this->healthWidget = new OrxGui::GLGuiBar();
     this->healthWidget->setSize2D(30,400);
     this->healthWidget->setAbsCoor2D(10,100);
@@ -423 +423 @@
 
 
-GLGuiWidget* WorldEntity::getHealthWidget()
+OrxGui::GLGuiWidget* WorldEntity::getHealthWidget()
 {
   this->createHealthWidget();

trunk/src/world_entities/world_entity.h

@@ -17 +17 @@
 // FORWARD DECLARATION
 namespace OrxSound { class SoundBuffer; class SoundSource; }
+namespace OrxGui { class GLGuiWidget; class GLGuiBar; };
+
 class BVTree;
 class Model;
-
-class GLGuiWidget;
-class GLGuiBar;
 
 //class CharacterAttributes;
@@ -91 +90 @@
   float decreaseHealth(float health);
   void increaseHealthMax(float increaseHealth);
-  GLGuiWidget* getHealthWidget();
+  OrxGui::GLGuiWidget* getHealthWidget();
   bool hasHealthWidget() const { return this->healthWidget; };
 
@@ -108 +107 @@
   float                   health;             //!< The Energy of this Entity, if the Entity has any energy at all.
   float                   healthMax;          //!< The Maximal energy this entity can take.
-  GLGuiBar*               healthWidget;       //!< The Slider (if wanted).
+  OrxGui::GLGuiBar*       healthWidget;       //!< The Slider (if wanted).
 
   std::vector<Model*>     models;             //!< The model that should be loaded for this entity.