atria-soft/gale
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[DEV] {ANDROID} update new gale enum to have a correct interface

Browse Source
This commit is contained in:
Edouard DUPIN 2015-09-15 22:01:19 +02:00
parent be8561c128
commit 4a222b60f4
3 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
gale/context/Android/Context.cpp
View File

@ -446,9 +446,13 @@ class AndroidContext : public gale::Context {
_myChar); _myChar);
} }
bool ANDROID_systemKeyboradEvent(enum gale::key::keyboardSystem _key, bool _down) { bool ANDROID_systemKeyboradEvent(enum gale::key::keyboard _key, bool _isDown) {
return systemKeyboradEvent(_key, _down); OS_setKeyboard(m_guiKeyBoardSpecialKeyMode,
_key,
(_isDown==true?gale::key::status_down:gale::key::status_up));
return false;
} }
void ANDROID_SetKeyboardMove(int _move, bool _isDown, bool _isARepeateKey=false) { void ANDROID_SetKeyboardMove(int _move, bool _isDown, bool _isARepeateKey=false) {
// direct wrapping : // direct wrapping :
enum gale::key::keyboard move = (enum gale::key::keyboard)_move; enum gale::key::keyboard move = (enum gale::key::keyboard)_move;
@ -832,25 +836,25 @@ extern "C" {
switch (_keyVal) { switch (_keyVal) {
case org_gale_GaleConstants_GALE_SYSTEM_KEY_VOLUME_UP: case org_gale_GaleConstants_GALE_SYSTEM_KEY_VOLUME_UP:
GALE_VERBOSE("IO keyboard Key system \"VOLUME_UP\" is down=" << _isdown); GALE_VERBOSE("IO keyboard Key system \"VOLUME_UP\" is down=" << _isdown);
return s_listInstance[_id]->ANDROID_systemKeyboradEvent(gale::key::keyboardSystemVolumeUp, _isdown); return s_listInstance[_id]->ANDROID_systemKeyboradEvent(gale::key::keyboard_volumeUp, _isdown);
case org_gale_GaleConstants_GALE_SYSTEM_KEY_VOLUME_DOWN: case org_gale_GaleConstants_GALE_SYSTEM_KEY_VOLUME_DOWN:
GALE_DEBUG("IO keyboard Key system \"VOLUME_DOWN\" is down=" << _isdown); GALE_DEBUG("IO keyboard Key system \"VOLUME_DOWN\" is down=" << _isdown);
return s_listInstance[_id]->ANDROID_systemKeyboradEvent(gale::key::keyboardSystemVolumeDown, _isdown); return s_listInstance[_id]->ANDROID_systemKeyboradEvent(gale::key::keyboard_volumeDown, _isdown);
case org_gale_GaleConstants_GALE_SYSTEM_KEY_MENU: case org_gale_GaleConstants_GALE_SYSTEM_KEY_MENU:
GALE_DEBUG("IO keyboard Key system \"MENU\" is down=" << _isdown); GALE_DEBUG("IO keyboard Key system \"MENU\" is down=" << _isdown);
return s_listInstance[_id]->ANDROID_systemKeyboradEvent(gale::key::keyboardSystemMenu, _isdown); return s_listInstance[_id]->ANDROID_systemKeyboradEvent(gale::key::keyboard_menu, _isdown);
case org_gale_GaleConstants_GALE_SYSTEM_KEY_CAMERA: case org_gale_GaleConstants_GALE_SYSTEM_KEY_CAMERA:
GALE_DEBUG("IO keyboard Key system \"CAMERA\" is down=" << _isdown); GALE_DEBUG("IO keyboard Key system \"CAMERA\" is down=" << _isdown);
return s_listInstance[_id]->ANDROID_systemKeyboradEvent(gale::key::keyboardSystemCamera, _isdown); return s_listInstance[_id]->ANDROID_systemKeyboradEvent(gale::key::keyboard_camera, _isdown);
case org_gale_GaleConstants_GALE_SYSTEM_KEY_HOME: case org_gale_GaleConstants_GALE_SYSTEM_KEY_HOME:
GALE_DEBUG("IO keyboard Key system \"HOME\" is down=" << _isdown); GALE_DEBUG("IO keyboard Key system \"HOME\" is down=" << _isdown);
return s_listInstance[_id]->ANDROID_systemKeyboradEvent(gale::key::keyboardSystemHome, _isdown); return s_listInstance[_id]->ANDROID_systemKeyboradEvent(gale::key::keyboard_home, _isdown);
case org_gale_GaleConstants_GALE_SYSTEM_KEY_POWER: case org_gale_GaleConstants_GALE_SYSTEM_KEY_POWER:
GALE_DEBUG("IO keyboard Key system \"POWER\" is down=" << _isdown); GALE_DEBUG("IO keyboard Key system \"POWER\" is down=" << _isdown);
return s_listInstance[_id]->ANDROID_systemKeyboradEvent(gale::key::keyboardSystemPower, _isdown); return s_listInstance[_id]->ANDROID_systemKeyboradEvent(gale::key::keyboard_power, _isdown);
case org_gale_GaleConstants_GALE_SYSTEM_KEY_BACK: case org_gale_GaleConstants_GALE_SYSTEM_KEY_BACK:
GALE_DEBUG("IO keyboard Key system \"BACK\" is down=" << _isdown); GALE_DEBUG("IO keyboard Key system \"BACK\" is down=" << _isdown);
return s_listInstance[_id]->ANDROID_systemKeyboradEvent(gale::key::keyboardSystemBack, _isdown); return s_listInstance[_id]->ANDROID_systemKeyboradEvent(gale::key::keyboard_back, _isdown);
default: default:
GALE_ERROR("IO keyboard Key system event : \"" << _keyVal << "\" is down=" << _isdown); GALE_ERROR("IO keyboard Key system event : \"" << _keyVal << "\" is down=" << _isdown);
break; break;

2
gale/context/Context.h
View File

@ -110,7 +110,7 @@ namespace gale {
virtual void OS_Background(); virtual void OS_Background();
public: public:
void requestUpdateSize(); void requestUpdateSize();
protected: public:
// return true if a flush is needed // return true if a flush is needed
bool OS_Draw(bool _displayEveryTime); bool OS_Draw(bool _displayEveryTime);
public: public:

2
gale/renderer/openGL/openGL.cpp
View File

@ -252,7 +252,9 @@ void gale::openGL::clearDepth(float _value) {
#ifdef GALE_SIMULATION_OPENGL_AVAILLABLE #ifdef GALE_SIMULATION_OPENGL_AVAILLABLE
if (s_simulationMode == false) { if (s_simulationMode == false) {
#endif #endif
#if !(defined(__TARGET_OS__Android) || defined(__TARGET_OS__MacOs))
glClearDepth(_value); glClearDepth(_value);
#endif
#ifdef GALE_SIMULATION_OPENGL_AVAILLABLE #ifdef GALE_SIMULATION_OPENGL_AVAILLABLE
} }
#endif #endif