Changeset 2256 for code/branches/objecthierarchy2/src/orxonox/objects/worldentities/pawns

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/worldentities/pawns

Files:

• Pawn.cc (modified) (1 diff)
• Pawn.h (modified) (2 diffs)
• SpaceShip.cc (modified) (1 diff)
• SpaceShip.h (modified) (1 diff)

code/branches/objecthierarchy2/src/orxonox/objects/worldentities/pawns/Pawn.cc

@@ -61 +61 @@
         this->weaponSystem_->getWeaponSetPointer(0)->getWeaponSlotPointer(0)->setAmmoType(true);
         */
+
+        this->setRadarObjectColour(ColourValue::Red);
+        this->setRadarObjectShape(RadarViewable::Dot);
 
         this->registerVariables();

code/branches/objecthierarchy2/src/orxonox/objects/worldentities/pawns/Pawn.h

@@ -33 +33 @@
 
 #include "objects/worldentities/ControllableEntity.h"
+#include "objects/RadarViewable.h"
 
 namespace orxonox
 {
-    class _OrxonoxExport Pawn : public ControllableEntity
+    class _OrxonoxExport Pawn : public ControllableEntity, public RadarViewable
     {
         public:
@@ -78 +79 @@
             virtual void postSpawn();
 
+            inline const WorldEntity* getWorldEntity() const
+                { return (WorldEntity*)this; }
+
         protected:
             virtual void spawn();

code/branches/objecthierarchy2/src/orxonox/objects/worldentities/pawns/SpaceShip.cc

@@ -229 +229 @@
         }
     }
+
+    void SpaceShip::setEngine(Engine* engine)
+    {
+        this->engine_ = engine;
+        if (engine && engine->getShip() != this)
+            engine->addToSpaceShip(this);
+    }
 }

code/branches/objecthierarchy2/src/orxonox/objects/worldentities/pawns/SpaceShip.h

@@ -58 +58 @@
             virtual void boost();
 
+            void setEngine(Engine* engine);
+            inline Engine* getEngine() const
+                { return this->engine_; }
+
             void setMaxRotation(const Degree& value)
                 { this->maxRotation_ = value; }