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

Timestamp:

Jun 4, 2008, 8:54:43 PM (17 years ago)

Author:

rgrieder

Message:

merged input branch back to trunk

Location:

code/trunk/src/orxonox/objects

Files:

• SpaceShip.cc (modified) (1 diff)
• SpaceShip.h (modified) (1 diff)
• Tickable.cc (copied) (copied from code/branches/input/src/orxonox/objects/Tickable.cc)
• Tickable.h (copied) (copied from code/branches/input/src/orxonox/objects/Tickable.h)
• WorldEntity.h (modified) (1 diff)

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

@@ -42 +42 @@
 #include "core/Debug.h"
 #include "GraphicsEngine.h"
-#include "core/InputManager.h"
+#include "core/input/InputManager.h"
 #include "particle/ParticleInterface.h"
 #include "Projectile.h"

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

@@ -34 +34 @@
 
 #include "util/Math.h"
-#include "core/InputInterfaces.h"
 #include "Camera.h"
 #include "Model.h"
-#include "../tools/BillboardSet.h"
+#include "tools/BillboardSet.h"
 
 namespace orxonox

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

@@ -39 +39 @@
 #include "network/Synchronisable.h"
 #include "core/BaseObject.h"
-#include "core/Tickable.h"
+#include "Tickable.h"
 #include "../tools/Mesh.h"