feature: Update UI fix small issues

Author: Kariaro

build.gradle

@@ -18,7 +18,7 @@ project.ext {
     lwjglVersion = '3.2.3'
     log4jVersion = '2.17.1'
     majorVersion = '0'
-    minorVersion = '3'
+    minorVersion = '4'
 }
 
 version = "${majorVersion}.${minorVersion}.${getBuildId()}"

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

@@ -1,24 +1,33 @@
 package com.bobrust.generator;
 
 class BorstCore {
-	static BorstColor computeColor(BorstImage target, BorstImage current, Scanline[] lines, int alpha) {
+	static BorstColor computeColor(BorstImage target, BorstImage current, int alpha, int size, int x_offset, int y_offset) {
 		long rsum_1 = 0;
 		long gsum_1 = 0;
 		long bsum_1 = 0;
-
+		
 		long rsum_2 = 0;
 		long gsum_2 = 0;
 		long bsum_2 = 0;
-
+		
 		int count = 0;
 		int w = target.width;
+		int h = target.height;
 
+		final Scanline[] lines = CircleCache.CIRCLE_CACHE[size];
 		final int len = lines.length;
-		for(int i = 0; i < len; i++) {
+		for (int i = 0; i < len; i++) {
 			Scanline line = lines[i];
-			int idx = line.y * w;
-
-			for(int x = line.x1; x <= line.x2; x++) {
+			int y = line.y + y_offset;
+			if (y < 0 || y >= h) {
+				continue;
+			}
+			
+			int xs = Math.max(line.x1 + x_offset, 0);
+			int xe = Math.min(line.x2 + x_offset, w - 1);
+			int idx = y * w;
+			
+			for (int x = xs; x <= xe; x++) {
 				int tt = target.pixels[idx + x];
 				int cc = current.pixels[idx + x];
 
@@ -30,7 +39,7 @@ static BorstColor computeColor(BorstImage target, BorstImage current, Scanline[]
 				gsum_2 += (cc >>>  8) & 0xff;
 				bsum_2 += (cc       ) & 0xff;
 			}
-
+			
 			count += (line.x2 - line.x1 + 1);
 		}
 
@@ -48,30 +57,30 @@ static BorstColor computeColor(BorstImage target, BorstImage current, Scanline[]
 
 		return BorstUtils.getClosestColor((alpha << 24) | (r << 16) | (g << 8) | (b));
 	}
-
-	static void copyLinesReplaceRegion(BorstImage dst, BorstImage src, Scanline[] lines) {
-		int w = dst.width;
-		int len = lines.length;
-		for(int i = 0; i < len; i++) {
-			Scanline line = lines[i];
-			int idx = line.x1 + line.y * w;
-			
-			System.arraycopy(src.pixels, idx, dst.pixels, idx, line.x2 - line.x1 + 1);
-		}
-	}
-
-	static void drawLines(BorstImage im, BorstColor c, Scanline[] lines, int alpha) {
+	
+	static void drawLines(BorstImage im, BorstColor c, int alpha, int size, int x_offset, int y_offset) {
 		int cr = c.r * alpha;
 		int cg = c.g * alpha;
 		int cb = c.b * alpha;
 		int pa = 255 - alpha;
 		int w = im.width;
+		int h = im.height;
+		
+		final Scanline[] lines = CircleCache.CIRCLE_CACHE[size];
 		final int len = lines.length;
-		for(int i = 0; i < len; i++) {
+		for (int i = 0; i < len; i++) {
 			Scanline line = lines[i];
+			int y = line.y + y_offset;
+			if (y < 0 || y >= h) {
+				continue;
+			}
+			
+			int xs = Math.max(line.x1 + x_offset, 0);
+			int xe = Math.min(line.x2 + x_offset, w - 1);
+			int idx = y * w;
 
-			for(int x = line.x1; x <= line.x2; x++) {
-				int a = im.pixels[line.y * w + x];
+			for (int x = xs; x <= xe; x++) {
+				int a = im.pixels[idx + x];
 				int a_a = (a >>> 24) & 0xff;
 				int a_r = (a >>> 16) & 0xff;
 				int a_g = (a >>>  8) & 0xff;
@@ -82,7 +91,7 @@ static void drawLines(BorstImage im, BorstColor c, Scanline[] lines, int alpha)
 				int ab = (cb + (a_b * pa)) >>> 8;
 				int aa = 255 - (((255 - a_a) * pa) >>> 8);
 
-				im.pixels[line.y * w + x] = (aa << 24) | (ar << 16) | (ag << 8) | (ab);
+				im.pixels[idx + x] = (aa << 24) | (ar << 16) | (ag << 8) | (ab);
 			}
 		}
 	}
@@ -119,18 +128,26 @@ static float differenceFull(BorstImage a, BorstImage b) {
 		return (float)(Math.sqrt(total / (w * h * 4.0)) / 255.0);
 	}
 
-	static float differencePartial(BorstImage target, BorstImage before, BorstImage after, float score, Scanline[] lines) {
+	static float differencePartial(BorstImage target, BorstImage before, BorstImage after, float score, int size, int x_offset, int y_offset) {
 		int w = target.width;
 		int h = target.height;
 		double denom = (w * h * 4.0);
 		long total = (long)(Math.pow(score * 255, 2) * denom);
 
+		final Scanline[] lines = CircleCache.CIRCLE_CACHE[size];
 		final int len = lines.length;
-		for(int i = 0; i < len; i++) {
+		for (int i = 0; i < len; i++) {
 			Scanline line = lines[i];
-			int idx = line.y * w;
+			int y = line.y + y_offset;
+			if (y < 0 || y >= h) {
+				continue;
+			}
+			
+			int xs = Math.max(line.x1 + x_offset, 0);
+			int xe = Math.min(line.x2 + x_offset, w - 1);
+			int idx = y * w;
 
-			for(int x = line.x1; x <= line.x2; x++) {
+			for (int x = xs; x <= xe; x++) {
 				int tt = target.pixels[idx + x];
 				int bb = before.pixels[idx + x];
 				int aa = after.pixels[idx + x];
@@ -168,10 +185,9 @@ static float differencePartial(BorstImage target, BorstImage before, BorstImage
 		return (float)(Math.sqrt(total / denom) / 255.0);
 	}
 
-	static float differencePartialThread(BorstImage target, BorstImage before, float score, int alpha, Scanline[] lines) {
-		BorstColor color = BorstCore.computeColor(target, before, lines, alpha);
+	static float differencePartialThread(BorstImage target, BorstImage before, float score, int alpha, int size, int x_offset, int y_offset) {
+		BorstColor color = BorstCore.computeColor(target, before, alpha, size, x_offset, y_offset);
 
-		final int len = lines.length;
 		final int h = target.height;
 		final int w = target.width;
 
@@ -183,11 +199,21 @@ static float differencePartialThread(BorstImage target, BorstImage before, float
 		final int cb = color.b * alpha;
 		final int pa = 255 - alpha;
 
-		for(int i = 0; i < len; i++) {
+		final Scanline[] lines = CircleCache.CIRCLE_CACHE[size];
+		final int len = lines.length;
+		
+		for (int i = 0; i < len; i++) {
 			Scanline line = lines[i];
-			int idx = line.y * w;
+			int y = line.y + y_offset;
+			if (y < 0 || y >= h) {
+				continue;
+			}
+			
+			int xs = Math.max(line.x1 + x_offset, 0);
+			int xe = Math.min(line.x2 + x_offset, w - 1);
+			int idx = y * w;
 
-			for(int x = line.x1; x <= line.x2; x++) {
+			for (int x = xs; x <= xe; x++) {
 				int tt = target.pixels[idx + x];
 				int bb = before.pixels[idx + x];
 

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

@@ -4,6 +4,7 @@
 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;
@@ -19,7 +20,7 @@ public class BorstGenerator {
 	private volatile Model model;
 
 	// Sent as a callback
-	private final BorstData data = new BorstData();
+	public final BorstData data = new BorstData();
 
 	public BorstGenerator(Consumer<BorstData> callback) {
 		this.callback = Objects.requireNonNull(callback);
@@ -72,7 +73,7 @@ public synchronized boolean start(Model previous, BufferedImage inputImage, int
 			int i = model.shapes.size();
 			try {
 				long begin = System.nanoTime();
-				for (; i <= maxShapes; i++) {
+				for (; i < maxShapes; i++) {
 					int n = model.processStep();
 					long end = System.nanoTime();
 
@@ -82,7 +83,7 @@ public synchronized boolean start(Model previous, BufferedImage inputImage, int
 						return;
 					}
 
-					if ((i == maxShapes) || (i % callbackInterval) == 0) {
+					if ((i == maxShapes - 1) || (i % callbackInterval) == 0) {
 						synchronized (data) {
 							data.update(model, i);
 							callback.accept(data);
@@ -125,13 +126,12 @@ public synchronized Model stop() {
 		var localThread = thread;
 		if (localThread != null) {
 			try {
-				// Interrupt the thread and join it to wait for it to close.
+				// Interrupt the thread and join it to wait for it to close
 				localThread.interrupt();
 				localThread.join();
 			} catch (InterruptedException ignored) {
 				Thread.currentThread().interrupt();
 			} finally {
-				// Make sure that the thread keeps it's interrupted state.
 				thread = null;
 			}
 		}
@@ -205,11 +205,7 @@ private List<Blob> generateDebugDrawList() {
 	/**
 	 * When accessing this object you must first synchronize with it
 	 * 
-	 * <pre>
-	 * synchronized (data) {
-	 *     
-	 * }
-	 * </pre>
+	 * <pre>synchronized (data);</pre>
 	 */
 	public static class BorstData {
 		private final List<Blob> blobs;
@@ -241,21 +237,21 @@ private synchronized void update(Model model, int index) {
 			}
 		}
 
-		private synchronized void clear() {
+		private void clear() {
 			this.alpha = 0;
 			this.index = 0;
 			this.blobs.clear();
 		}
 
-		public synchronized List<Blob> getBlobs() {
+		public List<Blob> getBlobs() {
 			return blobs;
 		}
 
-		public synchronized int getAlpha() {
+		public int getAlpha() {
 			return alpha;
 		}
 
-		public synchronized int getIndex() {
+		public int getIndex() {
 			return index;
 		}
 	}

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

@@ -5,7 +5,7 @@ public class BorstUtils {
 	// 23, 48, 153, 214, 250, 255
 	// public static final int[] ALPHAS = { 9, 18, 72, 136, 218, 255 };
 	// public static final int[] ALPHAS = { 23, 48, 153, 214, 250, 255 };
-	public static final int[] ALPHAS = { 23, 48, 140, 190, 230, 255 };
+	public static final int[] ALPHAS = { 23, 48, 100, 190, 230, 255 };
 	public static final int[] SIZES = CircleCache.CIRCLE_CACHE_LENGTH; // { 1, 2, 4, 6, 10, 13 };
 
 	public static final BorstColor[] COLORS = {

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

@@ -1,7 +1,5 @@
 package com.bobrust.generator;
 
-import java.util.ArrayList;
-import java.util.List;
 import java.util.Random;
 
 public class Circle {
@@ -16,10 +14,7 @@ public class Circle {
 
 	public Circle(Worker worker) {
 		this.worker = worker;
-		Random rnd = worker.rnd;
-		this.x = rnd.nextInt(worker.w);
-		this.y = rnd.nextInt(worker.h);
-		this.r = BorstUtils.SIZES[rnd.nextInt(BorstUtils.SIZES.length)];
+		this.randomize();
 	}
 
 	public Circle(Worker worker, int x, int y, int r) {
@@ -40,39 +35,20 @@ public void mutateShape() {
 			x = BorstUtils.clampInt(a, 0, w);
 			y = BorstUtils.clampInt(b, 0, h);
 		} else {
-			int c = BorstUtils.getClosestSize(r + (int)(rnd.nextGaussian() * 32));
+			int c = BorstUtils.getClosestSize(r + (int)(rnd.nextGaussian() * 16));
 			r = BorstUtils.clampInt(c, 1, w);
 		}
 	}
 
-
-	public Scanline[] getScanlines() {
-		int w = worker.w;
-		int h = worker.h;
-		
-		int cache_index = BorstUtils.getClosestSizeIndex(r);
-		Scanline[] LINES = CircleCache.CIRCLE_CACHE[cache_index];
-		int LENGTH = CircleCache.CIRCLE_CACHE_LENGTH[cache_index];
-		
-		List<Scanline> list = new ArrayList<>(LENGTH);
-		for (int i = 0; i < LENGTH; i++) {
-			Scanline line = LINES[i];
-			int yy = line.y + y;
-			if (yy < 0) {
-				continue;
-			}
-			
-			if (yy >= h) {
-				break;
-			}
-			
-			int x1 = line.x1 + x;
-			int x2 = line.x2 + x;
-			x1 = (x1 <  0) ? 0 : x1;
-			x2 = (x2 >= w) ? (w - 1):x2;
-			list.add(new Scanline(yy, x1, x2));
-		}
-		
-		return list.toArray(Scanline[]::new);
+	public void randomize() {
+		this.x = worker.rnd.nextInt(worker.w);
+		this.y = worker.rnd.nextInt(worker.h);
+		this.r = BorstUtils.SIZES[worker.rnd.nextInt(BorstUtils.SIZES.length)];
+	}
+	
+	public void fromValues(Circle shape) {
+		this.r = shape.r;
+		this.x = shape.x;
+		this.y = shape.y;
 	}
 }