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

- Allows writing on sdcard

Browse Source 
- Bound "back" key to menu, "volume down" to next phase and "volume down" to interrupt ... like on the N900 :)
This commit is contained in:
Xawotihs
2011-04-27 21:19:25 +00:00
parent 86042c206a
commit 7e4364b484
2 changed files with 35 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
JGE/src/SDLmain.cpp
View File

@@ -108,7 +108,7 @@ class SdlApp {
void OnMouseClicked(const SDL_MouseButtonEvent& event); void OnMouseClicked(const SDL_MouseButtonEvent& event);
void OnMouseMoved(const SDL_MouseMotionEvent& event); void OnMouseMoved(const SDL_MouseMotionEvent& event);
void OnEvent(SDL_Event* Event) { void OnEvent(SDL_Event* Event) {
if(Event->type < SDL_USEREVENT) DebugTrace("Received Event : " << Event->type); if(Event->type < SDL_USEREVENT) DebugTrace("Event received" << Event->type);
switch(Event->type){ switch(Event->type){
case SDL_QUIT: case SDL_QUIT:
{ {
@@ -149,9 +149,19 @@ class SdlApp {
lastMouseUpTime = eventTime; lastMouseUpTime = eventTime;
break; break;
} }
case WAGIC_UPDATE_EVENT: case SDL_FINGERMOTION:
OnUpdate(); {
DebugTrace("FingerMotion : touchId " << Event->tfinger.touchId
<< ", fingerId " << Event->tfinger.fingerId
<< ", state " << Event->tfinger.state
<< ", x " << Event->tfinger.x
<< ", y " << Event->tfinger.y
<< ", dy " << Event->tfinger.dx
<< ", dy " << Event->tfinger.dy
<< ", pressure " << Event->tfinger.pressure
);
break; break;
}
case SDL_MULTIGESTURE: case SDL_MULTIGESTURE:
{ {
DebugTrace("Multigesure : touchId " << Event->mgesture.touchId DebugTrace("Multigesure : touchId " << Event->mgesture.touchId
@@ -162,6 +172,9 @@ class SdlApp {
<< ", numFinder " << Event->mgesture.numFingers); << ", numFinder " << Event->mgesture.numFingers);
break; break;
} }
case WAGIC_UPDATE_EVENT:
OnUpdate();
break;
} }
} }
void OnUpdate(); void OnUpdate();
@@ -182,22 +195,24 @@ SdlApp *g_SdlApp = NULL;
static const struct { LocalKeySym keysym; JButton keycode; } gDefaultBindings[] = static const struct { LocalKeySym keysym; JButton keycode; } gDefaultBindings[] =
{ {
{ SDLK_RETURN, JGE_BTN_MENU }, { SDLK_RETURN, JGE_BTN_MENU },
{ SDLK_KP_ENTER, JGE_BTN_MENU }, { SDLK_KP_ENTER, JGE_BTN_MENU },
{ SDLK_ESCAPE, JGE_BTN_MENU }, { SDLK_ESCAPE, JGE_BTN_MENU },
{ SDLK_BACKSPACE, JGE_BTN_CTRL }, { SDLK_BACKSPACE, JGE_BTN_CTRL },
{ SDLK_UP, JGE_BTN_UP }, { SDLK_UP, JGE_BTN_UP },
{ SDLK_DOWN, JGE_BTN_DOWN }, { SDLK_DOWN, JGE_BTN_DOWN },
{ SDLK_LEFT, JGE_BTN_LEFT }, { SDLK_LEFT, JGE_BTN_LEFT },
{ SDLK_RIGHT, JGE_BTN_RIGHT }, { SDLK_RIGHT, JGE_BTN_RIGHT },
{ SDLK_SPACE, JGE_BTN_OK }, { SDLK_SPACE, JGE_BTN_OK },
{ SDLK_TAB, JGE_BTN_CANCEL }, { SDLK_TAB, JGE_BTN_CANCEL },
{ SDLK_j, JGE_BTN_PRI }, { SDLK_j, JGE_BTN_PRI },
{ SDLK_k, JGE_BTN_SEC }, { SDLK_k, JGE_BTN_SEC },
{ SDLK_q, JGE_BTN_PREV }, { SDLK_q, JGE_BTN_PREV },
{ SDLK_a, JGE_BTN_NEXT }, { SDLK_a, JGE_BTN_NEXT },
{ SDLK_f, JGE_BTN_FULLSCREEN }, { SDLK_f, JGE_BTN_FULLSCREEN },
{ SDL_SCANCODE_AC_BACK, JGE_BTN_MENU }, { SDLK_AC_BACK, JGE_BTN_MENU },
{ SDLK_VOLUMEUP, JGE_BTN_PREV },
{ SDLK_VOLUMEDOWN, JGE_BTN_SEC},
}; };
void JGECreateDefaultBindings() void JGECreateDefaultBindings()

1
projects/mtg/Android/AndroidManifest.xml
View File

@@ -3,6 +3,7 @@
package="org.libsdl.app" package="org.libsdl.app"
android:versionCode="1" android:versionCode="1"
android:versionName="1.0"> android:versionName="1.0">
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"></uses-permission>
<application android:label="@string/app_name" android:icon="@drawable/icon" android:debuggable="true" android:theme="@android:style/Theme.NoTitleBar.Fullscreen"> <application android:label="@string/app_name" android:icon="@drawable/icon" android:debuggable="true" android:theme="@android:style/Theme.NoTitleBar.Fullscreen">
<activity android:name="SDLActivity" <activity android:name="SDLActivity"
android:configChanges="orientation" android:configChanges="orientation"