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

Light cleanup

Browse Source
This commit is contained in:
Anuken
2020-04-24 11:08:02 -04:00
parent 1b2e10d355
commit 5d4ca753a7
20 changed files with 42 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/world/blocks/defense/MendProjector.java
View File

@@ -117,7 +117,7 @@ public class MendProjector extends Block{
@Override
public void drawLight(){
renderer.lights.add(x, y, 50f * efficiency(), baseColor, 0.7f * efficiency());
Drawf.light(x, y, 50f * efficiency(), baseColor, 0.7f * efficiency());
}
@Override

2
core/src/mindustry/world/blocks/defense/OverdriveProjector.java
View File

@@ -72,7 +72,7 @@ public class OverdriveProjector extends Block{
@Override
public void drawLight(){
renderer.lights.add(x, y, 50f * efficiency(), baseColor, 0.7f * efficiency());
Drawf.light(x, y, 50f * efficiency(), baseColor, 0.7f * efficiency());
}
@Override

2
core/src/mindustry/world/blocks/power/ImpactReactor.java
View File

@@ -126,7 +126,7 @@ public class ImpactReactor extends PowerGenerator{
@Override
public void drawLight(){
float fract = tile.<FusionReactorEntity>ent().warmup;
renderer.lights.add(x, y, (110f + Mathf.absin(5, 5f)) * fract, Tmp.c1.set(plasma2).lerp(plasma1, Mathf.absin(7f, 0.2f)), 0.8f * fract);
Drawf.light(x, y, (110f + Mathf.absin(5, 5f)) * fract, Tmp.c1.set(plasma2).lerp(plasma1, Mathf.absin(7f, 0.2f)), 0.8f * fract);
}
@Override

3
core/src/mindustry/world/blocks/power/ItemLiquidGenerator.java
View File

@@ -7,6 +7,7 @@ import arc.math.*;
import arc.util.*;
import mindustry.content.*;
import mindustry.entities.*;
import mindustry.graphics.*;
import mindustry.type.*;
import mindustry.world.consumers.*;
import mindustry.world.meta.*;
@@ -180,7 +181,7 @@ public class ItemLiquidGenerator extends PowerGenerator{
@Override
public void drawLight(){
renderer.lights.add(x, y, (60f + Mathf.absin(10f, 5f)) * productionEfficiency * size, Color.orange, 0.5f);
Drawf.light(x, y, (60f + Mathf.absin(10f, 5f)) * productionEfficiency * size, Color.orange, 0.5f);
}
}
}

2
core/src/mindustry/world/blocks/power/LightBlock.java
View File

@@ -60,7 +60,7 @@ public class LightBlock extends Block{
@Override
public void drawLight(){
renderer.lights.add(x, y, radius, Tmp.c1.set(color), brightness * efficiency());
Drawf.light(x, y, radius, Tmp.c1.set(color), brightness * efficiency());
}
@Override

2
core/src/mindustry/world/blocks/power/NuclearReactor.java
View File

@@ -149,7 +149,7 @@ public class NuclearReactor extends PowerGenerator{
@Override
public void drawLight(){
float fract = productionEfficiency;
renderer.lights.add(x, y, (90f + Mathf.absin(5, 5f)) * fract, Tmp.c1.set(lightColor).lerp(Color.scarlet, heat), 0.6f * fract);
Drawf.light(x, y, (90f + Mathf.absin(5, 5f)) * fract, Tmp.c1.set(lightColor).lerp(Color.scarlet, heat), 0.6f * fract);
}
@Override

5
core/src/mindustry/world/blocks/power/ThermalGenerator.java
View File

@@ -5,11 +5,10 @@ import arc.graphics.*;
import arc.math.*;
import mindustry.content.*;
import mindustry.entities.*;
import mindustry.graphics.*;
import mindustry.world.*;
import mindustry.world.meta.*;
import static mindustry.Vars.renderer;
public class ThermalGenerator extends PowerGenerator{
public Effect generateEffect = Fx.none;
public Attribute attribute = Attribute.heat;
@@ -46,7 +45,7 @@ public class ThermalGenerator extends PowerGenerator{
@Override
public void drawLight(){
renderer.lights.add(x, y, (40f + Mathf.absin(10f, 5f)) * productionEfficiency * size, Color.scarlet, 0.4f);
Drawf.light(x, y, (40f + Mathf.absin(10f, 5f)) * productionEfficiency * size, Color.scarlet, 0.4f);
}
@Override

5
core/src/mindustry/world/blocks/production/GenericSmelter.java
View File

@@ -5,8 +5,7 @@ import arc.graphics.*;
import arc.graphics.g2d.*;
import arc.math.*;
import arc.util.*;
import static mindustry.Vars.renderer;
import mindustry.graphics.*;
/** A GenericCrafter with a new glowing region drawn on top. */
public class GenericSmelter extends GenericCrafter{
@@ -48,7 +47,7 @@ public class GenericSmelter extends GenericCrafter{
@Override
public void drawLight(){
renderer.lights.add(x, y, (60f + Mathf.absin(10f, 5f)) * warmup * size, flameColor, 0.65f);
Drawf.light(x, y, (60f + Mathf.absin(10f, 5f)) * warmup * size, flameColor, 0.65f);
}
}
}

2
core/src/mindustry/world/blocks/storage/CoreBlock.java
View File

@@ -86,7 +86,7 @@ public class CoreBlock extends StorageBlock{
@Override
public void drawLight(){
renderer.lights.add(x, y, 30f * size, Pal.accent, 0.5f + Mathf.absin(20f, 0.1f));
Drawf.light(x, y, 30f * size, Pal.accent, 0.5f + Mathf.absin(20f, 0.1f));
}
@Override