TheCloud/Amethyst-Android
1
0
Fork 0
mirror of https://github.com/AngelAuraMC/Amethyst-Android.git synced 2025-09-16 16:16:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

Introduced unified mouse sensitivity.

Browse Source
This commit is contained in:
SerpentSpirale 2021-05-24 18:48:30 +02:00 committed by SerpentSpirale
parent 7132a576bf
commit e77499778f
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/BaseMainActivity.java
View File

@ -40,7 +40,9 @@ public class BaseMainActivity extends LoggableActivity {
private Gamepad gamepad; private Gamepad gamepad;
private boolean rightOverride = false; private boolean rightOverride = false;
private DisplayMetrics displayMetrics;
public float scaleFactor = 1; public float scaleFactor = 1;
public double sensitivityFactor;
private final int fingerStillThreshold = 8; private final int fingerStillThreshold = 8;
private int initialX, initialY; private int initialX, initialY;
private int scrollInitialX, scrollInitialY; private int scrollInitialX, scrollInitialY;
@ -75,7 +77,7 @@ public class BaseMainActivity extends LoggableActivity {
private MinecraftGLView minecraftGLView; private MinecraftGLView minecraftGLView;
private int guiScale; private int guiScale;
private DisplayMetrics displayMetrics;
public boolean hiddenTextIgnoreUpdate = true; public boolean hiddenTextIgnoreUpdate = true;
private boolean isVirtualMouseEnabled; private boolean isVirtualMouseEnabled;
@ -148,7 +150,8 @@ public class BaseMainActivity extends LoggableActivity {
// Minecraft 1.13+ // Minecraft 1.13+
isInputStackCall = mVersionInfo.arguments != null; isInputStackCall = mVersionInfo.arguments != null;
this.displayMetrics = Tools.getDisplayMetrics(this); displayMetrics = Tools.getDisplayMetrics(this);
sensitivityFactor = 1.4 * (1080f/ displayMetrics.heightPixels);
CallbackBridge.windowWidth = (int) ((float)displayMetrics.widthPixels * scaleFactor); CallbackBridge.windowWidth = (int) ((float)displayMetrics.widthPixels * scaleFactor);
CallbackBridge.windowHeight = (int) ((float)displayMetrics.heightPixels * scaleFactor); CallbackBridge.windowHeight = (int) ((float)displayMetrics.heightPixels * scaleFactor);
System.out.println("WidthHeight: " + CallbackBridge.windowWidth + ":" + CallbackBridge.windowHeight); System.out.println("WidthHeight: " + CallbackBridge.windowWidth + ":" + CallbackBridge.windowHeight);
@ -442,8 +445,8 @@ public class BaseMainActivity extends LoggableActivity {
if(e.getPointerId(0) != currentPointerID){ if(e.getPointerId(0) != currentPointerID){
currentPointerID = e.getPointerId(0); currentPointerID = e.getPointerId(0);
}else{ }else{
mouse_x += (int) (e.getX() - prevX); mouse_x += (int) (e.getX() - prevX) * sensitivityFactor;
mouse_y += (int) (e.getY() - prevY); mouse_y += (int) (e.getY() - prevY) * sensitivityFactor;
} }
prevX = e.getX(); prevX = e.getX();
prevY = e.getY(); prevY = e.getY();