Merge pull request #23 from Bob-Rust/feature/bug-fixes

feature: Fix some color issues

Author: Kariaro

.github/workflows/build.yml

@@ -7,21 +7,21 @@ jobs:
     runs-on: windows-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Cache Gradle packages
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ~/.gradle/caches
           key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
           restore-keys: ${{ runner.os }}-gradle
       - name: Set up JDK 16
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
           distribution: 'adopt'
           java-version: 16
       - name: Package
         run: ./gradlew jpackage
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v3
         with:
           name: Win-installer
           path: build/distributions/*

src/main/java/com/bobrust/generator/BorstCore.java

@@ -40,7 +40,7 @@ static BorstColor computeColor(BorstImage target, BorstImage current, int alpha,
 				bsum_2 += (cc       ) & 0xff;
 			}
 
-			count += (line.x2 - line.x1 + 1);
+			count += (xe - xs + 1);
 		}
 
 		int pd = 65280 / alpha; // (255 << 8) / alpha;

src/main/java/com/bobrust/generator/BorstGenerator.java

@@ -4,7 +4,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
-import java.util.concurrent.ExecutorService;
 import java.util.function.Consumer;
 
 import com.bobrust.generator.sorter.Blob;
@@ -62,7 +61,6 @@ public synchronized boolean start(Model previous, BufferedImage inputImage, int
 					data.blobs.clear();
 					data.blobs.addAll(generateDebugDrawList());
 					data.index = data.blobs.size();
-					data.alpha = 0;
 					callback.accept(data);
 				}
 
@@ -209,7 +207,6 @@ private List<Blob> generateDebugDrawList() {
 	 */
 	public static class BorstData {
 		private final List<Blob> blobs;
-		private int alpha;
 		private int index;
 
 		private BorstData() {
@@ -218,7 +215,6 @@ private BorstData() {
 
 		private synchronized void update(Model model, int index) {
 			this.index = index;
-			this.alpha = model.alpha;
 
 			// For all new elements
 			var shapes = model.shapes;
@@ -238,7 +234,6 @@ private synchronized void update(Model model, int index) {
 		}
 
 		private void clear() {
-			this.alpha = 0;
 			this.index = 0;
 			this.blobs.clear();
 		}
@@ -247,10 +242,6 @@ public List<Blob> getBlobs() {
 			return blobs;
 		}
 
-		public int getAlpha() {
-			return alpha;
-		}
-		
 		public int getIndex() {
 			return index;
 		}

src/main/java/com/bobrust/generator/BorstSettings.java

@@ -2,12 +2,15 @@
 
 import com.bobrust.generator.BorstGenerator;
 import com.bobrust.generator.BorstUtils;
+import com.bobrust.generator.sorter.BlobList;
+import com.bobrust.generator.sorter.BorstSorter;
 
 import java.awt.*;
 import java.awt.image.BufferedImage;
 import java.awt.image.DataBufferByte;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Random;
 
 /**
  * Optimized class for rendering many circles
@@ -49,11 +52,64 @@ public synchronized void createCanvas(int width, int height, int background) {
 		pixelBufferCache.add(canvasPixels.clone());
 	}
 
+	private BufferedImage createTest(BorstGenerator.BorstData data, int shapes) {
+		System.arraycopy(pixelBufferCache.get(0), 0, canvasPixels, 0, canvasPixels.length);
+		
+		Random random = new Random(34);
+		
+		BlobList sorted = new BlobList(data.getBlobs());
+		sorted = BorstSorter.sort(sorted);
+		
+		Graphics2D g = canvas.createGraphics();
+		g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
+		
+		double failRate = 0;
+		int cd = sorted.get(0).size;
+		int is = cd;
+		
+		int pc = sorted.get(0).color;
+		int ps = pc;
+		
+		for (int i = 0; i < shapes; i++) {
+			var blob = sorted.get(i);
+			int alpha = BorstUtils.ALPHAS[blob.alphaIndex];
+			
+			if (is != blob.size) {
+				is = blob.size;
+				if (random.nextDouble() > failRate) {
+					cd = is;
+				}
+			}
+			
+			if (ps != blob.color) {
+				ps = blob.color;
+				if (random.nextDouble() > failRate) {
+					pc = ps;
+				}
+			}
+			
+			g.setColor(new Color(pc | (alpha << 24), true));
+			if (blob.shapeIndex == 3) {
+				cd *= 1.25;
+				g.fillRect(blob.x - cd / 2, blob.y - cd / 2, cd, cd);
+			} else {
+				g.fillOval(blob.x - cd / 2, blob.y - cd / 2, cd, cd);
+			}
+		}
+		g.dispose();
+		
+		return canvas;
+	}
+	
 	public synchronized BufferedImage getImage(BorstGenerator.BorstData data, int shapes) {
 		if (pixelBufferCache.isEmpty()) {
 			return null;
 		}
 
+		//if (true) {
+		// return createTest(data, shapes);
+		//}
+		
 		int cacheIndex = shapes / cacheInterval;
 
 		// The pixel buffer of the closest image

src/main/java/com/bobrust/gui/render/ShapeRender.java

@@ -31,8 +31,6 @@ public static void main(String[] args) {
 		LOGGER.info("  AppVersion  : {}", AppConstants.VERSION);
 		LOGGER.info("");
 
-		// TODO: Do not draw outside the image region +- the radius of the largest shape
-		
 		// Setup settings
 		File CONFIG_FILE = new File("bobrust.properties");
 		Settings.InternalSettings.init(CONFIG_FILE);
@@ -53,22 +51,5 @@ public static void main(String[] args) {
 			// Make application window visible
 			new ApplicationWindow().setVisible(true);
 		});
-		
-		/*
-		Thread aliveThread = new Thread(() -> {
-			while (true) {
-				try {
-					Thread.sleep(10000);
-				} catch (InterruptedException ignored) {
-					Thread.currentThread().interrupt();
-					break;
-				}
-				
-				System.out.println("Alive");
-			}
-		}, "Alive thread");
-		aliveThread.setDaemon(true);
-		aliveThread.start();
-		*/
 	}
 }

src/main/java/com/bobrust/main/Main.java

@@ -109,11 +109,8 @@ public boolean startDrawing(GraphicsConfiguration monitor, Rectangle canvasArea,
 			}
 
 			// Change the color
-			if (lastColor != blob.colorIndex) {
-				if (!clickColor(robot, palette.getColorButton(BorstUtils.getClosestColor(blob.color)), 8, autoDelay)) {
-					// LOGGER.warn("Potentially failed to change color! Will still keep try drawing");
-				}
-				
+			if (lastColor != blob.colorIndex) { // Without 20 here it will not work
+				clickColor(robot, palette.getColorButton(BorstUtils.getClosestColor(blob.color)), 20, autoDelay);
 				lastColor = blob.colorIndex;
 				actions++;
 			}
@@ -145,7 +142,7 @@ public boolean startDrawing(GraphicsConfiguration monitor, Rectangle canvasArea,
 			int sy = (int) ty + displayY;
 
 			lastPoint.setLocation(sx, sy);
-			clickPointScaled(robot, lastPoint, autoDelay);
+			clickPointScaledDrawColor(robot, lastPoint, autoDelay);
 
 			if ((i % autosaveInterval) == 0) {
 				clickPoint(robot, palette.getSaveButton(), autoDelay);
@@ -179,7 +176,7 @@ private void clickPoint(Robot robot, Point point, int times, double delay) throw
 	/**
 	 * Click a point on the screen with a scaled point
 	 */
-	private void clickPointScaled(Robot robot, Point point, double delay) throws PaintingInterrupted {
+	private void clickPointScaledDrawColor(Robot robot, Point point, double delay) throws PaintingInterrupted {
 		double time = System.nanoTime() / 1000000.0;
 
 		robot.mouseMove(point.x, point.y);
@@ -246,7 +243,7 @@ private void clickSize(Robot robot, Point point, int maxAttempts, double delay)
 		}
 	}
 
-	private boolean clickColor(Robot robot, Point point, int maxAttempts, double delay) throws PaintingInterrupted {
+	private void clickColor(Robot robot, Point point, int maxAttempts, double delay) throws PaintingInterrupted {
 		Point colorPreview = palette.getColorPreview();
 		Color before = robot.getPixelColor(colorPreview.x, colorPreview.y);
 
@@ -256,28 +253,9 @@ private boolean clickColor(Robot robot, Point point, int maxAttempts, double del
 
 			Color after = robot.getPixelColor(colorPreview.x, colorPreview.y);
 			if (!before.equals(after)) {
-				return true;
-			}
-		}
-		
-		return false;
-	}
-	
-	private boolean clickColorTest(Robot robot, Point point, int maxAttempts, double delay) throws PaintingInterrupted {
-		Point colorPreview = palette.getColorPreview();
-		Color before = robot.getPixelColor(colorPreview.x, colorPreview.y);
-		
-		// Make sure that we press the size
-		while (maxAttempts-- > 0) {
-			clickPointScaled(robot, point, delay);
-			
-			Color after = robot.getPixelColor(colorPreview.x, colorPreview.y);
-			if (!before.equals(after)) {
-				return true;
+				return;
 			}
 		}
-		
-		return false;
 	}
 
 	/**

src/main/java/com/bobrust/robot/BobRustPainter.java

@@ -1 +1 @@
-0.4.64
+0.4.67

src/main/resources/version

@@ -1,2 +1,2 @@
-#Mon Jul 17 12:24:45 CEST 2023
-build_id=64
+#Fri Jul 21 13:35:02 CEST 2023
+build_id=68