Apple-2-Tools/apple2ix
1
0
Fork 0
mirror of https://github.com/mauiaaron/apple2.git synced 2024-06-25 09:29:28 +00:00
Code Issues Projects Releases Wiki Activity

More joystick settings including calibration mode

Browse Source
This commit is contained in:
Aaron Culliney 2015-08-02 11:28:48 -07:00
parent af04ba94d1
commit 7344cadfbd
17 changed files with 590 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Android/app/src/main/java/org/deadc0de/apple2ix/Apple2AbstractMenu.java
View File

@ -59,6 +59,10 @@ public abstract class Apple2AbstractMenu implements Apple2MenuView {
return mSettingsView;
}
public boolean isCalibrating() {
return false;
}
// ------------------------------------------------------------------------
// required overrides ...

15
Android/app/src/main/java/org/deadc0de/apple2ix/Apple2Activity.java
View File

@ -400,7 +400,7 @@ public class Apple2Activity extends Activity {
}
Apple2MenuView apple2MenuView = peekApple2View();
if (apple2MenuView != null) {
if ((apple2MenuView != null) && (!apple2MenuView.isCalibrating())) {
break;
}
@ -528,6 +528,19 @@ public class Apple2Activity extends Activity {
return mMenuStack.get(lastIndex);
}
public synchronized Apple2MenuView peekApple2View(int index) {
int lastIndex = mMenuStack.size() - 1;
if (lastIndex < 0) {
return null;
}
try {
return mMenuStack.get(index);
} catch (IndexOutOfBoundsException e) {
return null;
}
}
public synchronized Apple2MenuView popApple2View(Apple2MenuView apple2MenuView) {
boolean wasRemoved = mMenuStack.remove(apple2MenuView);
_disposeApple2View(apple2MenuView);

4
Android/app/src/main/java/org/deadc0de/apple2ix/Apple2DisksMenu.java
View File

@ -121,6 +121,10 @@ public class Apple2DisksMenu implements Apple2MenuView {
});
}
public final boolean isCalibrating() {
return false;
}
public void show() {
if (isShowing()) {
return;

107
Android/app/src/main/java/org/deadc0de/apple2ix/Apple2JoystickCalibration.java Normal file
View File

@ -0,0 +1,107 @@
/*
* Apple // emulator for *nix
*
* This software package is subject to the GNU General Public License
* version 2 or later (your choice) as published by the Free Software
* Foundation.
*
* THERE ARE NO WARRANTIES WHATSOEVER.
*
*/
package org.deadc0de.apple2ix;
import android.content.Context;
import android.support.annotation.NonNull;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.SeekBar;
import java.util.ArrayList;
public class Apple2JoystickCalibration implements Apple2MenuView {
private final static String TAG = "Apple2JoystickCalibration";
private Apple2Activity mActivity = null;
private View mSettingsView = null;
private ArrayList<Apple2MenuView> mViewStack = null;
private boolean mTouchMenuEnabled = false;
private int mSavedTouchDevice = Apple2Preferences.TouchDeviceVariant.NONE.ordinal();
public Apple2JoystickCalibration(Apple2Activity activity, ArrayList<Apple2MenuView> viewStack, Apple2Preferences.TouchDeviceVariant variant) {
mActivity = activity;
mViewStack = viewStack;
if (!(variant == Apple2Preferences.TouchDeviceVariant.JOYSTICK || variant == Apple2Preferences.TouchDeviceVariant.JOYSTICK_KEYPAD)) {
throw new RuntimeException("You're doing it wrong");
}
setup(variant);
}
private void setup(Apple2Preferences.TouchDeviceVariant variant) {
LayoutInflater inflater = (LayoutInflater) mActivity.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
mSettingsView = inflater.inflate(R.layout.activity_calibrate_joystick, null, false);
SeekBar sb = (SeekBar) mSettingsView.findViewById(R.id.seekBar);
sb.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
@Override
public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
if (!fromUser) {
return;
}
Apple2Preferences.JOYSTICK_DIVIDER.saveInt(mActivity, progress);
}
@Override
public void onStartTrackingTouch(SeekBar seekBar) {
}
@Override
public void onStopTrackingTouch(SeekBar seekBar) {
}
});
sb.setMax(0); // http://stackoverflow.com/questions/10278467/seekbar-not-setting-actual-progress-setprogress-not-working-on-early-android
sb.setMax(Apple2Preferences.JOYSTICK_DIVIDER_NUM_CHOICES);
sb.setProgress(Apple2Preferences.JOYSTICK_DIVIDER.intValue(mActivity));
mTouchMenuEnabled = Apple2Preferences.TOUCH_MENU_ENABLED.booleanValue(mActivity);
Apple2Preferences.nativeSetTouchMenuEnabled(false);
mSavedTouchDevice = Apple2Preferences.CURRENT_TOUCH_DEVICE.intValue(mActivity);
Apple2Preferences.nativeSetCurrentTouchDevice(variant.ordinal());
Apple2Preferences.nativeTouchJoystickBeginCalibrationMode();
}
public final boolean isCalibrating() {
return true;
}
public void show() {
if (isShowing()) {
return;
}
mActivity.pushApple2View(this);
}
public void dismiss() {
for (Apple2MenuView apple2MenuView : mViewStack) {
mActivity.pushApple2View(apple2MenuView);
}
Apple2Preferences.nativeSetTouchMenuEnabled(mTouchMenuEnabled);
Apple2Preferences.nativeSetCurrentTouchDevice(mSavedTouchDevice);
Apple2Preferences.nativeTouchJoystickEndCalibrationMode();
mActivity.popApple2View(this);
}
public boolean isShowing() {
return mSettingsView.isShown();
}
public View getView() {
return mSettingsView;
}
}

