Cleanup and refinements.

Author: code-disaster

src/main/java/com/badlogic/gdx/checksum/CRC32.java

@@ -82,6 +82,11 @@ public String toString() {
 		return String.format("%08x", value);
 	}
 
+	public static CRC32 reset(CRC32 checksum) {
+		checksum.value = 0;
+		return checksum;
+	}
+
 	public static boolean isNullOrZero(CRC32 checksum) {
 		return checksum == null || checksum.value == 0;
 	}

src/main/java/com/badlogic/gdx/function/BooleanFunction.java

@@ -268,6 +268,12 @@ public Texture getColorBufferTexture(int index) {
 		return colorTextures[index];
 	}
 
+	@Override
+	protected void attachFrameBufferColorTexture() {
+		gl30.glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D,
+				colorTexture.getTextureObjectHandle(), 0);
+	}
+
 	public void clampToBorder(int index, Color color) {
 		int handle = colorTextures[index].getTextureObjectHandle();
 		gl30.glBindTexture(GL_TEXTURE_2D, handle);

src/main/java/com/badlogic/gdx/graphics/glutils/MultiTargetFrameBuffer.java

@@ -22,6 +22,10 @@ public int nextInt(final int n) {
 		return (int) nextLong(n);
 	}
 
+	public int nextInt(int start, int end) {
+		return start + nextInt(end - start + 1);
+	}
+
 	public long nextLong() {
 		return generator.next();
 	}

src/main/java/com/badlogic/gdx/random/RandomNumbers.java

@@ -55,5 +55,10 @@ public void seed(long s0, long s1) {
 		this.s1 = s1;
 	}
 
+	public void getSeed(long[] out) {
+		out[0] = s0;
+		out[1] = s1;
+	}
+
 }
 

src/main/java/com/badlogic/gdx/random/XoRoShiRo128Plus.java

@@ -1,10 +1,9 @@
 package com.badlogic.gdx.utils;
 
-import com.badlogic.gdx.function.BooleanFunction;
-
 import javax.annotation.Nonnull;
 import java.util.*;
 import java.util.function.Consumer;
+import java.util.function.Predicate;
 
 /**
  * Array utility functions.
@@ -28,9 +27,9 @@ public static <T> void forEach(T[] array, Consumer<T> action) {
 	 * <p>
 	 * @return true if end of array was reached
 	 */
