geomerative 0.2.0-java → 0.3.2-java

data/src/geomerative/RContour.java

@@ -18,9 +18,12 @@
  */
 package geomerative;
 
-import processing.core.*;
+
 
 import java.util.List;
+import processing.core.PApplet;
+import processing.core.PConstants;
+import processing.core.PGraphics;
 
 /**
  * RContour is a reduced interface for creating, holding and drawing contours.
@@ -111,6 +114,10 @@ public class RContour extends RGeomElem {
         }
     }
 
+    /**
+     *
+     * @param g
+     */
     @Override
     public void draw(PApplet g) {
         int numPoints = countPoints();

data/src/geomerative/RFont.java

@@ -18,10 +18,13 @@
 */
 
 package geomerative;
-import processing.core.*;
+
 
 import org.apache.batik.svggen.font.*;
 import org.apache.batik.svggen.font.table.*;
+import processing.core.PApplet;
+import processing.core.PConstants;
+import processing.core.PGraphics;
 
 /**
  * RShape is a reduced interface for creating, holding and drawing text from TrueType Font files. It's a basic interpreter of TrueType fonts enabling to access any String in the form of a group of shapes.  Enabling us in this way to access their geometry.
@@ -98,7 +101,7 @@ public class RFont implements PConstants{
    * @related size
    * @related RFont
    */
-  public void setSize(int size){
+  public final void setSize(int size){
     short unitsPerEm = f.getHeadTable().getUnitsPerEm();
     int resolution = RG.dpi();
     this.scaleFactor = ((float)size * (float)resolution) / (72F * (float)unitsPerEm);
@@ -140,7 +143,7 @@ public class RFont implements PConstants{
    * @related align
    * @related RFont
    */
-  public void setAlign(int align) throws RuntimeException{
+  public final void setAlign(int align) throws RuntimeException{
     if(align!=LEFT && align!=CENTER && align!=RIGHT){
       throw new RuntimeException("Alignment unknown.  The only accepted values are: RFont.LEFT, RFont.CENTER and RFont.RIGHT");
     }
@@ -148,6 +151,7 @@ public class RFont implements PConstants{
   }
   
   /**
+     * @return 
    * @invisible
    **/
   public String getFamily(){
@@ -437,8 +441,7 @@ public class RFont implements PConstants{
   
   public void draw(char character) throws RuntimeException{
     this.toShape(character).draw();
-  }
-  
+  } 
   
   
   private static float midValue(float a, float b) {

data/src/geomerative/RG.java

@@ -18,14 +18,19 @@
  */
 package geomerative;
 
-import processing.core.*;
+
+
+import processing.core.PApplet;
+import processing.core.PConstants;
+import processing.core.PGraphics;
+
 
 /**
  * RG is a static class containing all the states, modes, etc.. Geomerative is
  * mostly used by calling RG methods. e.g. RShape s = RG.getEllipse(30, 40, 80,
  * 80)
  */
-public class RG implements PConstants {
+public class RG { 
 
     /**
      * @invisible
@@ -304,7 +309,7 @@ public class RG implements PConstants {
      * @eexample createShape
      */
     public static void breakShape(int endMode) {
-        if (endMode == CLOSE) {
+        if (endMode == PConstants.CLOSE) {
             shape.addClose();
         }
 

data/src/geomerative/RGeomElem.java

@@ -17,8 +17,8 @@
  * Geomerative. If not, see <http://www.gnu.org/licenses/>.
  */
 package geomerative;
-
-import processing.core.*;
+import processing.core.PApplet;
+import processing.core.PGraphics;
 
 /**
  * RGeomElem is an interface to any geometric element that can be drawn and
@@ -86,6 +86,10 @@ public abstract class RGeomElem {
     // They must be overrided
     public abstract void draw(PGraphics g);
 
+    /**
+     *
+     * @param g
+     */
     public abstract void draw(PApplet g);
 
     public void draw() {
@@ -142,15 +146,10 @@ public abstract class RGeomElem {
         RPoint bl = shp.getBottomRight();
         RPoint br = shp.getBottomLeft();
 
-        if (this.contains(tl)
+        return this.contains(tl)
             && this.contains(tr)
             && this.contains(bl)
-            && this.contains(br)) {
-
-            return true;
-        }
-
-        return false;
+            && this.contains(br);
     }
 
     /**

data/src/geomerative/RGroup.java

@@ -55,6 +55,7 @@ public class RGroup extends RGeomElem
 
   /**
    * Use this method to create a copy of a group.
+     * @param grp
    * @eexample RGroup
    */
   public RGroup(RGroup grp){
@@ -91,6 +92,7 @@ public class RGroup extends RGeomElem
    * @related getBounds ( )
    * @related getCenter ( )
    */
+  @Override
   public RPoint getCentroid(){
     RPoint bestCentroid = new RPoint();
     float bestArea = Float.NEGATIVE_INFINITY;
@@ -120,6 +122,7 @@ public class RGroup extends RGeomElem
     return elements.length;
   }
   
+  @Override
   public void print(){
     System.out.println("group: ");
     for(int i=0;i<countElements();i++)
@@ -135,6 +138,7 @@ public class RGroup extends RGeomElem
    * @eexample RGroup_draw
    * @param g PGraphics, the graphics object on which to draw the group
    */
+  @Override
   public void draw(PGraphics g){
     if(!RG.ignoreStyles){
       saveContext(g);
@@ -150,6 +154,7 @@ public class RGroup extends RGeomElem
     }
   }
   
+  @Override
   public void draw(PApplet a){
     if(!RG.ignoreStyles){
       saveContext(a);
@@ -171,7 +176,7 @@ public class RGroup extends RGeomElem
    * @param elem RGeomElem, any kind of RGeomElem to add.  It accepts the classes RShape, RPolygon and RMesh.
    * @related removeElement ( )
    */
-  public void addElement(RGeomElem elem){
+  public final void addElement(RGeomElem elem){
     this.append(elem);
   }
   
@@ -257,8 +262,10 @@ public class RGroup extends RGeomElem
   }
   
   /**
+     * @return 
    * @invisible
    */
+  @Override
   public RMesh toMesh() throws RuntimeException{
     //throw new RuntimeException("Transforming a Group to a Mesh is not yet implemented.");
     RGroup meshGroup = toMeshGroup();
@@ -274,8 +281,10 @@ public class RGroup extends RGeomElem
   }
   
   /**
+     * @return 
    * @invisible
    */
+  @Override
   public RPolygon toPolygon() throws RuntimeException{
     //throw new RuntimeException("Transforming a Group to a Polygon is not yet implemented.");
     //RGroup polygonGroup = toPolygonGroup();
@@ -291,8 +300,10 @@ public class RGroup extends RGeomElem
   }
   
   /**
+     * @return 
    * @invisible
    */
+  @Override
   public RShape toShape() throws RuntimeException{
     //throw new RuntimeException("Transforming a Group to a Shape is not yet implemented.");
     RShape result = new RShape();
@@ -311,6 +322,7 @@ public class RGroup extends RGeomElem
    * @eexample RGroup_getHandles
    * @return RPoint[], the points returned in an array.
    * */
+  @Override
   public RPoint[] getHandles(){
     int numElements = countElements();
     if(numElements == 0){
@@ -318,7 +330,7 @@ public class RGroup extends RGeomElem
     }
     
     RPoint[] result=null;
-    RPoint[] newresult=null;
+    RPoint[] newresult;
     for(int i=0;i<numElements;i++){
       RPoint[] newPoints = elements[i].getHandles();
       if(newPoints!=null){
@@ -336,6 +348,12 @@ public class RGroup extends RGeomElem
     return result;
   }  
   
+    /**
+     *
+     * @param t
+     * @return
+     */
+    @Override
   public RPoint getPoint(float t){
     float[] indAndAdv = indAndAdvAt(t);
     int indOfElement = (int)(indAndAdv[0]);
@@ -349,6 +367,7 @@ public class RGroup extends RGeomElem
    * @eexample RGroup_getPoints
    * @return RPoint[], the points returned in an array.
    * */
+  @Override
   public RPoint[] getPoints(){
     int numElements = countElements();
     if(numElements == 0){
@@ -357,7 +376,7 @@ public class RGroup extends RGeomElem
 
     RCommand.segmentAccOffset = RCommand.segmentOffset;    
     RPoint[] result=null;
-    RPoint[] newresult=null;
+    RPoint[] newresult;
     for(int i=0;i<numElements;i++){
       RPoint[] newPoints = elements[i].getPoints();
       if(newPoints!=null){
@@ -376,6 +395,7 @@ public class RGroup extends RGeomElem
     return result;
   }
 
+  @Override
   public RPoint getTangent(float t){
     float[] indAndAdv = indAndAdvAt(t);
     int indOfElement = (int)(indAndAdv[0]);
@@ -389,6 +409,7 @@ public class RGroup extends RGeomElem
    * @eexample RGroup_getPoints
    * @return RPoint[], the points returned in an array.
    * */
+  @Override
   public RPoint[] getTangents(){
     int numElements = countElements();
     if(numElements == 0){
@@ -396,7 +417,7 @@ public class RGroup extends RGeomElem
     }
     
     RPoint[] result=null;
-    RPoint[] newresult=null;
+    RPoint[] newresult;
     for(int i=0;i<numElements;i++){
       RPoint[] newPoints = elements[i].getTangents();
       if(newPoints!=null){
@@ -419,6 +440,7 @@ public class RGroup extends RGeomElem
    * @eexample RGroup_getPoints
    * @return RPoint[], the points returned in an array.
    * */
+  @Override
   public RPoint[][] getPointsInPaths(){
     int numElements = countElements();
     if(numElements == 0){
@@ -426,7 +448,7 @@ public class RGroup extends RGeomElem
     }
     
     RPoint[][] result=null;
-    RPoint[][] newresult=null;
+    RPoint[][] newresult;
     for(int i=0;i<numElements;i++){
       RPoint[][] newPointPaths = elements[i].getPointsInPaths();
       if(newPointPaths != null){
@@ -444,14 +466,14 @@ public class RGroup extends RGeomElem
     return result;    
   }
 
+  @Override
   public RPoint[][] getHandlesInPaths(){
     int numElements = countElements();
     if(numElements == 0){
       return null;
-    }
-    
+    }    
     RPoint[][] result=null;
-    RPoint[][] newresult=null;
+    RPoint[][] newresult;
     for(int i=0;i<numElements;i++){
       RPoint[][] newHandlePaths = elements[i].getHandlesInPaths();
       if(newHandlePaths != null){
@@ -469,14 +491,14 @@ public class RGroup extends RGeomElem
     return result;    
   }
 
+  @Override
   public RPoint[][] getTangentsInPaths(){
     int numElements = countElements();
     if(numElements == 0){
       return null;
-    }
-    
+    }    
     RPoint[][] result=null;
-    RPoint[][] newresult=null;
+    RPoint[][] newresult;
     for(int i=0;i<numElements;i++){
       RPoint[][] newTangentPaths = elements[i].getTangentsInPaths();
       if(newTangentPaths != null){
@@ -499,6 +521,7 @@ public class RGroup extends RGeomElem
    * @param p  the point for which to test containment..
    * @return boolean, true if the point is in the path.
    * */
+  @Override
   public boolean contains(RPoint p){
     float testx = p.x;
     float testy = p.y;
@@ -529,6 +552,7 @@ public class RGroup extends RGeomElem
    * @eexample RPolygon_getType
    * @return int, will allways return RGeomElem.POLYGON
    */
+  @Override
   public int getType(){
     return type;
   }
@@ -714,12 +738,11 @@ public class RGroup extends RGeomElem
           ((RShape)element).insertHandleInPaths(t);
           break;
         }
-    }
-    
-    return;
+    }    
   }
   
   
+  @Override
   protected void calculateCurveLengths(){
     lenCurves = new float[countElements()];
     lenCurve = 0F;
@@ -732,6 +755,8 @@ public class RGroup extends RGeomElem
   
   /**
    * Use this method to adapt a group of of figures to a group.
+     * @param wght
+     * @param lngthOffset
    * @eexample RGroup_adapt
    * @param grp  the path to which to adapt
    */
@@ -749,20 +774,17 @@ public class RGroup extends RGeomElem
         RGeomElem elem = this.elements[i];
         RPoint[] ps = elem.getHandles();
         if(ps != null){
-          for(int k=0;k<ps.length;k++){
-            float px = ps[k].x;
-            float py = ps[k].y;
-            
-            float t = ((px-xmin)/(xmax-xmin) + lngthOffset ) % 1.001F;
-            float amp = (ymax-py);
-            
-            RPoint tg = grp.getTangent(t);
-            RPoint p = grp.getPoint(t);
-            float angle = (float)Math.atan2(tg.y, tg.x) - (float)Math.PI/2F;
-            
-            ps[k].x = p.x + wght*amp*(float)Math.cos(angle);
-            ps[k].y = p.y + wght*amp*(float)Math.sin(angle);
-          }
+            for (RPoint p1 : ps) {
+                float px = p1.x;
+                float py = p1.y;
+                float t = ((px-xmin)/(xmax-xmin) + lngthOffset ) % 1.001F;
+                float amp = (ymax-py);
+                RPoint tg = grp.getTangent(t);
+                RPoint p = grp.getPoint(t);
+                float angle = (float)Math.atan2(tg.y, tg.x) - (float)Math.PI/2F;
+                p1.x = p.x + wght*amp*(float)Math.cos(angle);
+                p1.y = p.y + wght*amp*(float)Math.sin(angle);
+            }
         }
       }
       break;

data/src/geomerative/RMatrix.java

@@ -106,56 +106,52 @@ public class RMatrix
   public RMatrix(String transformationString){
     String[] transfTokens = PApplet.splitTokens(transformationString, ")");
     
-    // Loop through all transformations
-    for(int i=0; i<transfTokens.length; i++){
-      // Check the transformation and the parameters
-      String[] transf = PApplet.splitTokens(transfTokens[i], "(");
-      String[] params = PApplet.splitTokens(transf[1], ", ");
-      float[] fparams = new float[params.length];
-      for(int j=0; j<params.length; j++){
-        fparams[j] = PApplet.parseFloat(params[j]);
-      }
-      
-      transf[0] = PApplet.trim(transf[0]);
-      
-      if(transf[0].equals("translate")){
-        if(params.length == 1){
-          this.translate(fparams[0]);
-          
-        }else if(params.length == 2){
-          this.translate(fparams[0], fparams[1]);
-          
-        }
-      }else if(transf[0].equals("rotate")){
-        if(params.length == 1){
-          this.rotate(PApplet.radians(fparams[0]));
-          
-        }else if(params.length == 3){
-          this.rotate(PApplet.radians(fparams[0]), fparams[1], fparams[2]);
-          
-        }
-        
-      }else if(transf[0].equals("scale")){
-        if(params.length == 1){
-          this.scale(fparams[0]);
-          
-        }else if(params.length == 2){
-          this.scale(fparams[0], fparams[1]);
+      // Loop through all transformations
+      for (String transfToken : transfTokens) {
+          // Check the transformation and the parameters
+          String[] transf = PApplet.splitTokens(transfToken, "(");
+          String[] params = PApplet.splitTokens(transf[1], ", ");
+          float[] fparams = new float[params.length];
+          for(int j=0; j<params.length; j++){
+              fparams[j] = PApplet.parseFloat(params[j]);
+          }   transf[0] = PApplet.trim(transf[0]);
+        switch (transf[0]) {
+            case "translate":
+                if(params.length == 1){
+                    this.translate(fparams[0]);
+                    
+                }else if(params.length == 2){
+                    this.translate(fparams[0], fparams[1]);
+                    
+                } break;
+            case "rotate":
+                if(params.length == 1){
+                    this.rotate(PApplet.radians(fparams[0]));
+                    
+                }else if(params.length == 3){
+                    this.rotate(PApplet.radians(fparams[0]), fparams[1], fparams[2]);
+                    
+                } break;
+            case "scale":
+                if(params.length == 1){
+                    this.scale(fparams[0]);
+                    
+                }else if(params.length == 2){
+                    this.scale(fparams[0], fparams[1]);
+              } break;
+            case "skewX":
+                this.skewX(PApplet.radians(fparams[0]));
+                break;
+            case "skewY":
+                this.skewY(PApplet.radians(fparams[0]));
+                break;
+            case "matrix":
+                this.apply(fparams[0], fparams[2], fparams[4], fparams[1], fparams[3], fparams[5]);
+                break;
+            default:
+                throw new RuntimeException("Transformation unknown. '"+ transf[0]  +"'");
         }
-        
-      }else if(transf[0].equals("skewX")){
-        this.skewX(PApplet.radians(fparams[0]));
-        
-      }else if(transf[0].equals("skewY")){
-        this.skewY(PApplet.radians(fparams[0]));
-        
-      }else if(transf[0].equals("matrix")){
-        this.apply(fparams[0], fparams[2], fparams[4], fparams[1], fparams[3], fparams[5]);
-        
-      }else{
-        throw new RuntimeException("Transformation unknown. '"+ transf[0]  +"'");
       }
-    }
   }
   
   private void set(float m00, float m01, float m02,
@@ -185,7 +181,7 @@ public class RMatrix
    * @related scale ( )
    * @related shear ( )
    */ 
-  public void apply(float n00, float n01, float n02,
+  public final void apply(float n00, float n01, float n02,
                     float n10, float n11, float n12) {
     
     float r00 = m00*n00 + m01*n10;
@@ -225,12 +221,12 @@ public class RMatrix
    * @related scale ( )
    * @related shear ( )
    */
-  public void translate(float tx, float ty)
+  public final void translate(float tx, float ty)
   {
     apply(1, 0, tx, 0, 1, ty);
   }
 
-  public void translate(float tx)
+  public final void translate(float tx)
   {
     translate(tx, 0);
   }
@@ -260,14 +256,14 @@ public class RMatrix
    * @related translate ( )
    * @related scale ( )
    */ 
-  public void rotate(float angle, float vx, float vy)
+  public final void rotate(float angle, float vx, float vy)
   {
     translate(vx,vy);
     rotate(angle);
     translate(-vx,-vy);
   }
 
-  public void rotate(float angle)
+  public final void rotate(float angle)
   {
     float c = (float)Math.cos(angle);
     float s = (float)Math.sin(angle);
@@ -308,7 +304,7 @@ public class RMatrix
     translate(-x,-y);
   }
 
-  public void scale(float sx, float sy)
+  public final void scale(float sx, float sy)
   {
     apply(sx, 0, 0,  0, sy, 0);
   }
@@ -360,7 +356,7 @@ public class RMatrix
     scale(s, s, p.x, p.y);
   }
   
-  public void scale(float s)
+  public final void scale(float s)
   {
     scale(s, s);
   }
@@ -374,12 +370,12 @@ public class RMatrix
    * @related scale ( )
    * @related translate ( )
    */
-  public void skewX(float angle)
+  public final void skewX(float angle)
   {
     apply(1, (float)Math.tan(angle), 0,  0, 1, 0);
   }
   
-  public void skewY(float angle)
+  public final void skewY(float angle)
   {
     apply(1, 0, 0, (float)Math.tan(angle), 1, 0);
   }