ported updates & fixes from java mode

Author: codeanticode

core/src/assets/shaders/LineVert.glsl

@@ -71,7 +71,9 @@ void main() {
   //  and corrects for aspect ratio, see https://github.com/processing/processing/issues/5181)
   // t = +- normalize( (q.xy*p.w - p.xy*q.w) * viewport.zw )
 
-  vec2 tangent = normalize((q.xy*p.w - p.xy*q.w) * viewport.zw);
+  vec2 tangent = (q.xy*p.w - p.xy*q.w) * viewport.zw;
+  // don't normalize zero vector (line join triangles and lines perpendicular to the eye plane)
+  tangent = length(tangent) == 0.0 ? vec2(0.0, 0.0) : normalize(tangent);
 
   // flip tangent to normal (it's already normalized)
   vec2 normal = vec2(-tangent.y, tangent.x);

core/src/processing/core/PGraphics.java

@@ -2505,11 +2505,10 @@ public void sphere(float r) {
    * endShape();</PRE>
    */
   public float bezierPoint(float a, float b, float c, float d, float t) {
-    float t1 = 1.0f - t;
-    return a*t1*t1*t1 + 3*b*t*t1*t1 + 3*c*t*t*t1 + d*t*t*t;
+    float t1 = t-1.0f;
+    return t * ( 3*t1*(b*t1-c*t) + d*t*t ) - a*t1*t1*t1;
   }
 
-
   /**
    * Provide the tangent at the given point on the bezier curve.
    * Fix from davbol for 0136.

core/src/processing/data/FloatDict.java

@@ -1,25 +1,3 @@
-/* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */
-
-/*
-  Part of the Processing project - http://processing.org
-
-  Copyright (c) 2013-16 The Processing Foundation
-
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation, version 2.
-
-  This library is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty
-  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-  See the GNU Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General
-  Public License along with this library; if not, write to the
-  Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-  Boston, MA  02111-1307  USA
-*/
-
 package processing.data;
 
 import java.io.*;
@@ -45,7 +23,7 @@ public class FloatDict {
   protected float[] values;
 
   /** Internal implementation for faster lookups */
-  private HashMap<String, Integer> indices = new HashMap<String, Integer>();
+  private HashMap<String, Integer> indices = new HashMap<>();
 
 
   public FloatDict() {
@@ -137,6 +115,31 @@ public int size() {
   }
 
 
+  /**
+   * Resize the internal data, this can only be used to shrink the list.
+   * Helpful for situations like sorting and then grabbing the top 50 entries.
+   */
+  public void resize(int length) {
+    if (length == count) return;
+
+    if (length > count) {
+      throw new IllegalArgumentException("resize() can only be used to shrink the dictionary");
+    }
+    if (length < 1) {
+      throw new IllegalArgumentException("resize(" + length + ") is too small, use 1 or higher");
+    }
+
+    String[] newKeys = new String[length];
+    float[] newValues = new float[length];
+    PApplet.arrayCopy(keys, newKeys, length);
+    PApplet.arrayCopy(values, newValues, length);
+    keys = newKeys;
+    values = newValues;
+    count = length;
+    resetIndices();
+  }
+
+
   /**
    * Remove all entries.
    *
@@ -145,7 +148,15 @@ public int size() {
    */
   public void clear() {
     count = 0;
-    indices = new HashMap<String, Integer>();
+    indices = new HashMap<>();
+  }
+
+
+  private void resetIndices() {
+    indices = new HashMap<>(count);
+    for (int i = 0; i < count; i++) {
+      indices.put(keys[i], i);
+    }
   }
 
 
@@ -183,8 +194,8 @@ public void remove() {
       }
 
       public Entry next() {
+        ++index;
         Entry e = new Entry(keys[index], values[index]);
-        index++;
         return e;
       }
 
@@ -368,6 +379,15 @@ public void set(String key, float amount) {
   }
 
 
+  public void setIndex(int index, String key, float value) {
+    if (index < 0 || index >= count) {
+      throw new ArrayIndexOutOfBoundsException(index);
+    }
+    keys[index] = key;
+    values[index] = value;
+  }
+
+
   /**
    * @webref floatdict:method
    * @brief Check if a key is a part of the data structure
@@ -427,7 +447,7 @@ public void div(String key, float amount) {
   private void checkMinMax(String functionName) {
     if (count == 0) {
       String msg =
-        String.format("Cannot use %s() on an empty %s.",
+              String.format("Cannot use %s() on an empty %s.",
                       functionName, getClass().getSimpleName());
       throw new RuntimeException(msg);
     }
@@ -544,6 +564,27 @@ public float maxValue() {
   }
 
 
+  public float sum() {
+    double amount = sumDouble();
+    if (amount > Float.MAX_VALUE) {
+      throw new RuntimeException("sum() exceeds " + Float.MAX_VALUE + ", use sumDouble()");
+    }
+    if (amount < -Float.MAX_VALUE) {
+      throw new RuntimeException("sum() lower than " + -Float.MAX_VALUE + ", use sumDouble()");
+    }
+    return (float) amount;
+  }
+
+
+  public double sumDouble() {
+    double sum = 0;
+    for (int i = 0; i < count; i++) {
+      sum += values[i];
+    }
+    return sum;
+  }
+
+
   public int index(String what) {
     Integer found = indices.get(what);
     return (found == null) ? -1 : found.intValue();
@@ -717,10 +758,7 @@ public void swap(int a, int b) {
     s.run();
 
     // Set the indices after sort/swaps (performance fix 160411)
-    indices = new HashMap<String, Integer>();
-    for (int i = 0; i < count; i++) {
-      indices.put(keys[i], i);
-    }
+    resetIndices();
   }
 
 
@@ -730,10 +768,7 @@ public void swap(int a, int b) {
    * @return a FloatDict with the original keys, mapped to their pct of the total
    */
   public FloatDict getPercent() {
-    double sum = 0;
-    for (int i = 0; i < count; i++) {
-      sum += values[i];
-    }
+    double sum = sum();
     FloatDict outgoing = new FloatDict();
     for (int i = 0; i < size(); i++) {
       double percent = value(i) / sum;
@@ -791,4 +826,4 @@ public String toJSON() {
   public String toString() {
     return getClass().getSimpleName() + " size=" + size() + " " + toJSON();
   }
-}
+}

core/src/processing/data/IntDict.java

@@ -1,25 +1,3 @@
-/* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */
-
-/*
-  Part of the Processing project - http://processing.org
-
-  Copyright (c) 2013-16 The Processing Foundation
-
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation, version 2.
-
-  This library is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty
-  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-  See the GNU Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General
-  Public License along with this library; if not, write to the
-  Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-  Boston, MA  02111-1307  USA
-*/
-
 package processing.data;
 
 import java.io.*;
@@ -45,7 +23,7 @@ public class IntDict {
   protected int[] values;
 
   /** Internal implementation for faster lookups */
-  private HashMap<String, Integer> indices = new HashMap<String, Integer>();
+  private HashMap<String, Integer> indices = new HashMap<>();
 
 
   public IntDict() {
@@ -138,6 +116,29 @@ public int size() {
   }
 
 
+  /**
+   * Resize the internal data, this can only be used to shrink the list.
+   * Helpful for situations like sorting and then grabbing the top 50 entries.
+   */
+  public void resize(int length) {
+    if (length > count) {
+      throw new IllegalArgumentException("resize() can only be used to shrink the dictionary");
+    }
+    if (length < 1) {
+      throw new IllegalArgumentException("resize(" + length + ") is too small, use 1 or higher");
+    }
+
+    String[] newKeys = new String[length];
+    int[] newValues = new int[length];
+    PApplet.arrayCopy(keys, newKeys, length);
+    PApplet.arrayCopy(values, newValues, length);
+    keys = newKeys;
+    values = newValues;
+    count = length;
+    resetIndices();
+  }
+
+
   /**
    * Remove all entries.
    *
@@ -146,7 +147,15 @@ public int size() {
    */
   public void clear() {
     count = 0;
-    indices = new HashMap<String, Integer>();
+    indices = new HashMap<>();
+  }
+
+
+  private void resetIndices() {
+    indices = new HashMap<>(count);
+    for (int i = 0; i < count; i++) {
+      indices.put(keys[i], i);
+    }
   }
 
 
@@ -184,8 +193,8 @@ public void remove() {
       }
 
       public Entry next() {
+        ++index;
         Entry e = new Entry(keys[index], values[index]);
-        index++;
         return e;
       }
 
@@ -370,6 +379,16 @@ public void set(String key, int amount) {
     }
   }
 
+
+  public void setIndex(int index, String key, int value) {
+    if (index < 0 || index >= count) {
+      throw new ArrayIndexOutOfBoundsException(index);
+    }
+    keys[index] = key;
+    values[index] = value;
+  }
+
+
   /**
    * @webref intdict:method
    * @brief Check if a key is a part of the data structure
@@ -452,7 +471,7 @@ public void div(String key, int amount) {
   private void checkMinMax(String functionName) {
     if (count == 0) {
       String msg =
-        String.format("Cannot use %s() on an empty %s.",
+              String.format("Cannot use %s() on an empty %s.",
                       functionName, getClass().getSimpleName());
       throw new RuntimeException(msg);
     }
@@ -530,6 +549,27 @@ public int maxValue() {
   }
 
 
+  public int sum() {
+    long amount = sumLong();
+    if (amount > Integer.MAX_VALUE) {
+      throw new RuntimeException("sum() exceeds " + Integer.MAX_VALUE + ", use sumLong()");
+    }
+    if (amount < Integer.MIN_VALUE) {
+      throw new RuntimeException("sum() less than " + Integer.MIN_VALUE + ", use sumLong()");
+    }
+    return (int) amount;
+  }
+
+
+  public long sumLong() {
+    long sum = 0;
+    for (int i = 0; i < count; i++) {
+      sum += values[i];
+    }
+    return sum;
+  }
+
+
   public int index(String what) {
     Integer found = indices.get(what);
     return (found == null) ? -1 : found.intValue();
@@ -685,10 +725,7 @@ public void swap(int a, int b) {
     s.run();
 
     // Set the indices after sort/swaps (performance fix 160411)
-    indices = new HashMap<String, Integer>();
-    for (int i = 0; i < count; i++) {
-      indices.put(keys[i], i);
-    }
+    resetIndices();
   }
 
 
@@ -698,10 +735,7 @@ public void swap(int a, int b) {
    * @return an IntDict with the original keys, mapped to their pct of the total
    */
   public FloatDict getPercent() {
-    double sum = 0;
-    for (int i = 0; i < count; i++) {
-      sum += values[i];
-    }
+    double sum = sum();  // a little more accuracy
     FloatDict outgoing = new FloatDict();
     for (int i = 0; i < size(); i++) {
       double percent = value(i) / sum;
@@ -759,4 +793,4 @@ public String toJSON() {
   public String toString() {
     return getClass().getSimpleName() + " size=" + size() + " " + toJSON();
   }
-}
+}