Changeset 6218 for code/branches/presentation2/src

Timestamp:

Dec 2, 2009, 10:20:37 PM (15 years ago)

Author:

rgrieder

Message:

Fixed at least 8 unitialised value problems though not all of them are problematic. Still, the values are being used and some condition depends on it.

Location:

code/branches/presentation2/src

Files:

• libraries/core/ConfigValueContainer.h (modified) (2 diffs)
• libraries/tools/ParticleInterface.cc (modified) (2 diffs)
• libraries/tools/Shader.cc (modified) (1 diff)
• modules/overlays/hud/HUDBar.cc (modified) (1 diff)
• orxonox/interfaces/RadarViewable.cc (modified) (2 diffs)
• orxonox/overlays/Map.cc (modified) (1 diff)
• orxonox/overlays/OrxonoxOverlay.cc (modified) (1 diff)

code/branches/presentation2/src/libraries/core/ConfigValueContainer.h

@@ -146 +146 @@
                 if ((this->callback_ && object) || this->bContainerIsNew_)
                 {
-                    if (this->bContainerIsNew_)
-                        this->bContainerIsNew_ = false;
-
                     T temp = *value;
                     this->value_.getValue(value);
-                    if ((*value) != temp)
+                    if (this->bContainerIsNew_ || (*value) != temp)
                     {
                         if (this->callback_ && object)
@@ -158 +155 @@
                             this->bDoInitialCallback_ = true;
                     }
+
+                    if (this->bContainerIsNew_)
+                        this->bContainerIsNew_ = false;
                 }
                 else

code/branches/presentation2/src/libraries/tools/ParticleInterface.cc

@@ -64 +64 @@
         this->bAllowedByLOD_ = true;
         this->speedFactor_ = 1.0f;
+
+        this->setDetailLevel(static_cast<unsigned int>(detaillevel));
 
         this->setConfigValues();
@@ -80 +82 @@
             }
         }
-
-        this->setDetailLevel(static_cast<unsigned int>(detaillevel));
     }
 

code/branches/presentation2/src/libraries/tools/Shader.cc

@@ -79 +79 @@
     Shader::~Shader()
     {
-
-        if (this->bLoadCompositor_ && this->compositorInstance_)
+        if (this->compositorInstance_ && this->bLoadCompositor_)
         {
             Ogre::Viewport* viewport = GraphicsManager::getInstance().getViewport();

code/branches/presentation2/src/modules/overlays/hud/HUDBar.cc

@@ -85 +85 @@
 
         this->value_ = 1.0f;  // initielize with 1.0f to trigger a change when calling setValue(0.0f) on the line below
+        this->setAutoColour(true);
         this->setValue(0.0f); // <--
         this->setRightToLeft(false);
-        this->setAutoColour(true);
         this->currentColour_ = ColourValue::White;
 

code/branches/presentation2/src/orxonox/interfaces/RadarViewable.cc

@@ -51 +51 @@
         , line_(NULL)
         , LineNode_(NULL)
+        , isHumanShip_(false)
+        , bVisibility_(false)
         , radarObjectCamouflage_(0.0f)
         , radarObjectShape_(Dot)
@@ -56 +58 @@
     {
         RegisterRootObject(RadarViewable);
-
-        this->bVisibility_ = true;
-        this->isHumanShip_ = false;
 
         this->uniqueId_=getUniqueNumberString();

code/branches/presentation2/src/orxonox/overlays/Map.cc

@@ -94 +94 @@
 
         //Getting Scene Manager (Hack)
-        if( !sManager_ )
-        {
-            ObjectList<Scene>::iterator it = ObjectList<Scene>::begin();
-            this->sManager_ = it->getSceneManager();
-        }
+        ObjectList<Scene>::iterator it = ObjectList<Scene>::begin();
+        this->sManager_ = it->getSceneManager();
         if( !Map::getMapSceneManager() )
         {

code/branches/presentation2/src/orxonox/overlays/OrxonoxOverlay.cc

@@ -83 +83 @@
         // Get aspect ratio from the render window. Later on, we get informed automatically
         this->windowAspectRatio_ = static_cast<float>(this->getWindowWidth()) / this->getWindowHeight();
-        this->sizeCorrectionChanged();
-
-        this->changedVisibility();
-
-        setSize(Vector2(1.0f, 1.0f));
-        setPickPoint(Vector2(0.0f, 0.0f));
-        setPosition(Vector2(0.0f, 0.0f));
-        setRotation(Degree(0.0));
-        setAspectCorrection(false);
+
+        this->size_ = Vector2(1.0f, 1.0f);
+        this->pickPoint_= Vector2(0.0f, 0.0f);
+        this->position_ = Vector2(0.0f, 0.0f);
+        this->angle_ = Degree(0.0);
+        this->bCorrectAspect_ = false;
+        this->rotState_ = Horizontal;
+        this->angleChanged(); // updates all other values as well
+
         setBackgroundMaterial("");
     }