games/Factorio-FBSR
1
0
Fork 0
mirror of https://github.com/demodude4u/Factorio-FBSR.git synced 2024-11-27 08:20:57 +02:00
Code Issues Releases Activity

Added workaround for lack of blending method, and sort order/shadow

Browse Source
This commit is contained in:
Weston Rye (Demod) 2017-06-03 00:28:46 -04:00
parent 4b0fa3e676
commit f78f83aae3
2 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
FactorioBlueprintStringRenderer/src/com/demod/fbsr/render/AssemblingMachineRendering.java
View File

@ -29,7 +29,12 @@ public class AssemblingMachineRendering extends TypeRendererFactory {
@Override
public void createRenderers(Consumer<Renderer> register, WorldMap map, DataTable dataTable, BlueprintEntity entity,
EntityPrototype prototype) {
List<Sprite> sprites = getSpritesFromAnimation(prototype.lua().get("animation"), entity.getDirection());
prototype.debugPrint();
LuaValue animationLua = prototype.lua().get("idle_animation");
if (animationLua.isnil()) {
animationLua = prototype.lua().get("animation");
}
List<Sprite> sprites = getSpritesFromAnimation(animationLua, entity.getDirection());
register.accept(spriteRenderer(sprites, entity, prototype));

24
FactorioBlueprintStringRenderer/src/com/demod/fbsr/render/TypeRendererFactory.java
View File

@ -12,7 +12,6 @@ import java.awt.geom.Point2D.Double;
import java.awt.geom.Rectangle2D;
import java.awt.image.BufferedImage;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedHashMap;
@ -49,6 +48,8 @@ public class TypeRendererFactory {
public BufferedImage image;
public Rectangle source;
public Rectangle2D.Double bounds;
public boolean shadow = false;
public int order = 0;
public Sprite() {
}
@ -57,6 +58,7 @@ public class TypeRendererFactory {
image = other.image;
source = new Rectangle(other.source);
bounds = new Rectangle2D.Double(other.bounds.x, other.bounds.y, other.bounds.width, other.bounds.height);
shadow = other.shadow;
}
}
@ -178,12 +180,17 @@ public class TypeRendererFactory {
Sprite ret = new Sprite();
LuaValue filenameLua = lua.get("filename");
boolean drawAsShadow = lua.get("draw_as_shadow").optboolean(false);
ret.shadow = drawAsShadow;
drawAsShadow = false;// FIXME shadows need a special mask layer
if (drawAsShadow) {
ret.image = FactorioData.getModImage(filenameLua, new Color(255, 255, 255, 128));
} else {
ret.image = FactorioData.getModImage(filenameLua);
}
String blendMode = lua.get("blend_mode").optjstring("normal");
if (!blendMode.equals("normal")) { // FIXME blending will take effort
ret.image = Utils.EMPTY_IMAGE;
}
int srcX = lua.get("x").optint(0);
int srcY = lua.get("y").optint(0);
int srcWidth = lua.get("width").checkint();
@ -200,13 +207,22 @@ public class TypeRendererFactory {
List<Sprite> sprites = new ArrayList<>();
LuaValue layersLua = lua.get("layers");
if (!layersLua.isnil()) {
Utils.forEach(layersLua.checktable(), l -> {
sprites.add(getSpriteFromAnimation(l));
Utils.forEach(layersLua.checktable(), (i, l) -> {
Sprite sprite = getSpriteFromAnimation(l);
sprite.order = i.toint();
sprites.add(sprite);
});
Collections.reverse(sprites);
} else {
sprites.add(getSpriteFromAnimation(lua));
}
sprites.sort((s1, s2) -> {
if (s1.shadow != s2.shadow) {
return Boolean.compare(s2.shadow, s1.shadow);
}
return Integer.compare(s2.order, s1.order);
});
return sprites;
}