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

Tweak a few animations

Browse source
This commit is contained in:
Matthew Messinger 2016-05-20 04:51:27 -04:00
parent 16fd7ef973
commit 8fe82a826f
3 changed files with 26 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/main/java/com/brohoof/minelittlepony/model/PonyModelConstants.java
View file

@ -10,16 +10,16 @@ public interface PonyModelConstants {
float BODY_ROTATE_ANGLE_X_RIDING = (float) (Math.PI * 3.8); float BODY_ROTATE_ANGLE_X_RIDING = (float) (Math.PI * 3.8);
float BODY_RP_Y_NOTSNEAK = 0.0F; float BODY_RP_Y_NOTSNEAK = 0.0F;
float BODY_RP_Y_SNEAK = 7.0F; float BODY_RP_Y_SNEAK = 7.0F;
float BODY_RP_Y_RIDING = 3; float BODY_RP_Y_RIDING = 1;
float BODY_RP_Z_NOTSNEAK = 0.0F; float BODY_RP_Z_NOTSNEAK = 0.0F;
float BODY_RP_Z_SNEAK = -4.0F; float BODY_RP_Z_SNEAK = -4.0F;
float BODY_RP_Z_RIDING = 6F; float BODY_RP_Z_RIDING = 4F;
float EXT_WING_ROTATE_ANGLE_X = 2.5F; float EXT_WING_ROTATE_ANGLE_X = 2.5F;
float FIRSTP_ARM_CENTRE_X = -1.0F; float FIRSTP_ARM_CENTRE_X = -1.0F;
float FIRSTP_ARM_CENTRE_Y = 4.0F; float FIRSTP_ARM_CENTRE_Y = 4.0F;
float FIRSTP_ARM_CENTRE_Z = 0.0F; float FIRSTP_ARM_CENTRE_Z = 0.0F;
float FRONT_LEG_RP_Y_NOTSNEAK = 8.0F; float FRONT_LEG_RP_Y_NOTSNEAK = 8.0F;
float FRONT_LEG_RP_Y_SNEAK = 7.0F; float FRONT_LEG_RP_Y_SNEAK = 6.0F;
float HEAD_CENTRE_X = 0.0F; float HEAD_CENTRE_X = 0.0F;
float HEAD_CENTRE_Y = -1.0F; float HEAD_CENTRE_Y = -1.0F;
float HEAD_CENTRE_Z = -2.0F; float HEAD_CENTRE_Z = -2.0F;
@ -46,12 +46,12 @@ public interface PonyModelConstants {
float RIGHT_WING_RP_Z_SNEAK = 2.0F; float RIGHT_WING_RP_Z_SNEAK = 2.0F;
float ROTATE_270 = 4.712F; float ROTATE_270 = 4.712F;
float ROTATE_90 = 1.571F; float ROTATE_90 = 1.571F;
float SNEAK_LEG_X_ROTATION_ADJUSTMENT = 0.4F; float SNEAK_LEG_X_ROTATION_ADJUSTMENT = 0.8F;
float TAIL_RP_X = 0.0F; float TAIL_RP_X = 0.0F;
float TAIL_RP_Y = 0.8F; float TAIL_RP_Y = 0.0F;
float TAIL_RP_Z = 0.0F; float TAIL_RP_Z = 0.0F;
float TAIL_RP_Z_NOTSNEAK = 14.0F; float TAIL_RP_Z_NOTSNEAK = 14.0F;
float TAIL_RP_Z_SNEAK = 10.0F; float TAIL_RP_Z_SNEAK = 15.0F;
float THIRDP_ARM_CENTRE_X = 0.0F; float THIRDP_ARM_CENTRE_X = 0.0F;
float THIRDP_ARM_CENTRE_Y = 10.0F; float THIRDP_ARM_CENTRE_Y = 10.0F;
float THIRDP_ARM_CENTRE_Z = 0.0F; float THIRDP_ARM_CENTRE_Z = 0.0F;

3
src/main/java/com/brohoof/minelittlepony/model/part/AbstractHeadPart.java
View file

@ -4,8 +4,6 @@ import com.brohoof.minelittlepony.PonyData;
import com.brohoof.minelittlepony.model.AbstractPonyModel; import com.brohoof.minelittlepony.model.AbstractPonyModel;
import com.brohoof.minelittlepony.model.BodyPart; import com.brohoof.minelittlepony.model.BodyPart;
import net.minecraft.client.renderer.GlStateManager;
public abstract class AbstractHeadPart implements IPonyPart { public abstract class AbstractHeadPart implements IPonyPart {
protected final AbstractPonyModel pony; protected final AbstractPonyModel pony;
@ -17,7 +15,6 @@ public abstract class AbstractHeadPart implements IPonyPart {
@Override @Override
public void render(PonyData data, float scale) { public void render(PonyData data, float scale) {
pony.transform(BodyPart.HEAD); pony.transform(BodyPart.HEAD);
GlStateManager.translate(pony.bipedHead.offsetX, pony.bipedHead.offsetY, pony.bipedHead.offsetZ);
pony.bipedHead.postRender(scale); pony.bipedHead.postRender(scale);
} }

35
src/main/java/com/brohoof/minelittlepony/model/pony/ModelPlayerPony.java
View file

@ -89,25 +89,24 @@ public class ModelPlayerPony extends AbstractPonyModel implements PonyModelConst
} else if (this.isRiding) { } else if (this.isRiding) {
this.adjustBodyComponents(BODY_ROTATE_ANGLE_X_RIDING, BODY_RP_Y_RIDING, BODY_RP_Z_RIDING); this.adjustBodyComponents(BODY_ROTATE_ANGLE_X_RIDING, BODY_RP_Y_RIDING, BODY_RP_Z_RIDING);
this.adjustNeck((float) (Math.PI * 1), 9, 1); this.adjustNeck(BODY_ROTATE_ANGLE_X_NOTSNEAK, BODY_RP_Y_NOTSNEAK, BODY_RP_Z_NOTSNEAK);
this.bipedHead.offsetY = .1f;
this.bipedHead.offsetZ = .1f;
this.bipedHeadwear.offsetY = .1f;
this.bipedHeadwear.offsetZ = .1f;
this.bipedLeftLeg.rotationPointZ = 15; this.bipedLeftLeg.rotationPointZ = 15;
this.bipedLeftLeg.rotationPointY = 21; this.bipedLeftLeg.rotationPointY = 10;
this.bipedLeftLeg.rotateAngleX = (float) (Math.PI * 1.5); this.bipedLeftLeg.rotateAngleX = (float) (Math.PI * -0.25);
this.bipedLeftLeg.rotateAngleY = -.2f; this.bipedLeftLeg.rotateAngleY = (float) (Math.PI * -0.2);
this.bipedRightLeg.rotationPointZ = 15; this.bipedRightLeg.rotationPointZ = 15;
this.bipedRightLeg.rotationPointY = 21; this.bipedRightLeg.rotationPointY = 10;
this.bipedRightLeg.rotateAngleX = (float) (Math.PI * 1.5); this.bipedRightLeg.rotateAngleX = (float) (Math.PI * -0.25);
this.bipedRightLeg.rotateAngleY = .2f; this.bipedRightLeg.rotateAngleY = (float) (Math.PI * 0.2);
this.bipedLeftArm.rotateAngleZ = (float) (Math.PI * -0.06);
this.bipedRightArm.rotateAngleZ = (float) (Math.PI * 0.06);
for (int i = 0; i < Tail.length; ++i) { for (int i = 0; i < Tail.length; ++i) {
setRotationPoint(this.Tail[i], TAIL_RP_X, TAIL_RP_Y, TAIL_RP_Z_NOTSNEAK); this.Tail[i].rotationPointZ = 13;
this.Tail[i].rotationPointZ = 15; this.Tail[i].rotationPointY = 3;
this.Tail[i].rotationPointY = 14; this.Tail[i].rotateAngleX = (float) (Math.PI * 0.2);
} }
} else { } else {
@ -459,6 +458,8 @@ public class ModelPlayerPony extends AbstractPonyModel implements PonyModelConst
this.bipedLeftArm.rotateAngleX -= SNEAK_LEG_X_ROTATION_ADJUSTMENT; this.bipedLeftArm.rotateAngleX -= SNEAK_LEG_X_ROTATION_ADJUSTMENT;
this.bipedRightLeg.rotationPointY = FRONT_LEG_RP_Y_SNEAK; this.bipedRightLeg.rotationPointY = FRONT_LEG_RP_Y_SNEAK;
this.bipedLeftLeg.rotationPointY = FRONT_LEG_RP_Y_SNEAK; this.bipedLeftLeg.rotationPointY = FRONT_LEG_RP_Y_SNEAK;
this.bipedRightArm.rotationPointY = 1;
this.bipedLeftArm.rotationPointY = 1;
} }
@ -470,7 +471,7 @@ public class ModelPlayerPony extends AbstractPonyModel implements PonyModelConst
for (int i7 = 0; i7 < tailstop; ++i7) { for (int i7 = 0; i7 < tailstop; ++i7) {
setRotationPoint(this.Tail[i7], TAIL_RP_X, TAIL_RP_Y, TAIL_RP_Z_SNEAK); setRotationPoint(this.Tail[i7], TAIL_RP_X, TAIL_RP_Y, TAIL_RP_Z_SNEAK);
this.Tail[i7].rotateAngleX = 0.0F; this.Tail[i7].rotateAngleX = -BODY_ROTATE_ANGLE_X_SNEAK;
} }
} }
@ -601,6 +602,8 @@ public class ModelPlayerPony extends AbstractPonyModel implements PonyModelConst
var3 = 0; var3 = 0;
} }
this.bipedBody.postRender(this.scale);
for (int k = 0; k < var3; ++k) { for (int k = 0; k < var3; ++k) {
this.Tail[k].render(this.scale); this.Tail[k].render(this.scale);
} }
@ -608,6 +611,8 @@ public class ModelPlayerPony extends AbstractPonyModel implements PonyModelConst
} }
protected void renderLegs() { protected void renderLegs() {
this.bipedBody.postRender(this.scale);
this.bipedLeftArm.render(this.scale); this.bipedLeftArm.render(this.scale);
this.bipedRightArm.render(this.scale); this.bipedRightArm.render(this.scale);
this.bipedLeftLeg.render(this.scale); this.bipedLeftLeg.render(this.scale);