Skip to content

Preserve cursor visibility for disabled FlyByCamera (#1219) #3088

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

Open
adrian-andrzjewski wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Preserve cursor visibility for disabled FlyByCamera (#1219) #3088

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 1 addition & 2 deletions jme3-core/src/main/java/com/jme3/input/FlyByCamera.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,10 +277,9 @@ public void setDragToRotate(boolean dragToRotate) {
*/
public void registerWithInput(InputManager inputManager) {
this.inputManager = inputManager;
// Keep cursor visibility under application control when the camera is disabled.
if (enabled) {
registerInputMappings();
} else {
inputManager.setCursorVisible(true);
}
inputManager.addJoystickConnectionListener(this);
}
Expand Down
24 changes: 24 additions & 0 deletions jme3-core/src/test/java/com/jme3/test/PreventCoreIssueRegressions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
import com.jme3.app.state.ScreenshotAppState;
import com.jme3.asset.AssetManager;
import com.jme3.asset.DesktopAssetManager;
import com.jme3.input.FlyByCamera;
import com.jme3.input.InputManager;
import com.jme3.input.KeyInput;
import com.jme3.input.RawInputListener;
Expand Down Expand Up @@ -142,6 +143,29 @@ public void testIssue1138() {
}
}

/**
* Test case for JME issue #1219: Registering a disabled FlyByCamera preserves cursor visibility.
*/
@Test
public void testIssue1219() {
DummyMouseInput mouse = new DummyMouseInput();
mouse.initialize();
DummyKeyInput keys = new DummyKeyInput();
keys.initialize();
InputManager inputManager = new InputManager(mouse, keys, null, null);
FlyByCamera flyCam = new FlyByCamera(new Camera(1, 1));

flyCam.setEnabled(false);
inputManager.setCursorVisible(false);
flyCam.registerWithInput(inputManager);

assertFalse(inputManager.isCursorVisible());

flyCam.setEnabled(true);
flyCam.setEnabled(false);
assertTrue(inputManager.isCursorVisible());
}

@Test
public void testDeletedMappingClearsPressedKeyState() {
TestKeyInput keys = new TestKeyInput();
Expand Down