Changeset 1024 for code/trunk/src/orxonox/objects

Timestamp:

Apr 10, 2008, 5:35:49 PM (17 years ago)

Author:

rgrieder

Message:

merged input back into trunk
note: I have created an asylum with obsolete code, please check the files

Location:

code/trunk/src/orxonox/objects

Files:

• Fighter.cc (modified) (3 diffs)
• Fighter.h (modified) (1 diff)
• Model.h (modified) (1 diff)
• NPC.h (modified) (1 diff)
• Projectile.h (modified) (1 diff)
• Skybox.h (modified) (1 diff)
• SpaceShip.cc (modified) (3 diffs)
• SpaceShip.h (modified) (1 diff)
• SpaceshipSteeringObject.cc (deleted)
• SpaceshipSteeringObject.h (deleted)
• Test.h (deleted)
• test1.cc (deleted)
• test1.h (deleted)
• test2.cc (deleted)
• test2.h (deleted)
• test3.cc (deleted)
• test3.h (deleted)

code/trunk/src/orxonox/objects/Fighter.cc

@@ -39 +39 @@
 #include "core/CoreIncludes.h"
 #include "Orxonox.h"
-#include "InputHandler.h"
+#include "core/InputManager.h"
 #include "particle/ParticleInterface.h"
 #include "weapon/AmmunitionDump.h"
@@ -255 +255 @@
         if (!this->setMouseEventCallback_)
         {
-            if (InputHandler::getSingleton()->getMouse())
+            if (InputManager::getSingleton()->getMouse())
             {
-                InputHandler::getSingleton()->getMouse()->setEventCallback(this);
+                InputManager::getSingleton()->getMouse()->setEventCallback(this);
                 this->setMouseEventCallback_ = true;
             }
@@ -264 +264 @@
         WorldEntity::tick(dt);
 
-        OIS::Keyboard* mKeyboard = InputHandler::getSingleton()->getKeyboard();
-        OIS::Mouse* mMouse = InputHandler::getSingleton()->getMouse();
-
-        mKeyboard->capture();
-        mMouse->capture();
+        OIS::Keyboard* mKeyboard = InputManager::getSingleton()->getKeyboard();
+        OIS::Mouse* mMouse = InputManager::getSingleton()->getMouse();
+
+        //mKeyboard->capture();
+        //mMouse->capture();
 
         if (leftButtonPressed_)

code/trunk/src/orxonox/objects/Fighter.h

@@ -7 +7 @@
 
 #include "Model.h"
-
-class TiXmlElement; // Forward declaration
 
 namespace orxonox

code/trunk/src/orxonox/objects/Model.h

@@ -6 +6 @@
 #include "WorldEntity.h"
 #include "../tools/Mesh.h"
-
-class TiXmlElement; // Forward declaration
 
 namespace orxonox

code/trunk/src/orxonox/objects/NPC.h

@@ -11 +11 @@
 
 #include "Model.h"
-
-class TiXmlElement; // Forward declaration
 
 namespace orxonox {

code/trunk/src/orxonox/objects/Projectile.h

@@ -10 +10 @@
 namespace orxonox
 {
-    class SpaceShip; // Forward declaration
-
     class _OrxonoxExport Projectile : public WorldEntity
     {

code/trunk/src/orxonox/objects/Skybox.h

@@ -5 +5 @@
 
 #include "core/BaseObject.h"
-
-class TiXmlElement; // Forward declaration
 
 namespace orxonox

code/trunk/src/orxonox/objects/SpaceShip.cc

@@ -42 +42 @@
 #include "core/Debug.h"
 #include "Orxonox.h"
-#include "InputHandler.h"
+#include "core/InputManager.h"
 #include "particle/ParticleInterface.h"
 #include "Projectile.h"
@@ -417 +417 @@
     void SpaceShip::tick(float dt)
     {
-        if (!this->setMouseEventCallback_)
-        {
-            if (InputHandler::getSingleton()->getMouse())
+      if (InputManager::getSingleton()->getMouse()->getEventCallback() != this)
+        {
+            if (InputManager::getSingleton()->getMouse())
             {
-                InputHandler::getSingleton()->getMouse()->setEventCallback(this);
+                InputManager::getSingleton()->getMouse()->setEventCallback(this);
                 this->setMouseEventCallback_ = true;
             }
@@ -446 +446 @@
         }
 
-        OIS::Keyboard* mKeyboard = InputHandler::getSingleton()->getKeyboard();
-        OIS::Mouse* mMouse = InputHandler::getSingleton()->getMouse();
-
-        mKeyboard->capture();
-        mMouse->capture();
+        OIS::Keyboard* mKeyboard = InputManager::getSingleton()->getKeyboard();
+        OIS::Mouse* mMouse = InputManager::getSingleton()->getMouse();
 
 

code/trunk/src/orxonox/objects/SpaceShip.h

@@ -10 +10 @@
 #include "../tools/BillboardSet.h"
 
-class TiXmlElement;          // Forward declaration
-
 namespace orxonox
 {
-    class ParticleInterface; // Forward declaration
-
     class _OrxonoxExport SpaceShip : public Model, public OIS::MouseListener
     {