sigonasr2/jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remap logical ID instead of name since it is now

Browse Source 
logical ID that is used for look-ups and it is
not locale specific.


git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9783 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
This commit is contained in:
PSp..om 2012-09-27 21:33:52 +00:00
parent 9b763443fa
commit d9dd8603b8
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
engine/src/lwjgl/com/jme3/input/lwjgl/JInputJoyInput.java
View File

@ -213,14 +213,15 @@ public class JInputJoyInput implements JoyInput {
throw new IllegalArgumentException( "Component is not an axis:" + comp );
}
String original = comp.getName();
String name = JoystickCompatibilityMappings.remapComponent( controller.getName(), original );
String name = comp.getName();
String original = id.getName();
String logicalId = JoystickCompatibilityMappings.remapComponent( controller.getName(), original );
if( name != original ) {
logger.log(Level.INFO, "Remapped:" + original + " to:" + name);
logger.log(Level.INFO, "Remapped:" + original + " to:" + logicalId);
}
JoystickButton button = new DefaultJoystickButton( getInputManager(), this, getButtonCount(),
name, id.getName() );
name, logicalId );
addButton(button);
buttonIndex.put( comp, button );
}
@ -234,14 +235,15 @@ public class JInputJoyInput implements JoyInput {
throw new IllegalArgumentException( "Component is not an axis:" + comp );
}
String original = comp.getName();
String name = JoystickCompatibilityMappings.remapComponent( controller.getName(), original );
String name = comp.getName();
String original = id.getName();
String logicalId = JoystickCompatibilityMappings.remapComponent( controller.getName(), original );
if( name != original ) {
logger.log(Level.INFO, "Remapped:" + original + " to:" + name);
logger.log(Level.INFO, "Remapped:" + original + " to:" + logicalId);
}
JoystickAxis axis = new DefaultJoystickAxis( getInputManager(),
this, getAxisCount(), name, id.getName(),
this, getAxisCount(), name, logicalId,
comp.isAnalog(), comp.isRelative(),
comp.getDeadZone() );
addAxis(axis);