Changeset 1408

Timestamp:

May 24, 2008, 2:07:04 PM (16 years ago)

Author:

FelixSchulthess

Message:

compiles now with changes from trunk

Location:

code/branches/network/src/orxonox

Files:

• hud/RadarObject.cc (modified) (1 diff)
• hud/RadarObject.h (modified) (1 diff)
• hud/RadarOverlayElement.cc (modified) (1 diff)
• hud/RadarOverlayElement.h (modified) (1 diff)
• objects/SpaceShip.cc (modified) (1 diff)

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

@@ -31 +31 @@
 #include <string.h>
 #include <OgreOverlayManager.h>
-#include <OgrePanelOverlayElement.h>
 #include <OgreStringConverter.h>
-#include <util/Math.h>
 
 namespace orxonox

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

@@ -29 +29 @@
 #define _RADAR2_H__
 #include <OgrePrerequisites.h>
+#include <OgrePanelOverlayElement.h>
 #include "../OrxonoxPrereqs.h"
+#include "util/Math.h"
 
 namespace orxonox

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

@@ -78 +78 @@
 
     void RadarOverlayElement::update() {
-<<<<<<< .working
-        shipPos_ = SpaceShip::getLocalShip()->getPosition();
-        currentDir_ = SpaceShip::getLocalShip()->getOrientation()*initialDir_;          // according to beni....
-                currentOrth_ = SpaceShip::getLocalShip()->getOrientation()*initialOrth_;
-        plane = Plane(currentDir_, shipPos_);
-
-        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){

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

@@ -31 +31 @@
 #include <util/Math.h>
 #include <OgrePrerequisites.h>
+#include <OgrePanelOverlayElement.h>
 #include "../OrxonoxPrereqs.h"
 #include "RadarObject.h"

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

@@ -318 +318 @@
     }
 
-    Vector3 SpaceShip::getSPosition() {
-        return SpaceShip::getLocalShip()->getPosition();
-    }
-
-    Quaternion SpaceShip::getSOrientation() {
-        return SpaceShip::getLocalShip()->getOrientation();
-    }
-
     Vector3 SpaceShip::getDir() {
         return currentDir_;