vilyaem/Xrasher
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge.

Browse source
This commit is contained in:
Alibek Omarov (a1batross) 2017-04-01 00:19:08 +03:00
commit d216265519
13 changed files with 650 additions and 245 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.travis.yml
View file

@ -47,4 +47,4 @@ script:
after_script: after_script:
- sh travis-upload.sh *.apk - sh travis-upload.sh *.apk
- sh travis-deploy.sh *.apk - sh travis-deploy.sh android-optimized *.apk

5
AndroidManifest.xml
View file

@ -66,13 +66,16 @@
<activity android:name="in.celest.xash3d.XashActivity" <activity android:name="in.celest.xash3d.XashActivity"
android:screenOrientation="sensorLandscape" android:screenOrientation="sensorLandscape"
android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|screenLayout|fontScale|uiMode|orientation|screenSize|smallestScreenSize" android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|screenLayout|fontScale|uiMode|orientation|screenSize|smallestScreenSize"
android:label="@string/app_name"> android:label="@string/app_name"
android:launchMode="singleTask">
<intent-filter> <intent-filter>
<action android:name="in.celest.xash3d.START" /> <action android:name="in.celest.xash3d.START" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
</intent-filter> </intent-filter>
</activity> </activity>
<activity android:name="in.celest.xash3d.FPicker"></activity> <activity android:name="in.celest.xash3d.FPicker"></activity>
<service android:name="in.celest.xash3d.XashService" android:stopWithTask="false" />
<receiver android:name="in.celest.xash3d.XashService$exitButtonListener" />
<receiver android:name="in.celest.xash3d.InstallReceiver"> <receiver android:name="in.celest.xash3d.InstallReceiver">
<intent-filter android:priority="100"> <intent-filter android:priority="100">
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />

2
build-test.sh
View file

@ -1,4 +1,4 @@
ANDROID_JAR=../android-13.jar ANDROID_JAR=../android-14_.jar
AAPT=./../aapt AAPT=./../aapt
DX=./../dx DX=./../dx
APKBUILDER=./../apkbuilder APKBUILDER=./../apkbuilder

3
jni/Application.mk
View file

@ -10,8 +10,6 @@ else
APP_PLATFORM := android-9 APP_PLATFORM := android-9
endif endif
APP_STL := gnustl_static
# if non-zero, works only if single ABI selected # if non-zero, works only if single ABI selected
XASH_THREAD_NUM ?= 0 XASH_THREAD_NUM ?= 0
@ -41,6 +39,7 @@ APP_ABI := x86 armeabi armeabi-v7a-hard
APP_MODULES := xash menu client server NanoGL gpgs_support APP_MODULES := xash menu client server NanoGL gpgs_support
ifeq ($(GOOGLE_PLAY_BUILD),1) ifeq ($(GOOGLE_PLAY_BUILD),1)
APP_STL := gnustl_static
APP_MODULES += libgpg-1 APP_MODULES += libgpg-1
CFLAGS_OPT += -DGOOGLE_PLAY_BUILD CFLAGS_OPT += -DGOOGLE_PLAY_BUILD
endif endif

69
res/layout/notify.xml
View file

@ -1,43 +1,34 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="fill_parent"
android:layout_width="fill_parent" android:layout_height="65sp"
android:layout_height="fill_parent" android:orientation="horizontal">
android:padding="5dp">
<ImageView android:id="@+id/status_icon" <ImageView
android:layout_width="wrap_content" android:id="@+id/status_image"
android:layout_height="fill_parent" android:layout_width="32sp"
android:layout_alignParentLeft="true" android:layout_height="32sp"
android:layout_marginRight="10dp"/> android:src="@drawable/ic_launcher"
android:layout_weight="00"
android:layout_gravity="center_vertical" />
<TextView
android:id="@+id/status_text"
<RelativeLayout android:layout_width="fill_parent" android:layout_width="wrap_content"
android:layout_height="fill_parent" android:layout_height="wrap_content"
android:layout_toRightOf="@id/status_icon"> android:layout_alignParentTop="true"
android:layout_marginLeft="10dip"
android:singleLine="true"
android:layout_weight="90"
<TextView android:id="@+id/status_text" android:text="Xash3D"
android:layout_width="fill_parent" android:layout_gravity="center_vertical"/>
android:layout_height="wrap_content" <Button
android:layout_alignParentTop="true" /> android:id="@+id/status_exit_button"
android:layout_width="wrap_content"
<ProgressBar android:id="@+id/status_progress" android:layout_height="wrap_content"
android:layout_width="fill_parent" android:text="Exit"
android:layout_height="wrap_content" android:layout_weight="0"
android:layout_below="@id/status_text" android:layout_alignParentLeft="true"
android:indeterminate="false" android:layout_gravity="center_vertical" />
android:indeterminateOnly="false" </LinearLayout>
style="?android:attr/progressBarStyleHorizontal" />
</RelativeLayout>
</RelativeLayout>

36
res/layout/notify_21.xml Normal file
View file

