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

Fix jaw positioning and added the other two missing wings to parasprites

Browse source
This commit is contained in:
Sollace 2022-06-18 11:41:15 +02:00
parent 04ad57b526
commit 690decda00
2 changed files with 52 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
src/main/java/com/minelittlepony/client/model/entity/ParaspriteModel.java
View file

@ -7,6 +7,7 @@ import net.minecraft.client.render.entity.model.EntityModel;
import net.minecraft.client.util.math.MatrixStack; import net.minecraft.client.util.math.MatrixStack;
import net.minecraft.entity.LivingEntity; import net.minecraft.entity.LivingEntity;
import net.minecraft.entity.mob.VexEntity; import net.minecraft.entity.mob.VexEntity;
import net.minecraft.util.math.MathHelper;
import com.minelittlepony.common.util.animation.Interpolator; import com.minelittlepony.common.util.animation.Interpolator;
@ -20,6 +21,9 @@ public class ParaspriteModel<T extends LivingEntity> extends EntityModel<T> {
private final ModelPart leftWing; private final ModelPart leftWing;
private final ModelPart rightWing; private final ModelPart rightWing;
private final ModelPart leftWing2;
private final ModelPart rightWing2;
public ParaspriteModel(ModelPart tree) { public ParaspriteModel(ModelPart tree) {
super(RenderLayer::getEntityTranslucent); super(RenderLayer::getEntityTranslucent);
child = false; child = false;
@ -29,6 +33,8 @@ public class ParaspriteModel<T extends LivingEntity> extends EntityModel<T> {
lips = body.getChild("lips"); lips = body.getChild("lips");
leftWing = tree.getChild("leftWing"); leftWing = tree.getChild("leftWing");
rightWing = tree.getChild("rightWing"); rightWing = tree.getChild("rightWing");
leftWing2 = tree.getChild("leftWing2");
rightWing2 = tree.getChild("rightWing2");
} }
@Override @Override
@ -38,6 +44,8 @@ public class ParaspriteModel<T extends LivingEntity> extends EntityModel<T> {
@Override @Override
public void setAngles(T entity, float move, float swing, float ticks, float headYaw, float headPitch) { public void setAngles(T entity, float move, float swing, float ticks, float headYaw, float headPitch) {
root.pitch = MathHelper.clamp((float)entity.getVelocity().horizontalLength() / 10F, 0, 0.1F);
body.pitch = 0; body.pitch = 0;
lips.visible = false; lips.visible = false;
@ -49,26 +57,42 @@ public class ParaspriteModel<T extends LivingEntity> extends EntityModel<T> {
root.pitch = headPitch * 0.017453292F; root.pitch = headPitch * 0.017453292F;
} }
float sin = (float)Math.sin(ticks) / 2; float sin = (float)Math.sin(ticks) / 2F;
float cos = (float)Math.cos(ticks) / 3; float cos = (float)Math.cos(ticks) / 3F;
float jawOpenAmount = Interpolator.linear(entity.getUuid()).interpolate("jawOpen", entity instanceof VexEntity vex && vex.isCharging() ? 1 : 0, 10); float jawOpenAmount = Interpolator.linear(entity.getUuid()).interpolate("jawOpen", entity instanceof VexEntity vex && vex.isCharging() ? 1 : 0, 10);
if (jawOpenAmount > 0) { jaw.pivotY = Math.max(0, 1.2F * jawOpenAmount);
jaw.pivotY = Math.max(0, 2 * jawOpenAmount); lips.pivotY = jaw.pivotY - 0.9F;
lips.pivotY = jaw.pivotY - 1; lips.visible = jawOpenAmount > 0;
lips.visible = true; body.pitch += 0.3F * jawOpenAmount;
body.pitch += 0.3F * jawOpenAmount; jaw.pitch = 0.4F * jawOpenAmount;
jaw.pitch = 0.6F * jawOpenAmount; lips.pitch = 0.2F * jawOpenAmount;
lips.pitch = 0.25F * jawOpenAmount;
} float basWingExpand = 1;
float innerWingExpand = basWingExpand / 2F;
leftWing.visible = true; leftWing.visible = true;
leftWing.roll = 0.5F + cos; leftWing.pitch = 0;
leftWing.yaw = 0.5F - sin; leftWing.roll = basWingExpand + cos + 0.3F;
leftWing.yaw = basWingExpand - sin;
rightWing.visible = true; rightWing.visible = true;
rightWing.roll = -0.5F - cos; rightWing.pitch = 0;
rightWing.yaw = -0.5F + sin; rightWing.roll = -basWingExpand - cos - 0.3F;
rightWing.yaw = -basWingExpand + sin;
sin = -(float)Math.sin(ticks + Math.PI / 4F) / 2F;
cos = (float)Math.cos(ticks + Math.PI / 4F) / 3F;
leftWing2.visible = true;
leftWing2.pitch = 0;
leftWing2.roll = innerWingExpand + sin - 0.3F;
leftWing2.yaw = innerWingExpand - cos + 0.3F;
rightWing2.visible = true;
rightWing2.pitch = 0;
rightWing2.roll = -innerWingExpand - sin + 0.3F;
rightWing2.yaw = -innerWingExpand + cos - 0.3F;
} }
} }

16
src/main/resources/assets/minelittlepony/models/vex.json
View file

@ -37,8 +37,8 @@
} }
] ]
}, },
"rightWing": { "leftWing2": {
"name": "rightWing", "name": "leftWing",
"pivot": [0, -2, 4], "pivot": [0, -2, 4],
"texture": {"u": 48, "v": 0}, "texture": {"u": 48, "v": 0},
"cubes": [ "cubes": [
@ -49,6 +49,18 @@
"size": [ 16, 16 ] "size": [ 16, 16 ]
} }
] ]
},
"rightWing": {
"name": "rightWing",
"pivot": [0, -2, 4],
"type": "mson:planar",
"east": [0, -16, 0, 16, 16, 48, 0, true, false]
},
"rightWing2": {
"name": "rightWing",
"pivot": [0, -2, 4],
"type": "mson:planar",
"east": [0, -16, 0, 16, 16, 48, 0, true, false]
} }
} }
} }