From 32a3bab2f7d893916102ace29121e41a297aa49f Mon Sep 17 00:00:00 2001 From: DavidWyand-GG Date: Wed, 23 Jan 2013 02:37:37 -0500 Subject: [PATCH] Moved platform input event files under new input directory --- Engine/source/component/interfaces/IProcessInput.h | 2 +- Engine/source/gui/core/guiTypes.h | 2 +- Engine/source/platform/{ => input}/IInputDevice.h | 0 Engine/source/platform/{ => input}/event.cpp | 2 +- Engine/source/platform/{ => input}/event.h | 2 +- Engine/source/platform/platform.cpp | 2 +- Engine/source/platform/platformInput.h | 2 +- Tools/projectGenerator/modules/core.inc | 1 + 8 files changed, 7 insertions(+), 6 deletions(-) rename Engine/source/platform/{ => input}/IInputDevice.h (100%) rename Engine/source/platform/{ => input}/event.cpp (99%) rename Engine/source/platform/{ => input}/event.h (99%) diff --git a/Engine/source/component/interfaces/IProcessInput.h b/Engine/source/component/interfaces/IProcessInput.h index 3526848c3..9e639f71c 100644 --- a/Engine/source/component/interfaces/IProcessInput.h +++ b/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 diff --git a/Engine/source/gui/core/guiTypes.h b/Engine/source/gui/core/guiTypes.h index acb1e743d..e38a5fbed 100644 --- a/Engine/source/gui/core/guiTypes.h +++ b/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; diff --git a/Engine/source/platform/IInputDevice.h b/Engine/source/platform/input/IInputDevice.h similarity index 100% rename from Engine/source/platform/IInputDevice.h rename to Engine/source/platform/input/IInputDevice.h diff --git a/Engine/source/platform/event.cpp b/Engine/source/platform/input/event.cpp similarity index 99% rename from Engine/source/platform/event.cpp rename to Engine/source/platform/input/event.cpp index f0a27695d..254aca29d 100644 --- a/Engine/source/platform/event.cpp +++ b/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" diff --git a/Engine/source/platform/event.h b/Engine/source/platform/input/event.h similarity index 99% rename from Engine/source/platform/event.h rename to Engine/source/platform/input/event.h index 31ef4ed72..965dc0ac6 100644 --- a/Engine/source/platform/event.h +++ b/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" diff --git a/Engine/source/platform/platform.cpp b/Engine/source/platform/platform.cpp index fe9b14167..57032b531 100644 --- a/Engine/source/platform/platform.cpp +++ b/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" diff --git a/Engine/source/platform/platformInput.h b/Engine/source/platform/platformInput.h index 79f05e888..6abc459e7 100644 --- a/Engine/source/platform/platformInput.h +++ b/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 ); diff --git a/Tools/projectGenerator/modules/core.inc b/Tools/projectGenerator/modules/core.inc index 83d982e86..84cb1c016 100644 --- a/Tools/projectGenerator/modules/core.inc +++ b/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');