69
Android/app/src/main/java/org/deadc0de/apple2ix/Apple2JoystickSettingsMenu.java
View File

@ -16,6 +16,8 @@ import android.widget.CheckBox;
import android.widget.CompoundButton;
import android.widget.TextView;
import java.util.ArrayList;
public class Apple2JoystickSettingsMenu extends Apple2AbstractMenu {
private final static String TAG = "Apple2JoystickSettingsMenu";
@ -44,11 +46,11 @@ public class Apple2JoystickSettingsMenu extends Apple2AbstractMenu {
if (position < 0 || position >= SETTINGS.size) {
throw new ArrayIndexOutOfBoundsException();
}
return position != SETTINGS.AXIS_SENSITIVIY.ordinal() && position != SETTINGS.JOYSTICK_TAPDELAY.ordinal();
return position != SETTINGS.JOYSTICK_AXIS_SENSITIVIY.ordinal();
}
enum SETTINGS implements Apple2AbstractMenu.IMenuEnum {
AXIS_SENSITIVIY {
JOYSTICK_AXIS_SENSITIVIY {
@Override
public final String getTitle(Apple2Activity activity) {
return "";
@ -61,20 +63,21 @@ public class Apple2JoystickSettingsMenu extends Apple2AbstractMenu {
@Override
public View getView(final Apple2Activity activity, View convertView) {
return _sliderView(activity, this, Apple2Preferences.AXIS_SENSITIVITY_NUM_CHOICES, new IPreferenceSlider() {
return _sliderView(activity, this, Apple2Preferences.JOYSTICK_AXIS_SENSITIVITY_NUM_CHOICES, new IPreferenceSlider() {
@Override
public void saveInt(int progress) {
Apple2Preferences.AXIS_SENSITIVIY.saveInt(activity, progress);
Apple2Preferences.JOYSTICK_AXIS_SENSITIVIY.saveInt(activity, progress);
}
@Override
public int intValue() {
return Apple2Preferences.AXIS_SENSITIVIY.intValue(activity);
return Apple2Preferences.JOYSTICK_AXIS_SENSITIVIY.intValue(activity);
}
@Override
public void showValue(int progress, final TextView seekBarValue) {
int percent = (int) (Apple2Preferences.AXIS_SENSITIVIY.floatValue(activity) * 100.f);
saveInt(progress);
int percent = (int) (Apple2Preferences.JOYSTICK_AXIS_SENSITIVIY.floatValue(activity) * 100.f);
seekBarValue.setText("" + percent + "%");
}
});
@ -194,37 +197,6 @@ public class Apple2JoystickSettingsMenu extends Apple2AbstractMenu {
});
}
},
JOYSTICK_TAPDELAY {
@Override
public final String getTitle(Apple2Activity activity) {
return "";
}
@Override
public final String getSummary(Apple2Activity activity) {
return activity.getResources().getString(R.string.joystick_button_tapdelay_summary);
}
@Override
public View getView(final Apple2Activity activity, View convertView) {
return _sliderView(activity, this, Apple2Preferences.TAPDELAY_NUM_CHOICES, new IPreferenceSlider() {
@Override
public void saveInt(int progress) {
Apple2Preferences.JOYSTICK_TAPDELAY.saveInt(activity, progress);
}
@Override
public int intValue() {
return Apple2Preferences.JOYSTICK_TAPDELAY.intValue(activity);
}
@Override
public void showValue(int progress, final TextView seekBarValue) {
seekBarValue.setText("" + (((float) progress / Apple2Preferences.TAPDELAY_NUM_CHOICES) * Apple2Preferences.TAPDELAY_SCALE));
}
});
}
},
JOYSTICK_CALIBRATE {
@Override
public final String getTitle(Apple2Activity activity) {
@ -238,7 +210,28 @@ public class Apple2JoystickSettingsMenu extends Apple2AbstractMenu {
@Override
public void handleSelection(Apple2Activity activity, Apple2AbstractMenu settingsMenu, boolean isChecked) {
//new Apple2JoystickCalibration(activity).show();
ArrayList<Apple2MenuView> viewStack = new ArrayList<Apple2MenuView>();
{
int idx = 0;
while (true) {
Apple2MenuView apple2MenuView = activity.peekApple2View(idx);
if (apple2MenuView == null) {
break;
}
viewStack.add(apple2MenuView);
++idx;
}
}
Apple2JoystickCalibration calibration = new Apple2JoystickCalibration(activity, viewStack, Apple2Preferences.TouchDeviceVariant.JOYSTICK);
// show this new view...
calibration.show();
// ...with nothing else underneath 'cept the emulator OpenGL layer
for (Apple2MenuView apple2MenuView : viewStack) {
activity.popApple2View(apple2MenuView);
}
}
};

128
Android/app/src/main/java/org/deadc0de/apple2ix/Apple2KeypadSettingsMenu.java Normal file
View File

@ -0,0 +1,128 @@
/*
* Apple // emulator for *nix
*
* This software package is subject to the GNU General Public License
* version 2 or later (your choice) as published by the Free Software
* Foundation.
*
* THERE ARE NO WARRANTIES WHATSOEVER.
*
*/
package org.deadc0de.apple2ix;
import android.view.View;
import android.widget.CheckBox;
import android.widget.CompoundButton;
import android.widget.TextView;
import java.util.ArrayList;
public class Apple2KeypadSettingsMenu extends Apple2AbstractMenu {
private final static String TAG = "Apple2KeypadSettingsMenu";
public Apple2KeypadSettingsMenu(Apple2Activity activity) {
super(activity);
}
@Override
public final String[] allTitles() {
return SETTINGS.titles(mActivity);
}
@Override
public final IMenuEnum[] allValues() {
return SETTINGS.values();
}
@Override
public final boolean areAllItemsEnabled() {
return true;
}
@Override
public final boolean isEnabled(int position) {
if (position < 0 || position >= SETTINGS.size) {
throw new ArrayIndexOutOfBoundsException();
}
return true;
}
enum SETTINGS implements Apple2AbstractMenu.IMenuEnum {
KEYPAD_CHOOSE_BUTTONS {
@Override
public final String getTitle(Apple2Activity activity) {
return activity.getResources().getString(R.string.keypad_choose);
}
@Override
public final String getSummary(Apple2Activity activity) {
return activity.getResources().getString(R.string.keypad_choose_summary);
}
@Override
public void handleSelection(final Apple2Activity activity, final Apple2AbstractMenu settingsMenu, boolean isChecked) {
//new Apple2KeypadChooser(activity).show();
}
},
KEYPAD_CALIBRATE {
@Override
public final String getTitle(Apple2Activity activity) {
return activity.getResources().getString(R.string.keypad_calibrate);
}
@Override
public final String getSummary(Apple2Activity activity) {
return activity.getResources().getString(R.string.keypad_calibrate_summary);
}
@Override
public void handleSelection(Apple2Activity activity, Apple2AbstractMenu settingsMenu, boolean isChecked) {
ArrayList<Apple2MenuView> viewStack = new ArrayList<Apple2MenuView>();
{
int idx = 0;
while (true) {
Apple2MenuView apple2MenuView = activity.peekApple2View(idx);
if (apple2MenuView == null) {
break;
}
viewStack.add(apple2MenuView);
++idx;
}
}
Apple2JoystickCalibration calibration = new Apple2JoystickCalibration(activity, viewStack, Apple2Preferences.TouchDeviceVariant.JOYSTICK_KEYPAD);
// show this new view...
calibration.show();
// ...with nothing else underneath 'cept the emulator OpenGL layer
for (Apple2MenuView apple2MenuView : viewStack) {
activity.popApple2View(apple2MenuView);
}
}
};
public static final int size = SETTINGS.values().length;
@Override
public void handleSelection(Apple2Activity activity, Apple2AbstractMenu settingsMenu, boolean isChecked) {
/* ... */
}
@Override
public View getView(Apple2Activity activity, View convertView) {
return _basicView(activity, this, convertView);
}
public static String[] titles(Apple2Activity activity) {
String[] titles = new String[size];
int i = 0;
for (SETTINGS setting : values()) {
titles[i++] = setting.getTitle(activity);
}
return titles;
}
}
}

2
Android/app/src/main/java/org/deadc0de/apple2ix/Apple2MenuView.java
View File

@ -22,4 +22,6 @@ public interface Apple2MenuView {
public void dismiss();
public View getView();
public boolean isCalibrating();
}

80
Android/app/src/main/java/org/deadc0de/apple2ix/Apple2Preferences.java
View File

@ -157,7 +157,7 @@ public enum Apple2Preferences {
return activity.getPreferences(Context.MODE_PRIVATE).getInt(toString(), 5);
}
},
AXIS_SENSITIVIY {
JOYSTICK_AXIS_SENSITIVIY {
@Override
public void load(Apple2Activity activity) {
float sensitivity = floatValue(activity);
@ -166,25 +166,37 @@ public enum Apple2Preferences {
@Override
public int intValue(Apple2Activity activity) {
final int pivot = AXIS_SENSITIVITY_DEC_NUMCHOICES;
final int pivot = JOYSTICK_AXIS_SENSITIVITY_DEC_NUMCHOICES;
return activity.getPreferences(Context.MODE_PRIVATE).getInt(toString(), pivot);
}
@Override
public float floatValue(Apple2Activity activity) {
int tick = intValue(activity);
final int pivot = AXIS_SENSITIVITY_DEC_NUMCHOICES;
final int pivot = JOYSTICK_AXIS_SENSITIVITY_DEC_NUMCHOICES;
float sensitivity = 1.f;
if (tick < pivot) {
int decAmount = (pivot - tick);
sensitivity -= (AXIS_SENSITIVITY_DEC * decAmount);
sensitivity -= (JOYSTICK_AXIS_SENSITIVITY_DEC_STEP * decAmount);
} else if (tick > pivot) {
int incAmount = (tick - pivot);
sensitivity += (AXIS_SENSITIVITY_INC * incAmount);
sensitivity += (JOYSTICK_AXIS_SENSITIVITY_INC_STEP * incAmount);
}
return sensitivity;
}
},
JOYSTICK_BUTTON_THRESHOLD {
@Override
public void load(Apple2Activity activity) {
int tick = intValue(activity);
nativeSetTouchJoystickButtonSwitchThreshold(tick * JOYSTICK_BUTTON_THRESHOLD_STEP);
}
@Override
public int intValue(Apple2Activity activity) {
return activity.getPreferences(Context.MODE_PRIVATE).getInt(toString(), 5);
}
},
JOYSTICK_TAP_BUTTON {
@Override
public void load(Apple2Activity activity) {
@ -230,6 +242,29 @@ public enum Apple2Preferences {
public int intValue(Apple2Activity activity) {
return activity.getPreferences(Context.MODE_PRIVATE).getInt(toString(), TouchJoystickButtons.BUTTON2.ordinal());
}
},
JOYSTICK_AXIS_ON_LEFT {
@Override
public void load(Apple2Activity activity) {
nativeTouchJoystickSetAxisOnLeft(booleanValue(activity));
}
@Override
public boolean booleanValue(Apple2Activity activity) {
return activity.getPreferences(Context.MODE_PRIVATE).getBoolean(toString(), true);
}
},
JOYSTICK_DIVIDER {
@Override
public void load(Apple2Activity activity) {
int tick = intValue(activity);
nativeTouchJoystickSetScreenDivision(((float) tick / JOYSTICK_DIVIDER_NUM_CHOICES));
}
@Override
public int intValue(Apple2Activity activity) {
return activity.getPreferences(Context.MODE_PRIVATE).getInt(toString(), JOYSTICK_DIVIDER_NUM_CHOICES>>1);
}
};
public enum HiresColor {
@ -298,19 +333,24 @@ public enum Apple2Preferences {
public final static int DECENT_AMOUNT_OF_CHOICES = 20;
public final static int AUDIO_LATENCY_NUM_CHOICES = DECENT_AMOUNT_OF_CHOICES;
public final static int ALPHA_SLIDER_NUM_CHOICES = DECENT_AMOUNT_OF_CHOICES;
public final static int JOYSTICK_DIVIDER_NUM_CHOICES = DECENT_AMOUNT_OF_CHOICES;
public final static int TAPDELAY_NUM_CHOICES = DECENT_AMOUNT_OF_CHOICES;
public final static float TAPDELAY_SCALE = 0.5f;
public final static String TAG = "Apple2Preferences";
public final static float AXIS_SENSITIVITY_MIN = 0.25f;
public final static float AXIS_SENSITIVITY_DEFAULT = 1.f;
public final static float AXIS_SENSITIVITY_MAX = 4.f;
public final static float AXIS_SENSITIVITY_DEC = 0.05f;
public final static float AXIS_SENSITIVITY_INC = 0.25f;
public final static int AXIS_SENSITIVITY_DEC_NUMCHOICES = (int) ((AXIS_SENSITIVITY_DEFAULT - AXIS_SENSITIVITY_MIN) / AXIS_SENSITIVITY_DEC); // 15
public final static int AXIS_SENSITIVITY_INC_NUMCHOICES = (int) ((AXIS_SENSITIVITY_MAX - AXIS_SENSITIVITY_DEFAULT) / AXIS_SENSITIVITY_INC); // 12
public final static int AXIS_SENSITIVITY_NUM_CHOICES = AXIS_SENSITIVITY_DEC_NUMCHOICES + AXIS_SENSITIVITY_INC_NUMCHOICES; // 15 + 12
public final static int JOYSTICK_BUTTON_THRESHOLD_NUM_CHOICES = DECENT_AMOUNT_OF_CHOICES;
public final static int JOYSTICK_BUTTON_THRESHOLD_STEP = 5;
public final static float JOYSTICK_AXIS_SENSITIVITY_MIN = 0.25f;
public final static float JOYSTICK_AXIS_SENSITIVITY_DEFAULT = 1.f;
public final static float JOYSTICK_AXIS_SENSITIVITY_MAX = 4.f;
public final static float JOYSTICK_AXIS_SENSITIVITY_DEC_STEP = 0.05f;
public final static float JOYSTICK_AXIS_SENSITIVITY_INC_STEP = 0.25f;
public final static int JOYSTICK_AXIS_SENSITIVITY_DEC_NUMCHOICES = (int) ((JOYSTICK_AXIS_SENSITIVITY_DEFAULT - JOYSTICK_AXIS_SENSITIVITY_MIN) / JOYSTICK_AXIS_SENSITIVITY_DEC_STEP); // 15
public final static int JOYSTICK_AXIS_SENSITIVITY_INC_NUMCHOICES = (int) ((JOYSTICK_AXIS_SENSITIVITY_MAX - JOYSTICK_AXIS_SENSITIVITY_DEFAULT) / JOYSTICK_AXIS_SENSITIVITY_INC_STEP); // 12
public final static int JOYSTICK_AXIS_SENSITIVITY_NUM_CHOICES = JOYSTICK_AXIS_SENSITIVITY_DEC_NUMCHOICES + JOYSTICK_AXIS_SENSITIVITY_INC_NUMCHOICES; // 15 + 12
// set and apply
@ -387,7 +427,7 @@ public enum Apple2Preferences {
private static native void nativeSetAudioLatency(float latencySecs);
private static native void nativeSetCurrentTouchDevice(int device);
public static native void nativeSetCurrentTouchDevice(int device);
private static native void nativeSetTouchJoystickButtonTypes(int down, int north, int south);
@ -395,7 +435,9 @@ public enum Apple2Preferences {
private static native void nativeSetTouchJoystickAxisSensitivity(float multiplier);
private static native void nativeSetTouchMenuEnabled(boolean enabled);
private static native void nativeSetTouchJoystickButtonSwitchThreshold(int delta);
public static native void nativeSetTouchMenuEnabled(boolean enabled);
private static native void nativeSetTouchMenuVisibility(float alpha);
@ -404,4 +446,12 @@ public enum Apple2Preferences {
public static native int nativeGetCPUSpeed();
public static native void nativeSetCPUSpeed(int percentSpeed);
public static native void nativeTouchJoystickSetScreenDivision(float division);
public static native void nativeTouchJoystickSetAxisOnLeft(boolean axisIsOnLeft);
public static native void nativeTouchJoystickBeginCalibrationMode();
public static native void nativeTouchJoystickEndCalibrationMode();
}

97
Android/app/src/main/java/org/deadc0de/apple2ix/Apple2SettingsMenu.java
View File

@ -40,7 +40,7 @@ public class Apple2SettingsMenu extends Apple2AbstractMenu {
@Override
public final boolean areAllItemsEnabled() {
return true;
return false;
}
@Override
@ -48,7 +48,7 @@ public class Apple2SettingsMenu extends Apple2AbstractMenu {
if (position < 0 || position >= SETTINGS.size) {
throw new ArrayIndexOutOfBoundsException();
}
return true;
return position != SETTINGS.JOYSTICK_TAPDELAY.ordinal() && position != SETTINGS.JOYSTICK_BUTTON_THRESHOLD.ordinal();
}
enum SETTINGS implements Apple2AbstractMenu.IMenuEnum {
@ -94,6 +94,7 @@ public class Apple2SettingsMenu extends Apple2AbstractMenu {
public void saveInt(int progress) {
Apple2Preferences.TOUCH_MENU_VISIBILITY.saveInt(activity, progress);
}
@Override
public int intValue() {
return Apple2Preferences.TOUCH_MENU_VISIBILITY.intValue(activity);
@ -172,7 +173,97 @@ public class Apple2SettingsMenu extends Apple2AbstractMenu {
@Override
public void handleSelection(final Apple2Activity activity, final Apple2AbstractMenu settingsMenu, boolean isChecked) {
//new Apple2JoystickSettingsMenu(activity).show();
new Apple2KeypadSettingsMenu(activity).show();
}
},
JOYSTICK_TAPDELAY {
@Override
public final String getTitle(Apple2Activity activity) {
return "";
}
@Override
public final String getSummary(Apple2Activity activity) {
return activity.getResources().getString(R.string.joystick_button_tapdelay_summary);
}
@Override
public View getView(final Apple2Activity activity, View convertView) {
return _sliderView(activity, this, Apple2Preferences.TAPDELAY_NUM_CHOICES, new IPreferenceSlider() {
@Override
public void saveInt(int progress) {
Apple2Preferences.JOYSTICK_TAPDELAY.saveInt(activity, progress);
}
@Override
public int intValue() {
return Apple2Preferences.JOYSTICK_TAPDELAY.intValue(activity);
}
@Override
public void showValue(int progress, final TextView seekBarValue) {
seekBarValue.setText("" + (((float) progress / Apple2Preferences.TAPDELAY_NUM_CHOICES) * Apple2Preferences.TAPDELAY_SCALE));
}
});
}
},
JOYSTICK_AXIS_ON_LEFT {
@Override
public final String getTitle(Apple2Activity activity) {
return activity.getResources().getString(R.string.joystick_axisleft);
}
@Override
public final String getSummary(Apple2Activity activity) {
return activity.getResources().getString(R.string.joystick_axisleft_summary);
}
@Override
public View getView(final Apple2Activity activity, View convertView) {
convertView = _basicView(activity, this, convertView);
CheckBox cb = _addCheckbox(activity, this, convertView, Apple2Preferences.JOYSTICK_AXIS_ON_LEFT.booleanValue(activity));
cb.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
Apple2Preferences.JOYSTICK_AXIS_ON_LEFT.saveBoolean(activity, isChecked);
}
});
return convertView;
}
},
JOYSTICK_BUTTON_THRESHOLD {
@Override
public final String getTitle(Apple2Activity activity) {
return "";
}
@Override
public final String getSummary(Apple2Activity activity) {
return activity.getResources().getString(R.string.joystick_button_threshold_summary);
}
@Override
public View getView(final Apple2Activity activity, View convertView) {
return _sliderView(activity, this, Apple2Preferences.JOYSTICK_BUTTON_THRESHOLD_NUM_CHOICES, new IPreferenceSlider() {
@Override
public void saveInt(int progress) {
if (progress == 0) {
progress = 1;
}
Apple2Preferences.JOYSTICK_BUTTON_THRESHOLD.saveInt(activity, progress);
}
@Override
public int intValue() {
return Apple2Preferences.JOYSTICK_BUTTON_THRESHOLD.intValue(activity);
}
@Override
public void showValue(int progress, final TextView seekBarValue) {
int threshold = progress * Apple2Preferences.JOYSTICK_BUTTON_THRESHOLD_STEP;
seekBarValue.setText("" + threshold + " pts");
}
});
}
},
KEYBOARD_CONFIGURE {

4
Android/app/src/main/java/org/deadc0de/apple2ix/Apple2SplashScreen.java
View File

@ -53,6 +53,10 @@ public class Apple2SplashScreen implements Apple2MenuView {
});
}
public final boolean isCalibrating() {
return false;
}
public void show() {
if (isShowing()) {
return;

23
Android/app/src/main/res/layout/activity_calibrate_joystick.xml Normal file
View File

@ -0,0 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="0dp"
android:layout_marginStart="0dp"
android:layout_marginRight="0dp"
android:layout_marginEnd="0dp"
android:layout_marginTop="0dp"
android:layout_marginBottom="0dp"
android:layout_weight="1"
android:background="#00ff0000">
<SeekBar
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:id="@+id/seekBar"
android:layout_alignParentTop="true"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_marginLeft="0dp"
android:layout_marginStart="0dp" />
</RelativeLayout>

12
Android/app/src/main/res/values/strings.xml
View File

@ -41,23 +41,29 @@
<string name="joystick_button_button_none">None</string>
<string name="joystick_button_tap_button">Tap fire</string>
<string name="joystick_button_tap_button_summary">Button to fire on tap down</string>
<string name="joystick_button_tapdelay_summary">Tap delay in secs (interval to determine if tap or swipe)</string>
<string name="joystick_button_tapdelay_summary">Joystick/keypad tap delay in secs</string>
<string name="joystick_button_swipe_up_button">Swipe up fire</string>
<string name="joystick_button_swipe_up_button_summary">Button to fire on swipe up</string>
<string name="joystick_button_swipe_down_button">Swipe down fire</string>
<string name="joystick_button_swipe_down_button_summary">Button to fire on swipe down</string>
<string name="joystick_button_threshold_summary">Joystick/keypad button switch threshold in pts</string>
<string name="joystick_calibrate">Calibrate…</string>
<string name="joystick_calibrate_summary">Configure and test current settings</string>
<string name="joystick_configure">Configure joystick…</string>
<string name="joystick_configure_summary">Axis touch/tilt, buttons, etc</string>
<string name="joystick_current">Current joystick flavor</string>
<string name="joystick_current_summary">Emulated physical joystick or keypad</string>
<string name="joystick_swap">Swap axis and buttons</string>
<string name="joystick_swap_summary">Axis target on right and button </string>
<string name="joystick_axisleft">Joystick/keypad axis on left</string>
<string name="joystick_axisleft_summary">Joystick/keypad axis on left (buttons on right)</string>
<string name="keypad">Keypad Joystick</string>
<string name="keypadA">Touch Keypad Joystick</string>
<string name="keypad_calibrate">Calibrate…</string>
<string name="keypad_calibrate_summary">Configure and test current settings</string>
<string name="keypad_choose">Choose keys…</string>
<string name="keypad_choose_summary">Choose axis and button keys</string>
<string name="keypad_configure">Configure keypad joystick…</string>
<string name="keypad_configure_summary">Axis touch/tilt, buttons, etc</string>
<string name="keypad_threshold_summary">Keypad sensitivity threshold</string>
<string name="keyboard">Keyboard</string>
<string name="keyboard_configure">Configure keyboard…</string>
<string name="keyboard_configure_summary">Transparency, fading, custom keys</string>

6
Android/jni/jnihooks.c
View File

@ -281,12 +281,6 @@ jlong Java_org_deadc0de_apple2ix_Apple2Activity_nativeOnTouch(JNIEnv *env, jobje
return 0x0LL;
}
if (cpu_isPaused()) {
LOG("UNPAUSING NATIVE CPU THREAD");
cpu_resume();
return 0x0LL;
}
jfloat *x_coords = (*env)->GetFloatArrayElements(env, xCoords, 0);
jfloat *y_coords = (*env)->GetFloatArrayElements(env, yCoords, 0);

25
Android/jni/jniprefs.c
View File

@ -160,6 +160,31 @@ void Java_org_deadc0de_apple2ix_Apple2Preferences_nativeSetTouchJoystickAxisSens
joydriver_setTouchAxisSensitivity(multiplier);
}
void Java_org_deadc0de_apple2ix_Apple2Preferences_nativeSetTouchJoystickButtonSwitchThreshold(JNIEnv *env, jclass cls, jint delta) {
LOG("nativeSetTouchJoystickButtonSwitchThreshold() : %d", delta);
joydriver_setButtonSwitchThreshold(delta);
}
void Java_org_deadc0de_apple2ix_Apple2Preferences_nativeTouchJoystickSetScreenDivision(JNIEnv *env, jclass cls, jfloat division) {
LOG("nativeTouchJoystickSetScreenDivision() : %f", division);
joydriver_setScreenDivision(division);
}
void Java_org_deadc0de_apple2ix_Apple2Preferences_nativeTouchJoystickSetAxisOnLeft(JNIEnv *env, jclass cls, jboolean axisIsOnLeft) {
LOG("nativeTouchJoystickSetAxisOnLeft() : %d", axisIsOnLeft);
joydriver_setAxisOnLeft(axisIsOnLeft);
}
void Java_org_deadc0de_apple2ix_Apple2Preferences_nativeTouchJoystickBeginCalibrationMode(JNIEnv *env, jclass cls) {
LOG("nativeTouchJoystickBeginCalibrationMode() ...");
joydriver_beginCalibration();
}
void Java_org_deadc0de_apple2ix_Apple2Preferences_nativeTouchJoystickEndCalibrationMode(JNIEnv *env, jclass cls) {
LOG("nativeTouchJoystickEndCalibrationMode() ...");
joydriver_endCalibration();
}
jint Java_org_deadc0de_apple2ix_Apple2Preferences_nativeGetCPUSpeed(JNIEnv *env, jclass cls) {
LOG("nativeGetCPUSpeed() ...");
return (jint)round(cpu_scale_factor * 100.0);

5
src/joystick.c
View File

@ -265,8 +265,13 @@ void (*joydriver_setTouchButtonValues)(char button0Val, char button1Val, char bu
void (*joydriver_setTouchButtonTypes)(touchjoy_button_type_t down, touchjoy_button_type_t north, touchjoy_button_type_t south) = NULL;
void (*joydriver_setTapDelay)(float secs) = NULL;
void (*joydriver_setTouchAxisSensitivity)(float multiplier) = NULL;
void (*joydriver_setButtonSwitchThreshold)(int delta) = NULL;
void (*joydriver_setTouchVariant)(touchjoy_variant_t variant) = NULL;
touchjoy_variant_t (*joydriver_getTouchVariant)(void) = NULL;
void (*joydriver_setTouchAxisValues)(char up, char left, char right, char down) = NULL;
void (*joydriver_setScreenDivision)(float division) = NULL;
void (*joydriver_setAxisOnLeft)(bool axisIsOnLeft) = NULL;
void (*joydriver_beginCalibration)(void) = NULL;
void (*joydriver_endCalibration)(void) = NULL;
#endif

15
src/joystick.h
View File

@ -70,6 +70,9 @@ extern void (*joydriver_setTapDelay)(float secs);
// set the touch axis sensitivity multiplier
extern void (*joydriver_setTouchAxisSensitivity)(float multiplier);
// set the touch button switch threshold
extern void (*joydriver_setButtonSwitchThreshold)(int delta);
// set the joystick variant
extern void (*joydriver_setTouchVariant)(touchjoy_variant_t variant);
@ -79,6 +82,18 @@ extern touchjoy_variant_t (*joydriver_getTouchVariant)(void);
// set the axis visuals (these key values are also fired for keyboard variant)
extern void (*joydriver_setTouchAxisValues)(char north, char west, char east, char south);
// set screen divide between axis and buttons
extern void (*joydriver_setScreenDivision)(float division);
// swap axis and buttons sides
extern void (*joydriver_setAxisOnLeft)(bool axisIsOnLeft);
// begin calibration mode
extern void (*joydriver_beginCalibration)(void);
// end calibration mode
extern void (*joydriver_endCalibration)(void);
#endif // INTERFACE_TOUCH
#endif // whole file

73
src/video/gltouchjoy.c
View File

@ -436,20 +436,38 @@ static void gltouchjoy_render(void) {
static void gltouchjoy_reshape(int w, int h) {
LOG("gltouchjoy_reshape(%d, %d)", w, h);
touchport.axisX = 0;
touchport.axisY = 0;
touchport.buttonY = 0;
if (joyglobals.axisIsOnLeft) {
touchport.axisX = 0;
touchport.axisY = 0;
touchport.buttonY = 0;
if (w > touchport.width) {
touchport.width = w;
touchport.axisXMax = w>>1;
touchport.buttonX = w>>1;
touchport.buttonXMax = w;
}
if (h > touchport.height) {
touchport.height = h;
touchport.axisYMax = h;
touchport.buttonYMax = h;
if (w >= touchport.width) {
touchport.width = w;
touchport.axisXMax = (w * joyglobals.screenDivider);
touchport.buttonX = (w * joyglobals.screenDivider);
touchport.buttonXMax = w;
}
if (h >= touchport.height) {
touchport.height = h;
touchport.axisYMax = h;
touchport.buttonYMax = h;
}
} else {
touchport.buttonX = 0;
touchport.buttonY = 0;
touchport.axisY = 0;
if (w >= touchport.width) {
touchport.width = w;
touchport.buttonXMax = (w * joyglobals.screenDivider);
touchport.axisX = (w * joyglobals.screenDivider);
touchport.axisXMax = w;
}
if (h >= touchport.height) {
touchport.height = h;
touchport.buttonYMax = h;
touchport.axisYMax = h;
}
}
}
@ -732,6 +750,10 @@ static void gltouchjoy_setTouchAxisSensitivity(float multiplier) {
axes.multiplier = multiplier;
}
static void gltouchjoy_setButtonSwitchThreshold(int delta) {
buttons.switchThreshold = delta;
}
static void gltouchjoy_setTouchVariant(touchjoy_variant_t axisType) {
axes.type = axisType;
_setup_axis_object(axes.model);
@ -749,6 +771,26 @@ static void gltouchjoy_setTouchAxisValues(char north, char west, char east, char
_setup_axis_object(axes.model);
}
static void gltouchjoy_setScreenDivision(float screenDivider) {
joyglobals.screenDivider = screenDivider;
// force reshape here to apply changes ...
gltouchjoy_reshape(touchport.width, touchport.height);
}
static void gltouchjoy_setAxisOnLeft(bool axisIsOnLeft) {
joyglobals.axisIsOnLeft = axisIsOnLeft;
// force reshape here to apply changes ...
gltouchjoy_reshape(touchport.width, touchport.height);
}
static void gltouchjoy_beginCalibration(void) {
joyglobals.isCalibrating = true;
}
static void gltouchjoy_endCalibration(void) {
joyglobals.isCalibrating = false;
}
__attribute__((constructor(CTOR_PRIORITY_LATE)))
static void _init_gltouchjoy(void) {
LOG("Registering OpenGL software touch joystick");
@ -798,9 +840,14 @@ static void _init_gltouchjoy(void) {
joydriver_setTouchButtonTypes = &gltouchjoy_setTouchButtonTypes;
joydriver_setTapDelay = &gltouchjoy_setTapDelay;
joydriver_setTouchAxisSensitivity = &gltouchjoy_setTouchAxisSensitivity;
joydriver_setButtonSwitchThreshold = &gltouchjoy_setButtonSwitchThreshold;
joydriver_setTouchVariant = &gltouchjoy_setTouchVariant;
joydriver_getTouchVariant = &gltouchjoy_getTouchVariant;
joydriver_setTouchAxisValues = &gltouchjoy_setTouchAxisValues;
joydriver_setScreenDivision = &gltouchjoy_setScreenDivision;
joydriver_setAxisOnLeft = &gltouchjoy_setAxisOnLeft;
joydriver_beginCalibration = &gltouchjoy_beginCalibration;
joydriver_endCalibration = &gltouchjoy_endCalibration;
glnode_registerNode(RENDER_LOW, (GLNode){
.setup = &gltouchjoy_setup,