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

Improved laser visuals

Browse Source
This commit is contained in:
Anuken
2018-03-11 09:46:57 -04:00
parent 9d49c7d836
commit 5834dc9b2e
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/assets/version.properties
View File

@@ -1,5 +1,5 @@
#Autogenerated file. Do not modify. #Autogenerated file. Do not modify.
#Sat Mar 10 23:26:21 EST 2018 #Sun Mar 11 09:45:55 EDT 2018
version=release version=release
androidBuildCode=441 androidBuildCode=441
name=Mindustry name=Mindustry

18
core/src/io/anuke/mindustry/world/blocks/types/generation/Generator.java
View File

@@ -3,7 +3,6 @@ package io.anuke.mindustry.world.blocks.types.generation;
import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.math.GridPoint2; import com.badlogic.gdx.math.GridPoint2;
import com.badlogic.gdx.math.Vector2; import com.badlogic.gdx.math.Vector2;
import io.anuke.mindustry.core.GameState.State;
import io.anuke.mindustry.entities.TileEntity; import io.anuke.mindustry.entities.TileEntity;
import io.anuke.mindustry.graphics.Fx; import io.anuke.mindustry.graphics.Fx;
import io.anuke.mindustry.world.Layer; import io.anuke.mindustry.world.Layer;
@@ -21,10 +20,13 @@ import io.anuke.ucore.util.Mathf;
import io.anuke.ucore.util.Strings; import io.anuke.ucore.util.Strings;
import io.anuke.ucore.util.Translator; import io.anuke.ucore.util.Translator;
import static io.anuke.mindustry.Vars.*; import static io.anuke.mindustry.Vars.tilesize;
import static io.anuke.mindustry.Vars.world;
public class Generator extends PowerBlock{ public class Generator extends PowerBlock{
public static boolean drawRangeOverlay = false; public static boolean drawRangeOverlay = false;
public static final float thicknessScl = 0.85f;
public static final float laserMinValue = 0.7f;
protected Translator t1 = new Translator(); protected Translator t1 = new Translator();
protected Translator t2 = new Translator(); protected Translator t2 = new Translator();
@@ -142,7 +144,7 @@ public class Generator extends PowerBlock{
if(entity.power.amount > powerSpeed){ if(entity.power.amount > powerSpeed){
entity.laserThickness = Mathf.lerpDelta(entity.laserThickness, 1f, 0.05f); entity.laserThickness = Mathf.lerpDelta(entity.laserThickness, 1f, 0.05f);
}else{ }else{
entity.laserThickness = Mathf.lerpDelta(entity.laserThickness, 0.2f, 0.05f); entity.laserThickness = Mathf.lerpDelta(entity.laserThickness, laserMinValue, 0.05f);
} }
drawLaserTo(tile, (tile.getRotation() + i) - laserDirections / 2); drawLaserTo(tile, (tile.getRotation() + i) - laserDirections / 2);
} }
@@ -161,7 +163,7 @@ public class Generator extends PowerBlock{
} }
public static class GeneratorEntity extends PowerEntity{ public static class GeneratorEntity extends PowerEntity{
float laserThickness = 0.5f; float laserThickness = laserMinValue;
} }
protected void distributeLaserPower(Tile tile){ protected void distributeLaserPower(Tile tile){
@@ -189,7 +191,7 @@ public class Generator extends PowerBlock{
GeneratorEntity entity = tile.entity(); GeneratorEntity entity = tile.entity();
float scale = 1f * entity.laserThickness; float scale = thicknessScl * entity.laserThickness;
if(target != null){ if(target != null){
boolean interfering = isInterfering(target, rotation); boolean interfering = isInterfering(target, rotation);
@@ -205,9 +207,9 @@ public class Generator extends PowerBlock{
}else{ }else{
Draw.tint(Hue.mix(Color.SCARLET, Color.WHITE, 0.902f + Mathf.sin(Timers.time(), 1.7f, 0.08f))); Draw.tint(Hue.mix(Color.SCARLET, Color.WHITE, 0.902f + Mathf.sin(Timers.time(), 1.7f, 0.08f)));
if(state.is(State.playing) && Mathf.chance(Timers.delta() * 0.033)){ //if(state.is(State.playing) && Mathf.chance(Timers.delta() * 0.033)){
Effects.effect(Fx.laserspark, target.worldx() - t1.x, target.worldy() - t1.y); // Effects.effect(Fx.laserspark, target.worldx() - t1.x, target.worldy() - t1.y);
} //}
} }
float r = interfering ? 0f : 0f; float r = interfering ? 0f : 0f;