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

Mouse enabled in Tyrian, not finished yet (also nasty bug with keyboard repeat fixed)

Browse Source
This commit is contained in:
pelya
2010-08-30 15:55:09 +03:00
parent 61c4884a81
commit a0c98546b1
17 changed files with 28 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeAppSettings.sh
View File

@@ -351,8 +351,7 @@ echo Forcing rebuild of specific files
rm -rf project/libs/* rm -rf project/libs/*
rm -rf project/bin/ndk/local/*/objs/sdl_main/* project/bin/ndk/local/*/libsdl_main.so rm -rf project/bin/ndk/local/*/objs/sdl_main/* project/bin/ndk/local/*/libsdl_main.so
rm -rf project/bin/ndk/local/*/libsdl.so rm -rf project/bin/ndk/local/*/libsdl.so
rm -rf project/bin/ndk/local/*/objs/sdl/src/audio/android rm -rf project/bin/ndk/local/*/objs/sdl/src/*/android
rm -rf project/bin/ndk/local/*/objs/sdl/src/video/android/*.o
rm -rf project/bin/ndk/local/*/objs/sdl/src/video/SDL_video.o rm -rf project/bin/ndk/local/*/objs/sdl/src/video/SDL_video.o
rm -rf project/bin/ndk/local/*/objs/sdl/SDL_renderer_gles.o rm -rf project/bin/ndk/local/*/objs/sdl/SDL_renderer_gles.o
if [ "$LibSdlVersionOld" '!=' "$LibSdlVersion" ]; then if [ "$LibSdlVersionOld" '!=' "$LibSdlVersion" ]; then

6
project/AndroidManifest.xml
View File

@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="de.schwardtnet.alienblaster" package="com.googlecode.opentyrian"
android:versionCode="110008" android:versionCode="2106"
android:versionName="1.1.0.08" android:versionName="2.1.06"
android:installLocation="preferExternal" android:installLocation="preferExternal"
> >
<application android:label="@string/app_name" <application android:label="@string/app_name"

8
project/jni/Android.mk
View File

@@ -1,6 +1,6 @@
# The namespace in Java file, with dots replaced with underscores # The namespace in Java file, with dots replaced with underscores
SDL_JAVA_PACKAGE_PATH := de_schwardtnet_alienblaster SDL_JAVA_PACKAGE_PATH := com_googlecode_opentyrian
# Path to shared libraries - Android 1.6 cannot load them properly, thus we have to specify absolute path here # Path to shared libraries - Android 1.6 cannot load them properly, thus we have to specify absolute path here
# SDL_SHARED_LIBRARIES_PATH := /data/data/de.schwardtnet.alienblaster/lib # SDL_SHARED_LIBRARIES_PATH := /data/data/de.schwardtnet.alienblaster/lib
@@ -10,7 +10,7 @@ SDL_JAVA_PACKAGE_PATH := de_schwardtnet_alienblaster
# Typically /sdcard/alienblaster # Typically /sdcard/alienblaster
# Or /data/data/de.schwardtnet.alienblaster/files if you're planning to unpack data in application private folder # Or /data/data/de.schwardtnet.alienblaster/files if you're planning to unpack data in application private folder
# Your application will just set current directory there # Your application will just set current directory there
SDL_CURDIR_PATH := de.schwardtnet.alienblaster SDL_CURDIR_PATH := com.googlecode.opentyrian
# Android Dev Phone G1 has trackball instead of cursor keys, and # Android Dev Phone G1 has trackball instead of cursor keys, and
# sends trackball movement events as rapid KeyDown/KeyUp events, # sends trackball movement events as rapid KeyDown/KeyUp events,
@@ -23,13 +23,13 @@ SDL_TRACKBALL_KEYUP_DELAY := 1
# resized in HW-accelerated way, however it eats a tiny bit of CPU # resized in HW-accelerated way, however it eats a tiny bit of CPU
SDL_VIDEO_RENDER_RESIZE := 1 SDL_VIDEO_RENDER_RESIZE := 1
COMPILED_LIBRARIES := sdl_mixer sdl_image COMPILED_LIBRARIES := sdl_net
APPLICATION_ADDITIONAL_CFLAGS := -finline-functions -O2 APPLICATION_ADDITIONAL_CFLAGS := -finline-functions -O2
APPLICATION_ADDITIONAL_LDFLAGS := APPLICATION_ADDITIONAL_LDFLAGS :=
SDL_ADDITIONAL_CFLAGS := -DSDL_ANDROID_KEYCODE_MOUSE=UNKNOWN -DSDL_ANDROID_KEYCODE_0=RETURN -DSDL_ANDROID_KEYCODE_1=LCTRL -DSDL_ANDROID_KEYCODE_2=PAGEUP -DSDL_ANDROID_KEYCODE_3=PAGEDOWN -DSDL_ANDROID_KEYCODE_4=LCTRL SDL_ADDITIONAL_CFLAGS := -DSDL_ANDROID_KEYCODE_MOUSE=UNKNOWN -DSDL_ANDROID_KEYCODE_0=SPACE -DSDL_ANDROID_KEYCODE_1=RETURN -DSDL_ANDROID_KEYCODE_2=LCTRL -DSDL_ANDROID_KEYCODE_3=LALT -DSDL_ANDROID_KEYCODE_4=RETURN
# If SDL_Mixer should link to libMAD # If SDL_Mixer should link to libMAD
SDL_MIXER_USE_LIBMAD := SDL_MIXER_USE_LIBMAD :=

2
project/jni/Application.mk
View File

@@ -5,6 +5,6 @@ APP_PROJECT_PATH := $(call my-dir)/..
# sdl_image depends on png and jpeg # sdl_image depends on png and jpeg
# sdl_ttf depends on freetype # sdl_ttf depends on freetype
APP_MODULES := application sdl sdl_main stlport tremor png jpeg freetype sdl_mixer sdl_image APP_MODULES := application sdl sdl_main stlport tremor png jpeg freetype sdl_net
APP_ABI := armeabi APP_ABI := armeabi

2
project/jni/application/opentyrian/AppSettings.cfg
View File

@@ -6,7 +6,7 @@ ScreenOrientation=h
AppDataDownloadUrl="Data files size is 11 Mb|http://sites.google.com/site/xpelyax/Home/tyrian21-data.zip?attredirects=0&d=1|http://sitesproxy.goapk.com/site/xpelyax/Home/tyrian21-data.zip" AppDataDownloadUrl="Data files size is 11 Mb|http://sites.google.com/site/xpelyax/Home/tyrian21-data.zip?attredirects=0&d=1|http://sitesproxy.goapk.com/site/xpelyax/Home/tyrian21-data.zip"
SdlVideoResize=y SdlVideoResize=y
NeedDepthBuffer=n NeedDepthBuffer=n
AppUsesMouse=n AppUsesMouse=y
AppNeedsArrowKeys=y AppNeedsArrowKeys=y
AppUsesJoystick=n AppUsesJoystick=n
AppUsesMultitouch=n AppUsesMultitouch=n

2
project/jni/application/opentyrian/src/keyboard.cpp
View File

@@ -86,7 +86,9 @@ void wait_noinput( JE_boolean keyboard, JE_boolean mouse, JE_boolean joystick )
void init_keyboard( void ) void init_keyboard( void )
{ {
keysactive = SDL_GetKeyState(&numkeys); keysactive = SDL_GetKeyState(&numkeys);
#ifndef ANDROID
SDL_EnableKeyRepeat(500, 60); SDL_EnableKeyRepeat(500, 60);
#endif
newkey = newmouse = false; newkey = newmouse = false;
keydown = mousedown = false; keydown = mousedown = false;

2
project/jni/application/src
View File

@@ -1 +1 @@
alienblaster opentyrian

2
project/jni/sdl
View File

@@ -1 +1 @@
../sdl/sdl-1.3 ../sdl/sdl-1.2

2
project/res/values/strings.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<string name="app_name">Alien Blaster</string> <string name="app_name">OpenTyrian</string>
</resources> </resources>

2
project/src/Accelerometer.java
View File

@@ -1,5 +1,5 @@
// This string is autogenerated by ChangeAppSettings.sh, do not change spaces amount // This string is autogenerated by ChangeAppSettings.sh, do not change spaces amount
package de.schwardtnet.alienblaster; package com.googlecode.opentyrian;
import android.app.Activity; import android.app.Activity;
import android.content.Context; import android.content.Context;

2
project/src/Audio.java
View File

@@ -1,5 +1,5 @@
// This string is autogenerated by ChangeAppSettings.sh, do not change spaces amount // This string is autogenerated by ChangeAppSettings.sh, do not change spaces amount
package de.schwardtnet.alienblaster; package com.googlecode.opentyrian;
import android.app.Activity; import android.app.Activity;

2
project/src/DataDownloader.java
View File

@@ -1,5 +1,5 @@
// This string is autogenerated by ChangeAppSettings.sh, do not change spaces amount // This string is autogenerated by ChangeAppSettings.sh, do not change spaces amount
package de.schwardtnet.alienblaster; package com.googlecode.opentyrian;
import android.app.Activity; import android.app.Activity;
import android.content.Context; import android.content.Context;

2
project/src/GLSurfaceView_SDL.java
View File

@@ -18,7 +18,7 @@
fixed with a hammer and rasp to work with libSDL port */ fixed with a hammer and rasp to work with libSDL port */
// This string is autogenerated by ChangeAppSettings.sh, do not change spaces amount // This string is autogenerated by ChangeAppSettings.sh, do not change spaces amount
package de.schwardtnet.alienblaster; package com.googlecode.opentyrian;
import java.io.Writer; import java.io.Writer;
import java.util.ArrayList; import java.util.ArrayList;

