Updated Feather, Renamed 'ClientUtils' to 'ClientAPIUtils'

Author: ZeroMemes

src/main/java/me/zero/client/api/command/Command.java

@@ -17,7 +17,7 @@
 package me.zero.client.api.command;
 
 import me.zero.client.api.command.exception.CommandInitException;
-import me.zero.client.api.util.ClientUtils;
+import me.zero.client.api.util.ClientAPIUtils;
 
 /**
  * @author Brady
@@ -46,7 +46,7 @@ private void setup(String[] headers, String description, String[] syntax) {
         this.description = description;
         this.syntax = syntax;
 
-        if (ClientUtils.containsNull(headers, description, syntax))
+        if (ClientAPIUtils.containsNull(headers, description, syntax))
             throw new NullPointerException("One or more Command members were null!");
     }
 

src/main/java/me/zero/client/api/module/Module.java

@@ -21,7 +21,7 @@
 import me.zero.client.api.exception.ActionNotSupportedException;
 import me.zero.client.api.manage.Node;
 import me.zero.client.api.module.exception.ModuleInitException;
-import me.zero.client.api.util.ClientUtils;
+import me.zero.client.api.util.ClientAPIUtils;
 import me.zero.client.api.util.keybind.Keybind;
 import org.lwjgl.input.Keyboard;
 
@@ -102,7 +102,7 @@ private void setup(String name, String description, int bind) {
                 .filter(clazz -> clazz.isAnnotationPresent(Category.class))
                 .findFirst().orElse(Category.Default.class);
 
-        if (ClientUtils.containsNull(name, description, type))
+        if (ClientAPIUtils.containsNull(name, description, type))
             throw new NullPointerException("One or more Mod members were null!");
     }
 

…me/zero/client/api/util/ClientUtils.java …zero/client/api/util/ClientAPIUtils.javasrc/main/java/me/zero/client/api/util/ClientUtils.java renamed to src/main/java/me/zero/client/api/util/ClientAPIUtils.java src/main/java/me/zero/client/api/util/ClientUtils.java renamed to src/main/java/me/zero/client/api/util/ClientAPIUtils.java

@@ -22,14 +22,14 @@
 import java.util.Arrays;
 
 /**
- * Utils that the Client API uses
+ * Contains methods that ClientAPI uses throughout its code.
  *
  * @author Brady
  * @since 1/20/2017 12:00 PM
  */
