openeggbert/sprite-utils
1
0
Fork 0
mirror of https://github.com/openeggbert/sprite-utils.git synced 2025-03-25 15:37:50 +01:00
Code Projects Releases Activity

Some issues were fixed II

Browse Source
This commit is contained in:
Robert Vokac 2024-08-15 19:04:20 +02:00
parent 6c7e2d49b3
commit d5c106d8b9
No known key found for this signature in database
GPG Key ID: C459E1E4B4A986BB
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/org/nanoboot/spriteutils/commands/DrawCommand.java
View File

@ -27,6 +27,7 @@ import java.awt.image.BufferedImage;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.util.HashMap; import java.util.HashMap;
import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.function.BiConsumer; import java.util.function.BiConsumer;
import java.util.function.BiFunction; import java.util.function.BiFunction;
@ -288,6 +289,9 @@ public class DrawCommand implements Command {
if (spriteUtilsOptions.getFileName().isPresent() && !spriteUtilsOptions.getFileName().get().equals(imageFile.getName())) { if (spriteUtilsOptions.getFileName().isPresent() && !spriteUtilsOptions.getFileName().get().equals(imageFile.getName())) {
continue; continue;
} }
if(imageFile.getName().endsWith(".backup")) {
continue;
}
File backupFile = new File(imageFile.getAbsolutePath() + ".backup"); File backupFile = new File(imageFile.getAbsolutePath() + ".backup");
try { try {
@ -310,14 +314,20 @@ public class DrawCommand implements Command {
throw new SpriteUtilsException("Reading image failed", e); throw new SpriteUtilsException("Reading image failed", e);
} }
BufferedImage bi = image.getImage(); BufferedImage bi = image.getImage();
Graphics2D g = bi.createGraphics();
Supplier<Integer> randomByte = () -> random.apply(0, 255); Supplier<Integer> randomByte = () -> random.apply(0, 255);
Stroke dashedStroke = configureGraphics(g);
SpriteSheet spriteSheet = new SpriteSheet(new File(spriteUtilsOptions.getSpriteSheetPath())); SpriteSheet spriteSheet = new SpriteSheet(new File(spriteUtilsOptions.getSpriteSheetPath()));
spriteSheet final List<SpriteSheetRow> spriteSheetRows = spriteSheet
.getSpriteSheets(imageFile.getName().toLowerCase()) .getSpriteSheetRows(imageFile.getName().toLowerCase());
Graphics2D g = bi.createGraphics();
Stroke dashedStroke = configureGraphics(g);
if(spriteSheetRows == null) {
continue;
}
spriteSheetRows
.stream() .stream()
.filter(s -> spriteUtilsOptions.getRow().isEmpty() ? true : (spriteUtilsOptions.getRow().get() == s.getRow())) .filter(s -> spriteUtilsOptions.getRow().isEmpty() ? true : (spriteUtilsOptions.getRow().get() == s.getRow()))
.forEach(row -> { .forEach(row -> {

8
src/main/java/org/nanoboot/spriteutils/core/SpriteSheet.java
View File

@ -25,6 +25,7 @@ import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Optional; import java.util.Optional;
import java.util.stream.Collectors;
import lombok.Data; import lombok.Data;
import lombok.ToString; import lombok.ToString;
@ -146,8 +147,11 @@ public class SpriteSheet {
spriteSheetRow.numberPerSheet = 1; spriteSheetRow.numberPerSheet = 1;
} }
public List<SpriteSheetRow> getSpriteSheets(String file) { public List<SpriteSheetRow> getSpriteSheetRows(String file) {
System.out.println("getSpriteSheetRows() file=" + file);
return map.get(file); return map.get(file);
} }
public List<SpriteSheetRow> getSpriteSheetRows() {
return map.keySet().stream().map(k -> map.get(k)).flatMap(List::stream).collect(Collectors.toList());
}
} }