@ -0,0 +1,36 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="65sp"
android:orientation="horizontal"
android:background="#FFFFFF">
<ImageView
android:id="@+id/status_image_21"
android:src="@drawable/ic_launcher"
android:layout_weight="00"
android:layout_gravity="center_vertical"
android:layout_width="32sp"
android:layout_height="32sp"/>
<TextView
android:id="@+id/status_text_21"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:layout_marginLeft="10dip"
android:singleLine="true"
android:layout_weight="90"
android:text="Xash3D"
android:layout_gravity="center_vertical"
android:textColor="#000000"/>
<Button
android:id="@+id/status_exit_button_21"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Exit"
android:layout_weight="0"
android:layout_alignParentLeft="true"
android:layout_gravity="center_vertical" />
</LinearLayout>

20
res/values-ua/strings.xml
View file

@ -2,15 +2,15 @@
<resources> <resources>
<string name="launch_button">Запустити Xash3D</string> <string name="launch_button">Запустити Xash3D</string>
<string name="cmd_args_text">Аргументи командного рядка(тільки для експертів)</string> <string name="cmd_args_text">Аргументи командного рядка(тільки для експертів)</string>
<string name="use_controls">Включити екранне управління</string> <string name="use_controls">Увімкнути наекранне керування</string>
<string name="use_volume">Використовувати кнопки гучності</string> <string name="use_volume">Використовувати клавіші гучності</string>
<string name="text_res_path">Директорія ресурсів гри</string> <string name="text_res_path">Каталог ресурсів гри</string>
<string name="touch_set">Налаштування управління</string> <string name="touch_set">Налаштування керування</string>
<string name="text_shortcut">Ярлик Xash3D</string> <string name="text_shortcut">Ярлик Xash3D</string>
<string name="text_shortcut_test">Ярлик Xash3D_test</string> <string name="text_shortcut_test">Ярлик Xash3D_test</string>
<string name="shortcut_button_save">Зберегти ярлик</string> <string name="shortcut_button_save">Зберегти ярлик</string>
<string name="gamedir">Каталог мода</string> <string name="gamedir">Каталог модифікації</string>
<string name="pkgname">Пакет мода (тільки для експертів)</string> <string name="pkgname">Пакет модифікації(тільки для експертів)</string>
<string name="shortcut_name">Назва ярлика</string> <string name="shortcut_name">Назва ярлика</string>
<string name="about_copyright">FWGS не пов\'язаний з Valve або з будь-якими з їх партнерів. Всі авторські права належать їх відповідним власникам.</string> <string name="about_copyright">FWGS не пов\'язаний з Valve або з будь-якими з їх партнерів. Всі авторські права належать їх відповідним власникам.</string>
<string name="about_authors">Порт на Android здійснений командою FWGS:\n <string name="about_authors">Порт на Android здійснений командою FWGS:\n
@ -21,11 +21,11 @@
Особливі подяки:\n Особливі подяки:\n
&#8226; Дяде Мише за Xash3D\n &#8226; Дяде Мише за Xash3D\n
&#8226; Valve за Half-Life\n</string> &#8226; Valve за Half-Life\n</string>
<string name="about_links">Слідуйте за нами в:\n <string name="about_links">Слідкуйте за нами в:\n
&#8226; <a href="https://vk.com/xashdroid">VK</a>\n &#8226; <a href="https://vk.com/xashdroid">VK</a>\n
&#8226; <a href="http://moddb.com/game/xash3d-android">ModDB</a>\n &#8226; <a href="http://moddb.com/game/xash3d-android">ModDB</a>\n
&#8226; <a href="https://github.com/FWGS">GitHub</a></string> &#8226; <a href="https://github.com/FWGS">GitHub</a></string>
<string name="about_button">О Xash3D Android</string> <string name="about_button">Про Xash3D Android</string>
<string name="create_shortcut_button">Створити ярлик мода</string> <string name="create_shortcut_button">Створити ярлик модифікації</string>
<string name="select_folder">(вибрати)</string> <string name="select_folder">(обрати)</string>
</resources> </resources>

157
src/in/celest/xash3d/JoystickHandler.java
View file

