Changeset 1406 for code/branches/network/src

Timestamp:

May 24, 2008, 1:39:05 PM (17 years ago)

Author:

rgrieder

Message:

• merged Felix's changes from trunk to network branch
• added "svn:eol-style native" property to keybindings.ini

Location:

code/branches/network/src/orxonox

Files:

• CMakeLists.txt (modified) (1 diff)
• Orxonox.cc (modified) (3 diffs)
• hud/BarOverlayElement.cc (modified) (5 diffs)
• hud/BarOverlayElement.h (modified) (1 diff)
• hud/HUD.cc (modified) (5 diffs)
• hud/HUD.h (modified) (2 diffs)
• hud/Navigation.cc (copied) (copied from code/trunk/src/orxonox/hud/Navigation.cc)
• hud/Navigation.h (copied) (copied from code/trunk/src/orxonox/hud/Navigation.h)
• hud/RadarObject.cc (modified) (5 diffs)
• hud/RadarObject.h (modified) (2 diffs)
• hud/RadarOverlayElement.cc (modified) (7 diffs)
• hud/RadarOverlayElement.h (modified) (3 diffs)
• objects/Camera.h (modified) (2 diffs)
• objects/SpaceShip.cc (modified) (5 diffs)
• objects/SpaceShip.h (modified) (4 diffs)

code/branches/network/src/orxonox/CMakeLists.txt

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

code/branches/network/src/orxonox/Orxonox.cc

