Changeset 1350 for code/branches

Timestamp:

May 21, 2008, 11:00:40 PM (16 years ago)

Author:

FelixSchulthess

Message:

added a navigation marker

Location:

code/branches/hud3/src/orxonox/hud

Files:

• HUD.cc (modified) (1 diff)
• RadarOverlayElement.cc (modified) (4 diffs)
• RadarOverlayElement.h (modified) (4 diffs)

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

@@ -81 +81 @@
         radar->addObject(Vector3(1500.0, 0.0, 0.0));
         radar->addObject(Vector3(0.0, 4000.0, 0.0));
+        RadarOverlayElement::cycleFocus();
     }
 

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

@@ -32 +32 @@
     using namespace Ogre;
 
+    RadarOverlayElement* RadarOverlayElement::instance_s = NULL;
+
     RadarOverlayElement::RadarOverlayElement(const String& name):Ogre::PanelOverlayElement(name){
+        RadarOverlayElement::instance_s = this;
     }
 
@@ -47 +50 @@
         firstRadarObject_ = NULL;
         lastRadarObject_ = NULL;
+        focus_ = NULL;
+
+        // create nav marker ...
+        navMarker_ = static_cast<PanelOverlayElement*>(om->createOverlayElement("Panel", "NavMarker"));
+        navMarker_->setMetricsMode(Ogre::GMM_PIXELS);
+        navMarker_->setMaterialName("Orxonox/NavMarker");
+        navMarker_->setDimensions(16,16);
+        navMarker_->setPosition(0,386);
+        navMarker_->hide();
+        container_->addChild(navMarker_);
 
         // these have to fit the data in the level
@@ -105 +118 @@
             ro = ro->next;
                 }
+                updateNavMarker();
+    }
+
+    void RadarOverlayElement::updateNavMarker(){
+        if(focus_ == NULL) return;
+        // from the angle we find out where to draw the marker
+        // and which of the four arrows to take
+        float r1 = 0.97;//atan(windowW_/windowH_); // doesn't work correctly yet
+        float phi = focus_->phi_;
+        if(focus_->right_){
+            if(phi<r1){
+                navMarker_->setPosition(tan(phi)*windowH_/2+windowW_/2, 0);
+                navMarker_->setUV(0.5, 0.0, 1.0, 0.5);
+            }
+            else if(phi>3.14-r1){
+                navMarker_->setPosition(-tan(phi)*windowH_/2+windowW_/2, windowH_-16);
+                navMarker_->setUV(0.0, 0.5, 0.5, 1.0);
+            }
+            else {
+                navMarker_->setPosition(windowW_-16, -tan((3.14-2*phi)/2)*windowW_/2+windowH_/2);
+                navMarker_->setUV(0.5, 0.5, 1.0, 1.0);
+            }
+        }
+        else{
+            if(phi<r1) {
+                navMarker_->setPosition(-tan(phi)*windowH_/2+windowW_/2, 0);
+                navMarker_->setUV(0.5, 0.0, 1.0, 0.5);
+            }
+            else if(phi>3.14-r1) {
+                navMarker_->setPosition(tan(phi)*windowH_/2+windowW_/2, windowH_-16);
+                navMarker_->setUV(0.0, 0.5, 0.5, 1.0);
+            }
+            else {
+                navMarker_->setPosition(0, -tan((3.14-2*phi)/2)*windowW_/2+windowH_/2);
+                navMarker_->setUV(0.0, 0.0, 0.5, 0.5);
+            }
+        }
     }
 
@@ -147 +197 @@
         else return false;
         }
+
+        /*static*/void RadarOverlayElement::cycleFocus(){
+            if(RadarOverlayElement::instance_s == NULL) return;
+            if(RadarOverlayElement::instance_s->focus_ == NULL)
+            RadarOverlayElement::instance_s->focus_ = RadarOverlayElement::instance_s->firstRadarObject_;
+        else
+            RadarOverlayElement::instance_s->focus_ = RadarOverlayElement::instance_s->focus_->next;
+        if(RadarOverlayElement::instance_s->focus_ == NULL)
+            RadarOverlayElement::instance_s->navMarker_->hide();
+        else
+            RadarOverlayElement::instance_s->navMarker_->show();
+        }
 }
 

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

@@ -50 +50 @@
         private:
             Ogre::OverlayManager* om;               // our one and only overlay manager
-            Ogre::OverlayContainer* container_;
+            Ogre::OverlayContainer* container_;     // pointer to the container we're in
             Vector3 initialDir_;                        // direction of nose
             Vector3 currentDir_;
@@ -57 +57 @@
             Vector3 shipPos_;                       // position of ship
             Ogre::Plane plane;                      // plane perpendicular to dir
-
-                        RadarObject* firstRadarObject_;         // start of linked list
-                        RadarObject* lastRadarObject_;          // end of linked list
 
             Ogre::Real leftRel_, topRel_, dimRel_;  // relative position/dimension
@@ -71 +68 @@
                         void resize();
             void update();
+            void updateNavMarker();
             void addObject(Vector3 pos);
             void listObjects();
@@ -76 +74 @@
             float calcPhi(RadarObject* obj);
             bool calcRight(RadarObject* obj);
+
+            Ogre::PanelOverlayElement* navMarker_;  // marker to help navigating
+                        RadarObject* firstRadarObject_;         // start of linked list
+                        RadarObject* lastRadarObject_;          // end of linked list
+                        RadarObject* focus_;                    // object that is focussed
+
+            static RadarOverlayElement* instance_s;
+            static void cycleFocus();
         };
 }