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

Horizontal shifting of pistons (also adds proper icons for pistons) (#8345)

Browse Source 
* Horizontal offset for pistons

* might as well fix icons in the meantime

* Make a positive offset shift to the right
This commit is contained in:
MEEPofFaith
2023-05-10 10:10:48 -07:00
committed by GitHub
parent c7ad9d0250
commit a5eda4fb2e
4 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
core/assets-raw/sprites/blocks/power/chemical-combustion-chamber-piston-icon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 784 B

BIN
core/assets-raw/sprites/blocks/power/pyrolysis-generator-piston-icon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
core/assets-raw/sprites/blocks/production/spore-press-piston-icon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 464 B

15
core/src/mindustry/world/draw/DrawPistons.java
View File

@@ -9,14 +9,14 @@ import mindustry.gen.*;
import mindustry.world.*; import mindustry.world.*;
public class DrawPistons extends DrawBlock{ public class DrawPistons extends DrawBlock{
public float sinMag = 4f, sinScl = 6f, sinOffset = 50f, sideOffset = 0f, lenOffset = -1f, angleOffset = 0f; public float sinMag = 4f, sinScl = 6f, sinOffset = 50f, sideOffset = 0f, lenOffset = -1f, horiOffset = 0f, angleOffset = 0f;
public int sides = 4; public int sides = 4;
public String suffix = "-piston"; public String suffix = "-piston";
public TextureRegion region1, region2, regiont; public TextureRegion region1, region2, regiont, iconRegion;
@Override @Override
public void drawPlan(Block block, BuildPlan plan, Eachable<BuildPlan> list){ public void drawPlan(Block block, BuildPlan plan, Eachable<BuildPlan> list){
Draw.rect(iconRegion, plan.drawx(), plan.drawy());
} }
@Override @Override
@@ -32,7 +32,8 @@ public class DrawPistons extends DrawBlock{
Draw.yscl = -1f; Draw.yscl = -1f;
} }
Draw.rect(reg, build.x + Angles.trnsx(angle, len), build.y + Angles.trnsy(angle, len), angle); Tmp.v1.trns(angle, len, -horiOffset);
Draw.rect(reg, build.x + Tmp.v1.x, build.y + Tmp.v1.y, angle);
Draw.yscl = 1f; Draw.yscl = 1f;
} }
@@ -45,5 +46,11 @@ public class DrawPistons extends DrawBlock{
region1 = Core.atlas.find(block.name + suffix + "0", block.name + suffix); region1 = Core.atlas.find(block.name + suffix + "0", block.name + suffix);
region2 = Core.atlas.find(block.name + suffix + "1", block.name + suffix); region2 = Core.atlas.find(block.name + suffix + "1", block.name + suffix);
regiont = Core.atlas.find(block.name + suffix + "-t"); regiont = Core.atlas.find(block.name + suffix + "-t");
iconRegion = Core.atlas.find(block.name + suffix + "-icon");
}
@Override
public TextureRegion[] icons(Block block){
return new TextureRegion[]{iconRegion};
} }
} }