P3 update

.classpath

@@ -13,9 +13,7 @@
 	<classpathentry including="../src.core/**/*.java|toxi/**/*.java" kind="src" path="src.volume"/>
 	<classpathentry including="**/*.java|../lib/core.jar|../src.core/toxi/**/*.java" kind="src" path="src.p5"/>
 	<classpathentry including="../src.core/toxi/**/*.java|toxi/**/*.java" kind="src" path="src.newmesh"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3.8.1"/>
-	<classpathentry kind="lib" path="lib/core.jar"/>
 	<classpathentry kind="lib" path="lib/args4j-2.0.8.jar"/>
 	<classpathentry kind="lib" path="lib/joal/gluegen-rt.jar"/>
 	<classpathentry kind="lib" path="lib/joal/joal.jar" sourcepath="/Users/toxi/Documents/dev/java/joal-1.1.3-pre-20090308-src/joal/src">
@@ -37,5 +35,7 @@
 	<classpathentry kind="lib" path="lib/jaxb/jaxb-xjc.jar"/>
 	<classpathentry kind="lib" path="lib/jaxb/jaxb1-impl.jar"/>
 	<classpathentry kind="lib" path="lib/jaxb/jsr173_1.0_api.jar"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/Java SE 8 [1.8.0_45]"/>
+	<classpathentry kind="lib" path="lib/core.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

.gitignore

@@ -0,0 +1,3 @@
+/bin/
+/dist/
+/docs/

ant/versions.properties

@@ -1,7 +1,7 @@
 #Wed Feb 10 02:48:40 GMT 2010
 version.audio=0008
 version.color=0010
-version.core=0021
+version.core=0022
 version.data=0002
 version.image=0001
 version.p5=0004

examples/color/Theme/Theme.pde

@@ -80,9 +80,10 @@ void drawSpline(ColorList list) {
     points[i]=new Vec2D(random(-1,1)*50+(float)i/points.length*width,random(0.25,0.75)*height);
   }
   points[points.length-1]=new Vec2D(width+XRAD,random(height));
-  List<Vec2D> vertices=new Spline2D(points).computeVertices(width/RES);
+
+  List<Vec2D> vertices=new Spline2D(points).getPointList();
   for(Vec2D v: vertices) {
     fill(list.get((int) random(numCols)).toARGB());
     ellipse(v.x,v.y,noise(v.y*0.01)*XRAD,noise(v.x*0.01)*YRAD);
   }
-}
+}

examples/core/geometry/OctreeDemo/OctreeDemo.pde

@@ -31,7 +31,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-import processing.opengl.*;
+
 import toxi.geom.*;
 import toxi.processing.*;
 import java.util.List;
