Skip to content

Commit 045d849

Browse files
committed
Remove ancient deprecated code from com.jme3.input package
1 parent 33902ef commit 045d849

4 files changed

Lines changed: 0 additions & 121 deletions

File tree

jme3-core/src/main/java/com/jme3/input/AbstractJoystick.java

Lines changed: 0 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -92,50 +92,6 @@ public void stopRumble() {
9292
joyInput.stopJoyRumble(joyId);
9393
}
9494

95-
/**
96-
* Assign the mapping name to receive events from the given button index
97-
* on the joystick.
98-
*
99-
* @param mappingName The mapping to receive joystick button events.
100-
* @param buttonId The button index.
101-
*
102-
* @see Joystick#getButtonCount()
103-
* @deprecated Use JoystickButton.assignButton() instead.
104-
*/
105-
@Override
106-
@Deprecated
107-
public void assignButton(String mappingName, int buttonId) {
108-
if (buttonId < 0 || buttonId >= getButtonCount())
109-
throw new IllegalArgumentException();
110-
111-
inputManager.addMapping(mappingName, new JoyButtonTrigger(joyId, buttonId));
112-
}
113-
114-
/**
115-
* Assign the mappings to receive events from the given joystick axis.
116-
*
117-
* @param positiveMapping The mapping to receive events when the axis is negative
118-
* @param negativeMapping The mapping to receive events when the axis is positive
119-
* @param axisId The axis index.
120-
*
121-
* @see Joystick#getAxisCount()
122-
* @deprecated Use JoystickAxis.assignAxis() instead.
123-
*/
124-
@Override
125-
@Deprecated
126-
public void assignAxis(String positiveMapping, String negativeMapping, int axisId) {
127-
128-
// For backwards compatibility
129-
if (axisId == JoyInput.AXIS_POV_X) {
130-
axisId = getPovXAxis().getAxisId();
131-
} else if (axisId == JoyInput.AXIS_POV_Y) {
132-
axisId = getPovYAxis().getAxisId();
133-
}
134-
135-
inputManager.addMapping(positiveMapping, new JoyAxisTrigger(joyId, axisId, false));
136-
inputManager.addMapping(negativeMapping, new JoyAxisTrigger(joyId, axisId, true));
137-
}
138-
13995
@Override
14096
public JoystickAxis getAxis(String logicalId) {
14197
for (JoystickAxis axis : axes) {

jme3-core/src/main/java/com/jme3/input/ChaseCamera.java

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -100,43 +100,6 @@ public class ChaseCamera implements ActionListener, AnalogListener, Control, Jme
100100
protected Vector3f temp = new Vector3f(0, 0, 0);
101101
protected boolean invertYaxis = false;
102102
protected boolean invertXaxis = false;
103-
104-
/**
105-
* @deprecated use {@link CameraInput#CHASECAM_DOWN}
106-
*/
107-
@Deprecated
108-
public static final String ChaseCamDown = "ChaseCamDown";
109-
/**
110-
* @deprecated use {@link CameraInput#CHASECAM_UP}
111-
*/
112-
@Deprecated
113-
public static final String ChaseCamUp = "ChaseCamUp";
114-
/**
115-
* @deprecated use {@link CameraInput#CHASECAM_ZOOMIN}
116-
*/
117-
@Deprecated
118-
public static final String ChaseCamZoomIn = "ChaseCamZoomIn";
119-
/**
120-
* @deprecated use {@link CameraInput#CHASECAM_ZOOMOUT}
121-
*/
122-
@Deprecated
123-
public static final String ChaseCamZoomOut = "ChaseCamZoomOut";
124-
/**
125-
* @deprecated use {@link CameraInput#CHASECAM_MOVELEFT}
126-
*/
127-
@Deprecated
128-
public static final String ChaseCamMoveLeft = "ChaseCamMoveLeft";
129-
/**
130-
* @deprecated use {@link CameraInput#CHASECAM_MOVERIGHT}
131-
*/
132-
@Deprecated
133-
public static final String ChaseCamMoveRight = "ChaseCamMoveRight";
134-
/**
135-
* @deprecated use {@link CameraInput#CHASECAM_TOGGLEROTATE}
136-
*/
137-
@Deprecated
138-
public static final String ChaseCamToggleRotate = "ChaseCamToggleRotate";
139-
140103
protected boolean zoomin;
141104
protected boolean hideCursorOnRotate = true;
142105

jme3-core/src/main/java/com/jme3/input/InputManager.java

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -774,20 +774,6 @@ public void setSimulateMouse(boolean value) {
774774
touch.setSimulateMouse(value);
775775
}
776776
}
777-
/**
778-
* @deprecated Use isSimulateMouse
779-
* Returns state of simulation of mouse events. Used for touchscreen input only.
780-
*
781-
* @return true if a mouse is simulated, otherwise false
782-
*/
783-
@Deprecated
784-
public boolean getSimulateMouse() {
785-
if (touch != null) {
786-
return touch.isSimulateMouse();
787-
} else {
788-
return false;
789-
}
790-
}
791777

792778
/**
793779
* Returns state of simulation of mouse events. Used for touchscreen input only.

jme3-core/src/main/java/com/jme3/input/Joystick.java

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -41,32 +41,6 @@
4141
public interface Joystick extends HapticDevice {
4242

4343

44-
/**
45-
* Assign the mapping name to receive events from the given button index
46-
* on the joystick.
47-
*
48-
* @param mappingName The mapping to receive joystick button events.
49-
* @param buttonId The button index.
50-
*
51-
* @see Joystick#getButtonCount()
52-
* @deprecated Use JoystickButton.assignButton() instead.
53-
*/
54-
@Deprecated
55-
public void assignButton(String mappingName, int buttonId);
56-
57-
/**
58-
* Assign the mappings to receive events from the given joystick axis.
59-
*
60-
* @param positiveMapping The mapping to receive events when the axis is negative
61-
* @param negativeMapping The mapping to receive events when the axis is positive
62-
* @param axisId The axis index.
63-
*
64-
* @see Joystick#getAxisCount()
65-
* @deprecated Use JoystickAxis.assignAxis() instead.
66-
*/
67-
@Deprecated
68-
public void assignAxis(String positiveMapping, String negativeMapping, int axisId);
69-
7044
/**
7145
* Returns the JoystickAxis with the specified logical ID.
7246
*

0 commit comments

Comments
 (0)