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 ear behaviour on armour

Browse source
This commit is contained in:
Sollace 2018-08-24 13:54:24 +02:00
parent 9f42564c7e
commit 7a6a6716de
2 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/main/java/com/minelittlepony/model/AbstractPonyModel.java
View file

@ -528,14 +528,11 @@ public abstract class AbstractPonyModel extends ModelPlayer implements IModel, P
} }
protected void initHead(float yOffset, float stretch) { protected void initHead(float yOffset, float stretch) {
bipedHead = new PonyRenderer(this, 0, 0) bipedHead = new PonyRenderer(this, 0, 0)
.offset(HEAD_CENTRE_X, HEAD_CENTRE_Y, HEAD_CENTRE_Z) .offset(HEAD_CENTRE_X, HEAD_CENTRE_Y, HEAD_CENTRE_Z)
.around(HEAD_RP_X, HEAD_RP_Y + yOffset, HEAD_RP_Z - 2) .around(HEAD_RP_X, HEAD_RP_Y + yOffset, HEAD_RP_Z - 2)
.box(-4, -4, -4, 8, 8, 8, stretch) .box(-4, -4, -4, 8, 8, 8, stretch);
.tex(12, 16).box(-4, -6, 1, 2, 2, 2, stretch) initEars(((PonyRenderer)bipedHead), yOffset, stretch);
.flip().box( 2, -6, 1, 2, 2, 2, stretch);
bipedHeadwear = new PonyRenderer(this, 32, 0) bipedHeadwear = new PonyRenderer(this, 32, 0)
.offset(HEAD_CENTRE_X, HEAD_CENTRE_Y, HEAD_CENTRE_Z) .offset(HEAD_CENTRE_X, HEAD_CENTRE_Y, HEAD_CENTRE_Z)
@ -546,6 +543,11 @@ public abstract class AbstractPonyModel extends ModelPlayer implements IModel, P
snout.init(yOffset, stretch); snout.init(yOffset, stretch);
} }
protected void initEars(PonyRenderer head, float yOffset, float stretch) {
head.tex(12, 16).box(-4, -6, 1, 2, 2, 2, stretch) // right ear
.flip().box( 2, -6, 1, 2, 2, 2, stretch); // left ear
}
protected void initTail(float yOffset, float stretch) { protected void initTail(float yOffset, float stretch) {
tail = new PonyTail(this); tail = new PonyTail(this);
tail.init(yOffset, stretch); tail.init(yOffset, stretch);
@ -786,6 +788,7 @@ public abstract class AbstractPonyModel extends ModelPlayer implements IModel, P
transform(BodyPart.LEGS); transform(BodyPart.LEGS);
renderLegs(scale); renderLegs(scale);
popMatrix(); popMatrix();
} }
/** /**

9
src/main/java/com/minelittlepony/model/armour/ModelPonyArmor.java
View file

@ -41,11 +41,10 @@ public class ModelPonyArmor extends AbstractPonyModel implements IModelArmor {
} }
@Override @Override
protected void initHead(float yOffset, float stretch) { protected void initEars(PonyRenderer head, float yOffset, float stretch) {
super.initHead(yOffset, stretch * 1.1F); stretch /= 2;
((PonyRenderer)bipedHead).child() head.tex(0, 0).box(-4, -6, 1, 2, 2, 2, stretch) // right ear
.tex(0, 4).box(2, -6, 1, 2, 2, 2, stretch * 0.5F) .tex(0, 4).box( 2, -6, 1, 2, 2, 2, stretch); // left ear
.box(-4, -6, 1, 2, 2, 2, stretch * 0.5F);
} }
@Override @Override