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

Tidy up ponytails

Browse source
This commit is contained in:
Sollace 2018-04-26 23:53:22 +02:00
parent 2ad7119723
commit 7a66dfda42
1 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/main/java/com/minelittlepony/model/components/PonyTail.java
View file

@ -35,13 +35,13 @@ public class PonyTail extends PlaneRenderer {
} else if (theModel.isRiding) { } else if (theModel.isRiding) {
rotationPointZ = 13; rotationPointZ = 13;
rotationPointY = 3; rotationPointY = 3;
rotateAngleX = (float) (Math.PI * 0.2); rotateAngleX = PI / 5;
} else { } else {
setRotationPoint(TAIL_RP_X, TAIL_RP_Y, TAIL_RP_Z_NOTSNEAK); setRotationPoint(TAIL_RP_X, TAIL_RP_Y, TAIL_RP_Z_NOTSNEAK);
if (rainboom) { if (rainboom) {
rotateAngleX = ROTATE_90 + 0.1F * MathHelper.sin(limbSwing); rotateAngleX = ROTATE_90 + MathHelper.sin(limbSwing) / 10;
} else { } else {
rotateAngleX = 0.5F * limbSwingAmount; rotateAngleX = limbSwingAmount / 2;
} }
if (!rainboom) { if (!rainboom) {
@ -50,17 +50,17 @@ public class PonyTail extends PlaneRenderer {
} }
if (rainboom) { if (rainboom) {
rotationPointY += 6.0F; rotationPointY += 6;
rotationPointZ++; rotationPointZ++;
} }
} }
public void swingZ(boolean rainboom, float move, float swing) { public void swingZ(boolean rainboom, float move, float swing) {
rotateAngleZ = rainboom ? 0 : MathHelper.cos(move * 0.8F) * 0.2F * swing; rotateAngleZ = rainboom ? 0 : MathHelper.cos(move * 0.8F) * 0.2f * swing;
} }
public void swingX(float tick) { public void swingX(float tick) {
float sinTickFactor = MathHelper.sin(tick * 0.067F) * 0.05F; float sinTickFactor = MathHelper.sin(tick * 0.067f) * 0.05f;
rotateAngleX += sinTickFactor; rotateAngleX += sinTickFactor;
rotateAngleY += sinTickFactor; rotateAngleY += sinTickFactor;
} }
@ -94,16 +94,18 @@ public class PonyTail extends PlaneRenderer {
int texX = (index % 2) * 4; int texX = (index % 2) * 4;
if (index == 0) { if (index == 0) {
setTextureOffset(32, 0).addTopPlane(-2, 0, 2, 4, 4, stretch); tex(32, 0).addTopPlane(-2, 0, 2, 4, 4, stretch);
} }
setTextureOffset(36, texX).addEastPlane(2, 0, 2, 4, 4, stretch); around(TAIL_RP_X, TAIL_RP_Y + yOffset, TAIL_RP_Z);
addWestPlane(-2, 0, 2, 4, 4, stretch); tex(36, texX)
setTextureOffset(32, texX).addBackPlane(-2, 0, 2, 4, 4, stretch); .addEastPlane(2, 0, 2, 4, 4, stretch)
addFrontPlane(-2, 0, 6, 4, 4, stretch); .addWestPlane(-2, 0, 2, 4, 4, stretch);
setTextureOffset(32, 0).addBottomPlane(-2, 4, 2, 4, 4, stretch); tex(32, texX)
.addBackPlane(-2, 0, 2, 4, 4, stretch)
setRotationPoint(TAIL_RP_X, TAIL_RP_Y + yOffset, TAIL_RP_Z); .addFrontPlane(-2, 0, 6, 4, 4, stretch);
tex(32, 0)
.addBottomPlane(-2, 4, 2, 4, 4, stretch);
} }
} }
} }