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

Merged with master

Browse Source
This commit is contained in:
Anuken
2020-02-09 12:32:29 -05:00
parent a2706a80b1
commit c23e923ffb
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
core/assets/sprites/sprites2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 128 KiB

After

Width:  |  Height:  |  Size: 1.9 MiB

3
core/src/mindustry/graphics/ScorchGenerator.java
View File

@@ -2,6 +2,7 @@ package mindustry.graphics;
import arc.graphics.*; import arc.graphics.*;
import arc.math.*; import arc.math.*;
import arc.util.*;
import arc.util.noise.*; import arc.util.noise.*;
/** Generates a scorch pixmap based on parameters. Thread safe, unless multiple scorch generators are running in parallel. */ /** Generates a scorch pixmap based on parameters. Thread safe, unless multiple scorch generators are running in parallel. */
@@ -21,7 +22,7 @@ public class ScorchGenerator{
scaled -= noise(Angles.angle(x, y, size/2, size/2))*nscl; scaled -= noise(Angles.angle(x, y, size/2, size/2))*nscl;
boolean present = scaled < 1.5f; boolean present = scaled < 1.5f;
if(present) pix.draw(x, y, color); pix.draw(x, y, Tmp.c1.set(Color.white).a(Mathf.clamp(1f + 1.5f - (float)scaled)));
}); });
return pix; return pix;