Changeset 1393 for code/trunk

Timestamp:

May 23, 2008, 6:40:19 PM (17 years ago)

Author:

FelixSchulthess

Message:

moved navigation marker to new class: Navigation

Location:

code/trunk

Files:

• bin/keybindings.ini (modified) (1 diff)
• src/orxonox/CMakeLists.txt (modified) (1 diff)
• src/orxonox/hud/HUD.cc (modified) (7 diffs)
• src/orxonox/hud/HUD.h (modified) (3 diffs)
• src/orxonox/hud/Navigation.cc (added)
• src/orxonox/hud/Navigation.h (added)
• src/orxonox/hud/RadarObject.cc (modified) (1 diff)
• src/orxonox/hud/RadarObject.h (modified) (1 diff)
• src/orxonox/hud/RadarOverlayElement.cc (modified) (7 diffs)
• src/orxonox/hud/RadarOverlayElement.h (modified) (1 diff)

code/trunk/bin/keybindings.ini

@@ -15 +15 @@
 KeyEQUALS=activateConsole
 KeyBACK=
-KeyTAB=cycleRadarFocus
+KeyTAB=cycleNavigationFocus
 KeyQ=
 KeyW=

code/trunk/src/orxonox/CMakeLists.txt

@@ -9 +9 @@
   hud/RadarOverlayElement.cc
   hud/RadarObject.cc
+  hud/Navigation.cc
   particle/ParticleInterface.cc
   tolua/tolua_bind.cc

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

@@ -43 +43 @@
 namespace orxonox
 {
-    ConsoleCommandShortcut(HUD, cycleRadarFocus, AccessLevel::User);
+    ConsoleCommandShortcut(HUD, cycleNavigationFocus, AccessLevel::User);
 
     using namespace Ogre;
@@ -49 +49 @@
     HUD::HUD(){
         om = &Ogre::OverlayManager::getSingleton();
+        firstRadarObject = NULL;
+        lastRadarObject = NULL;
 
                 // create Factories
@@ -86 +88 @@
         radar->show();
 
+        // create Navigation
+        nav = new Navigation(container);
+
                 // set up screen-wide container
         container->show();
@@ -98 +103 @@
         container->addChild(test);
         container->addChild(fpsText);
+
         energyBar->init(0.01, 0.94, 0.4, container);
         energyBar->setValue(1);
+
         speedoBar->init(0.01, 0.90, 0.4, container);
+
         radar->init(0.5, 0.9, 0.2, container);
-        radar->addObject(Vector3(2000.0, 1000.0, 1000.0));
-        radar->addObject(Vector3(0.0, 4000.0, 0.0));
-        radar->addObject(Vector3(0.0, 0.0, 6800.0));
+        addRadarObject(Vector3(2000.0, 1000.0, 1000.0));
+        addRadarObject(Vector3(0.0, 4000.0, 0.0));
+        addRadarObject(Vector3(0.0, 0.0, 6800.0));
     }
 
@@ -113 +121 @@
     void HUD::tick(float dt)
     {
-        int d = (float)(radar->getDist2Focus()/10);
+        int d = (float)(nav->getDist2Focus()/10);
         if(d) test->setCaption("Distance: " + Ogre::StringConverter::toString(d));
         else test->setCaption("");
@@ -126 +134 @@
         radar->resize();
         radar->update();
+
+        nav->update();
+    }
+
+    void HUD::addRadarObject(Vector3 pos){
+        // check if this is the first RadarObject to create
+        if(firstRadarObject == NULL){
+            firstRadarObject = new RadarObject(container, pos);
+            lastRadarObject = firstRadarObject;
+        }
+        else{ // if not, append to list
+            lastRadarObject->next = new RadarObject(container, pos);
+            lastRadarObject = lastRadarObject->next;
+        }
+    }
+
+    RadarObject* HUD::getFirstRadarObject(){
+        return firstRadarObject;
     }
 
@@ -141 +167 @@
     }
 
-    /*static*/void HUD::cycleRadarFocus(){
-        HUD::getSingleton().radar->cycleFocus();
+    /*static*/void HUD::cycleNavigationFocus(){
+        HUD::getSingleton().nav->cycleFocus();
     }
 }

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

@@ -36 +36 @@
 #include "BarOverlayElement.h"
 #include "RadarOverlayElement.h"
+#include "Navigation.h"
+#include "RadarObject.h"
 
 
@@ -54 +56 @@
             BarOverlayElement* speedoBar;
             RadarOverlayElement* radar;
+            RadarObject* firstRadarObject;
+            RadarObject* lastRadarObject;
+            Navigation* nav;
 
         public:
             virtual void tick(float);
+            void addRadarObject(Vector3 pos);
+            RadarObject* getFirstRadarObject();
 
             static HUD* instance_s;