@ -1,157 +0,0 @@
package in.celest.xash3d;
import android.app.*;
import android.content.*;
import android.view.*;
import android.os.*;
import android.util.*;
import android.graphics.*;
import android.text.method.*;
import android.text.*;
import android.media.*;
import android.hardware.*;
import android.content.*;
import android.widget.*;
import android.content.pm.*;
import java.lang.*;
import java.util.List;
import in.celest.xash3d.hl.BuildConfig;
import in.celest.xash3d.XashConfig;
import in.celest.xash3d.XashActivity;
class JoystickHandler
{
public int getSource(KeyEvent event)
{
return InputDevice.SOURCE_UNKNOWN;
}
public int getSource(MotionEvent event)
{
return InputDevice.SOURCE_UNKNOWN;
}
public boolean handleAxis(MotionEvent event)
{
return false;
}
public boolean isGamepadButton(int keyCode)
{
return false;
}
public String keyCodeToString(int keyCode)
{
return String.valueOf(keyCode);
}
public void init()
{
}
}
class JoystickHandler_v12 extends JoystickHandler
{
private static float prevSide, prevFwd, prevYaw, prevPtch, prevLT, prevRT, prevHX, prevHY;
@Override
public void init()
{
XashActivity.mSurface.setOnGenericMotionListener(new MotionListener());
}
@Override
public int getSource(KeyEvent event)
{
return event.getSource();
}
@Override
public int getSource(MotionEvent event)
{
return event.getSource();
}
@Override
public boolean handleAxis( MotionEvent event )
{
// how event can be from null device, Android?
final InputDevice device = event.getDevice();
if( device == null )
return false;
// maybe I need to cache this...
for( InputDevice.MotionRange range: device.getMotionRanges() )
{
// normalize in -1.0..1.0 (copied from SDL2)
final float cur = ( event.getAxisValue( range.getAxis(), event.getActionIndex() ) - range.getMin() ) / range.getRange() * 2.0f - 1.0f;
final float dead = range.getFlat(); // get axis dead zone
switch( range.getAxis() )
{
// typical axes
// move
case MotionEvent.AXIS_X:
prevSide = XashActivity.performEngineAxisEvent(cur, XashActivity.JOY_AXIS_SIDE, prevSide, dead);
break;
case MotionEvent.AXIS_Y:
prevFwd = XashActivity.performEngineAxisEvent(cur, XashActivity.JOY_AXIS_FWD, prevFwd, dead);
break;
// rotate. Invert, so by default this works as it's should
case MotionEvent.AXIS_Z:
prevPtch = XashActivity.performEngineAxisEvent(-cur, XashActivity.JOY_AXIS_PITCH, prevPtch, dead);
break;
case MotionEvent.AXIS_RZ:
prevYaw = XashActivity.performEngineAxisEvent(-cur, XashActivity.JOY_AXIS_YAW, prevYaw, dead);
break;
// trigger
case MotionEvent.AXIS_RTRIGGER:
prevLT = XashActivity.performEngineAxisEvent(cur, XashActivity.JOY_AXIS_RT, prevLT, dead);
break;
case MotionEvent.AXIS_LTRIGGER:
prevRT = XashActivity.performEngineAxisEvent(cur, XashActivity.JOY_AXIS_LT, prevRT, dead);
break;
// hats
case MotionEvent.AXIS_HAT_X:
prevHX = XashActivity.performEngineHatEvent(cur, true, prevHX);
break;
case MotionEvent.AXIS_HAT_Y:
prevHY = XashActivity.performEngineHatEvent(cur, false, prevHY);
break;
}
}
return true;
}
@Override
public boolean isGamepadButton(int keyCode)
{
return KeyEvent.isGamepadButton(keyCode);
}
@Override
public String keyCodeToString(int keyCode)
{
return KeyEvent.keyCodeToString(keyCode);
}
class MotionListener implements View.OnGenericMotionListener
{
@Override
public boolean onGenericMotion(View view, MotionEvent event)
{
final int source = XashActivity.handler.getSource(event);
final int axisDevices = InputDevice.SOURCE_CLASS_JOYSTICK | InputDevice.SOURCE_GAMEPAD;
if( (source & axisDevices) != 0 )
return XashActivity.handler.handleAxis( event );
// TODO: Add it someday
// else if( (event.getSource() & InputDevice.SOURCE_CLASS_TRACKBALL) == InputDevice.SOURCE_CLASS_TRACKBALL )
// return XashActivity.handleBall( event );
//return super.onGenericMotion( view, event );
return false;
}
}
}

396
src/in/celest/xash3d/XashActivity.java
View file

