From 3b6252626747ad8a71521348fc0399ba2c406762 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sun, 11 Nov 2018 16:53:03 -0500
Subject: [PATCH] Re-added shadows

---
 core/src/io/anuke/mindustry/core/Renderer.java              | 6 ++++--
 core/src/io/anuke/mindustry/entities/Player.java            | 4 ++--
 core/src/io/anuke/mindustry/entities/units/FlyingUnit.java  | 4 ++--
 core/src/io/anuke/mindustry/entities/units/types/Drone.java | 2 +-
 core/src/io/anuke/mindustry/graphics/Trail.java             | 2 +-
 5 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/core/src/io/anuke/mindustry/core/Renderer.java b/core/src/io/anuke/mindustry/core/Renderer.java
index fdb4450779..1c9cc186c1 100644
--- a/core/src/io/anuke/mindustry/core/Renderer.java
+++ b/core/src/io/anuke/mindustry/core/Renderer.java
@@ -187,7 +187,8 @@ public class Renderer extends RendererModule{
         drawAndInterpolate(groundEffectGroup, e -> !(e instanceof BelowLiquidTrait));
 
         blocks.processBlocks();
-        //blocks.drawShadows();
+        blocks.drawShadows();
+
         for(Team team : Team.all){
             if(blocks.isTeamShown(team)){
                 boolean outline = team != players[0].getTeam() && team != Team.none;
@@ -218,7 +219,7 @@ public class Renderer extends RendererModule{
         blocks.skipLayer(Layer.turret);
         blocks.drawBlocks(Layer.laser);
 
-        //drawFlyerShadows();
+        drawFlyerShadows();
 
         drawAllTeams(true);
 
@@ -261,6 +262,7 @@ public class Renderer extends RendererModule{
     private void drawFlyerShadows(){
         Graphics.surface(effectSurface, true, false);
 
+
         float trnsX = -12, trnsY = -13;
 
         for(EntityGroup<? extends BaseUnit> group : unitGroups){
diff --git a/core/src/io/anuke/mindustry/entities/Player.java b/core/src/io/anuke/mindustry/entities/Player.java
index b575fb4aed..f6922621a7 100644
--- a/core/src/io/anuke/mindustry/entities/Player.java
+++ b/core/src/io/anuke/mindustry/entities/Player.java
@@ -376,10 +376,10 @@ public class Player extends Unit implements BuilderTrait, CarryTrait, ShooterTra
         drawBuilding(this);
 
         if(mech.flying || boostHeat > 0.001f){
-            float wobblyness = 0.6f;
+            float wobblyness = 0f;
             if(!state.isPaused()) trail.update(x + Angles.trnsx(rotation + 180f, 5f) + Mathf.range(wobblyness),
                     y + Angles.trnsy(rotation + 180f, 5f) + Mathf.range(wobblyness));
-            trail.draw(Hue.mix(mech.trailColor, mech.trailColorTo, mech.flying ? 0f : boostHeat, Tmp.c1), 5f * (isFlying() ? 1f : boostHeat));
+            trail.draw(Hue.mix(mech.trailColor, mech.trailColorTo, mech.flying ? 0f : boostHeat, Tmp.c1), 5f * (isFlying() ? 1f : boostHeat) * Mathf.clamp(velocity.len(), 0f, 2f) / 2f);
         }else{
             trail.clear();
         }
diff --git a/core/src/io/anuke/mindustry/entities/units/FlyingUnit.java b/core/src/io/anuke/mindustry/entities/units/FlyingUnit.java
index e72390c51e..c252fb2724 100644
--- a/core/src/io/anuke/mindustry/entities/units/FlyingUnit.java
+++ b/core/src/io/anuke/mindustry/entities/units/FlyingUnit.java
@@ -18,7 +18,7 @@ import static io.anuke.mindustry.Vars.world;
 
 public abstract class FlyingUnit extends BaseUnit implements CarryTrait{
     protected static Translator vec = new Translator();
-    protected static float wobblyness = 0.6f;
+    protected static float wobblyness = 0f;
 
     protected Trail trail = new Trail(8);
     protected CarriableTrait carrying;
@@ -171,7 +171,7 @@ public abstract class FlyingUnit extends BaseUnit implements CarryTrait{
 
     @Override
     public void drawOver(){
-        trail.draw(type.trailColor, 5f);
+        trail.draw(type.trailColor, 5f * Mathf.clamp(velocity.len(), 0f, 2f) / 2f);
     }
 
     @Override
diff --git a/core/src/io/anuke/mindustry/entities/units/types/Drone.java b/core/src/io/anuke/mindustry/entities/units/types/Drone.java
index 95110c5742..1c131f8c35 100644
--- a/core/src/io/anuke/mindustry/entities/units/types/Drone.java
+++ b/core/src/io/anuke/mindustry/entities/units/types/Drone.java
@@ -352,7 +352,7 @@ public class Drone extends FlyingUnit implements BuilderTrait{
 
     @Override
     public void drawOver(){
-        trail.draw(Palette.lightTrail, 3f);
+        trail.draw(Palette.lightTrail, 3f * Mathf.clamp(velocity.len(), 0, 1f) / 1f);
 
         TargetTrait entity = target;
 
diff --git a/core/src/io/anuke/mindustry/graphics/Trail.java b/core/src/io/anuke/mindustry/graphics/Trail.java
index 1d5f3fade1..3d7f5fa87b 100644
--- a/core/src/io/anuke/mindustry/graphics/Trail.java
+++ b/core/src/io/anuke/mindustry/graphics/Trail.java
@@ -58,7 +58,7 @@ public class Trail{
         }
 
         if(points.size >= 2){
-            Fill.circle(points.get(points.size - 2), points.get(points.size - 1), stroke / 2f);
+            Fill.circle(points.get(points.size - 2), points.get(points.size - 1), stroke / 2f * (points.size - 3f) / points.size);
         }
 
         Draw.reset();