@@ -65,7 +65,7 @@ ToxiclibsSupport gfx;
 int numParticles = 1;
 
 void setup() {
-  size(1024, 768, OPENGL);
+  size(1024, 768, P3D);
   textFont(createFont("SansSerif", 18));
   // setup empty octree so that it's centered around the world origin
   octree=new VisibleOctree(new Vec3D(-1, -1, -1).scaleSelf(DIM2), DIM);

examples/core/geometry/PlaneIntersection/PlaneIntersection.pde

@@ -1,15 +1,15 @@
 import toxi.geom.*;
 import toxi.util.*;
 import toxi.processing.*;
-import processing.opengl.*;
+
 
 Plane p1, p2;
 
 ToxiclibsSupport gfx;
 boolean doSave;
 
 void setup() {
-  size(1280, 720, OPENGL);
+  size(1280, 720, P3D);
   gfx = new ToxiclibsSupport(this);
   p1 = new Plane(new Vec3D(100, 100, 100), new Vec3D(0, 1, 0));
   p2 = new Plane(new Vec3D(100, 200, 100), Vec3D.randomVector());

examples/core/geometry/PolyTesselateSpherize/PolyTesselateSpherize.pde

@@ -40,7 +40,7 @@ import toxi.processing.*;
 import toxi.math.*;
 import java.util.List;
 
-import processing.opengl.*;
+
 
 // radius of the root delaunay triangle which encompasses (MUST) all other points
 float DELAUNAY_SIZE = 10000;
@@ -62,7 +62,7 @@ TriangleMesh mesh;
 float res=6;
 
 void setup() {
-  size(1024, 768, OPENGL);
+  size(1024, 768, P3D);
   smooth();
   gfx = new ToxiclibsSupport(this);
 

examples/core/geometry/RayReflectSphere/RayReflectSphere.pde

@@ -31,7 +31,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-import processing.opengl.*;
+
 import toxi.geom.*;
 import toxi.processing.*;
 
@@ -54,7 +54,7 @@ Vec3D camRot = new Vec3D();
 ToxiclibsSupport gfx;
 
 void setup() {
-  size(500,500,OPENGL);
+  size(500,500,P3D);
   gfx=new ToxiclibsSupport(this);
 }
 

examples/core/mapping/TwitterGeo/TwitterGeo.pde

@@ -35,7 +35,7 @@
 
 import toxi.geom.*;
 import toxi.processing.*;
-import processing.opengl.*;
+
 
 final int EARTH_RADIUS = 200;
 
@@ -66,7 +66,7 @@ Vec2D[] cities = new Vec2D[] {
 ToxiclibsSupport gfx;
 
 void setup() {
-  size(1024,576,OPENGL);
+  size(1024,576,P3D);
   gfx=new ToxiclibsSupport(this);
   searchTwitter(SEARCH_QUERY);
 }

examples/core/math/AdditiveWaves/AdditiveWaves.pde

@@ -50,7 +50,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-import processing.opengl.*;
+
 import toxi.math.waves.*;
 
 AbstractWave waveX,waveY;
@@ -61,7 +61,7 @@ int D2 = DIM/2;
 int AMP = 50;
 
 void setup() {
-  size(1024, 576, OPENGL);
+  size(1024, 576, P3D);
   noStroke();
   waveX=createRandomWave();
   waveY=createRandomWave();

examples/core/mesh/MeshAlignToAxis/MeshAlignToAxis.pde

@@ -24,7 +24,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-import processing.opengl.*;
+
 
 import toxi.geom.*;
 import toxi.geom.mesh.*;
@@ -38,7 +38,7 @@ TriangleMesh[] boxes=new TriangleMesh[600];
 ToxiclibsSupport gfx;
 
 void setup() {
-  size(600,600,OPENGL);
+  size(600,600,P3D);
   gfx=new ToxiclibsSupport(this);
   for(int i=0; i<boxes.length; i++) {
     // create a new direction vector for each box

examples/core/mesh/MeshAlignToTriangle/MeshAlignToTriangle.pde

@@ -2,14 +2,14 @@ import toxi.geom.*;
 import toxi.geom.mesh.*;
 import toxi.processing.*;
 
-import processing.opengl.*;
+
 
 Triangle3D tri;
 TriangleMesh mesh;
 ToxiclibsSupport gfx;
 
 void setup() {
-  size(400, 400, OPENGL);
+  size(400, 400, P3D);
   gfx=new ToxiclibsSupport(this);
   randomize();
 }

examples/core/mesh/MeshCutPlanes/MeshCutPlanes.pde

@@ -30,7 +30,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-import processing.opengl.*;
+
 
 import toxi.processing.*;
 
@@ -42,7 +42,7 @@ ToxiclibsSupport gfx;
 WETriangleMesh mesh;
 
 void setup() {
-  size(680,382, OPENGL);
+  size(680,382, P3D);
   gfx = new ToxiclibsSupport(this);
   mesh = (WETriangleMesh) new AABB(100).toMesh(new WETriangleMesh());
   MidpointSubdivision sd = new MidpointSubdivision();

examples/core/mesh/MobiusStripe/MobiusStripe.pde

@@ -34,7 +34,7 @@ import toxi.geom.*;
 import toxi.geom.mesh.*;
 import toxi.processing.*;
 
-import processing.opengl.*;
+
 
 // radius of mobius strip
 float BASE_RADIUS=150;

examples/core/mesh/SphericalHarmonicsMeshBuilder/SphericalHarmonicsMeshBuilder.pde

@@ -35,7 +35,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-import processing.opengl.*;
+
 
 import toxi.math.waves.*;
 import toxi.geom.*;
@@ -51,7 +51,7 @@ boolean doSave;
 Matrix4x4 normalMap = new Matrix4x4().translateSelf(128,128,128).scaleSelf(127);
 
 void setup() {
-  size(1024,576, OPENGL);
+  size(1024,576, P3D);
   randomizeMesh();
 }
 

examples/core/mesh/SubdivBasics/SubdivBasics.pde

@@ -45,7 +45,7 @@ import toxi.util.*;
 import toxi.processing.*;
 
 import java.util.List;
-import processing.opengl.*;
+
 
 ToxiclibsSupport gfx;
 WETriangleMesh mesh;
@@ -56,7 +56,7 @@ float currZoom = 1;
 boolean isWireframe=true;
 
 void setup() {
-  size(1280, 720, OPENGL);
+  size(1280, 720, P3D);
   gfx = new ToxiclibsSupport(this);
   initMesh();
 }

examples/core/mesh/SuperEllipsoidMeshBuilder/SuperEllipsoidMeshBuilder.pde

@@ -35,7 +35,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-import processing.opengl.*;
+
 
 import toxi.geom.*;
 import toxi.geom.mesh.*;
@@ -53,7 +53,7 @@ boolean showNormals;
 ToxiclibsSupport gfx;
 
 void setup() {
-  size(1024,576, OPENGL);
+  size(1024,576, P3D);
   modX = new SineWave(0, 0.01f, 2.5f, 2.5f);
   modY = new SineWave(PI, 0.017f, 2.5f, 2.5f);
   gfx=new ToxiclibsSupport(this);

examples/core/mesh/TerrainSteering/TerrainSteering.pde

@@ -38,7 +38,7 @@ import toxi.geom.mesh.*;
 import toxi.math.*;
 import toxi.processing.*;
 
-import processing.opengl.*;
+
 
 float NOISE_SCALE = 0.08f;
 int DIM=80;
@@ -52,7 +52,7 @@ Vec3D camOffset = new Vec3D(0, 100, 300);
 Vec3D eyePos = new Vec3D(0, 1000, 0);
 
 void setup() {
-  size(1024, 576, OPENGL);
+  size(1024, 576, P3D);
   // create terrain & generate elevation data
   terrain = new Terrain(DIM,DIM, 50);
   float[] el = new float[DIM*DIM];

examples/core/mesh/TexturedGlobe/TexturedGlobe.pde

@@ -3,7 +3,7 @@ import toxi.geom.mesh2d.*;
 import toxi.geom.mesh.*;
 import toxi.processing.*;
 
-import processing.opengl.*;
+
 
 float EARTH_RADIUS=300;
 Vec2D HOME=new Vec2D(0,51);
@@ -15,7 +15,7 @@ float texUOffset=180;
 ToxiclibsSupport gfx;
 
 void setup() {
-  size(1024, 768, OPENGL);
+  size(1024, 768, P3D);
   gfx = new ToxiclibsSupport(this);
   earthTex = loadImage("earth_1024.jpg");
   globe = (TriangleMesh)new SurfaceMeshBuilder(new SphereFunction()).createMesh(null, 36, EARTH_RADIUS);

examples/core/misc/ShiffmanFlocking3D/ShiffmanFlocking3D.pde

@@ -30,7 +30,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-import processing.opengl.*;
+
 import toxi.processing.*;
 import toxi.geom.*;
 import toxi.geom.mesh.*;
@@ -50,7 +50,7 @@ Matrix4x4 colorMatrix=new Matrix4x4().scale(255f/(DIM*2)).translate(DIM,DIM,DIM)
 ToxiclibsSupport gfx;
 
 void setup() {
-  size(1024,576,OPENGL);
+  size(1024,576,P3D);
   gfx=new ToxiclibsSupport(this);
   flock = new Flock();
   // Add an initial set of boids into the system

examples/core/splines/SplineBlobTest/SplineBlobTest.pde

@@ -32,7 +32,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-import processing.opengl.*;
+
 import toxi.geom.*;
 
 import java.util.List;
@@ -45,7 +45,7 @@ boolean newBlob=true;
 int drawMode=1;
 
 void setup() {
-  size(800,800,OPENGL);
+  size(800,800,P3D);
   smooth();
   cursor(CROSS);
 }

examples/p5/GeometryInStyle/GeometryInStyle.pde

@@ -34,14 +34,14 @@ import toxi.geom.mesh.*;
 import toxi.math.waves.*;
 import toxi.processing.*;
 
-import processing.opengl.*;
+
 
 ToxiclibsSupport gfx;
 
 AbstractWave sphereRes=new SineWave(0,0.02,15,18);
 
 void setup() {
-  size(680,382,OPENGL);
+  size(680,382,P3D);
   gfx=new ToxiclibsSupport(this);
 }
 

examples/physics/BoxConstraintDemo/BoxConstraintDemo.pde

@@ -33,7 +33,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-import processing.opengl.*;
+
 
 import toxi.geom.*;
 import toxi.physics3d.*;
@@ -49,7 +49,7 @@ VerletPhysics3D physics;
 VerletParticle3D head;
 
 void setup() {
-  size(1024,576,OPENGL);
+  size(1024,576,P3D);
   // create 2 boxes
   boxes[0]=new VisibleBoxConstraint(new Vec3D(100,-100,-100),new Vec3D(150,100,100));
   boxes[1]=new VisibleBoxConstraint(new Vec3D(-150,-100,-100),new Vec3D(-100,100,100));

examples/physics/BoxFluidDemo/BoxFluidDemo.pde

@@ -44,7 +44,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-import processing.opengl.*;
+
 
 import toxi.physics3d.*;
 import toxi.physics3d.behaviors.*;
@@ -83,7 +83,7 @@ boolean useBoundary=false;
 Vec3D colAmp=new Vec3D(400, 200, 200);
 
 void setup() {
-  size(1280,720,OPENGL);
+  size(1280,720,P3D);
   smooth();
   initPhysics();
   initGUI();