Changeset 1343

Timestamp:

May 21, 2008, 4:41:13 PM (16 years ago)

Author:

FelixSchulthess

Message:

finally: the radar dots move continiously

Location:

code/branches/hud3/src/orxonox/hud

Files:

• RadarOverlayElement.cc (modified) (3 diffs)
• RadarOverlayElement.h (modified) (1 diff)

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

@@ -69 +69 @@
         initialOrth_ = Vector3(0.0, 0.0, 1.0);
         currentOrth_ = initialOrth_;
+        plane = Plane(currentDir_, shipPos_);
 
         setMetricsMode(Ogre::GMM_PIXELS);
@@ -92 +93 @@
         currentDir_ = SpaceShip::instance_s->getOrientation()*initialDir_;              // according to beni....
                 currentOrth_ = SpaceShip::instance_s->getOrientation()*initialOrth_;
+        plane = Plane(currentDir_, shipPos_);
 
         RadarObject* ro = firstRadarObject_;
@@ -141 +143 @@
 
         float RadarOverlayElement::calcPhi(RadarObject* obj){
-            return(acos((currentOrth_.dotProduct(firstRadarObject_->pos_ - shipPos_))/
-                ((firstRadarObject_->pos_ - shipPos_).length()*currentOrth_.length())));
+            // project difference vector on our plane...
+            Ogre::Vector3 proj = plane.projectVector(obj->pos_ - shipPos_);
+            // ...and find out the angle
+            return(acos((currentOrth_.dotProduct(proj))/
+            (currentOrth_.length()*proj.length())));
         }
 

code/branches/hud3/src/orxonox/hud/RadarOverlayElement.h

@@ -72 +72 @@
             Vector3 currentOrth_;
             Vector3 shipPos_;                       // position of ship
+            Ogre::Plane plane;                      // plane perpendicular to dir
 
                         RadarObject* firstRadarObject_;         // start of linked list