Changeset 1596 for code/branches/core3/src/orxonox

Timestamp:

Jun 12, 2008, 10:53:51 PM (16 years ago)

Author:

landauf

Message:

• added feature to add a callback function to configvalues. they get called if the value changes. an examples is in Core.cc.
• changed the SetConfigValue macro and the Identifier::updateConfigValues() function to work properly with inherited classes in both possible cases: 1) they overwrite the config-value or 2) they don't. an example is ParticleProjectile that defines it's own speed_ configvalue.

Location:

code/branches/core3/src/orxonox

Files:

• GraphicsEngine.cc (modified) (1 diff)
• GraphicsEngine.h (modified) (1 diff)
• Settings.cc (modified) (1 diff)
• Settings.h (modified) (1 diff)
• objects/ParticleProjectile.cc (modified) (3 diffs)
• objects/ParticleProjectile.h (modified) (1 diff)
• objects/Projectile.cc (modified) (2 diffs)
• objects/Projectile.h (modified) (2 diffs)
• objects/RotatingProjectile.cc (modified) (1 diff)
• objects/RotatingProjectile.h (modified) (1 diff)

code/branches/core3/src/orxonox/GraphicsEngine.cc

@@ -97 +97 @@
     SetConfigValue(ogreLogLevelCritical_, 2).description("Corresponding orxonox debug level for ogre Critical");
 
-    unsigned int old = this->detailLevelParticle_;
-    SetConfigValue(detailLevelParticle_, 2).description("O: off, 1: low, 2: normal, 3: high");
-
-    if (this->detailLevelParticle_ != old)
-      for (ObjectList<ParticleInterface>::iterator it = ObjectList<ParticleInterface>::begin(); it; ++it)
-        it->detailLevelChanged(this->detailLevelParticle_);
+    SetConfigValue(detailLevelParticle_, 2).description("O: off, 1: low, 2: normal, 3: high").callback(&GraphicsEngine::detailLevelParticleChanged);
+  }
+
+  void GraphicsEngine::detailLevelParticleChanged()
+  {
+    for (ObjectList<ParticleInterface>::iterator it = ObjectList<ParticleInterface>::begin(); it; ++it)
+      it->detailLevelChanged(this->detailLevelParticle_);
   }
 

code/branches/core3/src/orxonox/GraphicsEngine.h

@@ -56 +56 @@
         public:
             void setConfigValues();
+            void detailLevelParticleChanged();
             bool setup();
             bool declareRessourceLocations();

code/branches/core3/src/orxonox/Settings.cc

@@ -68 +68 @@
   void Settings::setConfigValues()
   {
-    SetConfigValue(dataPath_, "../../Media/").description("Relative path to the game data.");
+    SetConfigValue(dataPath_, "../../Media/").description("Relative path to the game data.").callback(&Settings::dataPathChanged);
+  }
+
+  /**
+    @brief Callback function if the datapath has changed.
+  */
+  void Settings::dataPathChanged()
+  {
     if (dataPath_ != "" && dataPath_[dataPath_.size() - 1] != '/')
     {

code/branches/core3/src/orxonox/Settings.h

@@ -48 +48 @@
     public:
       void setConfigValues();
+      void dataPathChanged();
 
       static const std::string& getDataPath();

code/branches/core3/src/orxonox/objects/ParticleProjectile.cc

@@ -32 +32 @@
 #include "SpaceShip.h"
 #include "core/CoreIncludes.h"
-
+#include "core/ConfigValueIncludes.h"
 namespace orxonox
 {
@@ -52 +52 @@
             this->particles_ = 0;
         }
+
+        this->setConfigValues();
     }
 
@@ -60 +62 @@
     }
 
+    void ParticleProjectile::setConfigValues()
+    {
+        SetConfigValue(speed_, 5000.0).description("The speed of a projectile in units per second").callback(&ParticleProjectile::speedChanged);
+    }
+
+    void ParticleProjectile::speedChanged()
+    {
+        Projectile::speed_s = this->speed_;
+        if (this->owner_)
+            this->setVelocity(this->owner_->getInitialDir() * this->speed_);
+    }
+
     void ParticleProjectile::changedVisibility()
     {

code/branches/core3/src/orxonox/objects/ParticleProjectile.h

@@ -44 +44 @@
             virtual ~ParticleProjectile();
             virtual void changedVisibility();
+            void setConfigValues();
+            void speedChanged();
 
         private:

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

@@ -44 +44 @@
 namespace orxonox
 {
-    float Projectile::speed_ = 5000;
+    float Projectile::speed_s = 5000;
 
     Projectile::Projectile(SpaceShip* owner) : owner_(owner)
@@ -74 +74 @@
         SetConfigValue(damage_, 15.0).description("The damage caused by the projectile");
         SetConfigValue(lifetime_, 4.0).description("The time in seconds a projectile stays alive");
-        SetConfigValue(speed_, 5000.0).description("The speed of a projectile in units per second");
+        SetConfigValue(speed_, 5000.0).description("The speed of a projectile in units per second").callback(&Projectile::speedChanged);
+    }
 
+    void Projectile::speedChanged()
+    {
+        Projectile::speed_s = this->speed_;
         if (this->owner_)
             this->setVelocity(this->owner_->getInitialDir() * this->speed_);

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

@@ -42 +42 @@
             virtual ~Projectile();
             void setConfigValues();
+            void speedChanged();
             void destroyObject();
             virtual void tick(float dt);
 
             static float getSpeed()
-                { return Projectile::speed_; }
+                { return Projectile::speed_s; }
 
         protected:
@@ -55 +56 @@
             std::string explosionTemplateName_;
             std::string smokeTemplateName_;
-            static float speed_;
+        protected:
+            static float speed_s;
+            float speed_;
+        private:
             float lifetime_;
             float damage_;

code/branches/core3/src/orxonox/objects/RotatingProjectile.cc

@@ -65 +65 @@
     void RotatingProjectile::setConfigValues()
     {
-        SetConfigValue(colour_, ColourValue(1.0, 0.0, 0.0));
+        SetConfigValue(colour_, ColourValue(1.0, 0.0, 0.0)).callback(&RotatingProjectile::colourChanged);
+    }
 
+    void RotatingProjectile::colourChanged()
+    {
         if (this->isInitialized())
         {

code/branches/core3/src/orxonox/objects/RotatingProjectile.h

@@ -14 +14 @@
             virtual ~RotatingProjectile();
             void setConfigValues();
+            void colourChanged();
             virtual void tick(float dt);
             virtual void changedVisibility();