@@ -181 +181 @@
   {
     // keep in mind: the order of deletion is very important!
-    if (this->orxonoxHUD_)
-      delete this->orxonoxHUD_;
+//    if (this->orxonoxHUD_)
+//      delete this->orxonoxHUD_;
     Loader::close();
     InputManager::destroy();
@@ -350 +350 @@
     // Load the HUD
     COUT(3) << "Orxonox: Loading HUD..." << std::endl;
-    orxonoxHUD_ = new HUD(1);
+    orxonoxHUD_ = &HUD::getSingleton();
 
     COUT(3) << "Orxonox: Loading Console..." << std::endl;
@@ -490 +490 @@
 //      orxonoxHUD_->setRocket2(ogreRoot.getCurrentFrameNumber());
       if (eventTimes[3].back() - eventTimes[3].front() != 0)
-//        orxonoxHUD_->setRocket1((int)(50000.0f/(eventTimes[3].back() - eventTimes[3].front())));
+        HUD::setFPS(50000.0f/(eventTimes[3].back() - eventTimes[3].front()));
 
       // Iterate through all Tickables and call their tick(dt) function

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

@@ -28 +28 @@
 #include "OrxonoxStableHeaders.h"
 #include <OgreOverlayManager.h>
-#include <OgreOverlayElement.h>
-#include <OgrePanelOverlayElement.h>
 #include "GraphicsEngine.h"
 #include "BarOverlayElement.h"
@@ -37 +35 @@
   using namespace Ogre;
 
-    BarOverlayElement::BarOverlayElement(const String& name):Ogre::PanelOverlayElement(name){
+    BarOverlayElement::BarOverlayElement(const String& name):PanelOverlayElement(name){
         name_ = name;
     }
@@ -43 +41 @@
     BarOverlayElement::~BarOverlayElement(){}
 
-    void BarOverlayElement::init(Real leftRel, Real topRel, Real dimRel, Ogre::OverlayContainer* container){
+    void BarOverlayElement::init(Real leftRel, Real topRel, Real dimRel, OverlayContainer* container){
         // init some values...
         container_ = container;
-        om = &Ogre::OverlayManager::getSingleton();
+        om = &OverlayManager::getSingleton();
         value_ = 0;
         color_ = 2;
@@ -54 +52 @@
         topRel_ = topRel;
         dimRel_ = dimRel;
-        
+
         // create background...
         background_ = static_cast<OverlayContainer*>(om->createOverlayElement("Panel", name_+"container"));
         background_->show();
         container_->addChild(background_);
-        background_->setMetricsMode(Ogre::GMM_PIXELS);
+        background_->setMetricsMode(GMM_PIXELS);
         background_->setMaterialName("Orxonox/BarBackground");
 
@@ -66 +64 @@
 
         show();
-        setMetricsMode(Ogre::GMM_PIXELS);
+        setMetricsMode(GMM_PIXELS);
         setMaterialName("Orxonox/Green");
         background_->addChild(this);

code/branches/network/src/orxonox/hud/BarOverlayElement.h

@@ -30 +30 @@
 #define _BAR_H__
 
-#include <OgreOverlayManager.h>
-#include <OgreOverlayElement.h>
+
 #include <OgrePanelOverlayElement.h>
-
 #include <OgrePrerequisites.h>
 #include "../OrxonoxPrereqs.h"
-
-
 
 namespace orxonox

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

@@ -26 +26 @@
 */
 
-
+#include <string.h>
 #include "OrxonoxStableHeaders.h"
 #include <OgreOverlay.h>
 #include <OgreOverlayContainer.h>
 #include <OgreOverlayManager.h>
-#include <OgreSceneNode.h>
-#include <OgreEntity.h>
 #include <OgreStringConverter.h>
+
 #include "core/Debug.h"
+#include "core/ConsoleCommand.h"
 #include "objects/SpaceShip.h"
-#include "HUD.h"
 #include "BarOverlayElement.h"
 #include "RadarOverlayElement.h"
 #include "OverlayElementFactories.h"
+#include "HUD.h"
 
 namespace orxonox
 {
+    ConsoleCommandShortcut(HUD, cycleNavigationFocus, AccessLevel::User);
+
     using namespace Ogre;
 
-    HUD::HUD(int zoom){
+    HUD::HUD(){
         om = &Ogre::OverlayManager::getSingleton();
+        firstRadarObject = NULL;
+        lastRadarObject = NULL;
 
                 // create Factories
@@ -56 +60 @@
         orxonoxHUD = om->create("Orxonox/HUD");
         container = static_cast<Ogre::OverlayContainer*>(om->createOverlayElement("Panel", "Orxonox/HUD/container"));
-        // test
-        test = static_cast<TextAreaOverlayElement*>(om->createOverlayElement("TextArea", "test123"));
-        test->show();
-        test->setMetricsMode(Ogre::GMM_RELATIVE);
-        test->setDimensions(0.8, 0.8);
-        test->setPosition(0.02, 0.02);
-        test->setFontName("Console");
-        test->setCaption("init");
+
+        // creating text to display fps
+        fpsText = static_cast<TextAreaOverlayElement*>(om->createOverlayElement("TextArea", "fpsText"));
+        fpsText->show();
+        fpsText->setMetricsMode(Ogre::GMM_PIXELS);
+        fpsText->setDimensions(0.001, 0.001);
+        fpsText->setPosition(10, 10);
+        fpsText->setFontName("Console");
+        fpsText->setCharHeight(20);
+        fpsText->setCaption("init");
 
         // create energy bar
@@ -75 +81 @@
         radar->show();
 
+        // create Navigation
+        nav = new Navigation(container);
+
                 // set up screen-wide container
         container->show();
@@ -85 +94 @@
         container->setHeight(1.0);
         container->setMetricsMode(Ogre::GMM_RELATIVE);
-        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(1500.0, 0.0, 100.0));
-        radar->addObject(Vector3(0.0, 4000.0, 0.0));
-        radar->addObject(Vector3(0.0, 0.0, 6800.0));
-        RadarOverlayElement::cycleFocus();
+        addRadarObject(Vector3(2000.0, 0.0, 0.0));
+        addRadarObject(Vector3(0.0, 2000.0, 0.0));
+        addRadarObject(Vector3(0.0, 0.0, 2000.0));
+    }
+
+    HUD::~HUD(){
+        //todo: clean up objects
     }
 
     void HUD::tick(float dt)
     {
-        int d = radar->getDist2Focus()/10;
-        if(d) test->setCaption("Distance: " + Ogre::StringConverter::toString(d));
-        else test->setCaption("");
-
         energyBar->resize();
 
@@ -113 +124 @@
         radar->resize();
         radar->update();
+
+        nav->update();
     }
 
-    HUD::~HUD(void){
+    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;
+    }
+
+    /*static*/HUD& HUD::getSingleton(){
+        static HUD theInstance;
+        return theInstance;
+    }
+
+    /*static*/void HUD::setFPS(float fps){
+        HUD::getSingleton().fpsText->setCaption("FPS: " + Ogre::StringConverter::toString(fps));
+    }
+
+    /*static*/void HUD::setEnergy(float value){
+        HUD::getSingleton().energyBar->setValue(value);
+    }
+
+    /*static*/void HUD::cycleNavigationFocus(){
+        HUD::getSingleton().nav->cycleFocus();
     }
 }

code/branches/network/src/orxonox/hud/HUD.h

@@ -30 +30 @@
 #define _HUD_H__
 
-#include <string.h>
-#include <OgreOverlayElement.h>
+#include <OgrePrerequisites.h>
 #include <OgreTextAreaOverlayElement.h>
-#include <OgrePrerequisites.h>
-
 #include "OrxonoxPrereqs.h"
 #include "core/Tickable.h"
 #include "BarOverlayElement.h"
 #include "RadarOverlayElement.h"
+#include "Navigation.h"
+#include "RadarObject.h"
 
 
@@ -46 +45 @@
     {
         private:
+            HUD();
+            HUD(HUD& instance);
+            ~HUD();
             Ogre::OverlayManager* om;
             Ogre::Overlay* orxonoxHUD;
             Ogre::OverlayContainer* container;
-            Ogre::TextAreaOverlayElement* test;
+            Ogre::TextAreaOverlayElement* fpsText;
             BarOverlayElement* energyBar;
             BarOverlayElement* speedoBar;
             RadarOverlayElement* radar;
+            RadarObject* firstRadarObject;
+            RadarObject* lastRadarObject;
+            Navigation* nav;
 
         public:
-            HUD(int zoom);
-            ~HUD();
             virtual void tick(float);
+            void addRadarObject(Vector3 pos);
+            RadarObject* getFirstRadarObject();
 
+            static HUD* instance_s;
+            static HUD& getSingleton();
+            static void setFPS(float fps);
+            static void setEnergy(float value);
+            static void cycleNavigationFocus();
     };
 }

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

@@ -29 +29 @@
 #include "RadarObject.h"
 
+#include <string.h>
+#include <OgreOverlayManager.h>
+#include <OgrePanelOverlayElement.h>
+#include <OgreStringConverter.h>
+#include <util/Math.h>
+
 namespace orxonox
 {
@@ -35 +41 @@
         int RadarObject::count = 0;             // initialize static variable
 
-        RadarObject::RadarObject(Ogre::OverlayContainer* container){
+        RadarObject::RadarObject(OverlayContainer* container){
                 container_ = container;
                 pos_ = Vector3(0.0, 0.0, 0.0);
@@ -41 +47 @@
         }
 
-        RadarObject::RadarObject(Ogre::OverlayContainer* container, Vector3 pos){
+        RadarObject::RadarObject(OverlayContainer* container, Vector3 pos){
                 container_ = container;
                 pos_ = pos;
@@ -51 +57 @@
         void RadarObject::init(){
             next = NULL;
-                om = &Ogre::OverlayManager::getSingleton();
+                om = &OverlayManager::getSingleton();
                 panel_ = static_cast<PanelOverlayElement*>(om->createOverlayElement("Panel",
-                        "Object"+Ogre::StringConverter::toString(count)));
+                        "Object"+StringConverter::toString(count)));
                 panel_->setMaterialName("Orxonox/RedDot");
                 panel_->setDimensions(3,3);
@@ -63 +69 @@
         }
 }
-
-/* my local clipboard...
-COUT(3) << "WWWWWWWWWWWWWWWWWWWWWWWWWWWW\n";
-COUT(3) << firstRadarObject_->radius_ << "  " << firstRadarObject_->phi_ << std::endl;
-COUT(3) << "WWWWWWWWWWWWWWWWWWWWWWWWWWWW\n";
-*/

code/branches/network/src/orxonox/hud/RadarObject.h

@@ -28 +28 @@
 #ifndef _RADAR2_H__
 #define _RADAR2_H__
-
-#include <string.h>
 #include <OgrePrerequisites.h>
-#include <OgreOverlayManager.h>
-#include <OgreOverlayElement.h>
-#include <OgrePanelOverlayElement.h>
-#include <OgreStringConverter.h>
-
-#include <util/Math.h>
 #include "../OrxonoxPrereqs.h"
 
@@ -55 +47 @@
             int index_;                             // index number of object
                 Vector3 pos_;                                                   // position in space
-                        Ogre::Real radius_, phi_;                               // position on radar
                         Ogre::OverlayContainer* container_;
                         Ogre::PanelOverlayElement* panel_;              // the panel used to show the dot

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

@@ -22 +22 @@
 *      Yuning Chai
 *   Co-authors:
-*      ...
+*      Felix Schulthess
 *
 */
@@ -29 +29 @@
 #include "RadarOverlayElement.h"
 
+#include <string.h>
+#include <OgreOverlayManager.h>
+#include <OgreStringConverter.h>
+#include <OgrePanelOverlayElement.h>
+
+#include "GraphicsEngine.h"
+#include "core/Tickable.h"
+#include "core/ConsoleCommand.h"
+#include "objects/SpaceShip.h"
+#include "HUD.h"
+
 namespace orxonox
 {
-    ConsoleCommandShortcut(RadarOverlayElement, cycleFocus, AccessLevel::User);
 
     using namespace Ogre;
 
-    RadarOverlayElement* RadarOverlayElement::instance_s = NULL;
-
-    RadarOverlayElement::RadarOverlayElement(const String& name):Ogre::PanelOverlayElement(name){
-        RadarOverlayElement::instance_s = this;
+    RadarOverlayElement::RadarOverlayElement(const String& name):PanelOverlayElement(name){
     }
 
@@ -44 +51 @@
     }
 
-    void RadarOverlayElement::init(Real leftRel, Real topRel, Real dimRel, Ogre::OverlayContainer* container){
+    void RadarOverlayElement::init(Real leftRel, Real topRel, Real dimRel, OverlayContainer* container){
         // some initial data
-                om = &Ogre::OverlayManager::getSingleton();
+                om = &OverlayManager::getSingleton();
         dimRel_ = dimRel;
         leftRel_ = leftRel;
         topRel_ = topRel;
         container_ = container;
-        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
-        shipPos_ = Vector3(0.0, 0.0, 0.0);
-        initialDir_ = Vector3(1.0, 0.0, 0.0);
-        currentDir_ = initialDir_;
-        initialOrth_ = Vector3(0.0, 0.0, 1.0);
-        currentOrth_ = initialOrth_;
-        plane = Plane(currentDir_, shipPos_);
-
-        setMetricsMode(Ogre::GMM_PIXELS);
+        setMetricsMode(GMM_PIXELS);
         setMaterialName("Orxonox/Radar");
         resize();
@@ -91 +78 @@
 
     void RadarOverlayElement::update() {
+<<<<<<< .working
         shipPos_ = SpaceShip::getLocalShip()->getPosition();
         currentDir_ = SpaceShip::getLocalShip()->getOrientation()*initialDir_;          // according to beni....
@@ -97 +85 @@
 
         RadarObject* ro = firstRadarObject_;
+=======
+        shipPos_ = SpaceShip::getLocalShip()->getPosition();
+        currentDir_ = SpaceShip::getLocalShip()->getDir();
+                currentOrth_ = SpaceShip::getLocalShip()->getOrth();
+        RadarObject* ro = HUD::getSingleton().getFirstRadarObject();
+>>>>>>> .merge-right.r1401
         // iterate through all RadarObjects
                 while(ro != NULL){
                     // calc position on radar...
-            ro->radius_ = calcRadius(ro);
-            ro->phi_ = calcPhi(ro);
-            ro->right_ = calcRight(ro);
+            float radius = calcRadius(shipPos_, currentDir_, currentOrth_, ro);
+            float phi = calcPhi(shipPos_, currentDir_, currentOrth_, ro);
+            bool right = calcRight(shipPos_, currentDir_, currentOrth_, ro);
 
             // set size to fit distance...
@@ -111 +105 @@
             else ro->panel_->setDimensions(1,1);
 
-            if (ro->right_){
-                ro->panel_->setPosition(sin(ro->phi_)*ro->radius_/
-                    3.5*dim_/2+dim_/2+left_-2,-cos(ro->phi_)*ro->radius_/3.5*dim_/2+dim_/2+top_-2);
+            if (right){
+                ro->panel_->setPosition(sin(phi)*radius/
+                    3.5*dim_/2+dim_/2+left_-2,-cos(phi)*radius/3.5*dim_/2+dim_/2+top_-2);
             }
             else {
-                ro->panel_->setPosition(-sin(ro->phi_)*ro->radius_/
-                    3.5*dim_/2+dim_/2+left_-2,-cos(ro->phi_)*ro->radius_/3.5*dim_/2+dim_/2+top_-2);
+                ro->panel_->setPosition(-sin(phi)*radius/
+                    3.5*dim_/2+dim_/2+left_-2,-cos(phi)*radius/3.5*dim_/2+dim_/2+top_-2);
             }
             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
@@ -182 +128 @@
         }
 
-        float RadarOverlayElement::getDist2Focus(){
-            if(focus_ == NULL) return(0.0);
-            return((focus_->pos_-shipPos_).length());
+        float RadarOverlayElement::calcRadius(Vector3 pos, Vector3 dir, Vector3 orth, RadarObject* obj){
+            return(acos((dir.dotProduct(obj->pos_ - pos))/
+                        ((obj->pos_ - pos).length()*dir.length())));
         }
 
-        float RadarOverlayElement::calcRadius(RadarObject* obj){
-            return(acos((currentDir_.dotProduct(obj->pos_ - shipPos_))/
-                        ((obj->pos_ - shipPos_).length()*currentDir_.length())));
+        float RadarOverlayElement::calcPhi(Vector3 pos, Vector3 dir, Vector3 orth, RadarObject* obj){
+            // project difference vector on our plane...
+            Vector3 proj = Plane(dir, pos).projectVector(obj->pos_ - pos);
+            // ...and find out the angle
+            return(acos((orth.dotProduct(proj))/
+            (orth.length()*proj.length())));
         }
 
-        float RadarOverlayElement::calcPhi(RadarObject* obj){
-            // 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())));
-        }
-
-        bool RadarOverlayElement::calcRight(RadarObject* obj){
-            if((currentDir_.crossProduct(currentOrth_)).dotProduct(obj->pos_ - shipPos_) > 0)
+        bool RadarOverlayElement::calcRight(Vector3 pos, Vector3 dir, Vector3 orth, RadarObject* obj){
+            if((dir.crossProduct(orth)).dotProduct(obj->pos_ - pos) > 0)
                 return true;
         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_->panel_->setMaterialName("Orxonox/RedDot");
-            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();
-            RadarOverlayElement::instance_s->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/branches/network/src/orxonox/hud/RadarOverlayElement.h

@@ -29 +29 @@
 #define _RADAR_H__
 
-#include <string.h>
-#include <OgreOverlayManager.h>
-#include <OgreStringConverter.h>
-#include <OgreOverlayElement.h>
-#include <OgrePanelOverlayElement.h>
+#include <util/Math.h>
 #include <OgrePrerequisites.h>
-
-#include <util/Math.h>
-#include <string.h>
-#include "core/Tickable.h"
-#include "core/ConsoleCommand.h"
-#include "objects/SpaceShip.h"
 #include "../OrxonoxPrereqs.h"
 #include "RadarObject.h"
-#include "GraphicsEngine.h"
 
 namespace orxonox
@@ -52 +41 @@
             Ogre::OverlayManager* om;               // our one and only overlay manager
             Ogre::OverlayContainer* container_;     // pointer to the container we're in
-            Vector3 initialDir_;                        // direction of nose
             Vector3 currentDir_;
-            Vector3 initialOrth_;                   // direction of normal
             Vector3 currentOrth_;
             Vector3 shipPos_;                       // position of ship
-            Ogre::Plane plane;                      // plane perpendicular to dir
 
             Ogre::Real leftRel_, topRel_, dimRel_;  // relative position/dimension
@@ -69 +55 @@
                         void resize();
             void update();
-            void updateNavMarker();
-            void addObject(Vector3 pos);
             void listObjects();
-            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
-
-            static RadarOverlayElement* instance_s;
-            static void cycleFocus();
+            static float calcRadius(Vector3 pos, Vector3 dir, Vector3 orth, RadarObject* obj);
+            static float calcPhi(Vector3 pos, Vector3 dir, Vector3 orth, RadarObject* obj);
+            static bool calcRight(Vector3 pos, Vector3 dir, Vector3 orth, RadarObject* obj);
         };
 }

code/branches/network/src/orxonox/objects/Camera.h

@@ -50 +50 @@
         void setTargetNode(Ogre::SceneNode* obj);
 
+        Ogre::Camera* cam_;
+
         void tick(float dt);
         void update();
@@ -63 +65 @@
         Ogre::SceneNode* cameraNode_;
         Ogre::Vector3 oldPos;
-        Ogre::Camera* cam_;
         bool bHasFocus_;
     };

code/branches/network/src/orxonox/objects/SpaceShip.cc

@@ -75 +75 @@
       return NULL;
     }
-    
+
     SpaceShip::SpaceShip() :
       //testvector_(0,0,0),
@@ -118 +118 @@
         this->setConfigValues();
 
+        initialDir_ = Vector3(1.0, 0.0, 0.0);
+        currentDir_ = initialDir_;
+        initialOrth_ = Vector3(0.0, 0.0, 1.0);
+        currentOrth_ = initialOrth_;
 
         this->setRotationAxis(1, 0, 0);
@@ -233 +237 @@
         CameraHandler::getInstance()->requestFocus(cam_);
 
+    }
+
+    Camera* SpaceShip::getCamera(){
+        return cam_;
     }
 
@@ -318 +326 @@
     }
 
+    Vector3 SpaceShip::getDir() {
+        return currentDir_;
+    }
+
+    Vector3 SpaceShip::getOrth(){
+        return currentOrth_;
+    }
+
     float SpaceShip::getMaxSpeed() { return maxSpeed_; }
 
     void SpaceShip::tick(float dt)
     {
+        currentDir_ = getOrientation()*initialDir_;
+                currentOrth_ = getOrientation()*initialOrth_;
+
         if (this->cam_)
             this->cam_->tick(dt);
@@ -341 +360 @@
         if (this->bLMousePressed_ && this->timeToReload_ <= 0)
         {
-          
+
             Projectile *p = new Projectile(this);
-            
+
             p->setBacksync(true);
             this->timeToReload_ = this->reloadTime_;

code/branches/network/src/orxonox/objects/SpaceShip.h

@@ -44 +44 @@
     {
         public:
-          
+
             static SpaceShip *getLocalShip();
-            
+
             SpaceShip();
             ~SpaceShip();
@@ -64 +64 @@
             void setTransDamp(float value);
             void setRotDamp(float value);
+            void getFocus();
 
-            void getFocus();
-            static Vector3 getSPosition();
-            static Quaternion getSOrientation();
             static std::string whereAmI();
             static void setMaxSpeedTest(float value)
@@ -80 +78 @@
 
             float getMaxSpeed();
+            Vector3 getDir();
+            Vector3 getOrth();
+            Camera* getCamera();
 
         private:
@@ -85 +86 @@
 
             Vector3 testvector_;
+            Vector3 initialDir_;
+            Vector3 currentDir_;
+            Vector3 initialOrth_;
+            Vector3 currentOrth_;
             bool bInvertYAxis_;
             bool setMouseEventCallback_;