Changeset 7801 for code/trunk/src/modules/overlays

Timestamp:

Dec 22, 2010, 7:24:24 PM (14 years ago)

Author:

dafrick

Message:

Merging presentation2 branch back to trunk.

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/modules/overlays/hud/HUDBar.cc (modified) (2 diffs)
• src/modules/overlays/hud/HUDNavigation.cc (modified) (2 diffs)

code/trunk/src/modules/overlays/hud/HUDBar.cc

@@ -85 +85 @@
         this->bar_->setMaterialName(materialname);
 
-        this->value_ = 1.0f;  // initielize with 1.0f to trigger a change when calling setValue(0.0f) on the line below
+        this->value_ = 1.0f;  // initialize with 1.0f to trigger a change when calling setValue(0.0f) on the line below
         this->setAutoColour(true);
         this->setValue(0.0f); // <--
@@ -161 +161 @@
         if (this->right2Left_)
         {
-            // backward casew
+            // backward case
             this->bar_->setPosition(0.06f + 0.88f * (1 - this->value_), 0.0f);
             this->bar_->setDimensions(0.88f * this->value_, 1.0f);

code/trunk/src/modules/overlays/hud/HUDNavigation.cc

@@ -24 +24 @@
  *   Co-authors:
  *      Reto Grieder
+ *      Oliver Scheuss
  *
  */
@@ -410 +411 @@
     }
 }
-}
+
+}