Refactor code
This commit is contained in:
parent
848b1f8ae6
commit
57f3f03236
2 changed files with 326 additions and 501 deletions
|
@ -1 +1 @@
|
||||||
Subproject commit 342527f6eb5df3a783a431eee3e650c7ffa44fcf
|
Subproject commit d2bd0aaa30d53ae460b9cb74a6066ec40b55e0b6
|
|
@ -28,68 +28,72 @@ import java.lang.*;
|
||||||
*/
|
*/
|
||||||
public class XashActivity extends Activity {
|
public class XashActivity extends Activity {
|
||||||
|
|
||||||
// Main components
|
// Main components
|
||||||
protected static XashActivity mSingleton;
|
protected static XashActivity mSingleton;
|
||||||
protected static View mTextEdit;
|
protected static View mTextEdit;
|
||||||
private static EngineSurface mSurface;
|
private static EngineSurface mSurface;
|
||||||
public static String mArgv[];
|
public static String mArgv[];
|
||||||
public static final int sdk = Integer.valueOf(Build.VERSION.SDK);
|
public static final int sdk = Integer.valueOf(Build.VERSION.SDK);
|
||||||
public static int mPixelFormat;
|
public static final String TAG = "XASH3D:XashActivity";
|
||||||
protected static ViewGroup mLayout;
|
public static int mPixelFormat;
|
||||||
|
protected static ViewGroup mLayout;
|
||||||
|
|
||||||
// Preferences
|
// Preferences
|
||||||
public static SharedPreferences mPref = null;
|
public static SharedPreferences mPref = null;
|
||||||
|
|
||||||
// Audio
|
// Audio
|
||||||
private static Thread mAudioThread;
|
private static Thread mAudioThread;
|
||||||
private static AudioTrack mAudioTrack;
|
private static AudioTrack mAudioTrack;
|
||||||
// Load the .so
|
// Load the .so
|
||||||
static {
|
static {
|
||||||
System.loadLibrary("xash");
|
System.loadLibrary("xash");
|
||||||
}
|
}
|
||||||
|
|
||||||
// Setup
|
// Setup
|
||||||
protected void onCreate(Bundle savedInstanceState) {
|
protected void onCreate(Bundle savedInstanceState) {
|
||||||
//Log.v("SDL", "onCreate()");
|
Log.v(TAG, "onCreate()");
|
||||||
super.onCreate(savedInstanceState);
|
super.onCreate(savedInstanceState);
|
||||||
|
|
||||||
// So we can call stuff from static callbacks
|
// So we can call stuff from static callbacks
|
||||||
mSingleton = this;
|
mSingleton = this;
|
||||||
Intent intent = getIntent();
|
Intent intent = getIntent();
|
||||||
|
|
||||||
// fullscreen
|
// fullscreen
|
||||||
requestWindowFeature(Window.FEATURE_NO_TITLE);
|
requestWindowFeature(Window.FEATURE_NO_TITLE);
|
||||||
if(sdk >= 12) {
|
if(sdk >= 12)
|
||||||
getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
|
getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN);
|
||||||
WindowManager.LayoutParams.FLAG_FULLSCREEN);
|
|
||||||
}
|
|
||||||
|
|
||||||
// landscapeSensor is not supported until API9
|
// landscapeSensor is not supported until API9
|
||||||
if( sdk < 9 )
|
if( sdk < 9 )
|
||||||
setRequestedOrientation(0);
|
setRequestedOrientation(0);
|
||||||
|
|
||||||
// keep screen on
|
// keep screen on
|
||||||
getWindow().setFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON,
|
getWindow().setFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON, WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
|
||||||
WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
|
|
||||||
|
|
||||||
// Set up the surface
|
// Set up the surface
|
||||||
mSurface = new EngineSurface(getApplication());
|
mSurface = new EngineSurface(getApplication());
|
||||||
mLayout = new FrameLayout(this);
|
mLayout = new FrameLayout(this);
|
||||||
mLayout.addView(mSurface);
|
mLayout.addView(mSurface);
|
||||||
setContentView(mLayout);
|
setContentView(mLayout);
|
||||||
SurfaceHolder holder = mSurface.getHolder();
|
|
||||||
holder.setType(SurfaceHolder.SURFACE_TYPE_GPU);
|
SurfaceHolder holder = mSurface.getHolder();
|
||||||
|
holder.setType(SurfaceHolder.SURFACE_TYPE_GPU);
|
||||||
|
|
||||||
|
// setup envs
|
||||||
mPref = this.getSharedPreferences("engine", 0);
|
mPref = this.getSharedPreferences("engine", 0);
|
||||||
String argv = intent.getStringExtra("argv");
|
String argv = intent.getStringExtra("argv");
|
||||||
if(argv == null) argv = mPref.getString("argv", "-dev 3 -log");
|
if(argv == null) argv = mPref.getString("argv", "-dev 3 -log");
|
||||||
if(argv == null) argv = "-dev 3 -log";
|
if(argv == null) argv = "-dev 3 -log";
|
||||||
mArgv= argv.split(" ");
|
mArgv= argv.split(" ");
|
||||||
|
|
||||||
String gamelibdir = intent.getStringExtra("gamelibdir");
|
String gamelibdir = intent.getStringExtra("gamelibdir");
|
||||||
if(gamelibdir == null)
|
if(gamelibdir == null)
|
||||||
gamelibdir = getFilesDir().getParentFile().getPath() + "/lib";
|
gamelibdir = getFilesDir().getParentFile().getPath() + "/lib";
|
||||||
|
|
||||||
String gamedir = intent.getStringExtra("gamedir");
|
String gamedir = intent.getStringExtra("gamedir");
|
||||||
if(gamedir == null)
|
if(gamedir == null)
|
||||||
gamedir = "valve";
|
gamedir = "valve";
|
||||||
|
|
||||||
String basedir = intent.getStringExtra("basedir");
|
String basedir = intent.getStringExtra("basedir");
|
||||||
if(basedir == null)
|
if(basedir == null)
|
||||||
basedir = mPref.getString("basedir","/sdcard/xash/");
|
basedir = mPref.getString("basedir","/sdcard/xash/");
|
||||||
|
@ -99,7 +103,7 @@ public class XashActivity extends Activity {
|
||||||
setenv("XASH3D_GAMELIBDIR", gamelibdir, true);
|
setenv("XASH3D_GAMELIBDIR", gamelibdir, true);
|
||||||
setenv("XASH3D_GAMEDIR", gamedir, true);
|
setenv("XASH3D_GAMEDIR", gamedir, true);
|
||||||
|
|
||||||
InstallReceiver.extractPAK(this, false);
|
|
||||||
setenv("XASH3D_EXTRAS_PAK1", getFilesDir().getPath() + "/extras.pak", true);
|
setenv("XASH3D_EXTRAS_PAK1", getFilesDir().getPath() + "/extras.pak", true);
|
||||||
String pakfile = intent.getStringExtra("pakfile");
|
String pakfile = intent.getStringExtra("pakfile");
|
||||||
if( pakfile != null && pakfile != "" )
|
if( pakfile != null && pakfile != "" )
|
||||||
|
@ -117,201 +121,80 @@ public class XashActivity extends Activity {
|
||||||
{
|
{
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
InstallReceiver.extractPAK(this, false);
|
||||||
|
|
||||||
mPixelFormat = mPref.getInt("pixelformat", 0);
|
mPixelFormat = mPref.getInt("pixelformat", 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Events
|
// Events
|
||||||
protected void onPause() {
|
protected void onPause() {
|
||||||
//Log.v("SDL", "onPause()");
|
Log.v(TAG, "onPause()");
|
||||||
super.onPause();
|
super.onPause();
|
||||||
}
|
}
|
||||||
|
|
||||||
protected void onResume() {
|
protected void onResume() {
|
||||||
//Log.v("SDL", "onResume()");
|
Log.v(TAG, "onResume()");
|
||||||
super.onResume();
|
super.onResume();
|
||||||
}
|
}
|
||||||
|
|
||||||
// Messages from the SDLMain thread
|
public static native int nativeInit(Object arguments);
|
||||||
static int COMMAND_CHANGE_TITLE = 1;
|
public static native void nativeQuit();
|
||||||
|
public static native void onNativeResize(int x, int 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 nativeSetPause(int pause);
|
||||||
|
|
||||||
// Handler for the messages
|
public static native int setenv(String key, String value, boolean overwrite);
|
||||||
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 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);
|
|
||||||
|
|
||||||
|
|
||||||
// Java functions called from C
|
// Java functions called from C
|
||||||
|
|
||||||
public static boolean createGLContext() {
|
public static boolean createGLContext() {
|
||||||
return mSurface.InitGL();
|
return mSurface.InitGL();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void swapBuffers() {
|
public static void swapBuffers() {
|
||||||
mSurface.SwapBuffers();
|
mSurface.SwapBuffers();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void vibrate( int time ) {
|
public static void vibrate( int time ) {
|
||||||
((Vibrator) mSingleton.getSystemService(Context.VIBRATOR_SERVICE)).vibrate( time );
|
((Vibrator) mSingleton.getSystemService(Context.VIBRATOR_SERVICE)).vibrate( time );
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void toggleEGL(int toggle) {
|
public static void toggleEGL(int toggle) {
|
||||||
mSurface.toggleEGL(toggle);
|
mSurface.toggleEGL(toggle);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void setActivityTitle(String title) {
|
public static Context getContext() {
|
||||||
// Called from SDLMain() thread and can't directly affect the view
|
return mSingleton;
|
||||||
mSingleton.sendCommand(COMMAND_CHANGE_TITLE, title);
|
}
|
||||||
}
|
|
||||||
|
|
||||||
public static Context getContext() {
|
public static boolean handleKey( int keyCode, KeyEvent event )
|
||||||
return mSingleton;
|
{
|
||||||
}
|
|
||||||
|
|
||||||
// Audio
|
//Log.d( TAG, "Keycode " + keyCode );
|
||||||
private static Object buf;
|
if (event.getAction() == KeyEvent.ACTION_DOWN)
|
||||||
|
{
|
||||||
public static Object audioInit(int sampleRate, boolean is16Bit, boolean isStereo, int desiredFrames) {
|
if (event.isPrintingKey() || keyCode == 62)// space is printing too
|
||||||
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) {
|
|
||||||
XashActivity.nativeString(String.valueOf((char) event.getUnicodeChar()));
|
XashActivity.nativeString(String.valueOf((char) event.getUnicodeChar()));
|
||||||
}
|
|
||||||
XashActivity.nativeKey(1,keyCode);
|
XashActivity.nativeKey(1,keyCode);
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
} else if (event.getAction() == KeyEvent.ACTION_UP) {
|
}
|
||||||
|
else if (event.getAction() == KeyEvent.ACTION_UP)
|
||||||
|
{
|
||||||
|
|
||||||
XashActivity.nativeKey(0,keyCode);
|
XashActivity.nativeKey(0,keyCode);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
return false;
|
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
|
* 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
|
* the bottom edge of the input region and the top edge of an input
|
||||||
|
@ -335,11 +218,10 @@ public class XashActivity extends Activity {
|
||||||
}
|
}
|
||||||
if( show == 1 )
|
if( show == 1 )
|
||||||
{
|
{
|
||||||
|
mTextEdit.setVisibility(View.VISIBLE);
|
||||||
|
mTextEdit.requestFocus();
|
||||||
|
|
||||||
mTextEdit.setVisibility(View.VISIBLE);
|
imm.showSoftInput(mTextEdit, 0);
|
||||||
mTextEdit.requestFocus();
|
|
||||||
|
|
||||||
imm.showSoftInput(mTextEdit, 0);
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -352,7 +234,8 @@ public class XashActivity extends Activity {
|
||||||
/**
|
/**
|
||||||
* This method is called by SDL using JNI.
|
* 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
|
// Transfer the task to the main thread as a Runnable
|
||||||
mSingleton.runOnUiThread(new ShowTextInputTask(show));
|
mSingleton.runOnUiThread(new ShowTextInputTask(show));
|
||||||
}
|
}
|
||||||
|
@ -363,15 +246,11 @@ public class XashActivity extends Activity {
|
||||||
Simple nativeInit() runnable
|
Simple nativeInit() runnable
|
||||||
*/
|
*/
|
||||||
class XashMain implements Runnable {
|
class XashMain implements Runnable {
|
||||||
public void run() {
|
public void run()
|
||||||
// Runs SDL_main()
|
{
|
||||||
|
XashActivity.createGLContext();
|
||||||
XashActivity.createGLContext();
|
XashActivity.nativeInit(XashActivity.mArgv);
|
||||||
|
}
|
||||||
XashActivity.nativeInit(XashActivity.mArgv);
|
|
||||||
|
|
||||||
//Log.v("SDL", "SDL thread terminated");
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -384,252 +263,198 @@ class XashMain implements Runnable {
|
||||||
class EngineSurface extends SurfaceView implements SurfaceHolder.Callback,
|
class EngineSurface extends SurfaceView implements SurfaceHolder.Callback,
|
||||||
View.OnKeyListener {
|
View.OnKeyListener {
|
||||||
|
|
||||||
// This is what SDL runs in. It invokes SDL_main(), eventually
|
// This is what SDL runs in. It invokes SDL_main(), eventually
|
||||||
private Thread mEngThread;
|
private Thread mEngThread;
|
||||||
|
|
||||||
// EGL private objects
|
// EGL private objects
|
||||||
private EGLContext mEGLContext;
|
private EGLContext mEGLContext;
|
||||||
private EGLSurface mEGLSurface;
|
private EGLSurface mEGLSurface;
|
||||||
private EGLDisplay mEGLDisplay;
|
private EGLDisplay mEGLDisplay;
|
||||||
private EGL10 mEGL;
|
private EGL10 mEGL;
|
||||||
private EGLConfig mEGLConfig;
|
private EGLConfig mEGLConfig;
|
||||||
|
public static final String TAG = "XASH3D-EngineSurface";
|
||||||
|
|
||||||
// Sensors
|
// Sensors
|
||||||
|
|
||||||
// Startup
|
// Startup
|
||||||
public EngineSurface(Context context) {
|
public EngineSurface(Context context)
|
||||||
super(context);
|
{
|
||||||
getHolder().addCallback(this);
|
super(context);
|
||||||
|
getHolder().addCallback(this);
|
||||||
|
|
||||||
setFocusable(true);
|
setFocusable(true);
|
||||||
setFocusableInTouchMode(true);
|
setFocusableInTouchMode(true);
|
||||||
requestFocus();
|
requestFocus();
|
||||||
setOnKeyListener(this);
|
setOnKeyListener(this);
|
||||||
if( XashActivity.sdk >= 5 )
|
if( XashActivity.sdk >= 5 )
|
||||||
setOnTouchListener(new EngineTouchListener_v5());
|
setOnTouchListener(new EngineTouchListener_v5());
|
||||||
else
|
else
|
||||||
setOnTouchListener(new EngineTouchListener_v1());
|
setOnTouchListener(new EngineTouchListener_v1());
|
||||||
}
|
}
|
||||||
|
|
||||||
// Called when we have a valid drawing surface
|
// Called when we have a valid drawing surface
|
||||||
public void surfaceCreated(SurfaceHolder holder) {
|
public void surfaceCreated(SurfaceHolder holder)
|
||||||
//Log.v("SDL", "surfaceCreated()");
|
{
|
||||||
if( mEGL == null )
|
Log.v(TAG, "surfaceCreated()");
|
||||||
return;
|
if( mEGL == null )
|
||||||
XashActivity.nativeSetPause(0);
|
return;
|
||||||
}
|
XashActivity.nativeSetPause(0);
|
||||||
|
}
|
||||||
|
|
||||||
// Called when we lose the surface
|
// Called when we lose the surface
|
||||||
public void surfaceDestroyed(SurfaceHolder holder) {
|
public void surfaceDestroyed(SurfaceHolder holder)
|
||||||
if( mEGL == null )
|
{
|
||||||
return;
|
Log.v(TAG, "surfaceDestroyed()");
|
||||||
XashActivity.nativeSetPause(1);
|
if( mEGL == null )
|
||||||
}
|
return;
|
||||||
|
XashActivity.nativeSetPause(1);
|
||||||
|
}
|
||||||
|
|
||||||
// Called when the surface is resized
|
// Called when the surface is resized
|
||||||
public void surfaceChanged(SurfaceHolder holder,
|
public void surfaceChanged(SurfaceHolder holder, int format, int width, int height)
|
||||||
int format, int width, int height) {
|
{
|
||||||
//Log.v("SDL", "surfaceChanged()");
|
Log.v(TAG, "surfaceChanged()");
|
||||||
/*
|
|
||||||
int sdlFormat = 0x85151002; // SDL_PIXELFORMAT_RGB565 by default
|
XashActivity.onNativeResize(width, height);
|
||||||
switch (format) {
|
// Now start up the C app thread
|
||||||
case PixelFormat.A_8:
|
if (mEngThread == null) {
|
||||||
Log.v("SDL", "pixel format A_8");
|
|
||||||
break;
|
mEngThread = new Thread(new XashMain(), "EngineThread");
|
||||||
case PixelFormat.LA_88:
|
mEngThread.start();
|
||||||
Log.v("SDL", "pixel format LA_88");
|
}
|
||||||
break;
|
}
|
||||||
case PixelFormat.L_8:
|
|
||||||
Log.v("SDL", "pixel format L_8");
|
// unused
|
||||||
break;
|
public void onDraw(Canvas canvas) {}
|
||||||
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;
|
|
||||||
}*/
|
|
||||||
|
|
||||||
|
|
||||||
XashActivity.onNativeResize(width, height);
|
// EGL functions
|
||||||
// Now start up the C app thread
|
public boolean InitGL() {
|
||||||
if (mEngThread == null) {
|
|
||||||
|
|
||||||
mEngThread = new Thread(new XashMain(), "EngineThread");
|
try
|
||||||
mEngThread.start();
|
{
|
||||||
}
|
EGL10 egl = (EGL10)EGLContext.getEGL();
|
||||||
}
|
|
||||||
|
|
||||||
// unused
|
EGLDisplay dpy = egl.eglGetDisplay(EGL10.EGL_DEFAULT_DISPLAY);
|
||||||
public void onDraw(Canvas canvas) {}
|
|
||||||
|
|
||||||
|
int[] version = new int[2];
|
||||||
|
egl.eglInitialize(dpy, version);
|
||||||
|
|
||||||
// EGL functions
|
int[][] configSpec = {{
|
||||||
public boolean InitGL() {
|
EGL10.EGL_DEPTH_SIZE, 8,
|
||||||
|
EGL10.EGL_RED_SIZE, 8,
|
||||||
|
EGL10.EGL_GREEN_SIZE, 8,
|
||||||
|
EGL10.EGL_BLUE_SIZE, 8,
|
||||||
|
EGL10.EGL_ALPHA_SIZE, 8,
|
||||||
|
EGL10.EGL_NONE
|
||||||
|
}, {
|
||||||
|
EGL10.EGL_DEPTH_SIZE, 8,
|
||||||
|
EGL10.EGL_RED_SIZE, 8,
|
||||||
|
EGL10.EGL_GREEN_SIZE, 8,
|
||||||
|
EGL10.EGL_BLUE_SIZE, 8,
|
||||||
|
EGL10.EGL_ALPHA_SIZE, 0,
|
||||||
|
EGL10.EGL_NONE
|
||||||
|
}, {
|
||||||
|
EGL10.EGL_DEPTH_SIZE, 8,
|
||||||
|
EGL10.EGL_RED_SIZE, 5,
|
||||||
|
EGL10.EGL_GREEN_SIZE, 6,
|
||||||
|
EGL10.EGL_BLUE_SIZE, 5,
|
||||||
|
EGL10.EGL_ALPHA_SIZE, 0,
|
||||||
|
EGL10.EGL_NONE
|
||||||
|
}, {
|
||||||
|
EGL10.EGL_DEPTH_SIZE, 8,
|
||||||
|
EGL10.EGL_RED_SIZE, 5,
|
||||||
|
EGL10.EGL_GREEN_SIZE, 5,
|
||||||
|
EGL10.EGL_BLUE_SIZE, 5,
|
||||||
|
EGL10.EGL_ALPHA_SIZE, 1,
|
||||||
|
|
||||||
try {
|
EGL10.EGL_NONE
|
||||||
EGL10 egl = (EGL10)EGLContext.getEGL();
|
}, {
|
||||||
|
EGL10.EGL_DEPTH_SIZE, 8,
|
||||||
|
EGL10.EGL_RED_SIZE, 4,
|
||||||
|
EGL10.EGL_GREEN_SIZE, 4,
|
||||||
|
EGL10.EGL_BLUE_SIZE, 4,
|
||||||
|
EGL10.EGL_ALPHA_SIZE, 4,
|
||||||
|
|
||||||
EGLDisplay dpy = egl.eglGetDisplay(EGL10.EGL_DEFAULT_DISPLAY);
|
EGL10.EGL_NONE
|
||||||
|
}, {
|
||||||
|
EGL10.EGL_DEPTH_SIZE, 8,
|
||||||
|
EGL10.EGL_RED_SIZE, 3,
|
||||||
|
EGL10.EGL_GREEN_SIZE, 3,
|
||||||
|
EGL10.EGL_BLUE_SIZE, 2,
|
||||||
|
EGL10.EGL_ALPHA_SIZE, 0,
|
||||||
|
|
||||||
int[] version = new int[2];
|
EGL10.EGL_NONE
|
||||||
egl.eglInitialize(dpy, version);
|
}};
|
||||||
|
EGLConfig[] configs = new EGLConfig[1];
|
||||||
|
int[] num_config = new int[1];
|
||||||
|
if (!egl.eglChooseConfig(dpy, configSpec[XashActivity.mPixelFormat], configs, 1, num_config) || num_config[0] == 0)
|
||||||
|
{
|
||||||
|
Log.e(TAG, "No EGL config available");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
EGLConfig config = configs[0];
|
||||||
|
|
||||||
int[][] configSpec = {{
|
int EGL_CONTEXT_CLIENT_VERSION=0x3098;
|
||||||
EGL10.EGL_DEPTH_SIZE, 8,
|
int contextAttrs[] = new int[]
|
||||||
EGL10.EGL_RED_SIZE, 8,
|
{
|
||||||
EGL10.EGL_GREEN_SIZE, 8,
|
EGL_CONTEXT_CLIENT_VERSION, 1,
|
||||||
EGL10.EGL_BLUE_SIZE, 8,
|
EGL10.EGL_NONE
|
||||||
EGL10.EGL_ALPHA_SIZE, 8,
|
};
|
||||||
EGL10.EGL_NONE
|
EGLContext ctx = egl.eglCreateContext(dpy, config, EGL10.EGL_NO_CONTEXT, contextAttrs);
|
||||||
}, {
|
if (ctx == EGL10.EGL_NO_CONTEXT) {
|
||||||
EGL10.EGL_DEPTH_SIZE, 8,
|
Log.e(TAG, "Couldn't create context");
|
||||||
EGL10.EGL_RED_SIZE, 8,
|
return false;
|
||||||
EGL10.EGL_GREEN_SIZE, 8,
|
}
|
||||||
EGL10.EGL_BLUE_SIZE, 8,
|
|
||||||
EGL10.EGL_ALPHA_SIZE, 0,
|
|
||||||
EGL10.EGL_NONE
|
|
||||||
}, {
|
|
||||||
EGL10.EGL_DEPTH_SIZE, 8,
|
|
||||||
EGL10.EGL_RED_SIZE, 5,
|
|
||||||
EGL10.EGL_GREEN_SIZE, 6,
|
|
||||||
EGL10.EGL_BLUE_SIZE, 5,
|
|
||||||
EGL10.EGL_ALPHA_SIZE, 0,
|
|
||||||
EGL10.EGL_NONE
|
|
||||||
}, {
|
|
||||||
EGL10.EGL_DEPTH_SIZE, 8,
|
|
||||||
EGL10.EGL_RED_SIZE, 5,
|
|
||||||
EGL10.EGL_GREEN_SIZE, 5,
|
|
||||||
EGL10.EGL_BLUE_SIZE, 5,
|
|
||||||
EGL10.EGL_ALPHA_SIZE, 1,
|
|
||||||
|
|
||||||
EGL10.EGL_NONE
|
EGLSurface surface = egl.eglCreateWindowSurface(dpy, config, this, null);
|
||||||
}, {
|
if (surface == EGL10.EGL_NO_SURFACE) {
|
||||||
EGL10.EGL_DEPTH_SIZE, 8,
|
Log.e(TAG, "Couldn't create surface");
|
||||||
EGL10.EGL_RED_SIZE, 4,
|
return false;
|
||||||
EGL10.EGL_GREEN_SIZE, 4,
|
}
|
||||||
EGL10.EGL_BLUE_SIZE, 4,
|
|
||||||
EGL10.EGL_ALPHA_SIZE, 4,
|
|
||||||
|
|
||||||
EGL10.EGL_NONE
|
if (!egl.eglMakeCurrent(dpy, surface, surface, ctx)) {
|
||||||
}, {
|
Log.e(TAG, "Couldn't make context current");
|
||||||
EGL10.EGL_DEPTH_SIZE, 8,
|
return false;
|
||||||
EGL10.EGL_RED_SIZE, 3,
|
}
|
||||||
EGL10.EGL_GREEN_SIZE, 3,
|
|
||||||
EGL10.EGL_BLUE_SIZE, 2,
|
|
||||||
EGL10.EGL_ALPHA_SIZE, 0,
|
|
||||||
|
|
||||||
EGL10.EGL_NONE
|
mEGLContext = ctx;
|
||||||
}};
|
mEGLDisplay = dpy;
|
||||||
EGLConfig[] configs = new EGLConfig[1];
|
mEGLSurface = surface;
|
||||||
int[] num_config = new int[1];
|
mEGL = egl;
|
||||||
if (!egl.eglChooseConfig(dpy, configSpec[XashActivity.mPixelFormat], configs, 1, num_config) || num_config[0] == 0)
|
mEGLConfig = config;
|
||||||
{
|
|
||||||
Log.e("SDL", "No EGL config available");
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
EGLConfig config = configs[0];
|
|
||||||
|
|
||||||
int EGL_CONTEXT_CLIENT_VERSION=0x3098;
|
} catch(Exception e) {
|
||||||
int contextAttrs[] = new int[]
|
Log.v(TAG, e + "");
|
||||||
{
|
for (StackTraceElement s : e.getStackTrace()) {
|
||||||
EGL_CONTEXT_CLIENT_VERSION, 1,
|
Log.v(TAG, s.toString());
|
||||||
EGL10.EGL_NONE
|
}
|
||||||
};
|
}
|
||||||
EGLContext ctx = egl.eglCreateContext(dpy, config, EGL10.EGL_NO_CONTEXT, contextAttrs);
|
|
||||||
if (ctx == EGL10.EGL_NO_CONTEXT) {
|
|
||||||
Log.e("SDL", "Couldn't create context");
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
EGLSurface surface = egl.eglCreateWindowSurface(dpy, config, this, null);
|
return true;
|
||||||
if (surface == EGL10.EGL_NO_SURFACE) {
|
}
|
||||||
Log.e("SDL", "Couldn't create surface");
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!egl.eglMakeCurrent(dpy, surface, surface, ctx)) {
|
// EGL buffer flip
|
||||||
Log.e("SDL", "Couldn't make context current");
|
public void SwapBuffers()
|
||||||
return false;
|
{
|
||||||
}
|
if( mEGLSurface == null )
|
||||||
|
return;
|
||||||
mEGLContext = ctx;
|
mEGL.eglSwapBuffers(mEGLDisplay, mEGLSurface);
|
||||||
mEGLDisplay = dpy;
|
}
|
||||||
mEGLSurface = surface;
|
public void toggleEGL(int toggle)
|
||||||
mEGL = egl;
|
{
|
||||||
mEGLConfig = config;
|
if( toggle != 0 )
|
||||||
|
{
|
||||||
} catch(Exception e) {
|
mEGLSurface = mEGL.eglCreateWindowSurface(mEGLDisplay, mEGLConfig, this, null);
|
||||||
Log.v("SDL", e + "");
|
mEGL.eglMakeCurrent(mEGLDisplay, mEGLSurface, mEGLSurface, mEGLContext);
|
||||||
for (StackTraceElement s : e.getStackTrace()) {
|
}
|
||||||
Log.v("SDL", s.toString());
|
else
|
||||||
}
|
{
|
||||||
}
|
mEGL.eglMakeCurrent(mEGLDisplay, EGL10.EGL_NO_SURFACE, EGL10.EGL_NO_SURFACE, EGL10.EGL_NO_CONTEXT);
|
||||||
|
mEGL.eglDestroySurface(mEGLDisplay, mEGLSurface);
|
||||||
return true;
|
mEGLSurface = null;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
// EGL buffer flip
|
|
||||||
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)
|
|
||||||
{
|
|
||||||
if( toggle != 0 )
|
|
||||||
{
|
|
||||||
mEGLSurface = mEGL.eglCreateWindowSurface(mEGLDisplay, mEGLConfig, this, null);
|
|
||||||
mEGL.eglMakeCurrent(mEGLDisplay, mEGLSurface, mEGLSurface, mEGLContext);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
mEGL.eglMakeCurrent(mEGLDisplay, EGL10.EGL_NO_SURFACE, EGL10.EGL_NO_SURFACE, EGL10.EGL_NO_CONTEXT);
|
|
||||||
mEGL.eglDestroySurface(mEGLDisplay, mEGLSurface);
|
|
||||||
mEGLSurface = null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -717,74 +542,74 @@ class XashInputConnection extends BaseInputConnection {
|
||||||
// backspace
|
// backspace
|
||||||
XashActivity.nativeKey(1,KeyEvent.KEYCODE_DEL);
|
XashActivity.nativeKey(1,KeyEvent.KEYCODE_DEL);
|
||||||
XashActivity.nativeKey(0,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);
|
return super.deleteSurroundingText(beforeLength, afterLength);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
class EngineTouchListener_v1 implements View.OnTouchListener{
|
class EngineTouchListener_v1 implements View.OnTouchListener{
|
||||||
// Touch events
|
// 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());
|
{
|
||||||
|
XashActivity.nativeTouch(0, event.getAction(), event.getX(), event.getY());
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
class EngineTouchListener_v5 implements View.OnTouchListener{
|
class EngineTouchListener_v5 implements View.OnTouchListener{
|
||||||
// Touch events
|
// 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();
|
final int touchDevId = event.getDeviceId();
|
||||||
int action = event.getActionMasked();
|
final int pointerCount = event.getPointerCount();
|
||||||
int pointerFingerId;
|
int action = event.getActionMasked();
|
||||||
int mouseButton;
|
int pointerFingerId;
|
||||||
int i = -1;
|
int mouseButton;
|
||||||
float x,y;
|
int i = -1;
|
||||||
switch(action) {
|
float x,y;
|
||||||
case MotionEvent.ACTION_MOVE:
|
switch(action) {
|
||||||
for (i = 0; i < pointerCount; i++) {
|
case MotionEvent.ACTION_MOVE:
|
||||||
pointerFingerId = event.getPointerId(i);
|
for (i = 0; i < pointerCount; i++) {
|
||||||
x = event.getX(i);
|
pointerFingerId = event.getPointerId(i);
|
||||||
y = event.getY(i);
|
x = event.getX(i);
|
||||||
XashActivity.nativeTouch(pointerFingerId, 2, x, y);
|
y = event.getY(i);
|
||||||
}
|
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
|
// Primary pointer up/down, the index is always zero
|
||||||
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();
|
||||||
}
|
}
|
||||||
|
|
||||||
pointerFingerId = event.getPointerId(i);
|
pointerFingerId = event.getPointerId(i);
|
||||||
|
|
||||||
x = event.getX(i);
|
x = event.getX(i);
|
||||||
y = event.getY(i);
|
y = event.getY(i);
|
||||||
if( action == MotionEvent.ACTION_UP || action == MotionEvent.ACTION_POINTER_UP )
|
if( action == MotionEvent.ACTION_UP || action == MotionEvent.ACTION_POINTER_UP )
|
||||||
XashActivity.nativeTouch(pointerFingerId,1, x, y);
|
XashActivity.nativeTouch(pointerFingerId,1, x, y);
|
||||||
if( action == MotionEvent.ACTION_DOWN || action == MotionEvent.ACTION_POINTER_DOWN )
|
if( action == MotionEvent.ACTION_DOWN || action == MotionEvent.ACTION_POINTER_DOWN )
|
||||||
XashActivity.nativeTouch(pointerFingerId,0, x, y);
|
XashActivity.nativeTouch(pointerFingerId,0, x, y);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case MotionEvent.ACTION_CANCEL:
|
case MotionEvent.ACTION_CANCEL:
|
||||||
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);
|
||||||
y = event.getY(i);
|
y = event.getY(i);
|
||||||
XashActivity.nativeTouch(pointerFingerId, 1, x, y);
|
XashActivity.nativeTouch(pointerFingerId, 1, x, y);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue