re-add triangle methods

ankittechie · Jun 25, 2020 · d01a70b · d01a70b
1 parent b5a8a3b
commit d01a70b
Show file tree

Hide file tree

Showing 2 changed files with 161 additions and 1 deletion.
diff --git a/drawer/src/space/earlygrey/shapedrawer/AbstractShapeDrawer.java b/drawer/src/space/earlygrey/shapedrawer/AbstractShapeDrawer.java
@@ -28,6 +28,7 @@ public abstract class AbstractShapeDrawer {
 
 
     protected static final Matrix4 mat4 = new Matrix4();
+    protected static final float[] trianglePathPoints = new float[6];
 
     protected final LineDrawer lineDrawer;
     protected final PathDrawer pathDrawer;
@@ -136,6 +137,14 @@ protected boolean isJoinNecessary(float lineWidth) {
         return lineWidth > 3 * getPixelSize();
     }
 
+    /**
+     * See {@link AbstractShapeDrawer#isJoinNecessary(float)}.
+     * @return
+     */
+    protected boolean isJoinNecessary() {
+        return isJoinNecessary(getDefaultLineWidth());
+    }
+
     protected int estimateSidesRequired(float radiusX, float radiusY) {
         float circumference = (float) (ShapeUtils.PI2 * Math.sqrt((radiusX*radiusX + radiusY*radiusY)/2f));
         int sides = (int) (circumference / (16 * getPixelSize()));

diff --git a/drawer/src/space/earlygrey/shapedrawer/ShapeDrawer.java b/drawer/src/space/earlygrey/shapedrawer/ShapeDrawer.java
@@ -964,8 +964,159 @@ public void filledPolygon(float[] vertices, ShortArray triangles) {
     }
 
 
+    //=======================================
+    //              TRIANGLES
+    //=======================================
+
+    //====================
+    //     OUTLINED
+    //====================
+
+    /**
+     * Calls {@link #triangle(Vector2, Vector2, Vector2, float)}.
+     * @param v1 the first vertex
+     * @param v2 the second vertex
+     * @param v3 the third vertex
+     */
+    public void triangle(Vector2 v1, Vector2 v2, Vector2 v3) {
+        triangle(v1, v2, v3, getDefaultLineWidth());
+    }
+
+    /**
+     * Calls {@link #triangle(Vector2, Vector2, Vector2, float, float)}.
+     * @param v1 the first vertex
+     * @param v2 the second vertex
+     * @param v3 the third vertex
+     * @param color the packed float colour
+     */
+    public void triangle(Vector2 v1, Vector2 v2, Vector2 v3, Color color) {
+        triangle(v1, v2, v3, getDefaultLineWidth(), color.toFloatBits());
+    }
+
+    /**
+     * Calls {@link #triangle(Vector2, Vector2, Vector2, float, float)}.
+     * @param v1 the first vertex
+     * @param v2 the second vertex
+     * @param v3 the third vertex
+     * @param lineWidth
+     */
+    public void triangle(Vector2 v1, Vector2 v2, Vector2 v3, float lineWidth) {
+        triangle(v1, v2, v3, lineWidth, getPackedColor());
+    }
+
+    /**
+     * Calls {@link #triangle(Vector2, Vector2, Vector2, float, JoinType, float)}.
+     * @param v1 the first vertex
+     * @param v2 the second vertex
+     * @param v3 the third vertex
+     * @param lineWidth
+     * @param color the packed float colour
+     */
+    public void triangle(Vector2 v1, Vector2 v2, Vector2 v3, float lineWidth, float color) {
+        triangle(v1, v2, v3, lineWidth, isJoinNecessary(lineWidth)?JoinType.POINTY:JoinType.NONE, color);
+    }
+
+    /**
+     * Calls {@link #triangle(float, float, float, float, float, float, float, JoinType, float)}.
+     * @param v1 the first vertex
+     * @param v2 the second vertex
+     * @param v3 the third vertex
+     * @param lineWidth
+     * @param joinType the type of join, see {@link JoinType}
+     * @param color the packed float colour
+     */
+    public void triangle(Vector2 v1, Vector2 v2, Vector2 v3, float lineWidth, JoinType joinType, float color) {
+        triangle(v1.x, v1.y, v2.x, v2.y, v3.x, v3.y, lineWidth, joinType, color);
+    }
+
+    /**
+     * Calls {@link #triangle(float, float, float, float, float, float, float)} with the current drawer colour.
+     * @param x1 x coord of first vertex
+     * @param y1 y coord of first vertex
+     * @param x2 x coord of second vertex
+     * @param y2 y coord of second vertex
+     * @param x3 x coord of third vertex
+     * @param y3 y coord of third vertex
+     */
+    public void triangle(float x1, float y1, float x2, float y2, float x3, float y3) {
+        triangle(x1, y1, x2, y2, x3, y3, getDefaultLineWidth());
+    }
+
+    /**
+     * Calls {@link #triangle(float, float, float, float, float, float, float, JoinType, float)}.
+     * @param x1 x coord of first vertex
+     * @param y1 y coord of first vertex
+     * @param x2 x coord of second vertex
+     * @param y2 y coord of second vertex
+     * @param x3 x coord of third vertex
+     * @param y3 y coord of third vertex
+     * @param color the packed float colour
+     */
+    public void triangle(float x1, float y1, float x2, float y2, float x3, float y3, Color color) {
+        triangle(x1, y1, x2, y2, x3, y3, getDefaultLineWidth(), isJoinNecessary()?JoinType.POINTY:JoinType.NONE, color.toFloatBits());
+    }
+
+    /**
+     * Calls {@link #triangle(float, float, float, float, float, float, float, JoinType, float) with the current drawer colour.
+     * @param x1 x coord of first vertex
+     * @param y1 y coord of first vertex
+     * @param x2 x coord of second vertex
+     * @param y2 y coord of second vertex
+     * @param x3 x coord of third vertex
+     * @param y3 y coord of third vertex
+     * @param lineWidth
+     */
+    public void triangle(float x1, float y1, float x2, float y2, float x3, float y3, float lineWidth) {
+        triangle(x1, y1, x2, y2, x3, y3, lineWidth, isJoinNecessary(lineWidth)?JoinType.POINTY:JoinType.NONE, getPackedColor());
+    }
+
+    /**
+     * Calls {@link #triangle(float, float, float, float, float, float, float, JoinType, float)}.
+     * @param x1 x coord of first vertex
+     * @param y1 y coord of first vertex
+     * @param x2 x coord of second vertex
+     * @param y2 y coord of second vertex
+     * @param x3 x coord of third vertex
+     * @param y3 y coord of third vertex
+     * @param lineWidth
+     * @param color the packed float colour
+     */
+    public void triangle(float x1, float y1, float x2, float y2, float x3, float y3, float lineWidth, float color) {
+        triangle(x1, y1, x2, y2, x3, y3, lineWidth, isJoinNecessary(lineWidth)?JoinType.POINTY:JoinType.NONE, color);
+    }
+
+    /**
+     * Draws a triangle with the specified vertices and colour.
+     * @param x1 x coord of first vertex
+     * @param y1 y coord of first vertex
+     * @param x2 x coord of second vertex
+     * @param y2 y coord of second vertex
+     * @param x3 x coord of third vertex
+     * @param y3 y coord of third vertex
+     * @param lineWidth
+     * @param joinType the type of join, see {@link JoinType}
+     * @param color the packed float colour
+     */
+    public void triangle(float x1, float y1, float x2, float y2, float x3, float y3, float lineWidth, JoinType joinType, float color) {
+        float c = setColor(color);
+        if (joinType == JoinType.NONE) {
+            line(x1, y1, x2, y2);
+            line(x2, y2, x3, y3);
+            line(x3, y3, x1, y1);
+        } else {
+            trianglePathPoints[0] = x1;
+            trianglePathPoints[1] = y1;
+            trianglePathPoints[2] = x2;
+            trianglePathPoints[3] = y2;
+            trianglePathPoints[4] = x3;
+            trianglePathPoints[5] = y3;
+            pathDrawer.path(trianglePathPoints, lineWidth, joinType, false);
+        }
+        setColor(c);
+    }
+
     //====================
-    //  FILLED TRIANGLES
+    //      FILLED
     //====================
 
     /**