mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-07-08 23:07:33 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fixed #2530

Browse Source
This commit is contained in:
Anuken
2020-09-10 09:24:25 -04:00
parent 3e2fcfa30f
commit 55b6abffd1
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/src/mindustry/world/blocks/distribution/StackConveyor.java
View File

@ -115,20 +115,22 @@ public class StackConveyor extends Block implements Autotiler{
Draw.z(Layer.blockOver); Draw.z(Layer.blockOver);
Building from = world.build(link); Tile from = world.tile(link);
if(link == -1 || from == null) return; if(link == -1 || from == null) return;
int fromRot = from.build == null ? rotation : from.build.rotation;
//offset //offset
Tmp.v1.set(from); Tmp.v1.set(from.worldx(), from.worldy());
Tmp.v2.set(tile); Tmp.v2.set(x, y);
Tmp.v1.interpolate(Tmp.v2, 1f - cooldown, Interp.linear); Tmp.v1.interpolate(Tmp.v2, 1f - cooldown, Interp.linear);
//rotation //rotation
float a = (from.rotation%4) * 90; float a = (fromRot%4) * 90;
float b = (rotation%4) * 90; float b = (rotation%4) * 90;
if((from.rotation%4) == 3 && (rotation%4) == 0) a = -1 * 90; if((fromRot%4) == 3 && (rotation%4) == 0) a = -1 * 90;
if((from.rotation%4) == 0 && (rotation%4) == 3) a = 4 * 90; if((fromRot%4) == 0 && (rotation%4) == 3) a = 4 * 90;
//stack //stack
Draw.rect(stackRegion, Tmp.v1.x, Tmp.v1.y, Mathf.lerp(a, b, Interp.smooth.apply(1f - Mathf.clamp(cooldown * 2, 0f, 1f)))); Draw.rect(stackRegion, Tmp.v1.x, Tmp.v1.y, Mathf.lerp(a, b, Interp.smooth.apply(1f - Mathf.clamp(cooldown * 2, 0f, 1f))));