-	public static <T> boolean forEachWhile(T[] array, BooleanFunction<T> action) {
+	public static <T> boolean forEachWhile(T[] array, Predicate<T> predicate) {
 		for (T t : array) {
-			if (!action.apply(t)) {
+			if (!predicate.test(t)) {
 				return false;
 			}
 		}
@@ -42,9 +41,9 @@ public static <T> boolean forEachWhile(T[] array, BooleanFunction<T> action) {
 	 * <p>
 	 * @return true if end of array was reached
 	 */
-	public static <T> boolean forEachWhile(Array<T> array, BooleanFunction<T> action) {
+	public static <T> boolean forEachWhile(Array<T> array, Predicate<T> action) {
 		for (T t : array) {
-			if (!action.apply(t)) {
+			if (!action.test(t)) {
 				return false;
 			}
 		}
@@ -56,9 +55,9 @@ public static <T> boolean forEachWhile(Array<T> array, BooleanFunction<T> action
 	 * <p>
 	 * Returns null if no match is found.
 	 */
-	public static <T> T find(T[] array, BooleanFunction<T> match) {
+	public static <T> T find(T[] array, Predicate<T> match) {
 		for (T t : array) {
-			if (match.apply(t)) {
+			if (match.test(t)) {
 				return t;
 			}
 		}
@@ -70,9 +69,9 @@ public static <T> T find(T[] array, BooleanFunction<T> match) {
 	 * <p>
 	 * Returns null if no match is found.
 	 */
-	public static <T> T find(Array<T> array, BooleanFunction<T> match) {
+	public static <T> T find(Array<T> array, Predicate<T> match) {
 		for (T t : array) {
-			if (match.apply(t)) {
+			if (match.test(t)) {
 				return t;
 			}
 		}
@@ -84,9 +83,9 @@ public static <T> T find(Array<T> array, BooleanFunction<T> match) {
 	 * <p>
 	 * Returns -1 if no match is found.
 	 */
-	public static <T> int findIndex(T[] array, BooleanFunction<T> match) {
+	public static <T> int findIndex(T[] array, Predicate<T> match) {
 		for (int i = 0; i < array.length; i++) {
-			if (match.apply(array[i])) {
+			if (match.test(array[i])) {
 				return i;
 			}
 		}
@@ -98,9 +97,9 @@ public static <T> int findIndex(T[] array, BooleanFunction<T> match) {
 	 * <p>
 	 * Returns -1 if no match is found.
 	 */
-	public static <T> int findIndex(Array<T> array, BooleanFunction<T> match) {
+	public static <T> int findIndex(Array<T> array, Predicate<T> match) {
 		for (int i = 0; i < array.size; i++) {
-			if (match.apply(array.get(i))) {
+			if (match.test(array.get(i))) {
 				return i;
 			}
 		}
@@ -110,9 +109,9 @@ public static <T> int findIndex(Array<T> array, BooleanFunction<T> match) {
 	/**
 	 * Iterates the array, consuming items only which fulfill the user-defined comparison.
 	 */
-	public static <T> void findAll(T[] array, BooleanFunction<T> match, Consumer<T> action) {
+	public static <T> void findAll(T[] array, Predicate<T> match, Consumer<T> action) {
 		for (T t : array) {
-			if (match.apply(t)) {
+			if (match.test(t)) {
 				action.accept(t);
 			}
 		}
@@ -179,6 +178,40 @@ public static <T> T[][] expand(T[][] arrayOfArray, Class<T> clazz,
 		return dest;
 	}
 
+	/**
+	 * Expands an existing three-dimensional array.
+	 * <p>
+	 * This is a very memory-inefficient operation.
+	 */
+	@SuppressWarnings("unchecked")
+	public static <T> T[][][] expand(T[][][] arrayOfArrayOfArray, Class<T> clazz,
+								   int lowerDim0, int upperDim0, int lowerDim1, int upperDim1) {
+
+		int columns = arrayOfArrayOfArray.length + lowerDim0 + upperDim0;
+		int rows = arrayOfArrayOfArray[0].length + lowerDim1 + upperDim1;
+		int depth = arrayOfArrayOfArray[0][0].length;
+
+		Object copy = java.lang.reflect.Array.newInstance(clazz, columns, rows, depth);
+
+		T[][][] dest = (T[][][]) copy;
+
+		for (int i = lowerDim0; i < columns - upperDim0; i++) {
+			for (int j = lowerDim1; j < rows - upperDim1; j++) {
+				/*for (int k = 0; k < depth; k++) {
+					dest[i][j][k] = arrayOfArrayOfArray[i - lowerDim0][j - lowerDim1][k];
+				}*/
+				System.arraycopy(
+						arrayOfArrayOfArray[i - lowerDim0][j - lowerDim1],
+						0,
+						dest[i][j],
+						0,
+						depth);
+			}
+		}
+
+		return dest;
+	}
+
 	/**
 	 * Combined check for null or empty array.
 	 */

src/main/java/com/badlogic/gdx/utils/ArrayUtils.java

@@ -1,6 +1,8 @@
 package com.badlogic.gdx.utils;
 
+import com.badlogic.gdx.Files;
 import com.badlogic.gdx.checksum.SHA1;
+import com.badlogic.gdx.files.FileHandle;
 
 import java.io.*;
 
@@ -53,4 +55,33 @@ public static SHA1 hashStream(InputStream stream) throws IOException {
 		return sha1;
 	}
 
+	public static FileHandle newFileHandle(File file, Files.FileType type) {
+		return new FileHandleHelper(file, type);
+	}
+
+	/**
+	 * Normalizes the path of a file handle.
+	 *
+	 * This does some hoops to work around some restrictions of the {@link FileHandle} class.
+	 */
+	public static FileHandle normalize(FileHandle file) {
+		return new FileHandleHelper(file).normalize();
+	}
+
+	private static class FileHandleHelper extends FileHandle {
+
+		FileHandleHelper(FileHandle file) {
+			super(file.file(), file.type());
+		}
+
+		FileHandleHelper(File file, Files.FileType type) {
+			super(file, type);
+		}
+
+		FileHandleHelper normalize() {
+			file = file.toPath().normalize().toFile();
+			return this;
+		}
+	}
+
 }