Skip to content
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

Bugfix: Screen Density calculation. #90

Merged
merged 1 commit into from
Feb 21, 2023
Merged

Bugfix: Screen Density calculation. #90

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
13 changes: 7 additions & 6 deletions backends/backend-teavm/src/main/java/com/github/xpenatan/gdx/backends/teavm/TeaGraphics.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,13 +186,13 @@ public GLVersion getGLVersion() {
}

@Override
public float getPpiX() {
return 96;
public float getPpiX () {
return 96f * (float)getNativeScreenDensity();
}

@Override
public float getPpiY() {
return 96;
public float getPpiY () {
return 96f * (float)getNativeScreenDensity();
}

@Override
Expand All @@ -206,8 +206,9 @@ public float getPpcY() {
}

@Override
public float getDensity() {
return 96.0f / 160;
public float getDensity () {
float ppiX = getPpiX();
return (ppiX > 0 && ppiX <= Float.MAX_VALUE) ? ppiX / 160f : 1f;
}

@Override
Expand Down
43 changes: 9 additions & 34 deletions backends/backend-teavm/src/main/java/com/github/xpenatan/gdx/backends/teavm/TeaInput.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,8 +141,8 @@ private void handleMouseEvents(EventWrapper e) {
this.deltaX[0] = 0;
this.deltaY[0] = 0;
if(isCursorCatched()) {
this.touchX[0] += getMovementXJS(mouseEvent);
this.touchY[0] += getMovementYJS(mouseEvent);
this.touchX[0] += mouseEvent.getMovementX();
this.touchY[0] += mouseEvent.getMovementY();
}
else {
int relativeX = getRelativeX(mouseEvent, canvas);
Expand All @@ -163,9 +163,9 @@ else if(type.equals("mouseup")) {
this.pressedButtons.remove(KeyCodes.getButton(mouseEvent.getButton()));
this.touched[0] = pressedButtons.size > 0;
if(isCursorCatched()) {
setDelta(0, (int)getMovementXJS(mouseEvent), (int)getMovementYJS(mouseEvent));
this.touchX[0] += getMovementXJS(mouseEvent);
this.touchY[0] += getMovementYJS(mouseEvent);
setDelta(0, (int)mouseEvent.getMovementX(), (int)mouseEvent.getMovementY());
this.touchX[0] += mouseEvent.getMovementX();
this.touchY[0] += mouseEvent.getMovementY();
}
else {
setDelta(0, getRelativeX(mouseEvent, canvas) - touchX[0], getRelativeY(mouseEvent, canvas) - touchY[0]);
Expand All @@ -180,9 +180,9 @@ else if(type.equals("mouseup")) {
else if(type.equals("mousemove")) {
MouseEventWrapper mouseEvent = (MouseEventWrapper)e;
if(isCursorCatched()) {
setDelta(0, (int)getMovementXJS(mouseEvent), (int)getMovementYJS(mouseEvent));
this.touchX[0] += getMovementXJS(mouseEvent);
this.touchY[0] += getMovementYJS(mouseEvent);
setDelta(0, (int)mouseEvent.getMovementX(), (int)mouseEvent.getMovementY());
this.touchX[0] += mouseEvent.getMovementX();
this.touchY[0] += mouseEvent.getMovementY();
}
else {
int relativeX = getRelativeX(mouseEvent, canvas);
Expand Down Expand Up @@ -390,30 +390,6 @@ public void setDelta(int touchId, int x, int y) {
deltaY[touchId] = y;
}

/**
* from https://github.com/toji/game-shim/blob/master/game-shim.js
*
* @param event JavaScript Mouse Event
* @return movement in x direction
*/
private float getMovementXJS(MouseEventWrapper event) {
return event.getMovementX();
}

;

/**
* from https://github.com/toji/game-shim/blob/master/game-shim.js
*
* @param event JavaScript Mouse Event
* @return movement in y direction
*/
private float getMovementYJS(MouseEventWrapper event) {
return event.getMovementY();
}

;

private ElementWrapper getCompatMode(HTMLDocumentWrapper target) {
String compatMode = target.getCompatMode();
boolean isComp = compatMode.equals("CSS1Compat");
Expand Down Expand Up @@ -813,8 +789,7 @@ public boolean isCursorCatched() {

@Override
public void setCursorPosition(int x, int y) {
// TODO Auto-generated method stub

// not possible in a browser window
}

@Override
Expand Down