miguel.horta/commandergenius
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Auto-fire for up to 2 buttons

Browse Source
This commit is contained in:
pelya
2010-08-25 17:03:20 +03:00
parent 9dafe7e44d
commit 5f54667aa1
4 changed files with 63 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeAppSettings.sh
View File

@@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
CHANGE_APP_SETTINGS_VERSION=5 CHANGE_APP_SETTINGS_VERSION=6
AUTO= AUTO=
if [ "X$1" = "X-a" ]; then if [ "X$1" = "X-a" ]; then
@@ -118,6 +118,12 @@ if [ -n "$var" ] ; then
AppTouchscreenKeyboardKeysAmount="$var" AppTouchscreenKeyboardKeysAmount="$var"
fi fi
echo -n "\nNumber of virtual keyboard keys that support autofire (currently 2 is maximum) ($AppTouchscreenKeyboardKeysAmountAutoFire): "
read var
if [ -n "$var" ] ; then
AppTouchscreenKeyboardKeysAmountAutoFire="$var"
fi
echo -n "\nEnable multi-ABI binary, with hardware FPU support - \nit will also work on old devices, but .apk size is 2x bigger (y) or (n) ($MultiABI): " echo -n "\nEnable multi-ABI binary, with hardware FPU support - \nit will also work on old devices, but .apk size is 2x bigger (y) or (n) ($MultiABI): "
read var read var
if [ -n "$var" ] ; then if [ -n "$var" ] ; then
@@ -194,6 +200,7 @@ echo AppUsesJoystick=$AppUsesJoystick >> AppSettings.cfg
echo AppUsesMultitouch=$AppUsesMultitouch >> AppSettings.cfg echo AppUsesMultitouch=$AppUsesMultitouch >> AppSettings.cfg
echo RedefinedKeys=\"$RedefinedKeys\" >> AppSettings.cfg echo RedefinedKeys=\"$RedefinedKeys\" >> AppSettings.cfg
echo AppTouchscreenKeyboardKeysAmount=$AppTouchscreenKeyboardKeysAmount >> AppSettings.cfg echo AppTouchscreenKeyboardKeysAmount=$AppTouchscreenKeyboardKeysAmount >> AppSettings.cfg
echo AppTouchscreenKeyboardKeysAmountAutoFire=$AppTouchscreenKeyboardKeysAmountAutoFire >> AppSettings.cfg
echo MultiABI=$MultiABI >> AppSettings.cfg echo MultiABI=$MultiABI >> AppSettings.cfg
echo AppVersionCode=$AppVersionCode >> AppSettings.cfg echo AppVersionCode=$AppVersionCode >> AppSettings.cfg
echo AppVersionName=\"$AppVersionName\" >> AppSettings.cfg echo AppVersionName=\"$AppVersionName\" >> AppSettings.cfg
@@ -301,6 +308,7 @@ cat project/src/Globals.java | \
sed "s/public static boolean AppUsesJoystick = .*;/public static boolean AppUsesJoystick = $AppUsesJoystick;/" | \ sed "s/public static boolean AppUsesJoystick = .*;/public static boolean AppUsesJoystick = $AppUsesJoystick;/" | \
sed "s/public static boolean AppUsesMultitouch = .*;/public static boolean AppUsesMultitouch = $AppUsesMultitouch;/" | \ sed "s/public static boolean AppUsesMultitouch = .*;/public static boolean AppUsesMultitouch = $AppUsesMultitouch;/" | \
sed "s/public static int AppTouchscreenKeyboardKeysAmount = .*;/public static int AppTouchscreenKeyboardKeysAmount = $AppTouchscreenKeyboardKeysAmount;/" | \ sed "s/public static int AppTouchscreenKeyboardKeysAmount = .*;/public static int AppTouchscreenKeyboardKeysAmount = $AppTouchscreenKeyboardKeysAmount;/" | \
sed "s/public static int AppTouchscreenKeyboardKeysAmountAutoFire = .*;/public static int AppTouchscreenKeyboardKeysAmountAutoFire = $AppTouchscreenKeyboardKeysAmountAutoFire;/" | \
sed "s%public static String ReadmeText = .*%public static String ReadmeText = \"$ReadmeText\".replace(\"^\",\"\\\n\");%" | \ sed "s%public static String ReadmeText = .*%public static String ReadmeText = \"$ReadmeText\".replace(\"^\",\"\\\n\");%" | \
sed "s/public LoadLibrary() .*/public LoadLibrary() { $LibrariesToLoad };/" > \ sed "s/public LoadLibrary() .*/public LoadLibrary() { $LibrariesToLoad };/" > \
project/src/Globals.java.1 project/src/Globals.java.1