@@ -62 +69 @@
             static void setFPS(float fps);
             static void setEnergy(float value);
-            static void cycleRadarFocus();
+            static void cycleNavigationFocus();
     };
 }

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

@@ -67 +67 @@
         }
 }
-
-/* my local clipboard...
-COUT(3) << "WWWWWWWWWWWWWWWWWWWWWWWWWWWW\n";
-COUT(3) << firstRadarObject_->radius_ << "  " << firstRadarObject_->phi_ << std::endl;
-COUT(3) << "WWWWWWWWWWWWWWWWWWWWWWWWWWWW\n";
-*/

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

@@ -28 +28 @@
 #ifndef _RADAR2_H__
 #define _RADAR2_H__
-
 #include <OgrePrerequisites.h>
 #include "../OrxonoxPrereqs.h"

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

@@ -22 +22 @@
 *      Yuning Chai
 *   Co-authors:
-*      ...
+*      Felix Schulthess
 *
 */
@@ -37 +37 @@
 #include "core/ConsoleCommand.h"
 #include "objects/SpaceShip.h"
+#include "HUD.h"
 #include "RadarOverlayElement.h"
 
@@ -57 +58 @@
         topRel_ = topRel;
         container_ = container;
-        firstRadarObject_ = NULL;
-        lastRadarObject_ = NULL;
-        focus_ = NULL;
-
-        // create nav marker ...
-        navMarker_ = static_cast<PanelOverlayElement*>(om->createOverlayElement("Panel", "NavMarker"));
-        navMarker_->setMetricsMode(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
@@ -98 +87 @@
     void RadarOverlayElement::update() {
         shipPos_ = SpaceShip::instance_s->getPosition();
-        currentDir_ = SpaceShip::instance_s->getOrientation()*initialDir_;              // according to beni....
+        currentDir_ = SpaceShip::instance_s->getOrientation()*initialDir_;
                 currentOrth_ = SpaceShip::instance_s->getOrientation()*initialOrth_;
         plane = Plane(currentDir_, shipPos_);
-
-        RadarObject* ro = firstRadarObject_;
+        RadarObject* ro = HUD::getSingleton().getFirstRadarObject();
         // iterate through all RadarObjects
                 while(ro != NULL){
@@ -125 +113 @@
                     3.5*dim_/2+dim_/2+left_-2,-cos(ro->phi_)*ro->radius_/3.5*dim_/2+dim_/2+top_-2);
             }
+            listObjects();
             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 = atan((float)(windowW_)/(float)(windowH_));
-        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);
-            }
-        }
-    }
-
-    void RadarOverlayElement::addObject(Vector3 pos){
-        if(firstRadarObject_ == NULL){
-            firstRadarObject_ = new RadarObject(container_, pos);
-            lastRadarObject_ = firstRadarObject_;
-        }
-        else{
-            lastRadarObject_->next = new RadarObject(container_, pos);
-            lastRadarObject_ = lastRadarObject_->next;
-        }
-        }
 
         void RadarOverlayElement::listObjects(){
             int i = 0;
-            RadarObject* ro = firstRadarObject_;
+            RadarObject* ro = HUD::getSingleton().getFirstRadarObject();
             COUT(3) << "List of RadarObjects:\n";
             // iterate through all Radar Objects
@@ -186 +127 @@
                 ro = ro->next;
             }
-        }
-
-        float RadarOverlayElement::getDist2Focus(){
-            if(focus_ == NULL) return(0.0);
-            return((focus_->pos_-shipPos_).length());
         }
 
@@ -211 +147 @@
         else return false;
         }
-
-        void RadarOverlayElement::cycleFocus(){
-            if(focus_ == NULL){
-            focus_ = firstRadarObject_;
-            }
-        else{
-            focus_->panel_->setMaterialName("Orxonox/RedDot");
-            focus_ = focus_->next;
-        }
-
-        if(focus_ == NULL){
-            navMarker_->hide();
-        }
-        else{
-            navMarker_->show();
-            focus_->panel_->setMaterialName("Orxonox/WhiteDot");
-        }
-        }
 }
-
-/* my local clipboard...
-COUT(3) << "WWWWWWWWWWWWWWWWWWWWWWWWWWWW\n";
-COUT(3) << firstRadarObject_->radius_ << "  " << firstRadarObject_->phi_ << std::endl;
-COUT(3) << "WWWWWWWWWWWWWWWWWWWWWWWWWWWW\n";
-*/

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

@@ -58 +58 @@
                         void resize();
             void update();
-            void updateNavMarker();
-            void addObject(Vector3 pos);
             void listObjects();
-            void cycleFocus();
-            float getDist2Focus();
             float calcRadius(RadarObject* obj);
             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
         };
 }