-public final class ClientUtils {
+public final class ClientAPIUtils {
 
-    private ClientUtils() {}
+    private ClientAPIUtils() {}
 
     /**
      * Concatenates an array of generic arrays
@@ -102,4 +102,25 @@ public static <T> T objectFrom(T object, T[] array) {
             }
         }
     }
+
+    /**
+     * Determines if the specified array of generics contains
+     * matching members.
+     *
+     * @param objects Objects being checked
+     * @return Whether or not all members match
+     */
+    @SafeVarargs
+    public static <T> boolean matchingMembers(T... objects) {
+        T baseline = null;
+        boolean set = false;
+        for (T object : objects) {
+            if (!set)
+                baseline = object;
+            if (object != baseline)
+                return false;
+            set = true;
+        }
+        return true;
+    }
 }

src/main/java/me/zero/client/api/util/render/RenderUtils.java

@@ -22,8 +22,7 @@
 import me.zero.client.api.util.render.gl.GlUtils;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.client.renderer.OpenGlHelper;
-import pw.knx.feather.tessellate.GrowingTess;
-import pw.knx.feather.tessellate.OffsetTess;
+import pw.knx.feather.tessellate.Tessellator;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -43,7 +42,7 @@ private RenderUtils() {}
     /**
      * Instance of the Tessellator
      */
-    public static final OffsetTess tessellator = new OffsetTess(new GrowingTess(4));
+    public static final Tessellator tessellator = Tessellator.createExpanding(4, 1, 2);
 
     /**
      * Stores ClientState Gl Caps when setting up
@@ -142,7 +141,7 @@ public static void drawLine(float x, float y, float z, float x1, float y1, float
 
         setupRender(true);
         setupClientState(GLClientState.VERTEX, true);
-        tessellator.vertex(x, y, z).vertex(x1, y1, z1).draw(GL_LINE_STRIP);
+        tessellator.addVertex(x, y, z).addVertex(x1, y1, z1).draw(GL_LINE_STRIP);
         setupClientState(GLClientState.VERTEX, false);
         setupRender(false);
     }
@@ -159,10 +158,10 @@ public static void drawFlippedTexturedRect(float x1, float y1, float x2, float y
         setupClientState(GLClientState.TEXTURE, true);
 
         tessellator
-                .vertex(x1, y2, 0).texture(0, 0)
-                .vertex(x2, y2, 0).texture(1, 0)
-                .vertex(x2, y1, 0).texture(1, 1)
-                .vertex(x1, y1, 0).texture(0, 1)
+                .addVertex(x1, y2, 0).setTexture(0, 0)
+                .addVertex(x2, y2, 0).setTexture(1, 0)
+                .addVertex(x2, y1, 0).setTexture(1, 1)
+                .addVertex(x1, y1, 0).setTexture(0, 1)
                 .draw(GL_QUADS);
 
         setupClientState(GLClientState.TEXTURE, false);
@@ -180,10 +179,10 @@ public static void drawReflectedTexturedRect(float x1, float y1, float x2, float
         setupClientState(GLClientState.TEXTURE, true);
 
         tessellator
-                .vertex(x1, y2, 0).texture(1, 0)
-                .vertex(x2, y2, 0).texture(1, 0)
-                .vertex(x2, y1, 0).texture(0, 1)
-                .vertex(x1, y1, 0).texture(1, 1)
+                .addVertex(x1, y2, 0).setTexture(1, 0)
+                .addVertex(x2, y2, 0).setTexture(1, 0)
+                .addVertex(x2, y1, 0).setTexture(0, 1)
+                .addVertex(x1, y1, 0).setTexture(1, 1)
                 .draw(GL_QUADS);
 
         setupClientState(GLClientState.TEXTURE, false);
@@ -203,7 +202,7 @@ public static void rectangle(float x1, float y1, float x2, float y2, int color)
 
         setupRender(true);
         setupClientState(GLClientState.VERTEX, true);
-        tessellator.vertex(x1, y2, 0).vertex(x2, y2, 0).vertex(x2, y1, 0).vertex(x1, y1, 0).draw(GL_QUADS);
+        tessellator.addVertex(x1, y2, 0).addVertex(x2, y2, 0).addVertex(x2, y1, 0).addVertex(x1, y1, 0).draw(GL_QUADS);
         setupClientState(GLClientState.VERTEX, false);
         setupRender(false);
     }
@@ -232,30 +231,23 @@ private static void rectangleGradient(float x1, float y1, float x2, float y2, in
         if (color.length == 0)
             throw new RuntimeException("At least one set of colors should be supplied");
 
-        float[] r = new float[color.length];
-        float[] g = new float[color.length];
-        float[] b = new float[color.length];
-        float[] a = new float[color.length];
-        for (int i = 0; i < color.length; i++) {
-            float[] c = Colors.getColor(color[i]);
-            r[i] = c[0]; g[i] = c[1]; b[i] = c[2]; a[i] = c[3];
-        }
+        int c1, c2, c3, c4;
 
         if (color.length == 1) {
-            r = new float[] { r[0], r[0], r[0], r[0] };
-            g = new float[] { g[0], g[0], g[0], g[0] };
-            b = new float[] { b[0], b[0], b[0], b[0] };
-            a = new float[] { a[0], a[0], a[0], a[0] };
+            c1 = color[0];
+            c2 = color[1];
+            c3 = color[2];
+            c4 = color[3];
         } else if (color.length > 1 && color.length < 4) {
-            r = new float[] { r[0], r[0], r[1], r[1] };
-            g = new float[] { g[0], g[0], g[1], g[1] };
-            b = new float[] { b[0], b[0], b[1], b[1] };
-            a = new float[] { a[0], a[0], a[1], a[1] };
+            c1 = color[0];
+            c2 = color[0];
+            c3 = color[1];
+            c4 = color[2];
         } else {
-            r = new float[] { r[0], r[1], r[2], r[3] };
-            g = new float[] { g[0], g[1], g[2], g[3] };
-            b = new float[] { b[0], b[1], b[2], b[3] };
-            a = new float[] { a[0], a[1], a[2], a[3] };
+            c1 = color[0];
+            c2 = color[1];
+            c3 = color[2];
+            c4 = color[3];
         }
 
         setupRender(true);
@@ -264,14 +256,13 @@ private static void rectangleGradient(float x1, float y1, float x2, float y2, in
         setupClientState(GLClientState.COLOR, true);
 
         tessellator
-                .color(r[0], g[0], b[0], a[0]).vertex(x1, y2, 0)
-                .color(r[1], g[1], b[1], a[1]).vertex(x2, y2, 0)
-                .color(r[2], g[2], b[2], a[2]).vertex(x2, y1, 0)
-                .color(r[3], g[3], b[3], a[3]).vertex(x1, y1, 0)
+                .setColor(c1).addVertex(x1, y2, 0)
+                .setColor(c2).addVertex(x2, y2, 0)
+                .setColor(c3).addVertex(x2, y1, 0)
+                .setColor(c4).addVertex(x1, y1, 0)
                 .draw(GL_QUADS);
 
         setupClientState(GLClientState.COLOR, false);
-        GlStateManager.shadeModel(GL_FLAT);
         setupRender(false);
     }
 

src/main/java/me/zero/client/api/value/Values.java

@@ -17,7 +17,7 @@
 package me.zero.client.api.value;
 
 import me.zero.client.api.exception.ValueException;
-import me.zero.client.api.util.ClientUtils;
+import me.zero.client.api.util.ClientAPIUtils;
 import me.zero.client.api.util.annotation.Label;
 import me.zero.client.api.value.annotation.*;
 import me.zero.client.api.value.holder.IValueHolder;
@@ -131,7 +131,7 @@ private static Value getValue(Object parent, Field field) {
      * @param data The resolver data for the annotation
      */
     public static void define(Class<?> type, ResolverData data) {
-        if (ClientUtils.containsNull(type, data))
+        if (ClientAPIUtils.containsNull(type, data))
             throw new NullPointerException("One or more parameters were null");
 
         if (RESOLVERS.get(type) != null)

src/main/java/me/zero/client/api/value/type/MultiType.java

@@ -16,7 +16,7 @@
 
 package me.zero.client.api.value.type;
 
-import me.zero.client.api.util.ClientUtils;
+import me.zero.client.api.util.ClientAPIUtils;
 import me.zero.client.api.value.Value;
 import org.apache.commons.lang3.ArrayUtils;
 
@@ -43,7 +43,7 @@ public MultiType(String name, String id, String description, Object object, Fiel
 
     @Override
     public final void setValue(String value) {
-        super.setValue(ClientUtils.objectFrom(value, values));
+        super.setValue(ClientAPIUtils.objectFrom(value, values));
     }
 
     /**

src/main/java/pw/knx/feather/Feather.java

@@ -0,0 +1,138 @@
+package pw.knx.feather;
+
+import pw.knx.feather.font.FontCache;
+import pw.knx.feather.font.FontGlyph;
+import pw.knx.feather.font.GlyphLayout;
+import pw.knx.feather.tessellate.Tessellator;
+import pw.knx.feather.texture.Texture;
+
+import java.awt.*;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.lwjgl.opengl.GL11.*;
+import static org.lwjgl.opengl.GL15.*;
+
+/**
+ * The central class of the Feather library.
+ *
+ * Basically functions as a convenient state manager for OpenGL,
+ * wrapping the most commonly used functions in intuitive, intelligent,
+ * chainable methods. In this way, Feather reduces your required knowledge of
+ * obscure OpenGL constants and compacts otherwise painfully verbose state management code.
+ *
+ * Probably going to use the enum singleton pattern for simplicity, thread safety and global access.
+ * This should not pose an inconvenience since LWJGL only allows once thread to interact
+ * with OpenGL anyways.
+ *
+ * WIP
+ *
+ * @author KNOXDEV
+ * @since 6/7/2017 6:54 PM
+ */
+public enum Feather {
+	feather;
+
+	/**
+	 * The simple Feather Tessellator we've designated to render our glyphs.
+	 */
+	private final Tessellator tess = Tessellator.createExpanding(4 * 4, 1, 2);
+
+	private final Map<Font, FontCache> fonts = new HashMap<>();
+	private FontCache currentFont;
+
+
+	/*
+	 * State Management - Most of these return Feather so they can be chained.
+	 */
+
+	/**
+	 * Binds an existing texture object to the working texture2D buffer
+	 *
+	 * @param id The OpenGL ID of the texture object to be bound
+	 * @return the Feather manager, for additional chaining
+	 */
+	public Feather bindTexture(int id) {
+		glBindTexture(GL_TEXTURE_2D, id);
+		return this;
+	}
+
+	/**
+	 * Binds an existing buffer object to the working array buffer
+	 *
+	 * @param id The OpenGL ID of the buffer object to be bound
+	 * @return the Feather manager, for additional chaining
+	 */
+	public Feather bindBuffer(int id) {
+		glBindBuffer(GL_ARRAY_BUFFER, id);
+		return this;
+	}
+
+
+	/*
+	 * Allocators - Methods that wrap Java's unfortunate Buffer API
+	 */
+
+	/**
+	 * Allocates a ByteBuffer in the platform's native byte order
+	 *
+	 * @param capacity the size of the Buffer to be allocated in bytes
+	 * @return the allocated ByteBuffer
+	 */
+	public synchronized ByteBuffer allocateBuffer(int capacity) {
+		return ByteBuffer.allocateDirect(capacity).order(ByteOrder.nativeOrder());
+	}
+
+
+	/*
+	 * Basic Rendering Routines
+	 */
+
+	public Feather setFont(Font font) {
+		// holy shit streams
+		currentFont = fonts.computeIfAbsent(font, FontCache::from);
+		return this;
+	}
+
+	public Feather drawString(String str, float x, float y) {
+		if(currentFont == null)
+			throw new RuntimeException("You must first set the Font to draw");
+
+		/* Make sure the entire string is cached before rendering and return its glyph representation */
+		final GlyphLayout entry = currentFont.cacheString(str);
+
+		/* Track which texture is currently bound to minimize the number of glBindTexture() and Tessellator.draw() calls needed */
+		int boundTex = 0;
+
+		/* Cycle through the Glyphs to be rendered */
+		for (FontGlyph glyph : entry.glyphs) {
+			final Texture texture = glyph.texture;
+
+			/*
+			* Make sure the OpenGL texture storing this glyph's image is bound (if not already bound). All pending glyphs in the
+			* Tessellator's vertex array must be drawn before switching textures, otherwise they would erroneously use the new
+			* texture as well.
+			*/
+			if (boundTex != texture.id()) {
+				if (boundTex != 0)
+					tess.draw(GL_QUADS);
+				boundTex = texture.bind().id();
+			}
+			final float x1 = x + glyph.x;
+			final float x2 = x1 + texture.width();
+			final float y1 = y + glyph.y;
+			final float y2 = y1 + texture.height();
+			tess.setTexture(texture.u(), texture.v()).addVertex(x1, y1, 0);
+			tess.setTexture(texture.u(), texture.v1()).addVertex(x1, y2, 0);
+			tess.setTexture(texture.u1(), texture.v1()).addVertex(x2, y2, 0);
+			tess.setTexture(texture.u1(), texture.v()).addVertex(x2, y1, 0);
+		}
+
+		/* Draw any remaining glyphs in the Tessellator's vertex array (there should be at least one glyph pending) */
+		tess.draw(GL_QUADS);
+
+		return this;
+	}
+}