Changeset 697

Timestamp:

Dec 27, 2007, 5:06:55 AM (17 years ago)

Author:

landauf

Message:

put all SetConfigValue macro calls into the setConfigValues function (this is needed to allow changes of the config values at runtime)

Location:

code/branches/FICN/src/orxonox

Files:

• core/OrxonoxClass.cc (modified) (2 diffs)
• objects/Fighter.cc (modified) (2 diffs)
• objects/Fighter.h (modified) (1 diff)
• objects/Projectile.cc (modified) (3 diffs)
• objects/Projectile.h (modified) (1 diff)
• objects/SpaceShip.cc (modified) (3 diffs)
• objects/SpaceShip.h (modified) (1 diff)

code/branches/FICN/src/orxonox/core/OrxonoxClass.cc

@@ -38 +38 @@
     OrxonoxClass::OrxonoxClass()
     {
+        this->setConfigValues();
+
         this->identifier_ = 0;
         this->parents_ = 0;
@@ -43 +45 @@
         this->bActive_ = true;
         this->bVisible_ = true;
-
-        this->setConfigValues();
     }
 

code/branches/FICN/src/orxonox/objects/Fighter.cc

@@ -47 +47 @@
         RegisterObject(Fighter);
 
-        SetConfigValue(bInvertMouse_, false);
+        this->setConfigValues();
 
         this->setMouseEventCallback_ = false;
@@ -104 +104 @@
     }
 
+    void Fighter::setConfigValues()
+    {
+        SetConfigValue(bInvertMouse_, false);
+    }
+
     void Fighter::setMaxSpeedValues(float maxSpeedForward, float maxSpeedRotateUpDown, float maxSpeedRotateRightLeft, float maxSpeedLoopRightLeft)
     {

code/branches/FICN/src/orxonox/objects/Fighter.h

@@ -18 +18 @@
             Fighter();
             ~Fighter();
+            void setConfigValues();
             virtual void loadParams(TiXmlElement* xmlElem);
             void setMaxSpeedValues(float maxSpeedForward, float maxSpeedRotateUpDown, float maxSpeedRotateRightLeft, float maxSpeedLoopRightLeft);

code/branches/FICN/src/orxonox/objects/Projectile.cc

@@ -39 +39 @@
         RegisterObject(Projectile);
 
+        this->setConfigValues();
+
         this->owner_ = owner;
-
-        SetConfigValue(lifetime_, 10.0);
-        SetConfigValue(speed_, 2000.0);
 
         this->billboard_.setBillboardSet("Examples/Flare", ColourValue(1.0, 1.0, 0.5), 1);
@@ -64 +63 @@
     }
 
+    void Projectile::setConfigValues()
+    {
+        SetConfigValue(lifetime_, 10.0);
+        SetConfigValue(speed_, 2000.0);
+    }
+
     void Projectile::tick(float dt)
     {
@@ -77 +82 @@
                 if (this->getPosition().squaredDistance(it->getPosition()) <= (radius*radius))
                 {
-                    Explosion* explosion = new Explosion(this);
+                    new Explosion(this);
                     delete this;
                     return;

code/branches/FICN/src/orxonox/objects/Projectile.h

@@ -14 +14 @@
             Projectile(SpaceShip* owner = 0);
             virtual ~Projectile();
+            void setConfigValues();
             void destroyObject();
             virtual void tick(float dt);

code/branches/FICN/src/orxonox/objects/SpaceShip.cc

@@ -45 +45 @@
         RegisterObject(SpaceShip);
 
-        SetConfigValue(bInvertYAxis_, false);
-        SetConfigValue(reloadTime_, 0.125);
+        this->setConfigValues();
 
         this->setMouseEventCallback_ = false;
@@ -123 +122 @@
     }
 
+    void SpaceShip::setConfigValues()
+    {
+        SetConfigValue(bInvertYAxis_, false);
+        SetConfigValue(reloadTime_, 0.125);
+    }
+
     void SpaceShip::loadParams(TiXmlElement* xmlElem)
     {
@@ -363 +368 @@
         if (this->bLMousePressed_ && this->timeToReload_ <= 0)
         {
-            // FIXME, unused var; try recycling of projectiles
-            Projectile* proj = new Projectile(this);
+            new Projectile(this);
             this->timeToReload_ = this->reloadTime_;
         }

code/branches/FICN/src/orxonox/objects/SpaceShip.h

@@ -18 +18 @@
             SpaceShip();
             ~SpaceShip();
+            void setConfigValues();
             virtual void loadParams(TiXmlElement* xmlElem);
             virtual void tick(float dt);