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

Timestamp:

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

Author:

FelixSchulthess

Message:

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

File:

• code/branches/network/src/orxonox/hud/Navigation.cc (modified) (5 diffs)

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

@@ -96 +96 @@
 
         if(navCam_ == NULL) navCam_ = SpaceShip::getLocalShip()->getCamera()->cam_;
-        Vector3 pos = focus_->pos_;
+        Vector3 pos = focus_->getPosition();
         // transform to screen coordinates
         pos = navCam_->getProjectionMatrix()*navCam_->getViewMatrix()*pos;
@@ -107 +107 @@
         // is object in view?
         float radius = RadarOverlayElement::calcRadius(navCamPos_, currentDir_, currentOrth_, focus_);
-        bool isRight = (currentDir_.crossProduct(currentOrth_)).dotProduct(focus_->pos_ - navCamPos_)>0;
-        bool isAbove = currentOrth_.dotProduct(focus_->pos_ - navCamPos_)>0;
+        bool isRight = (currentDir_.crossProduct(currentOrth_)).dotProduct(focus_->getPosition() - navCamPos_)>0;
+        bool isAbove = currentOrth_.dotProduct(focus_->getPosition() - navCamPos_)>0;
         bool outOfView = (xPosRel<0 || xPosRel>1 || yPosRel<0 || yPosRel>1);
         // if object is behind us, it is out of view anyway:
@@ -206 +206 @@
         }
         else{
-            focus_->panel_->setMaterialName("Orxonox/RedDot");
+            focus_->resetColour();
             if(focus_ != NULL) focus_ = focus_->next;
         }
@@ -217 +217 @@
             navMarker_->show();
             navText_->show();
-            focus_->panel_->setMaterialName("Orxonox/WhiteDot");
+            focus_->setColour(RadarObject::WHITE);
         }
     }
@@ -223 +223 @@
     float Navigation::getDist2Focus(){
         if(focus_ == NULL) return(0.0);
-        return((focus_->pos_-SpaceShip::getLocalShip()->getPosition()).length());
+        return((focus_->getPosition()-SpaceShip::getLocalShip()->getPosition()).length());
     }
 }