89
project/sdl/sdl-1.3/src/video/android/SDL_touchscreenkeyboard.c
View File

@@ -43,13 +43,15 @@
#define MAX(X, Y) ((X) > (Y) ? (X) : (Y)) #define MAX(X, Y) ((X) > (Y) ? (X) : (Y))
static int isTouchscreenKeyboardUsed = 0; static int isTouchscreenKeyboardUsed = 0;
static int touchscreenKeyboardTheme = 0;
static int AutoFireButtonsNum = 0;
enum { enum {
FONT_LEFT = 0, FONT_RIGHT = 1, FONT_UP = 2, FONT_DOWN = 3, FONT_LEFT = 0, FONT_RIGHT = 1, FONT_UP = 2, FONT_DOWN = 3,
FONT_BTN1 = 4, FONT_BTN2 = 5, FONT_BTN3 = 6, FONT_BTN4 = 7 FONT_BTN1 = 4, FONT_BTN2 = 5, FONT_BTN3 = 6, FONT_BTN4 = 7
}; };
enum { MAX_BUTTONS = 7 } ; // Max amount of custom buttons enum { MAX_BUTTONS = 7, MAX_BUTTONS_AUTOFIRE = 2 } ; // Max amount of custom buttons
static GLshort fontGL[sizeof(font)/sizeof(font[0])][FONT_MAX_LINES_PER_CHAR * 4 + 1]; static GLshort fontGL[sizeof(font)/sizeof(font[0])][FONT_MAX_LINES_PER_CHAR * 4 + 1];
enum { FONT_CHAR_LINES_COUNT = FONT_MAX_LINES_PER_CHAR * 4 }; enum { FONT_CHAR_LINES_COUNT = FONT_MAX_LINES_PER_CHAR * 4 };
@@ -69,14 +71,14 @@ SDL_KEY(SDL_KEY_VAL(SDL_ANDROID_KEYCODE_8))
enum { ARROW_LEFT = 1, ARROW_RIGHT = 2, ARROW_UP = 4, ARROW_DOWN = 8 }; enum { ARROW_LEFT = 1, ARROW_RIGHT = 2, ARROW_UP = 4, ARROW_DOWN = 8 };
static int oldArrows = 0; static int oldArrows = 0;
static int Button1AutoFire = 0, Button1AutoFireX = 0, Button1AutoFireRot = 0; static int ButtonAutoFire[MAX_BUTTONS_AUTOFIRE] = {0, 0};
static int ButtonAutoFireX[MAX_BUTTONS_AUTOFIRE] = {0, 0};
static int ButtonAutoFireRot[MAX_BUTTONS_AUTOFIRE] = {0, 0};
static SDL_Rect * OldCoords[MAX_MULTITOUCH_POINTERS] = { NULL }; static SDL_Rect * OldCoords[MAX_MULTITOUCH_POINTERS] = { NULL };
static const float inv255f = 1.0f / 255.0f;
// Should be called on each char of font before drawing // Should be called on each char of font before drawing
static void prepareFontChar(int idx, int w, int h) static void prepareFontCharWireframe(int idx, int w, int h)
{ {
int i, count = 0; int i, count = 0;
float fw = (float) w / 255.0f; float fw = (float) w / 255.0f;
@@ -101,7 +103,7 @@ static void prepareFontChar(int idx, int w, int h)
}; };
static inline void beginDrawing() static inline void beginDrawingWireframe()
{ {
glPushMatrix(); glPushMatrix();
glLoadIdentity(); glLoadIdentity();
@@ -109,7 +111,7 @@ static inline void beginDrawing()
glPushMatrix(); glPushMatrix();
glEnableClientState(GL_VERTEX_ARRAY); glEnableClientState(GL_VERTEX_ARRAY);
} }
static inline void endDrawing() static inline void endDrawingWireframe()
{ {
glDisableClientState(GL_VERTEX_ARRAY); glDisableClientState(GL_VERTEX_ARRAY);
glPopMatrix(); glPopMatrix();
@@ -118,7 +120,7 @@ static inline void endDrawing()
// Draws a char on screen using embedded line font, (x, y) are center of char, not upper-left corner // Draws a char on screen using embedded line font, (x, y) are center of char, not upper-left corner
// TODO: use SDL 1.3 renderer routines? It will not be pixel-aligned then, if the screen is resized // TODO: use SDL 1.3 renderer routines? It will not be pixel-aligned then, if the screen is resized
static inline void drawChar(int idx, Uint16 x, Uint16 y, int rotation, Uint8 r, Uint8 g, Uint8 b, Uint8 a) static inline void drawCharWireframe(int idx, Uint16 x, Uint16 y, int rotation, Uint8 r, Uint8 g, Uint8 b, Uint8 a)
{ {
//glColor4f((GLfloat) r * inv255f, (GLfloat) g * inv255f, (GLfloat) b * inv255f, (GLfloat) a * inv255f); //glColor4f((GLfloat) r * inv255f, (GLfloat) g * inv255f, (GLfloat) b * inv255f, (GLfloat) a * inv255f);
glColor4x(r * 0x10000, g * 0x10000, b * 0x10000, a * 0x10000); glColor4x(r * 0x10000, g * 0x10000, b * 0x10000, a * 0x10000);
@@ -142,24 +144,27 @@ int SDL_ANDROID_drawTouchscreenKeyboard()
int i; int i;
if( !isTouchscreenKeyboardUsed ) if( !isTouchscreenKeyboardUsed )
return 0; return 0;
beginDrawing(); if( touchscreenKeyboardTheme == 0 )
// Draw arrow keys
drawChar( FONT_LEFT, arrows.x + arrows.w / 4, arrows.y + arrows.h / 2, 0,
255, 255, SDL_GetKeyboardState(NULL)[SDL_KEY(LEFT)] ? 255 : 0, 128 );
drawChar( FONT_RIGHT, arrows.x + arrows.w / 4 * 3, arrows.y + arrows.h / 2, 0,
255, 255, SDL_GetKeyboardState(NULL)[SDL_KEY(RIGHT)] ? 255 : 0, 128 );
drawChar( FONT_UP, arrows.x + arrows.w / 2, arrows.y + arrows.h / 4, 0,
255, 255, SDL_GetKeyboardState(NULL)[SDL_KEY(UP)] ? 255 : 0, 128 );
drawChar( FONT_DOWN, arrows.x + arrows.w / 2, arrows.y + arrows.h / 4 * 3, 0,
255, 255, SDL_GetKeyboardState(NULL)[SDL_KEY(DOWN)] ? 255 : 0, 128 );
// Draw buttons
for( i = 0; i < nbuttons; i++ )
{ {
drawChar( FONT_BTN1 + i, buttons[i].x + buttons[i].w / 2, buttons[i].y + buttons[i].h / 2, ( i == 0 ? Button1AutoFireRot * 0x10000 : 0 ), beginDrawingWireframe();
( i == 0 && Button1AutoFire ) ? 0 : 255, 255, SDL_GetKeyboardState(NULL)[buttonKeysyms[i]] ? 255 : 0, 128 ); // Draw arrow keys
drawCharWireframe( FONT_LEFT, arrows.x + arrows.w / 4, arrows.y + arrows.h / 2, 0,
255, 255, SDL_GetKeyboardState(NULL)[SDL_KEY(LEFT)] ? 255 : 0, 128 );
drawCharWireframe( FONT_RIGHT, arrows.x + arrows.w / 4 * 3, arrows.y + arrows.h / 2, 0,
255, 255, SDL_GetKeyboardState(NULL)[SDL_KEY(RIGHT)] ? 255 : 0, 128 );
drawCharWireframe( FONT_UP, arrows.x + arrows.w / 2, arrows.y + arrows.h / 4, 0,
255, 255, SDL_GetKeyboardState(NULL)[SDL_KEY(UP)] ? 255 : 0, 128 );
drawCharWireframe( FONT_DOWN, arrows.x + arrows.w / 2, arrows.y + arrows.h / 4 * 3, 0,
255, 255, SDL_GetKeyboardState(NULL)[SDL_KEY(DOWN)] ? 255 : 0, 128 );
// Draw buttons
for( i = 0; i < nbuttons; i++ )
{
drawCharWireframe( FONT_BTN1 + i, buttons[i].x + buttons[i].w / 2, buttons[i].y + buttons[i].h / 2, ( i < AutoFireButtonsNum ? ButtonAutoFireRot[i] * 0x10000 : 0 ),
( i < AutoFireButtonsNum && ButtonAutoFire[i] ) ? 0 : 255, 255, SDL_GetKeyboardState(NULL)[buttonKeysyms[i]] ? 255 : 0, 128 );
}
endDrawingWireframe();
} }
endDrawing();
return 1; return 1;
}; };
@@ -231,11 +236,11 @@ int SDL_android_processTouchscreenKeyboard(int x, int y, int action, int pointer
{ {
OldCoords[pointerId] = &buttons[i]; OldCoords[pointerId] = &buttons[i];
SDL_SendKeyboardKey( SDL_PRESSED, GetKeysym(buttonKeysyms[i], &keysym) ); SDL_SendKeyboardKey( SDL_PRESSED, GetKeysym(buttonKeysyms[i], &keysym) );
if( i == 0 ) if( i < AutoFireButtonsNum )
{ {
Button1AutoFireX = x; ButtonAutoFireX[i] = x;
Button1AutoFire = 0; ButtonAutoFire[i] = 0;
Button1AutoFireRot = 0; ButtonAutoFireRot[i] = 0;
} }
return 1; return 1;
} }
@@ -258,7 +263,7 @@ int SDL_android_processTouchscreenKeyboard(int x, int y, int action, int pointer
{ {
if( OldCoords[pointerId] == &buttons[i] ) if( OldCoords[pointerId] == &buttons[i] )
{ {
if( ! ( i == 0 && Button1AutoFire ) ) if( ! ( i < AutoFireButtonsNum && ButtonAutoFire[i] ) )
SDL_SendKeyboardKey( SDL_RELEASED, GetKeysym(buttonKeysyms[i] ,&keysym) ); SDL_SendKeyboardKey( SDL_RELEASED, GetKeysym(buttonKeysyms[i] ,&keysym) );
OldCoords[pointerId] = NULL; OldCoords[pointerId] = NULL;
return 1; return 1;
@@ -298,11 +303,14 @@ int SDL_android_processTouchscreenKeyboard(int x, int y, int action, int pointer
oldArrows = i; oldArrows = i;
} }
else else
if( OldCoords[pointerId] == &buttons[0] )
{ {
Button1AutoFire = abs(Button1AutoFireX - x) > buttons[0].w / 2; for(i = 0; i < AutoFireButtonsNum; i++)
if( !Button1AutoFire ) if( OldCoords[pointerId] == &buttons[i] )
Button1AutoFireRot = Button1AutoFireX - x; {
ButtonAutoFire[i] = abs(ButtonAutoFireX[i] - x) > buttons[i].w / 2;
if( !ButtonAutoFire[i] )
ButtonAutoFireRot[i] = ButtonAutoFireX[i] - x;
}
} }
if( OldCoords[pointerId] ) if( OldCoords[pointerId] )
@@ -314,13 +322,16 @@ int SDL_android_processTouchscreenKeyboard(int x, int y, int action, int pointer
}; };
JNIEXPORT void JNICALL JNIEXPORT void JNICALL
JAVA_EXPORT_NAME(Settings_nativeSetupScreenKeyboard) ( JNIEnv* env, jobject thiz, jint size, jint _nbuttons ) JAVA_EXPORT_NAME(Settings_nativeSetupScreenKeyboard) ( JNIEnv* env, jobject thiz, jint size, jint _nbuttons, jint nbuttonsAutoFire )
{ {
int i; int i;
int nbuttons1row, nbuttons2row; int nbuttons1row, nbuttons2row;
nbuttons = _nbuttons; nbuttons = _nbuttons;
if( nbuttons > MAX_BUTTONS ) if( nbuttons > MAX_BUTTONS )
nbuttons = MAX_BUTTONS; nbuttons = MAX_BUTTONS;
AutoFireButtonsNum = nbuttonsAutoFire;
if( AutoFireButtonsNum > MAX_BUTTONS_AUTOFIRE )
AutoFireButtonsNum = MAX_BUTTONS_AUTOFIRE;
// TODO: works for horizontal screen orientation only! // TODO: works for horizontal screen orientation only!
// TODO: configurable keyboard size // TODO: configurable keyboard size
@@ -357,14 +368,14 @@ JAVA_EXPORT_NAME(Settings_nativeSetupScreenKeyboard) ( JNIEnv* env, jobject thi
} }
// Resize char images // Resize char images
prepareFontChar(FONT_LEFT, arrows.w / 2, arrows.h / 2); prepareFontCharWireframe(FONT_LEFT, arrows.w / 2, arrows.h / 2);
prepareFontChar(FONT_RIGHT, arrows.w / 2, arrows.h / 2); prepareFontCharWireframe(FONT_RIGHT, arrows.w / 2, arrows.h / 2);
prepareFontChar(FONT_UP, arrows.w / 2, arrows.h / 2); prepareFontCharWireframe(FONT_UP, arrows.w / 2, arrows.h / 2);
prepareFontChar(FONT_DOWN, arrows.w / 2, arrows.h / 2); prepareFontCharWireframe(FONT_DOWN, arrows.w / 2, arrows.h / 2);
for( i = 0; i < nbuttons; i++ ) for( i = 0; i < nbuttons; i++ )
{ {
prepareFontChar(FONT_BTN1 + i, MIN(buttons[i].h, buttons[i].w), MIN(buttons[i].h, buttons[i].w)); prepareFontCharWireframe(FONT_BTN1 + i, MIN(buttons[i].h, buttons[i].w), MIN(buttons[i].h, buttons[i].w));
} }
}; };

2
project/src/Globals.java
View File

@@ -29,6 +29,8 @@ class Globals {
public static int AppTouchscreenKeyboardKeysAmount = 2; public static int AppTouchscreenKeyboardKeysAmount = 2;
public static int AppTouchscreenKeyboardKeysAmountAutoFire = 2;
// Phone-specific config // Phone-specific config
// It will download app data to /sdcard/alienblaster if set to true, // It will download app data to /sdcard/alienblaster if set to true,
// otherwise it will download it to /data/data/de.schwardtnet.alienblaster/files // otherwise it will download it to /data/data/de.schwardtnet.alienblaster/files

4
project/src/Settings.java
View File

@@ -394,7 +394,7 @@ class Settings
if( Globals.UseTouchscreenKeyboard ) if( Globals.UseTouchscreenKeyboard )
{ {
nativeSetTouchscreenKeyboardUsed(); nativeSetTouchscreenKeyboardUsed();
nativeSetupScreenKeyboard(Globals.TouchscreenKeyboardSize, Globals.AppTouchscreenKeyboardKeysAmount); nativeSetupScreenKeyboard(Globals.TouchscreenKeyboardSize, Globals.AppTouchscreenKeyboardKeysAmount, Globals.AppTouchscreenKeyboardKeysAmountAutoFire);
} }
nativeSetAccelerometerSensitivity(Globals.AccelerometerSensitivity); nativeSetAccelerometerSensitivity(Globals.AccelerometerSensitivity);
nativeSetTrackballDampening(Globals.TrackballDampening); nativeSetTrackballDampening(Globals.TrackballDampening);
@@ -430,7 +430,7 @@ class Settings
private static native void nativeSetJoystickUsed(); private static native void nativeSetJoystickUsed();
private static native void nativeSetMultitouchUsed(); private static native void nativeSetMultitouchUsed();
private static native void nativeSetTouchscreenKeyboardUsed(); private static native void nativeSetTouchscreenKeyboardUsed();
private static native void nativeSetupScreenKeyboard(int size, int nbuttons); private static native void nativeSetupScreenKeyboard(int size, int nbuttons, int nbuttonsAutoFire);
public static native void nativeSetEnv(final String name, final String value); public static native void nativeSetEnv(final String name, final String value);
} }