Changeset 1519

Timestamp:

Jun 2, 2008, 9:28:41 PM (16 years ago)

Author:

rgrieder

Message:

moved input related files to src/core/input

Location:

code/branches/input

Files:

• src/core/CMakeLists.txt (modified) (2 diffs)
• src/core/Shell.cc (modified) (1 diff)
• src/core/Shell.h (modified) (1 diff)
• src/core/input (added)
• src/core/input/InputBuffer.cc (moved) (moved from code/branches/input/src/core/InputBuffer.cc) (1 diff)
• src/core/input/InputBuffer.h (moved) (moved from code/branches/input/src/core/InputBuffer.h) (1 diff)
• src/core/input/InputInterfaces.h (moved) (moved from code/branches/input/src/core/InputInterfaces.h) (1 diff)
• src/core/input/InputManager.cc (moved) (moved from code/branches/input/src/core/InputManager.cc) (1 diff)
• src/core/input/InputManager.h (moved) (moved from code/branches/input/src/core/InputManager.h) (2 diffs)
• src/core/input/KeyBinder.cc (moved) (moved from code/branches/input/src/core/KeyBinder.cc) (1 diff)
• src/core/input/KeyBinder.h (moved) (moved from code/branches/input/src/core/KeyBinder.h) (2 diffs)
• src/orxonox/GraphicsEngine.cc (modified) (1 diff)
• src/orxonox/Orxonox.cc (modified) (1 diff)
• src/orxonox/console/InGameConsole.cc (modified) (1 diff)
• src/orxonox/objects/SpaceShip.cc (modified) (1 diff)
• src/orxonox/objects/SpaceShip.h (modified) (1 diff)
• visual_studio/vc8/core.vcproj (modified) (2 diffs)

code/branches/input/src/core/CMakeLists.txt

@@ -10 +10 @@
   Identifier.cc
   IdentifierDistributor.cc
-  InputManager.cc
-  KeyBinder.cc
   OutputBuffer.cc
-  InputBuffer.cc
   Shell.cc
   CommandExecutor.cc
@@ -34 +31 @@
   TclThreadManager.cc
   IRC.cc
+  input/InputBuffer.cc
+  input/InputManager.cc
+  input/KeyBinder.cc
   tolua/tolua_bind.cc
 )

code/branches/input/src/core/Shell.cc

@@ -33 +33 @@
 #include "CoreSettings.h"
 #include "ConsoleCommand.h"
-#include "InputInterfaces.h"
+#include "input/InputInterfaces.h"
 
 #define SHELL_UPDATE_LISTENERS(function) \

code/branches/input/src/core/Shell.h

@@ -36 +36 @@
 
 #include "OrxonoxClass.h"
-#include "InputBuffer.h"
+#include "input/InputBuffer.h"
 #include "OutputBuffer.h"
 

code/branches/input/src/core/input/InputBuffer.cc

@@ -32 +32 @@
 
 #include "util/Clipboard.h"
-#include "CoreIncludes.h"
-#include "ConfigValueIncludes.h"
+#include "core/CoreIncludes.h"
+#include "core/ConfigValueIncludes.h"
 
 namespace orxonox

code/branches/input/src/core/input/InputBuffer.h

@@ -30 +30 @@
 #define _InputBuffer_H__
 
-#include "CorePrereqs.h"
+#include "core/CorePrereqs.h"
 
 #include <string>
 #include <list>
 
+#include "core/OrxonoxClass.h"
 #include "InputInterfaces.h"
-#include "OrxonoxClass.h"
 
 namespace orxonox

code/branches/input/src/core/input/InputInterfaces.h

@@ -35 +35 @@
 #define _InputInterfaces_H__
 
-#include "CorePrereqs.h"
+#include "core/CorePrereqs.h"
 
 #include "ois/OIS.h"

code/branches/input/src/core/input/InputManager.cc

@@ -34 +34 @@
 
 #include "InputManager.h"
+
 #include "util/Convert.h"
-#include "CoreIncludes.h"
-#include "ConfigValueIncludes.h"
-#include "Debug.h"
+#include "core/CoreIncludes.h"
+#include "core/ConfigValueIncludes.h"
+#include "core/Debug.h"
+#include "core/CommandExecutor.h"
+#include "core/ConsoleCommand.h"
+#include "core/Shell.h"
 #include "InputBuffer.h"
 #include "KeyBinder.h"
-#include "CommandExecutor.h"
-#include "ConsoleCommand.h"
-#include "Shell.h"
 
 namespace orxonox

