Skip to content

Joy axis update #1483

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Mar 25, 2021
Merged

Joy axis update #1483

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
aa7d0bb
Allows the remapper to distinguish between axis and buttons.
Markil3 Feb 26, 2021
a8add8a
Enables the ability to remap the effective range of an axis.
Markil3 Feb 26, 2021
3286857
Adds axis range remapping to LWJGL and LWJGL3 modules.
Markil3 Feb 27, 2021
9e6bb00
Adds the old constructor back.
Markil3 Feb 27, 2021
3877f84
Fixes the unnecessary whitespace changes.
Markil3 Mar 17, 2021
d906af1
Merge branch 'master' into joyAxisUpdate
Markil3 Mar 17, 2021
111f45f
Fixes some documentation issues.
Markil3 Mar 22, 2021
527e6a0
Merge branch 'master' into joyAxisUpdate
Markil3 Mar 22, 2021
9024b12
Fixes a merge conflict in the header of JInputJoyInput
Markil3 Mar 24, 2021
ce7b817
Removed fine logging.
Markil3 Mar 24, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions jme3-android/src/main/java/com/jme3/input/android/AndroidJoystickJoyInput14.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,7 @@ public List<Joystick> loadJoysticks(int joyId, InputManager inputManager) {

public boolean onGenericMotion(MotionEvent event) {
boolean consumed = false;
float rawValue, value;
// logger.log(Level.INFO, "onGenericMotion event: {0}", event);
event.getDeviceId();
event.getSource();
Expand All @@ -185,7 +186,8 @@ public boolean onGenericMotion(MotionEvent event) {
if (joystick != null) {
for (int androidAxis: joystick.getAndroidAxes()) {
String axisName = MotionEvent.axisToString(androidAxis);
float value = event.getAxisValue(androidAxis);
rawValue = event.getAxisValue(androidAxis);
value = JoystickCompatibilityMappings.remapAxisRange(joystick.getAxis(androidAxis), rawValue);
int action = event.getAction();
if (action == MotionEvent.ACTION_MOVE) {
// logger.log(Level.INFO, "MOVE axis num: {0}, axisName: {1}, value: {2}",
Expand All @@ -194,7 +196,7 @@ public boolean onGenericMotion(MotionEvent event) {
if (axis != null) {
// logger.log(Level.INFO, "MOVE axis num: {0}, axisName: {1}, value: {2}, deadzone: {3}",
// new Object[]{androidAxis, axisName, value, axis.getDeadZone()});
JoyAxisEvent axisEvent = new JoyAxisEvent(axis, value);
JoyAxisEvent axisEvent = new JoyAxisEvent(axis, value, rawValue);
joyInput.addEvent(axisEvent);
consumed = true;
} else {
Expand Down Expand Up @@ -316,7 +318,7 @@ protected JoystickButton addButton( int keyCode ) {
original = JoystickButton.BUTTON_11;
}

String logicalId = JoystickCompatibilityMappings.remapComponent( getName(), original );
String logicalId = JoystickCompatibilityMappings.remapButton( getName(), original );
if( logicalId == null ? original != null : !logicalId.equals(original) ) {
logger.log(Level.FINE, "Remapped: {0} to: {1}",
new Object[]{original, logicalId});
Expand Down Expand Up @@ -347,7 +349,7 @@ protected JoystickAxis addAxis(MotionRange motionRange) {
} else if (motionRange.getAxis() == MotionEvent.AXIS_HAT_Y) {
original = JoystickAxis.POV_Y;
}
String logicalId = JoystickCompatibilityMappings.remapComponent( getName(), original );
String logicalId = JoystickCompatibilityMappings.remapAxis( getName(), original );
if( logicalId == null ? original != null : !logicalId.equals(original) ) {
logger.log(Level.FINE, "Remapped: {0} to: {1}",
new Object[]{original, logicalId});
Expand Down
4 changes: 2 additions & 2 deletions jme3-android/src/main/java/com/jme3/input/android/AndroidSensorJoyInput.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,7 +374,7 @@ private boolean updateOrientation() {
sensorData.haveData = true;
} else {
if (axis.isChanged()) {
joyInput.addEvent(new JoyAxisEvent(axis, axis.getJoystickAxisValue()));
joyInput.addEvent(new JoyAxisEvent(axis, axis.getJoystickAxisValue(), axis.getJoystickAxisValue()));
}
}
}
Expand Down Expand Up @@ -553,7 +553,7 @@ public void onSensorChanged(SensorEvent se) {
sensorData.haveData = true;
} else {
if (axis.isChanged()) {
JoyAxisEvent event = new JoyAxisEvent(axis, axis.getJoystickAxisValue());
JoyAxisEvent event = new JoyAxisEvent(axis, axis.getJoystickAxisValue(), axis.getJoystickAxisValue());
// logger.log(Level.INFO, "adding JoyAxisEvent: {0}", event);
joyInput.addEvent(event);
// joyHandler.addEvent(new JoyAxisEvent(axis, axis.getJoystickAxisValue()));
Expand Down
Loading