Changeset 1290 for code/branches/hud3/src/orxonox/hud
- Timestamp:
- May 15, 2008, 4:55:05 PM (17 years ago)
- Location:
- code/branches/hud3/src/orxonox/hud
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/hud3/src/orxonox/hud/RadarOverlayElement.cc
r1286 r1290 101 101 } 102 102 103 void RadarOverlayElement::setMainShipPosition(int dirX, dirY, dirZ, ortX, ortY,ortZ){103 void RadarOverlayElement::setMainShipPosition(int dirX, int dirY, int dirZ, int ortX, int ortY, int ortZ){ 104 104 dirX_=dirX; 105 105 dirY_=dirY; -
code/branches/hud3/src/orxonox/hud/RadarOverlayElement.cc~
r1286 r1290 101 101 } 102 102 103 void setMainShipPosition(int dirX, dirY, dirZ, ortX, ortY, ortZ){103 void RadarOverlayElement::setMainShipPosition(int dirX, dirY, dirZ, ortX, ortY, ortZ){ 104 104 dirX_=dirX; 105 105 dirY_=dirY; -
code/branches/hud3/src/orxonox/hud/RadarOverlayElement.h
r1286 r1290 54 54 bool right_; //checks whether the object is on the right side (since cos is not bijective) 55 55 56 static int ID = 0;56 //static int ID = 0; 57 57 58 58 public: … … 63 63 64 64 void initRadarOverlayElement(Real left, Real top, int dim, Ogre::OverlayContainer* container); 65 void setMainShipPosition(int dirX, dirY, dirZ, ortX, ortY,ortZ);65 void setMainShipPosition(int dirX, int dirY, int dirZ, int ortX, int ortY, int ortZ); 66 66 67 67 int newShip(int X, int Y, int Z); -
code/branches/hud3/src/orxonox/hud/RadarOverlayElement.h~
r1286 r1290 54 54 bool right_; //checks whether the object is on the right side (since cos is not bijective) 55 55 56 static int ID;56 //static int ID = 0; 57 57 58 58 public:
Note: See TracChangeset
for help on using the changeset viewer.