code/branches/input/src/core/input/InputManager.h

@@ -36 +36 @@
 #define _InputManager_H__
 
-#include "CorePrereqs.h"
+#include "core/CorePrereqs.h"
 
 #include <map>
@@ -43 +43 @@
 #include "ois/OIS.h"
 #include "util/Math.h"
-#include "Tickable.h"
+#include "core/Tickable.h"
 #include "InputInterfaces.h"
 

code/branches/input/src/core/input/KeyBinder.cc

@@ -38 +38 @@
 #include "util/SubString.h"
 #include "util/String.h"
-#include "Debug.h"
-#include "ConfigValueIncludes.h"
-#include "CoreIncludes.h"
-#include "CommandExecutor.h"
-#include "ConsoleCommand.h"
-#include "Executor.h"
+#include "core/Debug.h"
+#include "core/ConfigValueIncludes.h"
+#include "core/CoreIncludes.h"
+#include "core/CommandExecutor.h"
+#include "core/ConsoleCommand.h"
+#include "core/Executor.h"
 // TODO: only needed by the CalibratorCallback class; move to new file
 #include "InputManager.h"

code/branches/input/src/core/input/KeyBinder.h

@@ -35 +35 @@
 #define _KeyBinder_H__
 
-#include "CorePrereqs.h"
+#include "core/CorePrereqs.h"
 
 #include <string>
@@ -42 +42 @@
 #include "ois/OIS.h"
 #include "util/Math.h"
-#include "OrxonoxClass.h"
-#include "CommandEvaluation.h"
+#include "core/OrxonoxClass.h"
+#include "core/CommandEvaluation.h"
 #include "InputInterfaces.h"
 

code/branches/input/src/orxonox/GraphicsEngine.cc

@@ -40 +40 @@
 #include <OgreLogManager.h>
 #include <OgreTextureManager.h>
-#include "core/InputManager.h"
+#include "core/input/InputManager.h"
 #include "core/CoreIncludes.h"
 #include "core/ConfigValueIncludes.h"

code/branches/input/src/orxonox/Orxonox.cc

@@ -58 +58 @@
 #include "core/Loader.h"
 #include "core/Tickable.h"
-#include "core/InputManager.h"
+#include "core/input/InputManager.h"
 #include "core/TclBind.h"
 

code/branches/input/src/orxonox/console/InGameConsole.cc

@@ -42 +42 @@
 #include "core/ConfigValueIncludes.h"
 #include "core/ConsoleCommand.h"
-#include "core/InputManager.h"
+#include "core/input/InputManager.h"
 #include "util/Math.h"
 #include "GraphicsEngine.h"

code/branches/input/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/branches/input/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/branches/input/visual_studio/vc8/core.vcproj

@@ -280 +280 @@
                                 >
                                 <File
-                                        RelativePath="..\..\src\core\InputBuffer.cc"
-                                        >
-                                </File>
-                                <File
-                                        RelativePath="..\..\src\core\InputManager.cc"
-                                        >
-                                </File>
-                                <File
-                                        RelativePath="..\..\src\core\KeyBinder.cc"
+                                        RelativePath="..\..\src\core\input\InputBuffer.cc"
+                                        >
+                                </File>
+                                <File
+                                        RelativePath="..\..\src\core\input\InputManager.cc"
+                                        >
+                                </File>
+                                <File
+                                        RelativePath="..\..\src\core\input\KeyBinder.cc"
                                         >
                                 </File>
@@ -382 +382 @@
                                 >
                                 <File
-                                        RelativePath="..\..\src\core\InputBuffer.h"
-                                        >
-                                </File>
-                                <File
-                                        RelativePath="..\..\src\core\InputInterfaces.h"
-                                        >
-                                </File>
-                                <File
-                                        RelativePath="..\..\src\core\InputManager.h"
-                                        >
-                                </File>
-                                <File
-                                        RelativePath="..\..\src\core\KeyBinder.h"
+                                        RelativePath="..\..\src\core\input\InputBuffer.h"
+                                        >
+                                </File>
+                                <File
+                                        RelativePath="..\..\src\core\input\InputInterfaces.h"
+                                        >
+                                </File>
+                                <File
+                                        RelativePath="..\..\src\core\input\InputManager.h"
+                                        >
+                                </File>
+                                <File
+                                        RelativePath="..\..\src\core\input\KeyBinder.h"
                                         >
                                 </File>