浏览代码

Merge pull request #222 from DavidWyand-GG/MovePlatformInputEvent

Moved platform input event files under new input directory
David Wyand 12 年之前
父节点
当前提交
4edcb60e46

+ 1 - 1
Engine/source/component/interfaces/IProcessInput.h

@@ -23,7 +23,7 @@
 #ifndef _I_PROCESSINPUT_H_
 #define _I_PROCESSINPUT_H_
 
-#include "platform/event.h"
+#include "platform/input/event.h"
 
 
 // CodeReview : Input can come from a number of places to end up in 

+ 1 - 1
Engine/source/gui/core/guiTypes.h

@@ -38,7 +38,7 @@
 
 
 #include "gfx/gfxDevice.h"
-#include "platform/event.h"
+#include "platform/input/event.h"
 
 class GBitmap;
 class SFXTrack;

+ 0 - 0
Engine/source/platform/IInputDevice.h → Engine/source/platform/input/IInputDevice.h


+ 1 - 1
Engine/source/platform/event.cpp → Engine/source/platform/input/event.cpp

@@ -20,7 +20,7 @@
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
 
-#include "platform/event.h"
+#include "platform/input/event.h"
 #include "core/module.h"
 #include "core/util/journal/process.h"
 #include "core/strings/stringFunctions.h"

+ 1 - 1
Engine/source/platform/event.h → Engine/source/platform/input/event.h

@@ -30,7 +30,7 @@
 #define _EVENT_H_
 
 #include "platform/types.h"
-#include "platform/IInputDevice.h"
+#include "platform/input/IInputDevice.h"
 #include "core/util/journal/journaledSignal.h"
 #include "core/util/tSingleton.h"
 #include "core/util/tDictionary.h"

+ 1 - 1
Engine/source/platform/platform.cpp

@@ -27,7 +27,7 @@
 #include "console/consoleTypes.h"
 #include "platform/threads/mutex.h"
 #include "app/mainLoop.h"
-#include "platform/event.h"
+#include "platform/input/event.h"
 #include "platform/typetraits.h"
 
 

+ 1 - 1
Engine/source/platform/platformInput.h

@@ -27,7 +27,7 @@
 #include "console/simBase.h"
 #endif
 
-#include "platform/event.h"
+#include "platform/input/event.h"
 
 //------------------------------------------------------------------------------
 U8 TranslateOSKeyCode( U8 vcode );

+ 1 - 0
Tools/projectGenerator/modules/core.inc

@@ -72,6 +72,7 @@ switch( Generator::$platform )
 
 addEngineSrcDir('platform/threads');
 addEngineSrcDir('platform/async');
+addEngineSrcDir('platform/input');
 addEngineSrcDir('app');
 addEngineSrcDir('app/net');