zima 0.6.0

Author: asiekierka

build.gradle

@@ -6,7 +6,7 @@ plugins {
 }
 
 group 'pl.asie.zima'
-version '0.5.1'
+version '0.6.0'
 
 repositories {
     mavenCentral()

docs/changelog/0.6.0.txt

@@ -1,4 +1,6 @@
 Improvements:
 
 * Added experimental coarse (character-level) dithering support.
-* Minor performance optimizations.
+* Added option to change the stat cycles for statful elements.
+  * By default, it is now a cycle speed of 0, as opposed to 1!
+* Minor performance optimizations.

src/main/java/pl/asie/zima/image/ImageConverter.java

@@ -204,7 +204,7 @@ private static class ElementRuleResult {
 	public Pair<Result, BufferedImage> convert(BufferedImage inputImage, ImageConverterRuleset ruleset,
 											  int x, int y, int width, int height, int playerX, int playerY, int maxStatCount, boolean blinkingDisabled,
 											  int maxBoardSize, float coarseDitherStrength, DitherMatrix coarseDitherMatrixEnum,
-											  IntPredicate charCheck, IntPredicate colorCheck,
+											  IntPredicate charCheck, IntPredicate colorCheck, int defStatCycle,
 											  TextVisualRenderer previewRenderer,
 											  ProgressCallback progressCallback, boolean fast) {
 		if (!platform.isSupportsBlinking()) {
@@ -403,7 +403,7 @@ public Pair<Result, BufferedImage> convert(BufferedImage inputImage, ImageConver
 
 			stat.setX(x + coords.getX());
 			stat.setY(y + coords.getY());
-			stat.setCycle(1); // maybe we can reduce this to save CPU cycles?
+			stat.setCycle(defStatCycle); // maybe we can reduce this to save CPU cycles?
 			stat.setP1(result.getCharacter());
 
 			if (boardSerializationSize < (realMaxBoardSize - 128)) {

src/main/java/pl/asie/zima/image/gui/ZimaConversionProfile.java

@@ -45,6 +45,7 @@ public class ZimaConversionProfile {
     public static final Property<Integer> BOARD_Y = Property.create("output.boardY", 1);
     public static final Property<Integer> PLAYER_X = Property.create("output.playerX", 60);
     public static final Property<Integer> PLAYER_Y = Property.create("output.playerY", 25);
+    public static final Property<Integer> STAT_CYCLE = Property.create("output.statCycle", 0);
     public static final Property<Integer> MAX_STAT_COUNT = Property.create("converter.maxStatCount", 150);
     public static final Property<Integer> MAX_BOARD_SIZE = Property.create("converter.maxBoardSize", 20002);
     public static final Property<Float> TRIX_CONTRAST_REDUCTION = Property.create("converter.trix.contrastReduction", 0.0035f, MSE_CALCULATOR);
@@ -205,6 +206,7 @@ public Pair<ImageConverter.Result, BufferedImage> convert(BufferedImage input, P
                 properties.get(COARSE_DITHER_MATRIX),
                 properties.has(ALLOWED_CHARACTERS) ? properties.get(ALLOWED_CHARACTERS)::contains : null,
                 properties.has(ALLOWED_COLORS) ? properties.get(ALLOWED_COLORS)::contains : null,
+                properties.get(STAT_CYCLE),
                 this.renderer, progressCallback, fast);
     }
 }

src/main/java/pl/asie/zima/image/gui/ZimaFrontendSwing.java

@@ -155,6 +155,7 @@ Platform.MEGAZEUX, new ImageConverterRuleset(List.of())
 	// "Advanced" tab
 	private JCheckBox fastPreviewEdit;
 	private JCheckBox allowFacesEdit;
+	private JSpinner statCycleEdit;
 
 	private final byte[] defaultCharset;
 	private final int[] defaultPalette;
@@ -255,6 +256,7 @@ public ZimaFrontendSwing(byte[] defaultCharset, int[] defaultPalette, String zim
 				this.saveBrdItem.setEnabled(newPlatform.isUsesBoard());
 				this.maxBoardSizeEdit.setEnabled(newPlatform.getMaxBoardSize() > 0);
 				this.maxStatCountEdit.setEnabled(newPlatform.getMaxStatCount() > 0);
+				this.statCycleEdit.setEnabled(newPlatform.getMaxStatCount() > 0);
 			});
 
 			appendTabRow(this.optionsBoardPanel, gbc, "Board X", this.boardXEdit = new JSpinner(boardCoordsModel(1, false)));
@@ -453,6 +455,10 @@ public ZimaFrontendSwing(byte[] defaultCharset, int[] defaultPalette, String zim
 					this.contrastReductionReset = new JButton("Reset"));
 			bindPropertyFloat(this.profile.getProperties(), ZimaConversionProfile.TRIX_CONTRAST_REDUCTION, this.contrastReductionEdit, (f) -> (int) Math.sqrt(f * 10000000.0f), (i) -> (i * i) / 10000000.0f);
 			this.contrastReductionReset.addActionListener((e) -> { this.profile.getProperties().reset(ZimaConversionProfile.TRIX_CONTRAST_REDUCTION); });
+
+			appendTabRow(this.optionsAdvancedPanel, gbc, "Statful element cycles", this.statCycleEdit = new JSpinner(new SpinnerNumberModel(0, 0, 420, 1)));
+			bindPropertyInt(this.profile.getProperties(), ZimaConversionProfile.STAT_CYCLE, this.statCycleEdit);
+			this.profile.getProperties().addChangeListener(ZimaConversionProfile.PLATFORM, (k, v) -> this.statCycleEdit.setModel(new SpinnerNumberModel(((Number) this.statCycleEdit.getValue()).intValue(), 0, 420, 1)));
 		}
 
 		for (JPanel panel : List.of(this.optionsBoardPanel, this.optionsImagePanel, this.optionsCharsetPanel, this.optionsPalettePanel, this.optionsElementsPanel, this.optionsAdvancedPanel)) {