Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

J :

Browse Source 
* Change the name of a define to harmonize stuff.
This commit is contained in:
jean.chalard
2010-02-18 20:09:19 +00:00
parent e40691411a
commit ad933ecdf6
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
JGE/include/JGE.h
View File

@@ -28,15 +28,15 @@
#if defined(WIN32) #if defined(WIN32)
#include <windows.h> #include <windows.h>
typedef WPARAM LocalKeySym; typedef WPARAM LocalKeySym;
#define LOCAL_NO_KEY ((WPARAM)-1) #define LOCAL_KEY_NONE ((WPARAM)-1)
#elif defined(LINUX) #elif defined(LINUX)
#include <X11/XKBlib.h> #include <X11/XKBlib.h>
#include <X11/keysym.h> #include <X11/keysym.h>
typedef KeySym LocalKeySym; typedef KeySym LocalKeySym;
#define LOCAL_NO_KEY XK_VoidSymbol #define LOCAL_KEY_NONE XK_VoidSymbol
#else #else
typedef u32 LocalKeySym; typedef u32 LocalKeySym;
#define LOCAL_NO_KEY ((u32)-1) #define LOCAL_KEY_NONE ((u32)-1)
#endif #endif

10
JGE/src/JGE.cpp
View File

@@ -85,7 +85,7 @@ void JGE::PressKey(const LocalKeySym sym)
} }
void JGE::PressKey(const JButton sym) void JGE::PressKey(const JButton sym)
{ {
keyBuffer.push(make_pair(LOCAL_NO_KEY, sym)); keyBuffer.push(make_pair(LOCAL_KEY_NONE, sym));
} }
void JGE::HoldKey(const LocalKeySym sym) void JGE::HoldKey(const LocalKeySym sym)
{ {
@@ -113,12 +113,12 @@ void JGE::HoldKey_NoRepeat(const LocalKeySym sym)
} }
void JGE::HoldKey(const JButton sym) void JGE::HoldKey(const JButton sym)
{ {
keyBuffer.push(make_pair(LOCAL_NO_KEY, sym)); keyBuffer.push(make_pair(LOCAL_KEY_NONE, sym));
if (holds.end() == holds.find(sym)) holds[sym] = REPEAT_DELAY; if (holds.end() == holds.find(sym)) holds[sym] = REPEAT_DELAY;
} }
void JGE::HoldKey_NoRepeat(const JButton sym) void JGE::HoldKey_NoRepeat(const JButton sym)
{ {
keyBuffer.push(make_pair(LOCAL_NO_KEY, sym)); keyBuffer.push(make_pair(LOCAL_KEY_NONE, sym));
if (holds.end() == holds.find(sym)) holds[sym] = std::numeric_limits<float>::quiet_NaN(); if (holds.end() == holds.find(sym)) holds[sym] = std::numeric_limits<float>::quiet_NaN();
} }
void JGE::ReleaseKey(const LocalKeySym sym) void JGE::ReleaseKey(const LocalKeySym sym)
@@ -135,7 +135,7 @@ void JGE::Update(float dt)
{ {
for (map<JButton, float>::iterator it = holds.begin(); it != holds.end(); ++it) for (map<JButton, float>::iterator it = holds.begin(); it != holds.end(); ++it)
{ {
if (it->second < 0) { keyBuffer.push(make_pair(LOCAL_NO_KEY, it->first)); it->second = REPEAT_PERIOD; } if (it->second < 0) { keyBuffer.push(make_pair(LOCAL_KEY_NONE, it->first)); it->second = REPEAT_PERIOD; }
it->second -= dt; it->second -= dt;
} }
if (mApp != NULL) mApp->Update(); if (mApp != NULL) mApp->Update();
@@ -165,7 +165,7 @@ JButton JGE::ReadButton()
LocalKeySym JGE::ReadLocalKey() LocalKeySym JGE::ReadLocalKey()
{ {
if (keyBuffer.empty()) return LOCAL_NO_KEY; if (keyBuffer.empty()) return LOCAL_KEY_NONE;
LocalKeySym val = keyBuffer.front().first; LocalKeySym val = keyBuffer.front().first;
keyBuffer.pop(); keyBuffer.pop();
return val; return val;