Changeset 1450 for code/branches/network/src/orxonox/hud/RadarOverlayElement.cc

Timestamp:

May 28, 2008, 2:08:03 PM (16 years ago)

Author:

FelixSchulthess

Message:

making radar objects from scene nodes now. radar object supporting multiple colors

File:

• code/branches/network/src/orxonox/hud/RadarOverlayElement.cc (modified) (4 diffs)

code/branches/network/src/orxonox/hud/RadarOverlayElement.cc

@@ -89 +89 @@
 
             // set size to fit distance...
-            float d = (ro->pos_-shipPos_).length();
+            float d = (ro->getPosition()-shipPos_).length();
             if(d<4000) ro->panel_->setDimensions(4,4);
             else if(d<8000) ro->panel_->setDimensions(3,3);
@@ -113 +113 @@
         // iterate through all Radar Objects
         while(ro != NULL) {
-            COUT(3) << i++ << ": " << ro->pos_ << std::endl;
+            COUT(3) << i++ << ": " << ro->getPosition() << std::endl;
             ro = ro->next;
         }
@@ -119 +119 @@
 
     float RadarOverlayElement::calcRadius(Vector3 pos, Vector3 dir, Vector3 orth, RadarObject* obj){
-        return(acos((dir.dotProduct(obj->pos_ - pos))/
-        ((obj->pos_ - pos).length()*dir.length())));
+        return(acos((dir.dotProduct(obj->getPosition() - pos))/
+        ((obj->getPosition() - pos).length()*dir.length())));
     }
 
     float RadarOverlayElement::calcPhi(Vector3 pos, Vector3 dir, Vector3 orth, RadarObject* obj){
         // project difference vector on our plane...
-        Vector3 proj = Plane(dir, pos).projectVector(obj->pos_ - pos);
+        Vector3 proj = Plane(dir, pos).projectVector(obj->getPosition() - pos);
         // ...and find out the angle
         return(acos((orth.dotProduct(proj))/
@@ -132 +132 @@
 
     bool RadarOverlayElement::calcRight(Vector3 pos, Vector3 dir, Vector3 orth, RadarObject* obj){
-        if((dir.crossProduct(orth)).dotProduct(obj->pos_ - pos) > 0)
+        if((dir.crossProduct(orth)).dotProduct(obj->getPosition() - pos) > 0)
             return true;
         else return false;