Changeset 513 for code/branches/FICN/src/orxonox/hud

Timestamp:

Dec 13, 2007, 5:58:14 PM (17 years ago)

Author:

nicolasc

Message:

added copyright notice
network still need to be done

Location:

code/branches/FICN/src/orxonox/hud

Files:

• hud_overlay.cc (modified) (8 diffs)
• test_overlay.cc (modified) (2 diffs)

code/branches/FICN/src/orxonox/hud/hud_overlay.cc

@@ -5 +5 @@
  *   License notice:
  *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
+ *   This program is free software; you can redistribute it and/or
+ *   modify it under the terms of the GNU General Public License
+ *   as published by the Free Software Foundation; either version 2
+ *   of the License, or (at your option) any later version.
  *
  *   This program is distributed in the hope that it will be useful,
@@ -16 +16 @@
  *
  *   You should have received a copy of the GNU General Public License
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
  *   Author:
@@ -74 +74 @@
                 OverlayElement* TimeText = OverlayManager::getSingleton().getOverlayElement("Orxonox/HUD1.2/Time/Text");
                 TimeText->setCaption(StringConverter::toString(TimeMin) + ":" + StringConverter::toString(TimeSec));
-                
+
                 // set TargetWindow
                 String TargetWindowName = "HURRA";
@@ -81 +81 @@
                 int TargetWindowHitRating = 30;
                 OverlayElement* TargetWindowNameText = OverlayManager::getSingleton().getOverlayElement("Orxonox/HUD1.2/TargetWindow/Name");
-                TargetWindowNameText->setCaption( TargetWindowName);            
+                TargetWindowNameText->setCaption( TargetWindowName);
                 OverlayElement* TargetWindowDistanceText = OverlayManager::getSingleton().getOverlayElement("Orxonox/HUD1.2/TargetWindow/DistanceText");
                 TargetWindowDistanceText->setCaption(StringConverter::toString(TargetWindowDistance) + "km" );
@@ -88 +88 @@
                 OverlayElement* TargetWindowHitRatingText = OverlayManager::getSingleton().getOverlayElement("Orxonox/HUD1.2/TargetWindow/HitRatingText");
                 TargetWindowHitRatingText->setCaption(StringConverter::toString(TargetWindowHitRating) + "%" );
-                
+
                 // set Energy
                 int EnergyValue = 60.0;
                 OverlayElement* EnergyLength = OverlayManager::getSingleton().getOverlayElement("Orxonox/HUD1.2/EnergyBackground");
                 EnergyLength->setWidth((int)((double)60/(double)100*200));
-                
+
                 // set Shild
                 bool ShildLeftTopValue = true;
@@ -111 +111 @@
                 if (ShildRightBottomValue) ShildRightBottom->show();
                 else ShildRightBottom->hide();
-                
+
                 // set Rockets
                 int Rocket1 = 11;
@@ -125 +125 @@
                 OverlayElement* RocketNum4 = OverlayManager::getSingleton().getOverlayElement("Orxonox/HUD1.2/RocketNum4");
                 RocketNum4->setCaption(StringConverter::toString(Rocket4));
-                
+
                 // set EnergyDistribution
                 double EnergyDistrPixelX = 100;
-                double EnergyDistrPixelY = 86;          
+                double EnergyDistrPixelY = 86;
                 double EnergyDistrShild = 32;
                 double EnergyDistrEngine = 50;
@@ -137 +137 @@
                 double EnergyDistrY = (double)EnergyDistrEngineInv/((double)EnergyDistrEngineInv+(double)EnergyDistrLaserInv) * EnergyDistrPixelY;
                 double EnergyDistrX = EnergyDistrY/1.7321;
-                
-                
-                
+
+
+
                 OverlayElement* EnergyDistrPoint = OverlayManager::getSingleton().getOverlayElement("Orxonox/HUD1.2/EnergyDistrPoint");
 //              EnergyDistrPoint->setLeft();

code/branches/FICN/src/orxonox/hud/test_overlay.cc

@@ -5 +5 @@
  *   License notice:
  *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
+ *   This program is free software; you can redistribute it and/or
+ *   modify it under the terms of the GNU General Public License
+ *   as published by the Free Software Foundation; either version 2
+ *   of the License, or (at your option) any later version.
  *
  *   This program is distributed in the hope that it will be useful,
@@ -16 +16 @@
  *
  *   You should have received a copy of the GNU General Public License
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
  *   Author: