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

Merge pull request #2726 from Voz-Duh/shadow-fix

Browse Source 
Shadow Fix
This commit is contained in:
Anuken
2020-09-25 09:53:13 -04:00
committed by GitHub
parent 292793daf1 41b4cbbce2
commit 85d32cd510
9 changed files with 24 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/mindustry/world/blocks/defense/PointDefenseTurret.java
View File

@@ -112,9 +112,7 @@ public class PointDefenseTurret extends Block{
@Override
public void draw(){
Draw.rect(baseRegion, x, y);
Draw.color(Vars.turretShadowColor);
Draw.rect(region, x - (size / 2f), y - (size / 2f), rotation - 90);
Draw.color();
Drawf.shadow(region, x - (size / 2f), y - (size / 2f), rotation - 90);
Draw.rect(region, x, y, rotation - 90);
}

4
core/src/mindustry/world/blocks/defense/TractorBeamTurret.java
View File

@@ -107,9 +107,7 @@ public class TractorBeamTurret extends Block{
@Override
public void draw(){
Draw.rect(baseRegion, x, y);
Draw.color(Vars.turretShadowColor);
Draw.rect(region, x - (size / 2f), y - (size / 2f), rotation - 90);
Draw.color();
Drawf.shadow(region, x - (size / 2f), y - (size / 2f), rotation - 90);
Draw.rect(region, x, y, rotation - 90);
//draw laser if applicable

5
core/src/mindustry/world/blocks/defense/turrets/Turret.java
View File

@@ -11,7 +11,6 @@ import arc.struct.*;
import arc.util.ArcAnnotate.*;
import arc.util.*;
import arc.util.io.*;
import mindustry.*;
import mindustry.annotations.Annotations.*;
import mindustry.content.*;
import mindustry.entities.*;
@@ -203,9 +202,7 @@ public abstract class Turret extends Block{
tr2.trns(rotation, -recoil);
Draw.color(Vars.turretShadowColor);
Draw.rect(region, x + tr2.x - (size / 2f), y + tr2.y - (size / 2f), rotation - 90);
Draw.color();
Drawf.shadow(region, x + tr2.x - (size / 2f), y + tr2.y - (size / 2f), rotation - 90);
drawer.get(this);
if(heatRegion != Core.atlas.find("error")){

3
core/src/mindustry/world/blocks/distribution/MassDriver.java
View File

@@ -188,6 +188,9 @@ public class MassDriver extends Block{
Draw.z(Layer.turret);
Drawf.shadow(region,
x + Angles.trnsx(rotation + 180f, reload * knockback) - (size / 2),
y + Angles.trnsy(rotation + 180f, reload * knockback) - (size / 2), rotation - 90);
Draw.rect(region,
x + Angles.trnsx(rotation + 180f, reload * knockback),
y + Angles.trnsy(rotation + 180f, reload * knockback), rotation - 90);

2
core/src/mindustry/world/blocks/units/RepairPoint.java
View File

@@ -6,6 +6,7 @@ import arc.math.*;
import arc.math.geom.*;
import arc.struct.*;
import arc.util.*;
import mindustry.*;
import mindustry.annotations.Annotations.*;
import mindustry.entities.*;
import mindustry.gen.*;
@@ -70,6 +71,7 @@ public class RepairPoint extends Block{
Draw.rect(baseRegion, x, y);
Draw.z(Layer.turret);
Drawf.shadow(region, x - (size / 2), y - (size / 2), rotation - 90);
Draw.rect(region, x, y, rotation - 90);
if(target != null && Angles.angleDist(angleTo(target), rotation) < 30f){