Changeset 1580 for code/trunk/src

Timestamp:

Jun 9, 2008, 11:05:18 PM (16 years ago)

Author:

landauf

Message:

started another attempt to fix the occasionally focus-cycling crash

Location:

code/trunk/src/orxonox/hud

Files:

• HUD.cc (modified) (1 diff)
• Navigation.cc (modified) (18 diffs)
• Navigation.h (modified) (1 diff)

code/trunk/src/orxonox/hud/HUD.cc

@@ -247 +247 @@
             if ((*it)->getObject() == object)
             {
-                if (this->nav_)
-                  if (this->nav_->getFocus() == (*it))
-                    this->nav_->releaseFocus();
+                if (this->nav_ && this->nav_->getFocus() == (*it))
+                    this->nav_->releaseFocus();
 
                 delete (*it);

code/trunk/src/orxonox/hud/Navigation.cc

@@ -48 +48 @@
     using namespace Ogre;
 
-    Navigation::Navigation(OverlayContainer* container){
+    Navigation::Navigation(OverlayContainer* container)
+    {
         container_ = container;
         focus_ = NULL;
@@ -54 +55 @@
     }
 
-    Navigation::Navigation(OverlayContainer* container, RadarObject* focus){
-        container_ = container;
-        focus_ = focus;
-        init();
-    }
-
     Navigation::~Navigation()
     {
@@ -67 +62 @@
     }
 
-    void Navigation::init(){
+    void Navigation::init()
+    {
         // create nav text
         navText_ = static_cast<TextAreaOverlayElement*>(OverlayManager::getSingleton().createOverlayElement("TextArea", "navText"));
@@ -95 +91 @@
     }
 
-    void Navigation::update(){
+    void Navigation::update()
+    {
         if (!focus_)
             return;
@@ -102 +99 @@
     }
 
-    void Navigation::updateMarker(){
+    void Navigation::updateMarker()
+    {
         int windowW = GraphicsEngine::getSingleton().getWindowWidth();
         int windowH = GraphicsEngine::getSingleton().getWindowHeight();
@@ -134 +132 @@
         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:
-        if(!outOfView && radius > Ogre::Math::PI / 2) outOfView = true;
-
-        if(outOfView){
+        if (!outOfView && radius > Ogre::Math::PI / 2)
+            outOfView = true;
+
+        if (outOfView)
+        {
             // object is not in view
             navMarker_->setMaterialName("Orxonox/NavArrows");
@@ -147 +148 @@
             float phiNav = atan((float) xFromCenter / (float) yFromCenter);
 
-            if(isAbove && isRight){
+            if (isAbove && isRight)
+            {
                 // top right quadrant
-                if(-phiNav<phiUpperCorner){
+                if (-phiNav < phiUpperCorner)
+                {
                     //COUT(3) << "arrow up\n";
                     navMarker_->setPosition(-tan(phiNav)*windowH/2+windowW/2, 0);
@@ -156 +159 @@
                     navText_->setTop(navMarker_->getHeight());
                 }
-                else {
+                else
+                {
                     //COUT(3) << "arrow right\n";
                     navMarker_->setPosition(windowW-16, tan((3.14-2*phiNav)/2)*windowW/2+windowH/2);
@@ -164 +168 @@
                 }
             }
-            if(!isAbove && isRight){
+            if (!isAbove && isRight)
+            {
                 // bottom right quadrant
-                if(phiNav<phiUpperCorner) {
+                if (phiNav < phiUpperCorner)
+                {
                     //COUT(3) << "arrow down\n";
                     navMarker_->setPosition(tan(phiNav)*windowH/2+windowW/2, windowH-16);
@@ -173 +179 @@
                     navText_->setTop(navMarker_->getTop()-navMarker_->getHeight());
                 }
-                else {
+                else
+                {
                     //COUT(3) << "arrow right\n";
                     navMarker_->setPosition(windowW-16, tan((3.14-2*phiNav)/2)*windowW/2+windowH/2);
@@ -181 +188 @@
                 }
             }
-            if(isAbove && !isRight){
+            if (isAbove && !isRight)
+            {
                 // top left quadrant
-                if(phiNav<phiUpperCorner){
+                if (phiNav<phiUpperCorner)
+                {
                     //COUT(3) << "arrow up\n";
                     navMarker_->setPosition(-tan(phiNav)*windowH/2+windowW/2, 0);
@@ -190 +199 @@
                     navText_->setTop(navMarker_->getHeight());
                 }
-                else {
+                else
+                {
                     //COUT(3) << "arrow left\n";
                     navMarker_->setPosition(0, -tan((3.14-2*phiNav)/2)*windowW/2+windowH/2);
@@ -198 +208 @@
                 }
             }
-            if(!isAbove && !isRight){
+            if (!isAbove && !isRight)
+            {
                 // bottom left quadrant
-                if(phiNav>-phiUpperCorner) {
+                if (phiNav>-phiUpperCorner)
+                {
                     //COUT(3) << "arrow down\n";
                     navMarker_->setPosition(tan(phiNav)*windowH/2+windowW/2, windowH-16);
@@ -207 +219 @@
                     navText_->setTop(navMarker_->getTop()-navMarker_->getHeight());
                 }
-                else {
+                else
+                {
                     //COUT(3) << "arrow left\n";
                     navMarker_->setPosition(0, -tan((3.14-2*phiNav)/2)*windowW/2+windowH/2);
@@ -216 +229 @@
             }
         }
-        else{
+        else
+        {
             // object is in view
             navMarker_->setMaterialName("Orxonox/NavTDC");
@@ -230 +244 @@
     }
 
-    void Navigation::cycleFocus(){
-        if(focus_ == NULL){
+    void Navigation::cycleFocus()
+    {
+        if (!focus_)
+        {
             // Get closest object
             float distance = (unsigned int) -1;
@@ -255 +271 @@
                 HUD::getSingleton().getRadarObjects().insert(HUD::getSingleton().getRadarObjects().begin(), focus_);
                 it_ = HUD::getSingleton().getRadarObjects().begin();
-                ++it_;
-            }
-        }
-        else{
+            }
+        }
+        else if (it_ != HUD::getSingleton().getRadarObjects().end())
+        {
             focus_->resetMaterial();
-            if(it_ != HUD::getSingleton().getRadarObjects().end()){
+            ++it_;
+            if (it_ != HUD::getSingleton().getRadarObjects().end())
                 focus_ = *it_;
-                ++it_;
-            }
-            else focus_ = NULL;
+            else
+                focus_ = 0;
+        }
+        else
+        {
+            focus_ = 0;
         }
         updateFocus();
     }
 
-    void Navigation::updateFocus(){
-        if(focus_ == NULL){
+    void Navigation::updateFocus()
+    {
+        if (focus_)
+        {
+            navMarker_->show();
+            navText_->show();
+            focus_->setColour(ColourValue::White);
+        }
+        else
+        {
             navMarker_->hide();
             aimMarker_->hide();
             navText_->hide();
         }
-        else{
-            navMarker_->show();
-            navText_->show();
-            focus_->setColour(ColourValue::White);
-        }
     }
 
@@ -285 +308 @@
     {
         this->focus_ = 0;
-        this->it_ = HUD::getSingleton().getRadarObjects().end();
         this->updateFocus();
     }
 
-    float Navigation::getDist2Focus() const {
-        if(focus_ == NULL) return(0.0);
-        return((focus_->getPosition()-SpaceShip::getLocalShip()->getPosition()).length());
+    float Navigation::getDist2Focus() const
+    {
+        if (focus_)
+            return (focus_->getPosition() - SpaceShip::getLocalShip()->getPosition()).length();
+        else
+            return 0;
     }
 }

code/trunk/src/orxonox/hud/Navigation.h

@@ -42 +42 @@
       public:
         Navigation(Ogre::OverlayContainer* container);
-        Navigation(Ogre::OverlayContainer* container, RadarObject* focus);
         ~Navigation();