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

Timestamp:

Jun 19, 2008, 4:10:27 AM (16 years ago)

Author:

landauf

Message:

• fixed bug #1 in ConfigValueContainer (callback not being called the first time)
• fixed another bug in XMLPort, caused by the recently added support for extern types

Location:

code/branches/core3/src/orxonox

Files:

• GraphicsEngine.cc (modified) (1 diff)
• Settings.cc (modified) (1 diff)
• objects/ParticleProjectile.cc (modified) (1 diff)
• objects/Projectile.cc (modified) (1 diff)
• objects/RotatingProjectile.cc (modified) (1 diff)
• objects/WorldEntity.cc (modified) (1 diff)

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

@@ -97 +97 @@
     SetConfigValue(ogreLogLevelCritical_, 2).description("Corresponding orxonox debug level for ogre Critical");
 
-    SetConfigValue(detailLevelParticle_, 2).description("O: off, 1: low, 2: normal, 3: high").callback(&GraphicsEngine::detailLevelParticleChanged);
+    SetConfigValue(detailLevelParticle_, 2).description("O: off, 1: low, 2: normal, 3: high").callback(this, &GraphicsEngine::detailLevelParticleChanged);
   }
 

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

@@ -68 +68 @@
   void Settings::setConfigValues()
   {
-    SetConfigValue(dataPath_, "../../Media/").description("Relative path to the game data.").callback(&Settings::dataPathChanged);
+    SetConfigValue(dataPath_, "../../Media/").description("Relative path to the game data.").callback(this, &Settings::dataPathChanged);
   }
 

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

@@ -64 +64 @@
     void ParticleProjectile::setConfigValues()
     {
-        SetConfigValue(speed_, 5000.0).description("The speed of a projectile in units per second").callback(&ParticleProjectile::speedChanged);
+        SetConfigValue(speed_, 5000.0).description("The speed of a projectile in units per second").callback((Projectile*)this, &ParticleProjectile::speedChanged);
     }
 

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

@@ -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").callback(&Projectile::speedChanged);
+        SetConfigValue(speed_, 5000.0).description("The speed of a projectile in units per second").callback(this, &Projectile::speedChanged);
     }
 

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

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

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

@@ -112 +112 @@
         BaseObject::XMLPort(xmlelement, mode);
 
-        XMLPortParamExternTemplate(Ogre::Node, this->node_, "position", setPosition, getPosition, xmlelement, mode, Ogre::Node, const Vector3&);
+std::cout << "111111111111111\n";
+        XMLPortParamExternTemplate(WorldEntity, Ogre::Node, this->node_, "position", setPosition, getPosition, xmlelement, mode, Ogre::Node, const Vector3&);
+std::cout << "222222222222222\n";
         XMLPortParamLoadOnly(WorldEntity, "direction", setDirectionSimple, xmlelement, mode);
         XMLPortParamLoadOnly(WorldEntity, "yawpitchroll", setYawPitchRoll, xmlelement, mode);