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

Enable resize and get arguments in XashActivity

Browse source
This commit is contained in:
mittorn 2015-06-12 14:32:47 +07:00
parent f65e60703f
commit 94f416ec20
1 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -29,6 +29,7 @@ public class XashActivity extends Activity {
// Main components // Main components
private static XashActivity mSingleton; private static XashActivity mSingleton;
private static EngineSurface mSurface; private static EngineSurface mSurface;
private static String mArgv;
// Audio // Audio
private static Thread mAudioThread; private static Thread mAudioThread;
@ -47,7 +48,8 @@ public class XashActivity extends Activity {
// So we can call stuff from static callbacks // So we can call stuff from static callbacks
mSingleton = this; mSingleton = this;
Intent intent = getIntent();
mArgv = intent.getStringExtra(in.celest.xash3d.LauncherActivity.ARGV);
// Set up the surface // Set up the surface
mSurface = new EngineSurface(getApplication()); mSurface = new EngineSurface(getApplication());
setContentView(mSurface); setContentView(mSurface);
@ -85,11 +87,16 @@ public class XashActivity extends Activity {
msg.obj = data; msg.obj = data;
commandHandler.sendMessage(msg); commandHandler.sendMessage(msg);
} }
public static String[] getArguments()
{
return mArgv.split(" ");
}
// C functions we call // C functions we call
public static native int nativeInit(Object arguments); public static native int nativeInit(Object arguments);
public static native void nativeQuit(); public static native void nativeQuit();
public static native void onNativeResize(int x, int y, int format); public static native void onNativeResize(int x, int y);
public static native void onNativeKeyDown(int keycode); public static native void onNativeKeyDown(int keycode);
public static native void onNativeKeyUp(int keycode); public static native void onNativeKeyUp(int keycode);
public static native void onNativeTouch(int touchDevId, int pointerFingerId, public static native void onNativeTouch(int touchDevId, int pointerFingerId,
@ -223,7 +230,7 @@ class XashMain implements Runnable {
public void run() { public void run() {
// Runs SDL_main() // Runs SDL_main()
XashActivity.createGLContext(); XashActivity.createGLContext();
XashActivity.nativeInit("-dev 5 -console -log".split(" ")); XashActivity.nativeInit(XashActivity.getArguments());
//Log.v("SDL", "SDL thread terminated"); //Log.v("SDL", "SDL thread terminated");
} }
@ -334,9 +341,8 @@ View.OnKeyListener, View.OnTouchListener {
default: default:
Log.v("SDL", "pixel format unknown " + format); Log.v("SDL", "pixel format unknown " + format);
break; break;
} }*/
XashActivity.onNativeResize(width, height, sdlFormat); XashActivity.onNativeResize(width, height);
*/
// Now start up the C app thread // Now start up the C app thread
if (mEngThread == null) { if (mEngThread == null) {
mEngThread = new Thread(new XashMain(), "EngineThread"); mEngThread = new Thread(new XashMain(), "EngineThread");
@ -360,7 +366,10 @@ View.OnKeyListener, View.OnTouchListener {
egl.eglInitialize(dpy, version); egl.eglInitialize(dpy, version);
int[] configSpec = { int[] configSpec = {
//EGL10.EGL_DEPTH_SIZE, 16, EGL10.EGL_DEPTH_SIZE, 8,
EGL10.EGL_RED_SIZE, 8,
EGL10.EGL_GREEN_SIZE, 8,
EGL10.EGL_BLUE_SIZE, 8,
EGL10.EGL_RENDERABLE_TYPE, 1, EGL10.EGL_RENDERABLE_TYPE, 1,
EGL10.EGL_NONE EGL10.EGL_NONE
}; };