diff --git a/core/src/processing/core/PApplet.java b/core/src/processing/core/PApplet.java index 43272554c..ee43f3b77 100644 --- a/core/src/processing/core/PApplet.java +++ b/core/src/processing/core/PApplet.java @@ -4708,7 +4708,7 @@ public class PApplet extends Applet } static public Object subset(Object list, int start, int count) { - int length = Array.getLength(list); + //int length = Array.getLength(list); Class type = list.getClass().getComponentType(); Object outgoing = Array.newInstance(type, count); System.arraycopy(list, start, outgoing, 0, count); diff --git a/core/src/processing/core/PGraphics3.java b/core/src/processing/core/PGraphics3D.java similarity index 99% rename from core/src/processing/core/PGraphics3.java rename to core/src/processing/core/PGraphics3D.java index b51c2e1e2..20734f78e 100644 --- a/core/src/processing/core/PGraphics3.java +++ b/core/src/processing/core/PGraphics3D.java @@ -33,7 +33,7 @@ import java.awt.image.*; *

* Lighting and camera implementation by Simon Greenwold. */ -public class PGraphics3 extends PGraphics { +public class PGraphics3D extends PGraphics { // ........................................................ @@ -174,13 +174,13 @@ public class PGraphics3 extends PGraphics { * This prototype only exists because of annoying * java compilers, and should not be used. */ - public PGraphics3() { + public PGraphics3D() { forwardTransform = modelview; reverseTransform = modelviewInv; } - public PGraphics3(int iwidth, int iheight) { + public PGraphics3D(int iwidth, int iheight) { this(iwidth, iheight, null); } @@ -194,7 +194,7 @@ public class PGraphics3 extends PGraphics { * @param iwidth viewport width * @param iheight viewport height */ - public PGraphics3(int iwidth, int iheight, PApplet parent) { + public PGraphics3D(int iwidth, int iheight, PApplet parent) { // super will add the listeners to the applet, and call resize() super(iwidth, iheight, parent); forwardTransform = modelview; @@ -1438,7 +1438,7 @@ public class PGraphics3 extends PGraphics { //System.out.println(i + " " + a[Z] + " " + b[Z] + " " + c[Z]); if (raw != null) { - if (raw instanceof PGraphics3) { + if (raw instanceof PGraphics3D) { if ((a[VW] != 0) && (b[VW] != 0) && (c[VW] != 0)) { raw.fill(ar, ag, ab, a[A]); raw.vertex(a[VX] / a[VW], a[VY] / a[VW], a[VZ] / a[VW]); @@ -1512,7 +1512,7 @@ public class PGraphics3 extends PGraphics { b[X], b[Y], b[Z]); if (raw != null) { - if (raw instanceof PGraphics3) { + if (raw instanceof PGraphics3D) { if ((a[VW] != 0) && (b[VW] != 0)) { raw.stroke(a[SR], a[SG], a[SB], a[SA]); raw.vertex(a[VX] / a[VW], a[VY] / a[VW], a[VZ] / a[VW]); diff --git a/core/src/processing/core/PGraphicsJava.java b/core/src/processing/core/PGraphicsJava2D.java similarity index 99% rename from core/src/processing/core/PGraphicsJava.java rename to core/src/processing/core/PGraphicsJava2D.java index ae6a010fe..3a7a64b79 100644 --- a/core/src/processing/core/PGraphicsJava.java +++ b/core/src/processing/core/PGraphicsJava2D.java @@ -32,7 +32,7 @@ import java.awt.image.*; * Subclass for PGraphics that implements the graphics API * in Java 1.3+ using Java 2D. */ -public class PGraphicsJava extends PGraphics { +public class PGraphicsJava2D extends PGraphics { public Graphics2D g2; GeneralPath gpath; @@ -63,7 +63,7 @@ public class PGraphicsJava extends PGraphics { * This prototype only exists because of annoying * java compilers, and should not be used. */ - public PGraphicsJava() { } + public PGraphicsJava2D() { } /** @@ -75,7 +75,7 @@ public class PGraphicsJava extends PGraphics { * @param iwidth viewport width * @param iheight viewport height */ - public PGraphicsJava(int iwidth, int iheight, PApplet parent) { + public PGraphicsJava2D(int iwidth, int iheight, PApplet parent) { super(iwidth, iheight, parent); //resize(iwidth, iheight); } diff --git a/core/src/processing/core/PImage.java b/core/src/processing/core/PImage.java index e5cc5f8fc..6c25ea726 100644 --- a/core/src/processing/core/PImage.java +++ b/core/src/processing/core/PImage.java @@ -28,7 +28,7 @@ import java.awt.image.*; import java.io.*; import java.lang.reflect.*; -import javax.imageio.*; +//import javax.imageio.*; /** diff --git a/core/src/processing/core/PLine.java b/core/src/processing/core/PLine.java index d0b45b01c..3d4680198 100644 --- a/core/src/processing/core/PLine.java +++ b/core/src/processing/core/PLine.java @@ -98,10 +98,10 @@ public class PLine implements PConstants private float db; private float da; - private PGraphics3 parent; + private PGraphics3D parent; - public PLine(PGraphics3 g) { + public PLine(PGraphics3D g) { INTERPOLATE_Z = false; x_array = new float[2]; diff --git a/core/src/processing/core/PShape.java b/core/src/processing/core/PShape.java index cbc8e79b1..0046b975f 100644 --- a/core/src/processing/core/PShape.java +++ b/core/src/processing/core/PShape.java @@ -102,7 +102,7 @@ public class PShape { * shape(s); */ public void draw(PGraphics g) { - boolean flat = g instanceof PGraphics3; + boolean flat = g instanceof PGraphics3D; if (matrix != null) { g.pushMatrix(); diff --git a/core/src/processing/core/PTriangle.java b/core/src/processing/core/PTriangle.java index 7f7d4c0ea..5d41e7181 100644 --- a/core/src/processing/core/PTriangle.java +++ b/core/src/processing/core/PTriangle.java @@ -180,7 +180,7 @@ public class PTriangle implements PConstants private int m_index; /** */ - private PGraphics3 parent; + private PGraphics3D parent; private boolean noDepthTest; @@ -193,7 +193,7 @@ public class PTriangle implements PConstants /** */ private boolean m_bilinear; - public PTriangle(PGraphics3 g) { + public PTriangle(PGraphics3D g) { //SCREEN_WIDTH = g.width; //SCREEN_HEIGHT = g.height; //SCREEN_WIDTH1 = SCREEN_WIDTH-1; diff --git a/dxf/src/processing/dxf/RawDXF.java b/dxf/src/processing/dxf/RawDXF.java index 65017420d..b150313b3 100644 --- a/dxf/src/processing/dxf/RawDXF.java +++ b/dxf/src/processing/dxf/RawDXF.java @@ -22,8 +22,6 @@ package processing.dxf; -import java.awt.*; -import java.awt.event.*; import java.io.*; import processing.core.*; @@ -113,7 +111,7 @@ import processing.core.*; * Rewritten to support beginRaw/endRaw by Ben Fry in February 2006. * Updated again for inclusion as a core library in March 2006. */ -public class RawDXF extends PGraphics3 { +public class RawDXF extends PGraphics3D { //static final int MAX_TRI_LAYERS = 500000; //static final int NO_LAYER = -1; diff --git a/net/src/processing/net/Client.java b/net/src/processing/net/Client.java index 0a8f4c2fd..d4eb2ef48 100644 --- a/net/src/processing/net/Client.java +++ b/net/src/processing/net/Client.java @@ -26,9 +26,6 @@ package processing.net; import processing.core.*; -import java.awt.event.*; -import java.util.*; -import java.awt.*; import java.io.*; import java.lang.reflect.*; import java.net.*; diff --git a/net/src/processing/net/Server.java b/net/src/processing/net/Server.java index a64150e4e..60211813a 100644 --- a/net/src/processing/net/Server.java +++ b/net/src/processing/net/Server.java @@ -26,12 +26,10 @@ package processing.net; import processing.core.*; -import java.awt.event.*; -import java.util.*; -import java.awt.*; import java.io.*; import java.lang.reflect.*; import java.net.*; +import java.util.*; public class Server implements Runnable { diff --git a/opengl/src/processing/opengl/PGraphicsGL.java b/opengl/src/processing/opengl/PGraphicsOpenGL.java similarity index 99% rename from opengl/src/processing/opengl/PGraphicsGL.java rename to opengl/src/processing/opengl/PGraphicsOpenGL.java index d927d9213..a848c7176 100644 --- a/opengl/src/processing/opengl/PGraphicsGL.java +++ b/opengl/src/processing/opengl/PGraphicsOpenGL.java @@ -64,7 +64,7 @@ import com.sun.opengl.util.*; * as we approached beta while both Simon and I were working on it. * Relax, we'll get it fixed up later. */ -public class PGraphicsGL extends PGraphics3 { +public class PGraphicsOpenGL extends PGraphics3D { public GL gl; public GLU glu; public GLCanvas canvas; @@ -101,7 +101,7 @@ public class PGraphicsGL extends PGraphics3 { * that is visible on screen in order to work properly. * @param applet the host applet */ - public PGraphicsGL(int width, int height, PApplet applet) { + public PGraphicsOpenGL(int width, int height, PApplet applet) { //System.out.println("creating PGraphicsGL"); if (applet == null) { @@ -660,7 +660,7 @@ public class PGraphicsGL extends PGraphics3 { gl.glDisable(GL.GL_TEXTURE_2D); if (raw != null) { - if (raw instanceof PGraphics3) { + if (raw instanceof PGraphics3D) { if ((a[VW] != 0) && (b[VW] != 0) && (c[VW] != 0)) { raw.texture(texture); raw.fill(ar, ag, ab, a[A]); @@ -703,7 +703,7 @@ public class PGraphicsGL extends PGraphics3 { gl.glVertex3f(c[VX], c[VY], c[VZ]); if (raw != null) { - if (raw instanceof PGraphics3) { + if (raw instanceof PGraphics3D) { if ((a[VW] != 0) && (b[VW] != 0) && (c[VW] != 0)) { raw.fill(ar, ag, ab, a[A]); raw.vertex(a[VX] / a[VW], a[VY] / a[VW], a[VZ] / a[VW]); @@ -761,7 +761,7 @@ public class PGraphicsGL extends PGraphics3 { if (a[SA] > EPSILON) { // don't draw if transparent raw.colorMode(RGB, 1); raw.beginShape(LINE_STRIP); - if (raw instanceof PGraphics3) { + if (raw instanceof PGraphics3D) { if (a[VW] != 0) { raw.stroke(a[SR], a[SG], a[SB], a[SA]); raw.vertex(a[VX] / a[VW], a[VY] / a[VW], a[VZ] / a[VW]); @@ -780,7 +780,7 @@ public class PGraphicsGL extends PGraphics3 { gl.glColor4f(b[SR], b[SG], b[SB], b[SA]); gl.glVertex3f(b[VX], b[VY], b[VZ]); if (raw != null) { - if (raw instanceof PGraphics3) { + if (raw instanceof PGraphics3D) { if ((a[VW] != 0) && (b[VW] != 0)) { raw.stroke(b[SR], b[SG], b[SB], b[SA]); raw.vertex(b[VX] / b[VW], b[VY] / b[VW], b[VZ] / b[VW]); diff --git a/pdf/src/processing/pdf/PGraphicsPDF.java b/pdf/src/processing/pdf/PGraphicsPDF.java index 0bb33be3b..429e70795 100644 --- a/pdf/src/processing/pdf/PGraphicsPDF.java +++ b/pdf/src/processing/pdf/PGraphicsPDF.java @@ -8,7 +8,7 @@ import com.lowagie.text.pdf.*; import processing.core.*; -public class PGraphicsPDF extends PGraphicsJava { +public class PGraphicsPDF extends PGraphicsJava2D { File temp; //int frameCount;