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

Removed redundand texture shift for left and legacy wings (and cleaned code that made it possible)

Browse source
This commit is contained in:
PolyacovYury 2018-11-05 22:57:52 +03:00
parent 4afbf7abb3
commit 341383bd42
6 changed files with 13 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/com/minelittlepony/model/components/BatWings.java
View file

@ -13,10 +13,8 @@ public class BatWings<T extends AbstractPonyModel & IModelPegasus> extends Pegas
@Override @Override
public void init(float yOffset, float stretch) { public void init(float yOffset, float stretch) {
int x = 57; leftWing = new ModelBatWing<>(pegasus, false, false, yOffset, stretch, 16);
rightWing = new ModelBatWing<>(pegasus, true, false, yOffset, stretch, 16);
leftWing = new ModelBatWing<T>(pegasus, false, false, yOffset, stretch, x, 16);
rightWing = new ModelBatWing<T>(pegasus, true, false, yOffset, stretch, x - 1, 16);
} }
@Override @Override

6
src/main/java/com/minelittlepony/model/components/BugWings.java
View file

@ -11,10 +11,8 @@ public class BugWings<T extends AbstractPonyModel & IModelPegasus> extends Pegas
@Override @Override
public void init(float yOffset, float stretch) { public void init(float yOffset, float stretch) {
int x = 57; leftWing = new ModelBugWing<>(pegasus, false, false, yOffset, stretch, 16);
rightWing = new ModelBugWing<>(pegasus, true, false, yOffset, stretch, 16);
leftWing = new ModelBugWing<T>(pegasus, false, false, yOffset, stretch, x, 16);
rightWing = new ModelBugWing<T>(pegasus, true, false, yOffset, stretch, x - 1, 16);
} }
@Override @Override

4
src/main/java/com/minelittlepony/model/components/ModelBatWing.java
View file

@ -6,8 +6,8 @@ import com.minelittlepony.render.model.PlaneRenderer;
public class ModelBatWing<T extends AbstractPonyModel & IModelPegasus> extends ModelWing<T> { public class ModelBatWing<T extends AbstractPonyModel & IModelPegasus> extends ModelWing<T> {
public ModelBatWing(T pegasus, boolean right, boolean legacy, float y, float scale, int texX, int texY) { public ModelBatWing(T pegasus, boolean right, boolean legacy, float y, float scale, int texY) {
super(pegasus, right, legacy, y, scale, texX, texY); super(pegasus, right, legacy, y, scale, texY);
} }
@Override @Override

4
src/main/java/com/minelittlepony/model/components/ModelBugWing.java
View file

@ -6,8 +6,8 @@ import com.minelittlepony.render.model.PlaneRenderer;
public class ModelBugWing<T extends AbstractPonyModel & IModelPegasus> extends ModelWing<T> { public class ModelBugWing<T extends AbstractPonyModel & IModelPegasus> extends ModelWing<T> {
public ModelBugWing(T pegasus, boolean right, boolean legacy, float y, float scale, int texX, int texY) { public ModelBugWing(T pegasus, boolean right, boolean legacy, float y, float scale, int texY) {
super(pegasus, right, legacy, y, scale, texX, texY); super(pegasus, right, legacy, y, scale, texY);
} }
@Override @Override

4
src/main/java/com/minelittlepony/model/components/ModelWing.java
View file

@ -15,11 +15,11 @@ public class ModelWing<T extends AbstractPonyModel & IModelPegasus> implements P
protected final PonyRenderer extended; protected final PonyRenderer extended;
protected final PonyRenderer folded; protected final PonyRenderer folded;
public ModelWing(T pegasus, boolean right, boolean legacy, float y, float scale, int texX, int texY) { public ModelWing(T pegasus, boolean right, boolean legacy, float y, float scale, int texY) {
this.pegasus = pegasus; this.pegasus = pegasus;
folded = new PonyRenderer(pegasus, 56, texY).mirror(legacy); folded = new PonyRenderer(pegasus, 56, texY).mirror(legacy);
extended = new PonyRenderer(pegasus, texX, texY + 3); extended = new PonyRenderer(pegasus, 56, texY + 3);
addClosedWing(right, y, scale); addClosedWing(right, y, scale);
addFeathers(right, legacy, y, scale); addFeathers(right, legacy, y, scale);

8
src/main/java/com/minelittlepony/model/components/PegasusWings.java
View file

@ -26,12 +26,10 @@ public class PegasusWings<T extends AbstractPonyModel & IModelPegasus> implement
@Override @Override
public void init(float yOffset, float stretch) { public void init(float yOffset, float stretch) {
int x = 57; leftWing = new ModelWing<>(pegasus, false, false, yOffset, stretch, 32);
rightWing = new ModelWing<>(pegasus, true, false, yOffset, stretch, 16);
leftWing = new ModelWing<>(pegasus, false, false, yOffset, stretch, x, 32); legacyWing = new ModelWing<>(pegasus, true, true, yOffset, stretch, 32);
rightWing = new ModelWing<>(pegasus, true, false, yOffset, stretch, x - 1, 16);
legacyWing = new ModelWing<>(pegasus, true, true, yOffset, stretch, x, 32);
} }
public ModelWing<T> getLeft() { public ModelWing<T> getLeft() {