PonyMirrors/MineLittlePony
1
0
Fork 0
mirror of https://github.com/MineLittlePony/MineLittlePony.git synced 2025-02-13 16:24:23 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fixed inaccuracies when adjusting for altered camera heights

Browse source
This commit is contained in:
Sollace 2022-12-12 21:56:23 +00:00
parent ee0aca3967
commit 8feaccd9bb
1 changed files with 21 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

74
src/main/java/com/minelittlepony/client/HorseCam.java
View file

@ -12,6 +12,9 @@ public class HorseCam {
private static float lastOriginalPitch; private static float lastOriginalPitch;
private static float lastComputedPitch; private static float lastComputedPitch;
private static final double HALF_PI = Math.PI / 2D;
private static final double TO_DEGREES = 180D / Math.PI;
/** /**
* Restores the previous camera (unadjusted) angle for the client when the server sends an update. * Restores the previous camera (unadjusted) angle for the client when the server sends an update.
* This is to prevent issues caused by the server updating our pitch whenever the player leaves a portal. * This is to prevent issues caused by the server updating our pitch whenever the player leaves a portal.
@ -81,42 +84,6 @@ public class HorseCam {
* @return The new pitch value, otherwise the original value passed in. * @return The new pitch value, otherwise the original value passed in.
*/ */
public static float rescaleCameraPitch(double toHeight, float originalPitch) { public static float rescaleCameraPitch(double toHeight, float originalPitch) {
/* -90
* |
* ---------------0
* |
* 90
*/
/* A A - toHeight
* |\ B - fromHeight
* |?\ y - headPitch
* | \ ? - result
* | \ C - raytrace
* B- \
* |y - \
* | - \ Tan(?) = horDist / toHeight
*==|-------C=== ? = arcTan(horDist / toHeight);
* horDist
*
* horDist
* |-------C
* | /.
* | /.
* | / .
* | / .
* | / .
* |?/ .
* A/ .
* | .
* | .
* | .
* | .
* B
* |
* |
*==o===========
*/
MinecraftClient client = MinecraftClient.getInstance(); MinecraftClient client = MinecraftClient.getInstance();
PlayerEntity player = client.player; PlayerEntity player = client.player;
client.gameRenderer.updateTargetedEntity(client.getTickDelta()); client.gameRenderer.updateTargetedEntity(client.getTickDelta());
@ -132,27 +99,28 @@ public class HorseCam {
return originalPitch; return originalPitch;
} }
Vec3d hitPos = hit.getPos(); return (float)adjustAngle(originalPitch, hit.getPos(), player.getPos(), toHeight);
Vec3d pos = player.getPos(); }
double diffX = hitPos.x - pos.x; private static double adjustAngle(double pitch, Vec3d hitPos, Vec3d pos, double toHeight) {
double diffZ = hitPos.z - pos.z; double x = horizontalDistance(pos, hitPos);
double y = pos.y + toHeight - hitPos.y;
double horDist = Math.sqrt(diffX * diffX + diffZ * diffZ); if (MathHelper.approximatelyEquals(y, 0)) {
return 0;
}
double toEyePos = pos.y + toHeight; double newPitch = (HALF_PI - Math.atan(x / y)) * TO_DEGREES;
if (newPitch > 90) {
newPitch -= 180F;
}
double verDist = Math.abs(hitPos.y - toEyePos); return newPitch;
}
double theta = Math.atan(horDist / verDist); private static double horizontalDistance(Vec3d from, Vec3d to) {
double diffX = to.x - from.x;
// convert to degress double diffZ = to.z - from.z;
theta /= Math.PI / 180D; return Math.sqrt(diffX * diffX + diffZ * diffZ);
// convert to vertical pitch (-90 to 90).
// Preserve up/down direction.
double newPitch = Math.abs(90 - theta) * Math.signum(originalPitch);
return (float)newPitch;
} }
} }