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

Generative outlines for mod parts

Browse Source
This commit is contained in:
Anuken
2021-11-25 13:08:10 -05:00
parent 9b291a366a
commit 6c7dbdc91e
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/src/mindustry/world/Block.java
View File

@@ -1049,6 +1049,20 @@ public class Block extends UnlockableContent{
packer.add(PageType.main, name, out); packer.add(PageType.main, name, out);
} }
var toOutline = new Seq<TextureRegion>();
getRegionsToOutline(toOutline);
for(var region : toOutline){
if(region instanceof AtlasRegion atlas){
String regionName = atlas.name;
Pixmap outlined = Pixmaps.outline(Core.atlas.getPixmap(region), outlineColor, outlineRadius);
if(Core.settings.getBool("linear", true)) Pixmaps.bleed(outlined);
packer.add(PageType.main, regionName + "-outline", outlined);
}
}
var editorBase = Core.atlas.getPixmap(fullIcon); var editorBase = Core.atlas.getPixmap(fullIcon);
if(gen.length > 1){ if(gen.length > 1){

1
core/src/mindustry/world/consumers/ConsumeLiquids.java
View File

@@ -64,7 +64,6 @@ public class ConsumeLiquids extends Consume{
@Override @Override
public void display(Stats stats){ public void display(Stats stats){
//TODO display is wrong
stats.add(booster ? Stat.booster : Stat.input, StatValues.liquids(1f, true, liquids)); stats.add(booster ? Stat.booster : Stat.input, StatValues.liquids(1f, true, liquids));
} }