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

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

Files:

• ControllableEntity.cc (modified) (7 diffs)
• WorldEntity.h (modified) (1 diff)
• pawns/Pawn.cc (modified) (1 diff)
• pawns/Pawn.h (modified) (2 diffs)
• pawns/SpaceShip.cc (modified) (1 diff)
• pawns/SpaceShip.h (modified) (1 diff)

code/branches/objecthierarchy2/src/orxonox/objects/worldentities/ControllableEntity.cc

@@ -168 +168 @@
             {
                 this->client_overwrite_ = this->server_overwrite_;
-COUT(0) << "CE: bidirectional synchronization" << std::endl;
                 this->setObjectMode(direction::bidirectional);
             }
@@ -202 +201 @@
     void ControllableEntity::startLocalHumanControl()
     {
-//        std::cout << this->getObjectID() << " ###### start local control" << std::endl;
         this->camera_ = new Camera(this);
         this->camera_->requestFocus();
@@ -216 +214 @@
             this->hud_ = new OverlayGroup(this);
             this->hud_->addTemplate(this->hudtemplate_);
+            this->hud_->setOwner(this);
         }
     }
@@ -221 +220 @@
     void ControllableEntity::stopLocalHumanControl()
     {
-//        std::cout << "###### stop local control" << std::endl;
         this->camera_->detachFromParent();
         delete this->camera_;
@@ -244 +242 @@
             else if (this->bHasLocalController_)
             {
-//                COUT(2) << "setting client position" << endl;
                 this->client_velocity_ = this->velocity_;
                 this->client_position_ = this->node_->getPosition();
@@ -254 +251 @@
     {
         REGISTERSTRING(this->cameraPositionTemplate_, direction::toclient);
+        REGISTERSTRING(this->hudtemplate_, direction::toclient);
 
         REGISTERDATA(this->client_overwrite_,   direction::toserver);
@@ -304 +302 @@
         if (this->server_overwrite_ == this->client_overwrite_)
         {
-//            COUT(2) << "callback: setting client position" << endl;
             this->node_->setPosition(this->client_position_);
             this->server_position_ = this->client_position_;
         }
-//        else
-//          COUT(2) << "callback: not setting client position" << endl;
     }
 

code/branches/objecthierarchy2/src/orxonox/objects/worldentities/WorldEntity.h

@@ -72 +72 @@
             inline void translate(float x, float y, float z, Ogre::Node::TransformSpace relativeTo = Ogre::Node::TS_LOCAL)
                 { this->translate(Vector3(x, y, z), relativeTo); }
+
+            virtual inline const Vector3& getVelocity() const
+                { return Vector3::ZERO; }
 
             virtual void setOrientation(const Quaternion& orientation) = 0;

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; }