Rework the face buttons to match the d-pad

This commit is contained in:
Cameron Gutman 2016-01-19 16:23:40 -05:00
parent cc71ce6180
commit e04ecaaf7a

View File

@ -138,79 +138,84 @@ public class VirtualControllerConfigurationLoader {
return new RightAnalogStick(controller, context); return new RightAnalogStick(controller, context);
} }
private static final int BUTTON_BASE_X = 65;
private static final int BUTTON_BASE_Y = 10;
private static final int BUTTON_WIDTH = getPercent(30, 33);
private static final int BUTTON_HEIGHT = getPercent(40, 33);
public static void createDefaultLayout(final VirtualController controller, final Context context) { public static void createDefaultLayout(final VirtualController controller, final Context context) {
DisplayMetrics screen = context.getResources().getDisplayMetrics(); DisplayMetrics screen = context.getResources().getDisplayMetrics();
controller.addElement(createDigitalPad(controller, context), controller.addElement(createDigitalPad(controller, context),
getPercent(5, screen.widthPixels), getPercent(5, screen.widthPixels),
getPercent(10, screen.heightPixels), getPercent(BUTTON_BASE_Y, screen.heightPixels),
getPercent(30, screen.widthPixels), getPercent(30, screen.widthPixels),
getPercent(40, screen.heightPixels) getPercent(40, screen.heightPixels)
); );
controller.addElement(createDigitalButton( controller.addElement(createDigitalButton(
ControllerPacket.A_FLAG, 0, 1, "A", -1, controller, context), ControllerPacket.A_FLAG, 0, 1, "A", -1, controller, context),
getPercent(75, screen.widthPixels), getPercent(BUTTON_BASE_X+BUTTON_WIDTH, screen.widthPixels),
getPercent(40, screen.heightPixels), getPercent(BUTTON_BASE_Y+2*BUTTON_HEIGHT, screen.heightPixels),
getPercent(10, screen.widthPixels), getPercent(BUTTON_WIDTH, screen.widthPixels),
getPercent(10, screen.heightPixels) getPercent(BUTTON_HEIGHT, screen.heightPixels)
); );
controller.addElement(createDigitalButton( controller.addElement(createDigitalButton(
ControllerPacket.B_FLAG, 0, 1, "B", -1, controller, context), ControllerPacket.B_FLAG, 0, 1, "B", -1, controller, context),
getPercent(85, screen.widthPixels), getPercent(BUTTON_BASE_X+2*BUTTON_WIDTH, screen.widthPixels),
getPercent(30, screen.heightPixels), getPercent(BUTTON_BASE_Y+BUTTON_HEIGHT, screen.heightPixels),
getPercent(10, screen.widthPixels), getPercent(BUTTON_WIDTH, screen.widthPixels),
getPercent(10, screen.heightPixels) getPercent(BUTTON_HEIGHT, screen.heightPixels)
); );
controller.addElement(createDigitalButton( controller.addElement(createDigitalButton(
ControllerPacket.X_FLAG, 0, 1, "X", -1, controller, context), ControllerPacket.X_FLAG, 0, 1, "X", -1, controller, context),
getPercent(65, screen.widthPixels), getPercent(BUTTON_BASE_X, screen.widthPixels),
getPercent(30, screen.heightPixels), getPercent(BUTTON_BASE_Y+BUTTON_HEIGHT, screen.heightPixels),
getPercent(10, screen.widthPixels), getPercent(BUTTON_WIDTH, screen.widthPixels),
getPercent(10, screen.heightPixels) getPercent(BUTTON_HEIGHT, screen.heightPixels)
); );
controller.addElement(createDigitalButton( controller.addElement(createDigitalButton(
ControllerPacket.Y_FLAG, 0, 1, "Y", -1, controller, context), ControllerPacket.Y_FLAG, 0, 1, "Y", -1, controller, context),
getPercent(75, screen.widthPixels), getPercent(BUTTON_BASE_X+BUTTON_WIDTH, screen.widthPixels),
getPercent(20, screen.heightPixels), getPercent(BUTTON_BASE_Y, screen.heightPixels),
getPercent(10, screen.widthPixels), getPercent(BUTTON_WIDTH, screen.widthPixels),
getPercent(10, screen.heightPixels) getPercent(BUTTON_HEIGHT, screen.heightPixels)
); );
controller.addElement(createLeftTrigger( controller.addElement(createLeftTrigger(
0, "LT", -1, controller, context), 0, "LT", -1, controller, context),
getPercent(65, screen.widthPixels), getPercent(BUTTON_BASE_X, screen.widthPixels),
getPercent(20, screen.heightPixels), getPercent(BUTTON_BASE_Y, screen.heightPixels),
getPercent(10, screen.widthPixels), getPercent(BUTTON_WIDTH, screen.widthPixels),
getPercent(10, screen.heightPixels) getPercent(BUTTON_HEIGHT, screen.heightPixels)
); );
controller.addElement(createRightTrigger( controller.addElement(createRightTrigger(
0, "RT", -1, controller, context), 0, "RT", -1, controller, context),
getPercent(85, screen.widthPixels), getPercent(BUTTON_BASE_X+2*BUTTON_WIDTH, screen.widthPixels),
getPercent(20, screen.heightPixels), getPercent(BUTTON_BASE_Y, screen.heightPixels),
getPercent(10, screen.widthPixels), getPercent(BUTTON_WIDTH, screen.widthPixels),
getPercent(10, screen.heightPixels) getPercent(BUTTON_HEIGHT, screen.heightPixels)
); );
controller.addElement(createDigitalButton( controller.addElement(createDigitalButton(
ControllerPacket.LB_FLAG, 0, 1, "LB", -1, controller, context), ControllerPacket.LB_FLAG, 0, 1, "LB", -1, controller, context),
getPercent(65, screen.widthPixels), getPercent(BUTTON_BASE_X, screen.widthPixels),
getPercent(40, screen.heightPixels), getPercent(BUTTON_BASE_Y+2*BUTTON_HEIGHT, screen.heightPixels),
getPercent(10, screen.widthPixels), getPercent(BUTTON_WIDTH, screen.widthPixels),
getPercent(10, screen.heightPixels) getPercent(BUTTON_HEIGHT, screen.heightPixels)
); );
controller.addElement(createDigitalButton( controller.addElement(createDigitalButton(
ControllerPacket.RB_FLAG, 0, 1, "RB", -1, controller, context), ControllerPacket.RB_FLAG, 0, 1, "RB", -1, controller, context),
getPercent(85, screen.widthPixels), getPercent(BUTTON_BASE_X+2*BUTTON_WIDTH, screen.widthPixels),
getPercent(40, screen.heightPixels), getPercent(BUTTON_BASE_Y+2*BUTTON_HEIGHT, screen.heightPixels),
getPercent(10, screen.widthPixels), getPercent(BUTTON_WIDTH, screen.widthPixels),
getPercent(10, screen.heightPixels) getPercent(BUTTON_HEIGHT, screen.heightPixels)
); );
controller.addElement(createLeftStick(controller, context), controller.addElement(createLeftStick(controller, context),