Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Better leg sprite support

Browse Source
This commit is contained in:
Anuken
2020-05-26 10:57:02 -04:00
parent 90f38fd135
commit c1d4a4851f
5 changed files with 461 additions and 434 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/mindustry/entities/Leg.java
View File

@@ -3,6 +3,5 @@ package mindustry.entities;
import arc.math.geom.*;
public class Leg{
public final Vec2 joint = new Vec2(), base = new Vec2(), target = new Vec2();
public boolean moving = false;
public final Vec2 joint = new Vec2(), base = new Vec2();
}

25
core/src/mindustry/type/UnitType.java
View File

@@ -59,7 +59,7 @@ public class UnitType extends UnlockableContent{
public Sound deathSound = Sounds.bang;
public Array<Weapon> weapons = new Array<>();
public TextureRegion baseRegion, legRegion, region, shadowRegion, cellRegion, occlusionRegion;
public TextureRegion baseRegion, legRegion, region, shadowRegion, cellRegion, occlusionRegion, jointRegion, footRegion, legBaseRegion;
public UnitType(String name){
super(name);
@@ -114,6 +114,9 @@ public class UnitType extends UnlockableContent{
weapons.each(Weapon::load);
region = Core.atlas.find(name);
legRegion = Core.atlas.find(name + "-leg");
jointRegion = Core.atlas.find(name + "-joint");
footRegion = Core.atlas.find(name + "-foot");
legBaseRegion = Core.atlas.find(name + "-leg-base", name + "-leg");
baseRegion = Core.atlas.find(name + "-base");
cellRegion = Core.atlas.find(name + "-cell", Core.atlas.find("power-cell"));
occlusionRegion = Core.atlas.find("circle-shadow");
@@ -319,24 +322,28 @@ public class UnitType extends UnlockableContent{
public void drawLegs(Legsc unit){
Leg[] legs = unit.legs();
Lines.stroke(4f, Color.gray);
float srad = 2.1f;
float ssize = footRegion.getWidth() * Draw.scl * 1.5f;
for(Leg leg : legs){
Drawf.shadow(leg.base.x, leg.base.y, ssize);
}
for(Leg leg : legs){
Draw.color();
Lines.stroke(legRegion.getHeight() * Draw.scl);
Lines.line(legRegion, unit.x(), unit.y(), leg.joint.x, leg.joint.y, CapStyle.none, 0);
Lines.line(legRegion, leg.joint.x, leg.joint.y, leg.base.x, leg.base.y, CapStyle.none, 0);
Draw.color(Pal.darkMetal);
Fill.circle(leg.joint.x, leg.joint.y, srad);
Lines.stroke(legBaseRegion.getHeight() * Draw.scl);
Lines.line(legBaseRegion, leg.joint.x, leg.joint.y, leg.base.x, leg.base.y, CapStyle.none, 0);
Draw.color(Pal.darkerMetal);
Fill.circle(leg.base.x, leg.base.y, srad);
float angle1 = unit.angleTo(leg.joint), angle2 = unit.angleTo(leg.base);
Draw.color();
//Lines.line(unit.x(), unit.y(), leg.base.x, leg.base.y);
Draw.rect(jointRegion, leg.joint.x, leg.joint.y);
Draw.rect(footRegion, leg.base.x, leg.base.y, angle2);
}
Draw.reset();