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

Refactor code

Browse source
This commit is contained in:
mittorn 2016-05-09 14:03:50 +00:00
parent 848b1f8ae6
commit 57f3f03236
2 changed files with 326 additions and 501 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
jni/src/Xash3D/xash3d

@ -1 +1 @@
Subproject commit 342527f6eb5df3a783a431eee3e650c7ffa44fcf
Subproject commit d2bd0aaa30d53ae460b9cb74a6066ec40b55e0b6

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

@ -34,6 +34,7 @@ public class XashActivity extends Activity {
private static EngineSurface mSurface;
public static String mArgv[];
public static final int sdk = Integer.valueOf(Build.VERSION.SDK);
public static final String TAG = "XASH3D:XashActivity";
public static int mPixelFormat;
protected static ViewGroup mLayout;
@ -50,7 +51,7 @@ public class XashActivity extends Activity {
// Setup
protected void onCreate(Bundle savedInstanceState) {
//Log.v("SDL", "onCreate()");
Log.v(TAG, "onCreate()");
super.onCreate(savedInstanceState);
// So we can call stuff from static callbacks
@ -59,37 +60,40 @@ public class XashActivity extends Activity {
// fullscreen
requestWindowFeature(Window.FEATURE_NO_TITLE);
if(sdk >= 12) {
getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
WindowManager.LayoutParams.FLAG_FULLSCREEN);
}
if(sdk >= 12)
getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN);
// landscapeSensor is not supported until API9
if( sdk < 9 )
setRequestedOrientation(0);
// keep screen on
getWindow().setFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON,
WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
getWindow().setFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON, WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
// Set up the surface
mSurface = new EngineSurface(getApplication());
mLayout = new FrameLayout(this);
mLayout.addView(mSurface);
setContentView(mLayout);
SurfaceHolder holder = mSurface.getHolder();
holder.setType(SurfaceHolder.SURFACE_TYPE_GPU);
// setup envs
mPref = this.getSharedPreferences("engine", 0);
String argv = intent.getStringExtra("argv");
if(argv == null) argv = mPref.getString("argv", "-dev 3 -log");
if(argv == null) argv = "-dev 3 -log";
mArgv= argv.split(" ");
String gamelibdir = intent.getStringExtra("gamelibdir");
if(gamelibdir == null)
gamelibdir = getFilesDir().getParentFile().getPath() + "/lib";
String gamedir = intent.getStringExtra("gamedir");
if(gamedir == null)
gamedir = "valve";
String basedir = intent.getStringExtra("basedir");
if(basedir == null)
basedir = mPref.getString("basedir","/sdcard/xash/");
@ -99,7 +103,7 @@ public class XashActivity extends Activity {
setenv("XASH3D_GAMELIBDIR", gamelibdir, true);
setenv("XASH3D_GAMEDIR", gamedir, true);
InstallReceiver.extractPAK(this, false);
setenv("XASH3D_EXTRAS_PAK1", getFilesDir().getPath() + "/extras.pak", true);
String pakfile = intent.getStringExtra("pakfile");
if( pakfile != null && pakfile != "" )
@ -117,52 +121,29 @@ public class XashActivity extends Activity {
{
e.printStackTrace();
}
InstallReceiver.extractPAK(this, false);
mPixelFormat = mPref.getInt("pixelformat", 0);
}
// Events
protected void onPause() {
//Log.v("SDL", "onPause()");
Log.v(TAG, "onPause()");
super.onPause();
}
protected void onResume() {
//Log.v("SDL", "onResume()");
Log.v(TAG, "onResume()");
super.onResume();
}
// Messages from the SDLMain thread
static int COMMAND_CHANGE_TITLE = 1;
// Handler for the messages
Handler commandHandler = new Handler() {
public void handleMessage(Message msg) {
if (msg.arg1 == COMMAND_CHANGE_TITLE) {
setTitle((String)msg.obj);
}
}
};
// Send a message from the SDLMain thread
void sendCommand(int command, Object data) {
Message msg = commandHandler.obtainMessage();
msg.arg1 = command;
msg.obj = data;
commandHandler.sendMessage(msg);
}
// C functions we call
public static native int nativeInit(Object arguments);
public static native void nativeQuit();
public static native void onNativeResize(int x, int y);
public static native void onNativeKeyDown(int keycode);
public static native void onNativeKeyUp(int keycode);
public static native void nativeTouch(int pointerFingerId,
int action, float x,
float y);
public static native void nativeTouch(int pointerFingerId, int action, float x, float y);
public static native void nativeKey( int down, int code );
public static native void nativeString( String text );
public static native void onNativeAccel(float x, float y, float z);
public static native void nativeRunAudioThread();
public static native void nativeSetPause(int pause);
public static native int setenv(String key, String value, boolean overwrite);
@ -186,132 +167,34 @@ public class XashActivity extends Activity {
mSurface.toggleEGL(toggle);
}
public static void setActivityTitle(String title) {
// Called from SDLMain() thread and can't directly affect the view
mSingleton.sendCommand(COMMAND_CHANGE_TITLE, title);
}
public static Context getContext() {
return mSingleton;
}
// Audio
private static Object buf;
public static Object audioInit(int sampleRate, boolean is16Bit, boolean isStereo, int desiredFrames) {
int channelConfig = isStereo ? AudioFormat.CHANNEL_CONFIGURATION_STEREO : AudioFormat.CHANNEL_CONFIGURATION_MONO;
int audioFormat = is16Bit ? AudioFormat.ENCODING_PCM_16BIT : AudioFormat.ENCODING_PCM_8BIT;
int frameSize = (isStereo ? 2 : 1) * (is16Bit ? 2 : 1);
Log.v("SDL", "SDL audio: wanted " + (isStereo ? "stereo" : "mono") + " " + (is16Bit ? "16-bit" : "8-bit") + " " + ((float)sampleRate / 1000f) + "kHz, " + desiredFrames + " frames buffer");
// Let the user pick a larger buffer if they really want -- but ye
// gods they probably shouldn't, the minimums are horrifyingly high
// latency already
desiredFrames = Math.max(desiredFrames, (AudioTrack.getMinBufferSize(sampleRate, channelConfig, audioFormat) + frameSize - 1) / frameSize);
mAudioTrack = new AudioTrack(AudioManager.STREAM_MUSIC, sampleRate,
channelConfig, audioFormat, desiredFrames * frameSize, AudioTrack.MODE_STREAM);
audioStartThread();
Log.v("SDL", "SDL audio: got " + ((mAudioTrack.getChannelCount() >= 2) ? "stereo" : "mono") + " " + ((mAudioTrack.getAudioFormat() == AudioFormat.ENCODING_PCM_16BIT) ? "16-bit" : "8-bit") + " " + ((float)mAudioTrack.getSampleRate() / 1000f) + "kHz, " + desiredFrames + " frames buffer");
if (is16Bit) {
buf = new short[desiredFrames * (isStereo ? 2 : 1)];
} else {
buf = new byte[desiredFrames * (isStereo ? 2 : 1)];
}
return buf;
}
public static void audioStartThread() {
mAudioThread = new Thread(new Runnable() {
public void run() {
mAudioTrack.play();
nativeRunAudioThread();
}
});
// I'd take REALTIME if I could get it!
mAudioThread.setPriority(Thread.MAX_PRIORITY);
mAudioThread.start();
}
public static void audioWriteShortBuffer(short[] buffer) {
for (int i = 0; i < buffer.length; ) {
int result = mAudioTrack.write(buffer, i, buffer.length - i);
if (result > 0) {
i += result;
} else if (result == 0) {
try {
Thread.sleep(1);
} catch(InterruptedException e) {
// Nom nom
}
} else {
Log.w("SDL", "SDL audio: error return from write(short)");
return;
}
}
}
public static void audioWriteByteBuffer(byte[] buffer) {
for (int i = 0; i < buffer.length; ) {
int result = mAudioTrack.write(buffer, i, buffer.length - i);
if (result > 0) {
i += result;
} else if (result == 0) {
try {
Thread.sleep(1);
} catch(InterruptedException e) {
// Nom nom
}
} else {
Log.w("SDL", "SDL audio: error return from write(short)");
return;
}
}
}
public static void audioQuit() {
if (mAudioThread != null) {
try {
mAudioThread.join();
} catch(Exception e) {
Log.v("SDL", "Problem stopping audio thread: " + e);
}
mAudioThread = null;
//Log.v("SDL", "Finished waiting for audio thread");
}
if (mAudioTrack != null) {
mAudioTrack.stop();
mAudioTrack = null;
}
}
public static boolean handleKey( int keyCode, KeyEvent event )
{
/*
* This handles the keycodes from soft keyboard (and IME-translated
* input from hardkeyboard)
*/
Log.d("XASH3D", "Keycode " + keyCode );
if (event.getAction() == KeyEvent.ACTION_DOWN) {
if (event.isPrintingKey() || keyCode == 62) {
//Log.d( TAG, "Keycode " + keyCode );
if (event.getAction() == KeyEvent.ACTION_DOWN)
{
if (event.isPrintingKey() || keyCode == 62)// space is printing too
XashActivity.nativeString(String.valueOf((char) event.getUnicodeChar()));
}
XashActivity.nativeKey(1,keyCode);
return true;
} else if (event.getAction() == KeyEvent.ACTION_UP) {
}
else if (event.getAction() == KeyEvent.ACTION_UP)
{
XashActivity.nativeKey(0,keyCode);
return true;
}
return false;
}
static class ShowTextInputTask implements Runnable {
static class ShowTextInputTask implements Runnable
{
/*
* This is used to regulate the pan&scan method to have some offset from
* the bottom edge of the input region and the top edge of an input
@ -335,7 +218,6 @@ public class XashActivity extends Activity {
}
if( show == 1 )
{
mTextEdit.setVisibility(View.VISIBLE);
mTextEdit.requestFocus();
@ -352,7 +234,8 @@ public class XashActivity extends Activity {
/**
* This method is called by SDL using JNI.
*/
public static void showKeyboard( int show ) {
public static void showKeyboard( int show )
{
// Transfer the task to the main thread as a Runnable
mSingleton.runOnUiThread(new ShowTextInputTask(show));
}
@ -363,14 +246,10 @@ public class XashActivity extends Activity {
Simple nativeInit() runnable
*/
class XashMain implements Runnable {
public void run() {
// Runs SDL_main()
public void run()
{
XashActivity.createGLContext();
XashActivity.nativeInit(XashActivity.mArgv);
//Log.v("SDL", "SDL thread terminated");
}
}
@ -393,11 +272,13 @@ View.OnKeyListener {
private EGLDisplay mEGLDisplay;
private EGL10 mEGL;
private EGLConfig mEGLConfig;
public static final String TAG = "XASH3D-EngineSurface";
// Sensors
// Startup
public EngineSurface(Context context) {
public EngineSurface(Context context)
{
super(context);
getHolder().addCallback(this);
@ -412,70 +293,27 @@ View.OnKeyListener {
}
// Called when we have a valid drawing surface
public void surfaceCreated(SurfaceHolder holder) {
//Log.v("SDL", "surfaceCreated()");
public void surfaceCreated(SurfaceHolder holder)
{
Log.v(TAG, "surfaceCreated()");
if( mEGL == null )
return;
XashActivity.nativeSetPause(0);
}
// Called when we lose the surface
public void surfaceDestroyed(SurfaceHolder holder) {
public void surfaceDestroyed(SurfaceHolder holder)
{
Log.v(TAG, "surfaceDestroyed()");
if( mEGL == null )
return;
XashActivity.nativeSetPause(1);
}
// Called when the surface is resized
public void surfaceChanged(SurfaceHolder holder,
int format, int width, int height) {
//Log.v("SDL", "surfaceChanged()");
/*
int sdlFormat = 0x85151002; // SDL_PIXELFORMAT_RGB565 by default
switch (format) {
case PixelFormat.A_8:
Log.v("SDL", "pixel format A_8");
break;
case PixelFormat.LA_88:
Log.v("SDL", "pixel format LA_88");
break;
case PixelFormat.L_8:
Log.v("SDL", "pixel format L_8");
break;
case PixelFormat.RGBA_4444:
Log.v("SDL", "pixel format RGBA_4444");
sdlFormat = 0x85421002; // SDL_PIXELFORMAT_RGBA4444
break;
case PixelFormat.RGBA_5551:
Log.v("SDL", "pixel format RGBA_5551");
sdlFormat = 0x85441002; // SDL_PIXELFORMAT_RGBA5551
break;
case PixelFormat.RGBA_8888:
Log.v("SDL", "pixel format RGBA_8888");
sdlFormat = 0x86462004; // SDL_PIXELFORMAT_RGBA8888
break;
case PixelFormat.RGBX_8888:
Log.v("SDL", "pixel format RGBX_8888");
sdlFormat = 0x86262004; // SDL_PIXELFORMAT_RGBX8888
break;
case PixelFormat.RGB_332:
Log.v("SDL", "pixel format RGB_332");
sdlFormat = 0x84110801; // SDL_PIXELFORMAT_RGB332
break;
case PixelFormat.RGB_565:
Log.v("SDL", "pixel format RGB_565");
sdlFormat = 0x85151002; // SDL_PIXELFORMAT_RGB565
break;
case PixelFormat.RGB_888:
Log.v("SDL", "pixel format RGB_888");
// Not sure this is right, maybe SDL_PIXELFORMAT_RGB24 instead?
sdlFormat = 0x86161804; // SDL_PIXELFORMAT_RGB888
break;
default:
Log.v("SDL", "pixel format unknown " + format);
break;
}*/
public void surfaceChanged(SurfaceHolder holder, int format, int width, int height)
{
Log.v(TAG, "surfaceChanged()");
XashActivity.onNativeResize(width, height);
// Now start up the C app thread
@ -493,7 +331,8 @@ View.OnKeyListener {
// EGL functions
public boolean InitGL() {
try {
try
{
EGL10 egl = (EGL10)EGLContext.getEGL();
EGLDisplay dpy = egl.eglGetDisplay(EGL10.EGL_DEFAULT_DISPLAY);
@ -551,7 +390,7 @@ View.OnKeyListener {
int[] num_config = new int[1];
if (!egl.eglChooseConfig(dpy, configSpec[XashActivity.mPixelFormat], configs, 1, num_config) || num_config[0] == 0)
{
Log.e("SDL", "No EGL config available");
Log.e(TAG, "No EGL config available");
return false;
}
EGLConfig config = configs[0];
@ -564,18 +403,18 @@ View.OnKeyListener {
};
EGLContext ctx = egl.eglCreateContext(dpy, config, EGL10.EGL_NO_CONTEXT, contextAttrs);
if (ctx == EGL10.EGL_NO_CONTEXT) {
Log.e("SDL", "Couldn't create context");
Log.e(TAG, "Couldn't create context");
return false;
}
EGLSurface surface = egl.eglCreateWindowSurface(dpy, config, this, null);
if (surface == EGL10.EGL_NO_SURFACE) {
Log.e("SDL", "Couldn't create surface");
Log.e(TAG, "Couldn't create surface");
return false;
}
if (!egl.eglMakeCurrent(dpy, surface, surface, ctx)) {
Log.e("SDL", "Couldn't make context current");
Log.e(TAG, "Couldn't make context current");
return false;
}
@ -586,9 +425,9 @@ View.OnKeyListener {
mEGLConfig = config;
} catch(Exception e) {
Log.v("SDL", e + "");
Log.v(TAG, e + "");
for (StackTraceElement s : e.getStackTrace()) {
Log.v("SDL", s.toString());
Log.v(TAG, s.toString());
}
}
@ -596,25 +435,11 @@ View.OnKeyListener {
}
// EGL buffer flip
public void SwapBuffers() {
public void SwapBuffers()
{
if( mEGLSurface == null )
return;
try {
//EGL10 egl = (EGL10)EGLContext.getEGL();
//egl.eglWaitNative(EGL10.EGL_CORE_NATIVE_ENGINE, null);
//egl.eglWaitGL();
mEGL.eglSwapBuffers(mEGLDisplay, mEGLSurface);
} catch(Exception e) {
Log.v("SDL", "flipEGL(): " + e);
for (StackTraceElement s : e.getStackTrace()) {
Log.v("SDL", s.toString());
}
}
}
public void toggleEGL(int toggle)
{
@ -717,8 +542,6 @@ class XashInputConnection extends BaseInputConnection {
// backspace
XashActivity.nativeKey(1,KeyEvent.KEYCODE_DEL);
XashActivity.nativeKey(0,KeyEvent.KEYCODE_DEL);
//return super.sendKeyEvent(new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_DEL))
//&& super.sendKeyEvent(new KeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_DEL));
}
return super.deleteSurroundingText(beforeLength, afterLength);
@ -726,7 +549,8 @@ class XashInputConnection extends BaseInputConnection {
}
class EngineTouchListener_v1 implements View.OnTouchListener{
// Touch events
public boolean onTouch(View v, MotionEvent event) {
public boolean onTouch(View v, MotionEvent event)
{
XashActivity.nativeTouch(0, event.getAction(), event.getX(), event.getY());
return true;
}
@ -734,7 +558,8 @@ class EngineTouchListener_v1 implements View.OnTouchListener{
class EngineTouchListener_v5 implements View.OnTouchListener{
// Touch events
public boolean onTouch(View v, MotionEvent event) {
public boolean onTouch(View v, MotionEvent event)
{
final int touchDevId = event.getDeviceId();
final int pointerCount = event.getPointerCount();
int action = event.getActionMasked();