Changeset 1588 for code/branches/hud/src/orxonox/objects

Timestamp:

Jun 11, 2008, 12:21:42 AM (17 years ago)

Author:

rgrieder

Message:

• added XML loadable HUD
• Radar and navi are not yet done
• explanations follow with when things are finished

Location:

code/branches/hud/src/orxonox/objects

Files:

• Ambient.cc (modified) (1 diff)
• Ambient.h (modified) (1 diff)
• NPC.cc (modified) (1 diff)
• NPC.h (modified) (1 diff)
• WorldEntity.cc (modified) (1 diff)
• WorldEntity.h (modified) (1 diff)
• weapon/AmmunitionDump.h (modified) (1 diff)
• weapon/BaseWeapon.h (modified) (1 diff)
• weapon/Bullet.h (modified) (1 diff)
• weapon/BulletManager.h (modified) (1 diff)

code/branches/hud/src/orxonox/objects/Ambient.cc

@@ -73 +73 @@
       
     }
-    
-    void Ambient::loadParams(TiXmlElement* xmlElem)
+
+    void Ambient::setAmbientLight(const ColourValue& colour)
     {
-        if (xmlElem->Attribute("colourvalue"))
-        {
-        SubString colourvalues(xmlElem->Attribute("colourvalue"), ',');
-
-                float r, g, b;
-        convertValue<std::string, float>(&r, colourvalues[0]);
-        convertValue<std::string, float>(&g, colourvalues[1]);
-        convertValue<std::string, float>(&b, colourvalues[2]);
-
-                this->setAmbientLight(ColourValue(r, g, b));
-
-                COUT(4) << "Loader: Set ambient light: "<<r<<" " << g << " " << b  << std::endl << std::endl;
-        }
-   }
-
-   void Ambient::setAmbientLight(const ColourValue& colour)
-   {
-        GraphicsEngine::getSingleton().getSceneManager()->setAmbientLight(colour);
+            GraphicsEngine::getSingleton().getSceneManager()->setAmbientLight(colour);
       ambientLight_=colour;     
-   }
+    }
 
     /**

code/branches/hud/src/orxonox/objects/Ambient.h

@@ -44 +44 @@
             virtual ~Ambient();
 
-            void loadParams(TiXmlElement* xmlElem);
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
             void setAmbientLight(const ColourValue& colour);

code/branches/hud/src/orxonox/objects/NPC.cc

@@ -45 +45 @@
   NPC::~NPC()
   {
-  }
-
-  void NPC::loadParams(TiXmlElement* xmlElem)
-  {
-    Model::loadParams(xmlElem);
   }
 

code/branches/hud/src/orxonox/objects/NPC.h

@@ -48 +48 @@
       NPC();
       virtual ~NPC();
-      virtual void loadParams(TiXmlElement* xmlElem);
       void tick(float dt);
       void update();

code/branches/hud/src/orxonox/objects/WorldEntity.cc

@@ -95 +95 @@
     }
 
-    void WorldEntity::loadParams(TiXmlElement* xmlElem)
-    {
-
-        BaseObject::loadParams(xmlElem);
-        create();
-    }
-
 
     void WorldEntity::setYawPitchRoll(const Degree& yaw, const Degree& pitch, const Degree& roll)

code/branches/hud/src/orxonox/objects/WorldEntity.h

@@ -51 +51 @@
 
             virtual void tick(float dt);
-            virtual void loadParams(TiXmlElement* xmlElem);
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
             virtual inline bool create(){ return Synchronisable::create(); }

code/branches/hud/src/orxonox/objects/weapon/AmmunitionDump.h

@@ -56 +56 @@
     int getStockSize(const std::string &name);
 
-    virtual void loadParams(TiXmlElement* xmlElem) { BaseObject::loadParams(xmlElem); };
-
 
   protected:

code/branches/hud/src/orxonox/objects/weapon/BaseWeapon.h

@@ -72 +72 @@
     void setAmmoDump(AmmunitionDump*);
 
-    inline virtual void loadParams(TiXmlElement* xmlElem) { Model::loadParams(xmlElem); };
-
     virtual void tick(float dt);
 

code/branches/hud/src/orxonox/objects/weapon/Bullet.h

@@ -45 +45 @@
 
     virtual void tick(float dt) { }
-
-    inline virtual void loadParams(TiXmlElement* xmlElem) { Model::loadParams(xmlElem); };
  };
 }

code/branches/hud/src/orxonox/objects/weapon/BulletManager.h

@@ -57 +57 @@
     virtual void tick(float dt);
 
-    inline virtual void loadParams(TiXmlElement* xmlElem) { BaseObject::loadParams(xmlElem); };
-
   protected:
     inline bool create() { return Synchronisable::create(); }