@ -26,6 +26,7 @@ import android.database.*;
import android.view.inputmethod.*; import android.view.inputmethod.*;
import java.lang.*; import java.lang.*;
import java.lang.reflect.*;
import java.util.List; import java.util.List;
import java.security.MessageDigest; import java.security.MessageDigest;
@ -34,6 +35,7 @@ import in.celest.xash3d.hl.BuildConfig;
import in.celest.xash3d.XashConfig; import in.celest.xash3d.XashConfig;
import in.celest.xash3d.JoystickHandler; import in.celest.xash3d.JoystickHandler;
import in.celest.xash3d.CertCheck; import in.celest.xash3d.CertCheck;
import android.provider.Settings.Secure;
/** /**
Xash Activity Xash Activity
@ -53,8 +55,10 @@ public class XashActivity extends Activity {
public static ImmersiveMode mImmersiveMode; public static ImmersiveMode mImmersiveMode;
public static boolean keyboardVisible = false; public static boolean keyboardVisible = false;
public static boolean mEngineReady = false; public static boolean mEngineReady = false;
public static boolean mEnginePaused = false;
private static Vibrator mVibrator; public static Vibrator mVibrator;
public static boolean fMouseShown = true;
private static boolean mHasVibrator; private static boolean mHasVibrator;
private int mReturingWithResultCode = 0; private int mReturingWithResultCode = 0;
@ -88,7 +92,6 @@ public class XashActivity extends Activity {
System.loadLibrary("xash"); System.loadLibrary("xash");
} }
// Setup // Setup
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
@ -155,15 +158,6 @@ public class XashActivity extends Activity {
setFolderAsk( false ); // don't ask on next run setFolderAsk( false ); // don't ask on next run
Log.v(TAG, "Got new basedir from FPicker: " + newBaseDir ); Log.v(TAG, "Got new basedir from FPicker: " + newBaseDir );
} }
else if( requestCode == OPEN_DOCUMENT_TREE_RESULT )
{
Uri uri = resultData.getData();
if( uri != null )
{
getContentResolver().takePersistableUriPermission(uri,
Intent.FLAG_GRANT_READ_URI_PERMISSION | Intent.FLAG_GRANT_WRITE_URI_PERMISSION );
}
}
} }
} }
@ -235,34 +229,43 @@ public class XashActivity extends Activity {
@Override @Override
protected void onResume() { protected void onResume() {
Log.v(TAG, "onResume()"); Log.v(TAG, "onResume()");
if( mEngineReady )
nativeOnResume();
mEnginePaused = false;
super.onResume(); super.onResume();
} }
@Override @Override
protected void onStop() { protected void onStop() {
Log.v(TAG, "onStop()"); Log.v(TAG, "onStop()");
/*
if( mEngineReady ) if( mEngineReady )
{ {
nativeSetPause(0);
// let engine properly exit, instead of killing it's thread // let engine properly exit, instead of killing it's thread
nativeOnStop(); nativeOnStop();
// wait for engine // wait for engine
mSurface.engineThreadWait(); mSurface.engineThreadWait();
} }
*/
super.onStop(); super.onStop();
} }
@Override @Override
protected void onDestroy() { protected void onDestroy() {
Log.v(TAG, "onStop()"); Log.v(TAG, "onDestroy()");
if( mEngineReady ) if( mEngineReady )
{ {
nativeUnPause();
// let engine a chance to properly exit // let engine a chance to properly exit
nativeOnDestroy(); nativeOnDestroy();
//mSurface.engineThreadWait();
// wait until Xash will exit // wait until Xash will exit
mSurface.engineThreadJoin(); mSurface.engineThreadJoin();
} }
@ -274,6 +277,9 @@ public class XashActivity extends Activity {
@Override @Override
public void onWindowFocusChanged(boolean hasFocus) public void onWindowFocusChanged(boolean hasFocus)
{ {
if( mEngineReady )
nativeOnFocusChange();
super.onWindowFocusChanged(hasFocus); super.onWindowFocusChanged(hasFocus);
if( mImmersiveMode != null ) if( mImmersiveMode != null )
@ -397,10 +403,12 @@ public class XashActivity extends Activity {
SurfaceHolder holder = mSurface.getHolder(); SurfaceHolder holder = mSurface.getHolder();
holder.setType(SurfaceHolder.SURFACE_TYPE_GPU); holder.setType(SurfaceHolder.SURFACE_TYPE_GPU);
if( sdk < 12 ) if( sdk >= 14 )
handler = new JoystickHandler(); handler = new JoystickHandler_v14();
else else if( sdk >= 12 )
handler = new JoystickHandler_v12(); handler = new JoystickHandler_v12();
else
handler = new JoystickHandler();
handler.init(); handler.init();
mPixelFormat = mPref.getInt("pixelformat", 0); mPixelFormat = mPref.getInt("pixelformat", 0);
@ -416,7 +424,13 @@ public class XashActivity extends Activity {
mDecorView = getWindow().getDecorView(); mDecorView = getWindow().getDecorView();
mVibrator = (Vibrator)getSystemService(Context.VIBRATOR_SERVICE); mVibrator = (Vibrator)getSystemService(Context.VIBRATOR_SERVICE);
mHasVibrator = ( mVibrator != null ) && ( mVibrator.hasVibrator() );
mHasVibrator = ( mVibrator != null );
if( sdk >= 11 )
mHasVibrator = ( mVibrator != null ) && ( handler.hasVibrator() );
if( sdk >= 5 )
startService(new Intent(getBaseContext(), XashService.class));
mEngineReady = true; mEngineReady = true;
} }
@ -469,12 +483,15 @@ public class XashActivity extends Activity {
public static native void nativeString( String text ); public static native void nativeString( String text );
public static native void nativeSetPause(int pause); public static native void nativeSetPause(int pause);
public static native void nativeOnDestroy(); public static native void nativeOnDestroy();
public static native void nativeOnStop(); public static native void nativeOnResume();
public static native void nativeOnFocusChange();
public static native void nativeOnPause(); public static native void nativeOnPause();
public static native void nativeUnPause();
public static native void nativeHat(int id, byte hat, byte keycode, boolean down); public static native void nativeHat(int id, byte hat, byte keycode, boolean down);
public static native void nativeAxis(int id, byte axis, short value); public static native void nativeAxis(int id, byte axis, short value);
public static native void nativeJoyButton(int id, byte button, boolean down); public static native void nativeJoyButton(int id, byte button, boolean down);
public static native int nativeTestWritePermission( String path ); public static native int nativeTestWritePermission( String path );
public static native void nativeMouseMove( float x, float y );
// for future expansion // for future expansion
public static native void nativeBall(int id, byte ball, short xrel, short yrel); public static native void nativeBall(int id, byte ball, short xrel, short yrel);
@ -763,8 +780,66 @@ public class XashActivity extends Activity {
mSingleton.runOnUiThread(new ShowTextInputTask(show)); mSingleton.runOnUiThread(new ShowTextInputTask(show));
} }
public static void setIcon(String path)
{
Log.v(TAG,"setIcon("+path+")");
if( sdk < 5 )
return;
try{
BitmapFactory.Options o = new BitmapFactory.Options();
o.inJustDecodeBounds = true;
Bitmap icon = BitmapFactory.decodeFile(path,o);
if( icon.getWidth() < 16 )
return;
XashService.notification.contentView.setImageViewUri (XashService.status_image, Uri.parse("file://"+path));
((NotificationManager) mSingleton.getApplicationContext()
.getSystemService(Context.NOTIFICATION_SERVICE)).notify(100,XashService.notification);
}
catch( Exception e)
{
}
}
public static void setTitle(String title)
{
Log.v(TAG,"setTitle("+title+")");
if( sdk < 5 )
return;
XashService.notification.contentView.setTextViewText(XashService.status_text, title);
((NotificationManager) mSingleton.getApplicationContext()
.getSystemService(Context.NOTIFICATION_SERVICE)).notify(100,XashService.notification);
}
public static String getAndroidID()
{
String str = Secure.getString( mSingleton.getContentResolver(), Secure.ANDROID_ID );
if( str == null )
return "";
return str;
}
public static String loadID()
{
return mPref.getString("xash_id", "");
}
public static void saveID(String id)
{
SharedPreferences.Editor editor = mPref.edit();
editor.putString( "xash_id", id );
editor.commit();
}
public static void showMouse( int show )
{
fMouseShown = show != 0;
handler.showMouse( show != 0 );
}
} }
/** /**
Simple nativeInit() runnable Simple nativeInit() runnable
*/ */
@ -821,6 +896,7 @@ class EngineSurface extends SurfaceView implements SurfaceHolder.Callback, View.
if( mEGL == null ) if( mEGL == null )
return; return;
XashActivity.nativeSetPause(0); XashActivity.nativeSetPause(0);
XashActivity.mEnginePaused = false;
} }
// Called when we lose the surface // Called when we lose the surface
@ -1157,6 +1233,8 @@ class EngineTouchListener_v1 implements View.OnTouchListener{
} }
class EngineTouchListener_v5 implements View.OnTouchListener{ class EngineTouchListener_v5 implements View.OnTouchListener{
float lx=0, ly=0;
boolean secondarypressed = false;
// Touch events // Touch events
public boolean onTouch(View v, MotionEvent event) public boolean onTouch(View v, MotionEvent event)
{ {
@ -1167,8 +1245,19 @@ class EngineTouchListener_v5 implements View.OnTouchListener{
int mouseButton; int mouseButton;
int i = -1; int i = -1;
float x,y; float x,y;
switch(action) { switch(action) {
case MotionEvent.ACTION_MOVE: case MotionEvent.ACTION_MOVE:
if( !XashActivity.fMouseShown && (XashActivity.handler.getSource(event) & InputDevice.SOURCE_MOUSE) != 0 )
{
x = event.getX();
y = event.getY();
XashActivity.nativeMouseMove(x - lx, y -ly);
lx = x;
ly = y;
return true;
}
for (i = 0; i < pointerCount; i++) { for (i = 0; i < pointerCount; i++) {
pointerFingerId = event.getPointerId(i); pointerFingerId = event.getPointerId(i);
x = event.getX(i); x = event.getX(i);
@ -1176,13 +1265,34 @@ class EngineTouchListener_v5 implements View.OnTouchListener{
XashActivity.nativeTouch(pointerFingerId, 2, x, y); XashActivity.nativeTouch(pointerFingerId, 2, x, y);
} }
break; break;
case MotionEvent.ACTION_UP: case MotionEvent.ACTION_UP:
case MotionEvent.ACTION_DOWN: case MotionEvent.ACTION_DOWN:
// Primary pointer up/down, the index is always zero if( !XashActivity.fMouseShown && (XashActivity.handler.getSource(event) & InputDevice.SOURCE_MOUSE) != 0 )
{
lx = event.getX();
ly = event.getY();
boolean down = action == MotionEvent.ACTION_DOWN || action == MotionEvent.ACTION_POINTER_DOWN;
int buttonState = XashActivity.handler.getButtonState( event );
if( down && (buttonState & MotionEvent.BUTTON_SECONDARY) != 0 )
{
XashActivity.nativeKey( 1,-243 );
secondarypressed = true;
return true;
}
else if( !down && secondarypressed && (buttonState & MotionEvent.BUTTON_SECONDARY) == 0 )
{
secondarypressed = false;
XashActivity.nativeKey( 0,-243 );
return true;
}
XashActivity.nativeKey( down?1:0,-241 );
return true;
}
i = 0; i = 0;
case MotionEvent.ACTION_POINTER_UP: case MotionEvent.ACTION_POINTER_UP:
case MotionEvent.ACTION_POINTER_DOWN: case MotionEvent.ACTION_POINTER_DOWN:
// Non primary pointer up/down // Non primary pointer up/down
if (i == -1) { if (i == -1) {
i = event.getActionIndex(); i = event.getActionIndex();
@ -1294,3 +1404,243 @@ class ImmersiveMode_v19 extends ImmersiveMode
} }
} }
class JoystickHandler
{
public int getSource(KeyEvent event)
{
return InputDevice.SOURCE_UNKNOWN;
}
public int getSource(MotionEvent event)
{
return InputDevice.SOURCE_UNKNOWN;
}
public boolean handleAxis(MotionEvent event)
{
return false;
}
public boolean isGamepadButton(int keyCode)
{
return false;
}
public String keyCodeToString(int keyCode)
{
return String.valueOf(keyCode);
}
public void init()
{
}
public boolean hasVibrator()
{
return true;
}
public void showMouse( boolean show )
{
}
public int getButtonState( MotionEvent event)
{
return 0;
}
}
class Wrap_NVMouseExtensions{
private static Object inputManager;
private static Method mInputManager_setCursorVisibility;
public static int nMotionEvent_AXIS_RELATIVE_X = 0;
public static int nMotionEvent_AXIS_RELATIVE_Y = 0;
//**************************************************************************
static {
try { mInputManager_setCursorVisibility =
Class.forName("android.hardware.input.InputManager").getMethod("setCursorVisibility", boolean.class);
inputManager = XashActivity.mSingleton.getSystemService("input");
}
catch (Exception ex) { }
/* DO THE SAME FOR RELATIVEY */
}
//**************************************************************************
public static void checkAvailable() throws Exception {
Field fieldMotionEvent_AXIS_RELATIVE_X = MotionEvent.class.getField("AXIS_RELATIVE_X");
nMotionEvent_AXIS_RELATIVE_X = (Integer)fieldMotionEvent_AXIS_RELATIVE_X.get(null);
Field fieldMotionEvent_AXIS_RELATIVE_Y = MotionEvent.class.getField("AXIS_RELATIVE_Y");
nMotionEvent_AXIS_RELATIVE_Y = (Integer)fieldMotionEvent_AXIS_RELATIVE_Y.get(null);
};
//**************************************************************************
public static void setCursorVisibility(boolean fVisibility) {
try { mInputManager_setCursorVisibility.invoke(inputManager, fVisibility); }
catch (Exception e)
{
}
}
//**************************************************************************
public static int getAxisRelativeX() { return nMotionEvent_AXIS_RELATIVE_X; };
public static int getAxisRelativeY() { return nMotionEvent_AXIS_RELATIVE_Y; };
}
class JoystickHandler_v12 extends JoystickHandler
{
private static float prevSide, prevFwd, prevYaw, prevPtch, prevLT, prevRT, prevHX, prevHY;
public static boolean mNVMouseExtensions = false;
static {
try { Wrap_NVMouseExtensions.checkAvailable();
mNVMouseExtensions = true;
}
catch (Throwable t) { mNVMouseExtensions = false; }
}
@Override
public void init()
{
XashActivity.mSurface.setOnGenericMotionListener(new MotionListener());
Log.d(XashActivity.TAG, "mNVMouseExtensions = " + mNVMouseExtensions );
}
@Override
public int getSource(KeyEvent event)
{
return event.getSource();
}
@Override
public int getSource(MotionEvent event)
{
return event.getSource();
}
@Override
public boolean handleAxis( MotionEvent event )
{
// how event can be from null device, Android?
final InputDevice device = event.getDevice();
if( device == null )
return false;
// maybe I need to cache this...
for( InputDevice.MotionRange range: device.getMotionRanges() )
{
// normalize in -1.0..1.0 (copied from SDL2)
final float cur = ( event.getAxisValue( range.getAxis(), event.getActionIndex() ) - range.getMin() ) / range.getRange() * 2.0f - 1.0f;
final float dead = range.getFlat(); // get axis dead zone
switch( range.getAxis() )
{
// typical axes
// move
case MotionEvent.AXIS_X:
prevSide = XashActivity.performEngineAxisEvent(cur, XashActivity.JOY_AXIS_SIDE, prevSide, dead);
break;
case MotionEvent.AXIS_Y:
prevFwd = XashActivity.performEngineAxisEvent(cur, XashActivity.JOY_AXIS_FWD, prevFwd, dead);
break;
// rotate. Invert, so by default this works as it's should
case MotionEvent.AXIS_Z:
prevPtch = XashActivity.performEngineAxisEvent(-cur, XashActivity.JOY_AXIS_PITCH, prevPtch, dead);
break;
case MotionEvent.AXIS_RZ:
prevYaw = XashActivity.performEngineAxisEvent(-cur, XashActivity.JOY_AXIS_YAW, prevYaw, dead);
break;
// trigger
case MotionEvent.AXIS_RTRIGGER:
prevLT = XashActivity.performEngineAxisEvent(cur, XashActivity.JOY_AXIS_RT, prevLT, dead);
break;
case MotionEvent.AXIS_LTRIGGER:
prevRT = XashActivity.performEngineAxisEvent(cur, XashActivity.JOY_AXIS_LT, prevRT, dead);
break;
// hats
case MotionEvent.AXIS_HAT_X:
prevHX = XashActivity.performEngineHatEvent(cur, true, prevHX);
break;
case MotionEvent.AXIS_HAT_Y:
prevHY = XashActivity.performEngineHatEvent(cur, false, prevHY);
break;
}
}
return true;
}
@Override
public boolean isGamepadButton(int keyCode)
{
return KeyEvent.isGamepadButton(keyCode);
}
@Override
public String keyCodeToString(int keyCode)
{
return KeyEvent.keyCodeToString(keyCode);
}
class MotionListener implements View.OnGenericMotionListener
{
@Override
public boolean onGenericMotion(View view, MotionEvent event)
{
final int source = XashActivity.handler.getSource(event);
final int axisDevices = InputDevice.SOURCE_CLASS_JOYSTICK | InputDevice.SOURCE_GAMEPAD;
if( (source & InputDevice.SOURCE_MOUSE) != 0 && mNVMouseExtensions )
{
float x = event.getAxisValue(Wrap_NVMouseExtensions.getAxisRelativeX(), 0);
float y = event.getAxisValue(Wrap_NVMouseExtensions.getAxisRelativeY(), 0);
switch (event.getAction()) {
case MotionEvent.ACTION_SCROLL:
if (event.getAxisValue(MotionEvent.AXIS_VSCROLL) < 0.0f)
{
XashActivity.nativeKey(1,-239);
XashActivity.nativeKey(0,-239);
return true;
}
else
{
XashActivity.nativeKey(1,-240);
XashActivity.nativeKey(0,-240);
}
return true;
}
XashActivity.nativeMouseMove( x, y );
Log.v("XashInput", "MouseMove: " +x + " " + y );
return true;
}
if( (source & axisDevices) != 0 )
return XashActivity.handler.handleAxis( event );
// TODO: Add it someday
// else if( (event.getSource() & InputDevice.SOURCE_CLASS_TRACKBALL) == InputDevice.SOURCE_CLASS_TRACKBALL )
// return XashActivity.handleBall( event );
//return super.onGenericMotion( view, event );
return false;
}
}
public boolean hasVibrator()
{
return XashActivity.mVibrator.hasVibrator();
}
public void showMouse( boolean show )
{
if( mNVMouseExtensions )
Wrap_NVMouseExtensions.setCursorVisibility( show );
}
}
class JoystickHandler_v14 extends JoystickHandler_v12
{
public int getButtonState( MotionEvent event )
{
return event.getButtonState();
}
};

117
src/in/celest/xash3d/XashService.java Normal file
View file

@ -0,0 +1,117 @@
package in.celest.xash3d;
import javax.microedition.khronos.egl.EGL10;
import javax.microedition.khronos.egl.EGLConfig;
import javax.microedition.khronos.egl.EGLContext;
import javax.microedition.khronos.opengles.GL10;
import javax.microedition.khronos.egl.*;
import android.app.*;
import android.content.*;
import android.view.*;
import android.os.*;
import android.util.*;
import android.graphics.*;
import android.text.method.*;
import android.text.*;
import android.media.*;
import android.hardware.*;
import android.content.*;
import android.widget.*;
import android.content.pm.*;
import android.net.Uri;
import android.provider.*;
import android.database.*;
import android.view.inputmethod.*;
import java.lang.*;
import java.util.List;
import java.security.MessageDigest;
import in.celest.xash3d.hl.R;
import in.celest.xash3d.hl.BuildConfig;
import in.celest.xash3d.XashConfig;
import in.celest.xash3d.JoystickHandler;
import in.celest.xash3d.CertCheck;
public class XashService extends Service {
public static Notification notification;
public static int status_image = R.id.status_image;
public static int status_text = R.id.status_text;
@Override
public IBinder onBind(Intent intent) {
return null;
}
public static class exitButtonListener extends BroadcastReceiver {
@Override
public void onReceive(Context context, Intent intent) {
XashActivity.nativeUnPause();
XashActivity.nativeOnDestroy();
}
}
@Override
public int onStartCommand(Intent intent, int flags, int startId) {
int status_exit_button = R.id.status_exit_button;
int notify = R.layout.notify;
if( XashActivity.sdk >= 21 )
{
status_image = R.id.status_image_21;
status_text = R.id.status_text_21;
status_exit_button = R.id.status_exit_button_21;
notify = R.layout.notify_21;
}
Log.d("XashService", "Service Started");
Intent intent_ = new Intent(this, XashActivity.class);
intent_.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
final PendingIntent pendingIntent = PendingIntent.getActivity(
getApplicationContext(), 0, intent_, 0);
notification = new Notification(R.drawable.ic_launcher,
"Xash3D", System.currentTimeMillis());
notification.contentView = new RemoteViews(getApplicationContext()
.getPackageName(), notify);
notification.contentIntent = pendingIntent;
notification.flags = notification.flags
| Notification.FLAG_ONGOING_EVENT | Notification.FLAG_FOREGROUND_SERVICE;
notification.contentView.setTextViewText(status_text, "Xash3D Engine");
Intent exitIntent = new Intent(this, exitButtonListener.class);
PendingIntent pendingExitIntent = PendingIntent.getBroadcast(this, 0,
exitIntent, 0);
notification.contentView.setOnClickPendingIntent(status_exit_button, pendingExitIntent);
startForeground(100, notification);
return START_NOT_STICKY;
}
@Override
public void onDestroy() {
super.onDestroy();
Log.d("XashService", "Service Destroyed");
}
@Override
public void onCreate()
{
}
@Override
public void onTaskRemoved(Intent rootIntent) {
Log.e("XashService", "OnTaskRemoved");
if( XashActivity.mEngineReady )
{
XashActivity.mEngineReady = false;
XashActivity.nativeUnPause();
XashActivity.nativeOnDestroy();
}
stopSelf();
}
};

11
test/AndroidManifest.xml
View file

@ -5,8 +5,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="in.celest.xash3d.hl.test" package="in.celest.xash3d.hl.test"
android:versionCode="1" android:versionCode="1"
android:versionName="0.18.1-beta" android:versionName="0.19"
android:installLocation="auto"> android:installLocation="auto">
<!-- Create a Java class extending SDLActivity and place it in a <!-- Create a Java class extending SDLActivity and place it in a
directory under src matching the package, e.g. directory under src matching the package, e.g.
@ -77,13 +77,16 @@
android:screenOrientation="sensorLandscape" android:screenOrientation="sensorLandscape"
android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|screenLayout|fontScale|uiMode|orientation|screenSize|smallestScreenSize" android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|screenLayout|fontScale|uiMode|orientation|screenSize|smallestScreenSize"
android:windowSoftInputMode="adjustResize" android:windowSoftInputMode="adjustResize"
android:label="@string/app_name"> android:label="@string/app_name"
android:launchMode="singleTask">
<intent-filter> <intent-filter>
<action android:name="in.celest.xash3d.START" /> <action android:name="in.celest.xash3d.START" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
</intent-filter> </intent-filter>
</activity> </activity>
<receiver android:name="in.celest.xash3d.InstallReceiver"> <service android:name="in.celest.xash3d.XashService" android:stopWithTask="false"/>
<receiver android:name="in.celest.xash3d.XashService$exitButtonListener" />
<receiver android:name="in.celest.xash3d.InstallReceiver">
<intent-filter android:priority="100"> <intent-filter android:priority="100">
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
<action android:name="android.intent.action.PACKAGE_ADDED" /> <action android:name="android.intent.action.PACKAGE_ADDED" />

34
travis-deploy.sh
View file

@ -3,16 +3,36 @@ if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
echo "Travis should not deploy from pull requests" echo "Travis should not deploy from pull requests"
exit 0 exit 0
else else
SOURCE_NAME=$1
shift
mkdir xash3d-travis mkdir xash3d-travis
cp -a $* xash3d-travis/ cp -a $* xash3d-travis/
cd xash3d-travis cd xash3d-travis
git init git init
git config user.name mittorn git config user.name FWGS-deployer
git config user.email mittorn@sibmail.com git config user.email FWGS-deployer@users.noreply.github.com
git remote add travis-deploy-public https://mittorn:${GH_TOKEN}@github.com/mittorn/xash3d-travis.git git remote add travis-deploy-public https://FWGS-deployer:${GH_TOKEN}@github.com/FWGS/xash3d-deploy.git
echo \# $TRAVIS_BRANCH branch autobuilds from $SOURCE_NAME >> README.md
echo >> README.md
echo Short changelog: >> README.md
echo \`\`\` >> README.md
(cd ..;git log --pretty=format:'%h %ad %s' --date iso -n 10 HEAD `curl https://raw.githubusercontent.com/FWGS/xash3d-deploy/$SOURCE_NAME-$TRAVIS_BRANCH/commit.txt`.. )| cut -d ' ' -f 1-3,5-100 >> README.md
echo \`\`\` >> README.md
echo >> README.md
echo [code on github]\(https://github.com/FWGS/xash3d-android-project/tree/$TRAVIS_COMMIT\) >> README.md
echo >> README.md
echo [full changelog for this build]\(https://github.com/FWGS/xash3d-android-project/commits/$TRAVIS_COMMIT\) >> README.md
echo >> README.md
for arg in $*; do
echo \* [$arg]\(https://github.com/FWGS/xash3d-deploy/blob/$SOURCE_NAME-$TRAVIS_BRANCH/$arg\?raw\=true\) >> README.md
echo >> README.md
done
echo $TRAVIS_COMMIT > commit.txt
git add . git add .
git commit -m "Laterst travis android optimized deploy $TRAVIS_COMMIT" git commit -m "Laterst travis deploy $TRAVIS_COMMIT"
git checkout -b android-optimized-$TRAVIS_BRANCH git checkout -b $SOURCE_NAME-$TRAVIS_BRANCH
git push --force travis-deploy-public android-optimized-$TRAVIS_BRANCH git push -q --force travis-deploy-public $SOURCE_NAME-$TRAVIS_BRANCH > /dev/null 2>/dev/null
git checkout -b $SOURCE_NAME-latest
git push -q --force travis-deploy-public $SOURCE_NAME-latest > /dev/null 2>/dev/null
fi fi
exit 0 exit 0

43
unused/notify.xml Normal file
View file

@ -0,0 +1,43 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:padding="5dp">
<ImageView android:id="@+id/status_icon"
android:layout_width="wrap_content"
android:layout_height="fill_parent"
android:layout_alignParentLeft="true"
android:layout_marginRight="10dp"/>
<RelativeLayout android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_toRightOf="@id/status_icon">
<TextView android:id="@+id/status_text"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_alignParentTop="true" />
<ProgressBar android:id="@+id/status_progress"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_below="@id/status_text"
android:indeterminate="false"
android:indeterminateOnly="false"
style="?android:attr/progressBarStyleHorizontal" />
</RelativeLayout>
</RelativeLayout>