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

Merge branch 'master' of https://github.com/SDLash3D/xash3d-android-project

Browse source
This commit is contained in:
mittorn 2015-05-25 00:25:47 +07:00
commit 08f1b882c8
1 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/org/libsdl/app/SDLActivity.java
View file

@ -102,11 +102,7 @@ public class SDLActivity extends Activity {
protected String[] getLibraries() { protected String[] getLibraries() {
return new String[] { return new String[] {
"SDL2", "SDL2",
// "SDL2_image", "touchcontrols"
// "SDL2_mixer",
// "SDL2_net",
// "SDL2_ttf",
"touchcontrols",
"xash" "xash"
}; };
} }
@ -331,7 +327,7 @@ public class SDLActivity extends Activity {
if (!SDLActivity.mIsPaused && SDLActivity.mIsSurfaceReady) { if (!SDLActivity.mIsPaused && SDLActivity.mIsSurfaceReady) {
SDLActivity.mIsPaused = true; SDLActivity.mIsPaused = true;
SDLActivity.nativePause(); SDLActivity.nativePause();
mSurface.enableSensor(Sensor.TYPE_ACCELEROMETER, false); //mSurface.enableSensor(Sensor.TYPE_ACCELEROMETER, false);
} }
} }
@ -1027,7 +1023,7 @@ View.OnKeyListener, View.OnTouchListener, SensorEventListener {
requestFocus(); requestFocus();
setOnKeyListener(this); setOnKeyListener(this);
setOnTouchListener(this); setOnTouchListener(this);
enableSensor(Sensor.TYPE_ACCELEROMETER, true); //enableSensor(Sensor.TYPE_ACCELEROMETER, true);
} }
public Surface getNativeSurface() { public Surface getNativeSurface() {
@ -1117,7 +1113,7 @@ View.OnKeyListener, View.OnTouchListener, SensorEventListener {
// Start up the C app thread and enable sensor input for the first time // Start up the C app thread and enable sensor input for the first time
final Thread sdlThread = new Thread(new SDLMain(), "SDLThread"); final Thread sdlThread = new Thread(new SDLMain(), "SDLThread");
enableSensor(Sensor.TYPE_ACCELEROMETER, true); //enableSensor(Sensor.TYPE_ACCELEROMETER, true);
sdlThread.start(); sdlThread.start();
// Set up a listener thread to catch when the native thread ends // Set up a listener thread to catch when the native thread ends