Changeset 2256 for code/branches/objecthierarchy2/src/orxonox/objects/items

Timestamp:

Nov 25, 2008, 1:14:19 AM (16 years ago)

Author:

landauf

Message:

The SpaceShips HUD is working again (Speedbar and Radar)

Location:

code/branches/objecthierarchy2/src/orxonox/objects/items

Files:

• Engine.cc (modified) (3 diffs)
• Engine.h (modified) (2 diffs)

code/branches/objecthierarchy2/src/orxonox/objects/items/Engine.cc

@@ -64 +64 @@
     Engine::~Engine()
     {
+        if (this->isInitialized() && this->ship_)
+            this->ship_->setEngine(0);
     }
 
@@ -111 +113 @@
             Synchronisable* object = Synchronisable::getSynchronisable(this->shipID_);
             if (object)
-                this->ship_ = dynamic_cast<SpaceShip*>(object);
+                this->addToSpaceShip(dynamic_cast<SpaceShip*>(object));
         }
     }
@@ -182 +184 @@
         this->ship_ = ship;
         if (ship)
+        {
             this->shipID_ = ship->getObjectID();
+            if (ship->getEngine() != this)
+                ship->setEngine(this);
+        }
     }
 

code/branches/objecthierarchy2/src/orxonox/objects/items/Engine.h

@@ -72 +72 @@
                 { this->maxSpeedUpDown_ = speed; }
 
+            inline float getMaxSpeedFront() const
+                { return this->maxSpeedFront_; }
+            inline float getMaxSpeedBack() const
+                { return this->maxSpeedBack_; }
+            inline float getMaxSpeedLeftRight() const
+                { return this->maxSpeedLeftRight_; }
+            inline float getMaxSpeedUpDown() const
+                { return this->maxSpeedUpDown_; }
+
             inline void setAccelerationFront(float acceleration)
                 { this->accelerationFront_ = acceleration; }
@@ -82 +91 @@
             inline void setAccelerationUpDown(float acceleration)
                 { this->accelerationUpDown_ = acceleration; }
+
+            inline float getAccelerationFront() const
+                { return this->accelerationFront_; }
+            inline float getAccelerationBrake() const
+                { return this->accelerationBrake_; }
+            inline float getAccelerationBack() const
+                { return this->accelerationBack_; }
+            inline float getAccelerationLeftRight() const
+                { return this->accelerationLeftRight_; }
+            inline float getAccelerationUpDown() const
+                { return this->accelerationUpDown_; }
 
             virtual const Vector3& getDirection() const;