Merge branch 'master' of https://github.com/sugarcubes/SugarCubes into alexgreen

Conflicts:
	AlexGreen.pde

diff --cc AlexGreen.pde
index 910371a4c2dac3c2ea7eba695e8fe6286ea4b2f9,91677db78efd90e70327392cd6bafc857a3f4c45..d2220b790e2367b9578fecef68a0e223f8413464
--- 1/AlexGreen.pde
--- 2/AlexGreen.pde
+++ b/AlexGreen.pde
@@@ -1,9 -1,9 +1,10 @@@
 -class SineSphere extends SCPattern {
 -  private SinLFO yrot = new SinLFO(0, TWO_PI, 2000);
 +class SineSphere extends DPat {
 +  private SawLFO yrot = new SawLFO(0, TWO_PI, 3000);
    public final Projection sinespin; 
 +  private BasicParameter rotation = new BasicParameter("rotation", 0);
   float modelrad = sqrt((model.xMax)*(model.xMax) + (model.yMax)*(model.yMax) + (model.zMax)*(model.zMax));
    Pick Sshape; 
+   public final PVector P = new PVector();
  
    class Sphery {
    float f1xcenter, f1ycenter, f1zcenter, f2xcenter , f2ycenter, f2zcenter; //second three are for an ellipse with two foci

diff --cc MarkSlee.pde
Simple merge