12
project/src/Globals.java
View File

@@ -1,14 +1,14 @@
// This string is autogenerated by ChangeAppSettings.sh, do not change spaces amount anywhere // This string is autogenerated by ChangeAppSettings.sh, do not change spaces amount anywhere
package de.schwardtnet.alienblaster; package com.googlecode.opentyrian;
import android.app.Activity; import android.app.Activity;
import android.content.Context; import android.content.Context;
class Globals { class Globals {
public static String ApplicationName = "AlienBlaster"; public static String ApplicationName = "OpenTyrian";
// Should be zip file // Should be zip file
public static String DataDownloadUrl = "Data size is 2 Mb|http://sites.google.com/site/xpelyax/Home/alienblaster110_data.zip?attredirects=0%26d=1|http://sitesproxy.goapk.com/site/xpelyax/Home/alienblaster110_data.zip"; public static String DataDownloadUrl = "Data files size is 11 Mb|http://sites.google.com/site/xpelyax/Home/tyrian21-data.zip?attredirects=0%26d=1|http://sitesproxy.goapk.com/site/xpelyax/Home/tyrian21-data.zip";
// Set this value to true if you're planning to render 3D using OpenGL - it eats some GFX resources, so disabled for 2D // Set this value to true if you're planning to render 3D using OpenGL - it eats some GFX resources, so disabled for 2D
public static boolean NeedDepthBuffer = false; public static boolean NeedDepthBuffer = false;
@@ -17,9 +17,9 @@ class Globals {
public static boolean HorizontalOrientation = true; public static boolean HorizontalOrientation = true;
// Readme text to be shown on download page // Readme text to be shown on download page
public static String ReadmeText = "^You can press \"Home\" now - the data will be downloaded in background^In game press \"Menu\" for secondary fire, \"Volume Up/Down\" to cycle weapons".replace("^","\n"); public static String ReadmeText = "^You may press \"Home\" now - the data will be downloaded in background".replace("^","\n");
public static boolean AppUsesMouse = false; public static boolean AppUsesMouse = true;
public static boolean AppNeedsArrowKeys = true; public static boolean AppNeedsArrowKeys = true;
@@ -48,5 +48,5 @@ class Globals {
} }
class LoadLibrary { class LoadLibrary {
public LoadLibrary() { System.loadLibrary("sdl"); System.loadLibrary("sdl_mixer"); System.loadLibrary("sdl_image"); }; public LoadLibrary() { System.loadLibrary("sdl"); System.loadLibrary("sdl_net"); };
} }

2
project/src/MainActivity.java
View File

@@ -1,5 +1,5 @@
// This string is autogenerated by ChangeAppSettings.sh, do not change spaces amount // This string is autogenerated by ChangeAppSettings.sh, do not change spaces amount
package de.schwardtnet.alienblaster; package com.googlecode.opentyrian;
import android.app.Activity; import android.app.Activity;
import android.content.Context; import android.content.Context;

2
project/src/Settings.java
View File

@@ -1,5 +1,5 @@
// This string is autogenerated by ChangeAppSettings.sh, do not change spaces amount // This string is autogenerated by ChangeAppSettings.sh, do not change spaces amount
package de.schwardtnet.alienblaster; package com.googlecode.opentyrian;
import android.app.Activity; import android.app.Activity;
import android.content.Context; import android.content.Context;

2
project/src/Video.java
View File

@@ -1,5 +1,5 @@
// This string is autogenerated by ChangeAppSettings.sh, do not change spaces amount // This string is autogenerated by ChangeAppSettings.sh, do not change spaces amount
package de.schwardtnet.alienblaster; package com.googlecode.opentyrian;
import javax.microedition.khronos.opengles.GL10; import javax.microedition.khronos.opengles.GL10;