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

Fixed incorrect angles/improved rotation when in negative gravity

Browse source
This commit is contained in:
Sollace 2021-02-23 18:08:17 +02:00
parent a69bcb5419
commit 8ebead92a9
1 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/main/java/com/minelittlepony/unicopia/client/render/WorldRenderDelegate.java
View file

@ -26,6 +26,7 @@ import net.minecraft.client.util.math.MatrixStack;
import net.minecraft.client.util.math.Vector3f; import net.minecraft.client.util.math.Vector3f;
import net.minecraft.entity.Entity; import net.minecraft.entity.Entity;
import net.minecraft.entity.LivingEntity; import net.minecraft.entity.LivingEntity;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.state.property.Properties; import net.minecraft.state.property.Properties;
import net.minecraft.util.math.Direction; import net.minecraft.util.math.Direction;
import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.MathHelper;
@ -69,15 +70,13 @@ public class WorldRenderDelegate {
roll = pony instanceof Pony ? ((Pony)pony).getInterpolator().interpolate("g_roll", roll, 15) : roll; roll = pony instanceof Pony ? ((Pony)pony).getInterpolator().interpolate("g_roll", roll, 15) : roll;
if (negative) { matrices.translate(x, y + owner.getHeight() / 2, z);
matrices.translate(x, y, z); matrices.multiply(Vector3f.POSITIVE_X.getDegreesQuaternion(roll));
matrices.translate(0, owner.getHeight(), 0); matrices.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(roll));
matrices.multiply(Vector3f.POSITIVE_Z.getDegreesQuaternion(roll)); matrices.translate(-x, -y - owner.getHeight() / 2, -z);
matrices.translate(-x, -y, -z);
if (negative) {
flipAngles(owner); flipAngles(owner);
} else {
matrices.multiply(Vector3f.POSITIVE_Z.getDegreesQuaternion(roll));
} }
if (pony instanceof Caster<?>) { if (pony instanceof Caster<?>) {
@ -183,9 +182,10 @@ public class WorldRenderDelegate {
} }
private void flipAngles(Entity entity) { private void flipAngles(Entity entity) {
if (!MinecraftClient.getInstance().options.getPerspective().isFirstPerson()) { if (entity instanceof PlayerEntity) {
entity.prevYaw *= -1; entity.prevYaw *= -1;
entity.yaw *= -1; entity.yaw *= -1;
}
if (entity instanceof LivingEntity) { if (entity instanceof LivingEntity) {
LivingEntity living = (LivingEntity)entity; LivingEntity living = (LivingEntity)entity;
@ -195,7 +195,6 @@ public class WorldRenderDelegate {
living.headYaw = -living.headYaw; living.headYaw = -living.headYaw;
living.prevHeadYaw = -living.prevHeadYaw; living.prevHeadYaw = -living.prevHeadYaw;
} }
}
entity.prevPitch *= -1; entity.prevPitch *= -1;
entity.pitch *= -1; entity.pitch *= -1;
} }