Changeset 1398 for code/branches/network/src/orxonox

Timestamp:

May 23, 2008, 7:12:05 PM (16 years ago)

Author:

rgrieder

Message:

• removed the mouseHandler in SpaceShip

Location:

code/branches/network/src/orxonox/objects

Files:

• SpaceShip.cc (modified) (2 diffs)
• SpaceShip.h (modified) (2 diffs)

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

@@ -159 +159 @@
     void SpaceShip::init()
     {
-        if ((server_ || ( network::Client::getSingleton() && network::Client::getSingleton()->getShipID()==objectID ) ))
-        {
-              if (!setMouseEventCallback_)
-              {
-                  InputManager::addMouseHandler(this, "SpaceShip");
-                  InputManager::enableMouseHandler("SpaceShip");
-                  setMouseEventCallback_ = true;
-              }
-        }
-
         // START CREATING THRUSTER
         this->tt_ = new ParticleInterface(GraphicsEngine::getSingleton().getSceneManager(),"twinthruster" + this->getName(),"Orxonox/engineglow");
@@ -314 +304 @@
     }
 
-    void SpaceShip::mouseButtonPressed(MouseButton::Enum id)
-    {
-        if (id == MouseButton::Right)
-            this->bRMousePressed_ = true;
-    }
-
-    void SpaceShip::mouseButtonReleased(MouseButton::Enum id)
-    {
-        if (id == MouseButton::Right)
-        {
-            this->bRMousePressed_ = false;
-            this->camNode_->resetOrientation();
-        }
-    }
-
     std::string SpaceShip::whereAmI() {
         return getConvertedValue<float, std::string>(SpaceShip::getLocalShip()->getPosition().x)

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

@@ -41 +41 @@
 namespace orxonox
 {
-    class _OrxonoxExport SpaceShip : public Model, public MouseHandler
+    class _OrxonoxExport SpaceShip : public Model
     {
         public:
@@ -78 +78 @@
             static void moveLateral(float value);
             static void fire();
-
-            void mouseButtonPressed (MouseButton::Enum id);
-            void mouseButtonReleased(MouseButton::Enum id);
-            void mouseButtonHeld    (MouseButton::Enum id) { }
-            void mouseMoved         (IntVector2 abs, IntVector2 rel, IntVector2 clippingSize) { }
-            void mouseScrolled      (int abs, int rel) { }
 
             float getMaxSpeed();