1 files changed, 103 insertions, 97 deletions
diff --git a/src/com/pheelicks/visualizer/renderer/CircleBarRenderer.java b/src/com/pheelicks/visualizer/renderer/CircleBarRenderer.java
index ff1e7d5..6d4e47f 100644
--- a/src/com/pheelicks/visualizer/renderer/CircleBarRenderer.java
+++ b/src/com/pheelicks/visualizer/renderer/CircleBarRenderer.java
@@ -4,6 +4,7 @@
  * Licensed under the MIT license:
  * http://creativecommons.org/licenses/MIT/
  */
+
 package com.pheelicks.visualizer.renderer;
 
 import android.graphics.Canvas;
@@ -16,106 +17,111 @@ import com.pheelicks.visualizer.FFTData;
 
 public class CircleBarRenderer extends Renderer
 {
-  private int mDivisions;
-  private Paint mPaint;
-  private boolean mCycleColor;
-
-  /**
-   * Renders the FFT data onto a pulsing, rotating circle
-   * @param canvas
-   * @param paint - Paint to draw lines with
-   */
-  public CircleBarRenderer(Paint paint, int divisions)
-  {
-    this(paint, divisions, false);
-  }
-
-  /**
-   * Renders the audio data onto a pulsing circle
-   * @param canvas
-   * @param paint - Paint to draw lines with
-   * @param divisions - must be a power of 2. Controls how many lines to draw
-   * @param cycleColor - If true the color will change on each frame
-   */
-  public CircleBarRenderer(Paint paint, int divisions, boolean cycleColor)
-  {
-    super();
-    mPaint = paint;
-    mDivisions = divisions;
-    mCycleColor = cycleColor;
-  }
-
-  @Override
-  public void onRender(Canvas canvas, AudioData data, Rect rect)
-  {
-    // Do nothing, we only display FFT data
-  }
-
-  @Override
-  public void onRender(Canvas canvas, FFTData data, Rect rect)
-  {
-    if(mCycleColor)
+    private int mDivisions;
+    private Paint mPaint;
+    private boolean mCycleColor;
+
+    /**
+     * Renders the FFT data onto a pulsing, rotating circle
+     * 
+     * @param canvas
+     * @param paint - Paint to draw lines with
+     */
+    public CircleBarRenderer(Paint paint, int divisions)
+    {
+        this(paint, divisions, false);
+    }
+
+    /**
+     * Renders the audio data onto a pulsing circle
+     * 
+     * @param canvas
+     * @param paint - Paint to draw lines with
+     * @param divisions - must be a power of 2. Controls how many lines to draw
+     * @param cycleColor - If true the color will change on each frame
+     */
+    public CircleBarRenderer(Paint paint, int divisions, boolean cycleColor)
     {
-      cycleColor();
+        super();
+        mPaint = paint;
+        mDivisions = divisions;
+        mCycleColor = cycleColor;
     }
 
-    for (int i = 0; i < data.bytes.length / mDivisions; i++) {
-      // Calculate dbValue
-      byte rfk = data.bytes[mDivisions * i];
-      byte ifk = data.bytes[mDivisions * i + 1];
-      float magnitude = (rfk * rfk + ifk * ifk);
-      float dbValue = 75 * (float)Math.log10(magnitude);
-
-      float[] cartPoint = {
-          (float)(i * mDivisions) / (data.bytes.length - 1),
-          rect.height() / 2 - dbValue / 4
-      };
-
-      float[] polarPoint = toPolar(cartPoint, rect);
-      mFFTPoints[i * 4] = polarPoint[0];
-      mFFTPoints[i * 4 + 1] = polarPoint[1];
-
-      float[] cartPoint2 = {
-          (float)(i * mDivisions) / (data.bytes.length - 1),
-          rect.height() / 2 + dbValue
-      };
-
-      float[] polarPoint2 = toPolar(cartPoint2, rect);
-      mFFTPoints[i * 4 + 2] = polarPoint2[0];
-      mFFTPoints[i * 4 + 3] = polarPoint2[1];
+    @Override
+    public void onRender(Canvas canvas, AudioData data, Rect rect)
+    {
+        // Do nothing, we only display FFT data
+    }
+
+    @Override
+    public void onRender(Canvas canvas, FFTData data, Rect rect)
+    {
+        if (mCycleColor)
+        {
+            cycleColor();
+        }
+
+        for (int i = 0; i < data.bytes.length / mDivisions; i++) {
+            // Calculate dbValue
+            byte rfk = data.bytes[mDivisions * i];
+            byte ifk = data.bytes[mDivisions * i + 1];
+            float magnitude = (rfk * rfk + ifk * ifk);
+            float dbValue = 75 * (float) Math.log10(magnitude);
+
+            float[] cartPoint = {
+                    (float) (i * mDivisions) / (data.bytes.length - 1),
+                    rect.height() / 2 - dbValue / 4
+            };
+
+            float[] polarPoint = toPolar(cartPoint, rect);
+            mFFTPoints[i * 4] = polarPoint[0];
+            mFFTPoints[i * 4 + 1] = polarPoint[1];
+
+            float[] cartPoint2 = {
+                    (float) (i * mDivisions) / (data.bytes.length - 1),
+                    rect.height() / 2 + dbValue
+            };
+
+            float[] polarPoint2 = toPolar(cartPoint2, rect);
+            mFFTPoints[i * 4 + 2] = polarPoint2[0];
+            mFFTPoints[i * 4 + 3] = polarPoint2[1];
+        }
+
+        canvas.drawLines(mFFTPoints, mPaint);
+
+        // Controls the pulsing rate
+        modulation += 0.13;
+        angleModulation += 0.28;
     }
 
-    canvas.drawLines(mFFTPoints, mPaint);
-
-    // Controls the pulsing rate
-    modulation += 0.13;
-    angleModulation += 0.28;
-  }
-
-  float modulation = 0;
-  float modulationStrength = 0.4f; // 0-1
-  float angleModulation = 0;
-  float aggresive = 0.4f;
-  private float[] toPolar(float[] cartesian, Rect rect)
-  {
-    double cX = rect.width()/2;
-    double cY = rect.height()/2;
-    double angle = (cartesian[0]) * 2 * Math.PI;
-    double radius = ((rect.width()/2) * (1 - aggresive) + aggresive * cartesian[1]/2) * ((1 - modulationStrength) + modulationStrength * (1 + Math.sin(modulation)) / 2);
-    float[] out =  {
-        (float)(cX + radius * Math.sin(angle + angleModulation)),
-        (float)(cY + radius * Math.cos(angle + angleModulation))
-    };
-    return out;
-  }
-
-  private float colorCounter = 0;
-  private void cycleColor()
-  {
-    int r = (int)Math.floor(128*(Math.sin(colorCounter) + 1));
-    int g = (int)Math.floor(128*(Math.sin(colorCounter + 2) + 1));
-    int b = (int)Math.floor(128*(Math.sin(colorCounter + 4) + 1));
-    mPaint.setColor(Color.argb(128, r, g, b));
-    colorCounter += 0.03;
-  }
+    float modulation = 0;
+    float modulationStrength = 0.4f; // 0-1
+    float angleModulation = 0;
+    float aggresive = 0.4f;
+
+    private float[] toPolar(float[] cartesian, Rect rect)
+    {
+        double cX = rect.width() / 2;
+        double cY = rect.height() / 2;
+        double angle = (cartesian[0]) * 2 * Math.PI;
+        double radius = ((rect.width() / 2) * (1 - aggresive) + aggresive * cartesian[1] / 2)
+                * ((1 - modulationStrength) + modulationStrength * (1 + Math.sin(modulation)) / 2);
+        float[] out = {
+                (float) (cX + radius * Math.sin(angle + angleModulation)),
+                (float) (cY + radius * Math.cos(angle + angleModulation))
+        };
+        return out;
+    }
+
+    private float colorCounter = 0;
+
+    private void cycleColor()
+    {
+        int r = (int) Math.floor(128 * (Math.sin(colorCounter) + 1));
+        int g = (int) Math.floor(128 * (Math.sin(colorCounter + 2) + 1));
+        int b = (int) Math.floor(128 * (Math.sin(colorCounter + 4) + 1));
+        mPaint.setColor(Color.argb(128, r, g, b));
+        colorCounter += 0.03;
+    }
 }