PonyMirrors/MineLittlePony
1
0
Fork 0
mirror of https://github.com/MineLittlePony/MineLittlePony.git synced 2024-11-29 07:27:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

Tweak the horsecam calculations a little

Browse source
This commit is contained in:
Sollace 2022-12-08 03:09:32 +00:00
parent 9ca7e06075
commit 743d012533
1 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3,10 +3,10 @@ package com.minelittlepony.client;
import net.minecraft.client.MinecraftClient; import net.minecraft.client.MinecraftClient;
import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.util.hit.HitResult; import net.minecraft.util.hit.HitResult;
import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.*;
import net.minecraft.util.math.Vec3d;
import com.minelittlepony.api.pony.IPony; import com.minelittlepony.api.pony.IPony;
import com.minelittlepony.common.util.settings.Setting;
public class HorseCam { public class HorseCam {
private static float lastOriginalPitch; private static float lastOriginalPitch;
@ -48,8 +48,20 @@ public class HorseCam {
IPony pony = MineLittlePony.getInstance().getManager().getPony(player); IPony pony = MineLittlePony.getInstance().getManager().getPony(player);
if (!pony.getRace().isHuman()) { if (!pony.getRace().isHuman()) {
float factor = pony.getMetadata().getSize().getEyeHeightFactor(); Setting<Boolean> fillyCam = MineLittlePony.getInstance().getConfig().fillycam;
pitch = rescaleCameraPitch(player.getStandingEyeHeight() / factor, pitch);
fillyCam.set(false);
final float vanillaHeight = player.getEyeHeight(player.getPose());
fillyCam.set(true);
final float alteredHeight = player.getEyeHeight(player.getPose());
// only change the angle if required
if (!MathHelper.approximatelyEquals(vanillaHeight, alteredHeight)) {
pitch = rescaleCameraPitch(vanillaHeight, pitch);
}
//float factor = pony.getMetadata().getSize().getEyeHeightFactor();
//pitch = rescaleCameraPitch(player.getStandingEyeHeight() / factor, pitch);
} }
if (lastOriginalPitch != 0) { if (lastOriginalPitch != 0) {
@ -123,8 +135,8 @@ public class HorseCam {
Vec3d hitPos = hit.getPos(); Vec3d hitPos = hit.getPos();
Vec3d pos = player.getPos(); Vec3d pos = player.getPos();
double diffX = Math.abs(hitPos.x - pos.x); double diffX = hitPos.x - pos.x;
double diffZ = Math.abs(hitPos.z - pos.z); double diffZ = hitPos.z - pos.z;
double horDist = Math.sqrt(diffX * diffX + diffZ * diffZ); double horDist = Math.sqrt(diffX * diffX + diffZ * diffZ);