ids = trackables.keySet();
+ for (String id: ids) {
+ ARTrackable t = trackables.get(id);
+ if (t.isStopped()) trackables.remove(id);
+ }
+ }
+
+ protected void remove(int idx) {
+ int id = g.trackableId(idx);
+ String sid = String.valueOf(id);
+ remove(sid);
+ }
+
+ protected void remove(String id) {
+ trackables.remove(id);
+ }
+
+ protected void setEventHandler() {
+ try {
+ trackableEventMethod = p.getClass().getMethod("trackableEvent", ARTrackable.class);
+ return;
+ } catch (Exception e) {
+ // no such method, or an error... which is fine, just ignore
+ }
+
+ // trackableEvent can alternatively be defined as receiving an Object, to allow
+ // Processing mode implementors to support the video library without linking
+ // to it at build-time.
+ try {
+ trackableEventMethod = p.getClass().getMethod("trackableEvent", Object.class);
+ } catch (Exception e) {
+ // no such method, or an error... which is fine, just ignore
+ }
+ }
+}
diff --git a/libs/processing-ar/src/main/java/processing/ar/BackgroundRenderer.java b/libs/processing-ar/src/main/java/processing/ar/BackgroundRenderer.java
new file mode 100644
index 000000000..f00464866
--- /dev/null
+++ b/libs/processing-ar/src/main/java/processing/ar/BackgroundRenderer.java
@@ -0,0 +1,152 @@
+package processing.ar;
+
+import android.content.Context;
+import android.opengl.GLES11Ext;
+import android.opengl.GLES20;
+
+import com.google.ar.core.Frame;
+
+import java.net.URL;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.nio.FloatBuffer;
+
+public class BackgroundRenderer {
+
+ private static final int COORDS_PER_VERTEX = 3;
+ private static final int TEXCOORDS_PER_VERTEX = 2;
+ private static final int FLOAT_SIZE = 4;
+
+ private FloatBuffer quadVertices;
+ private FloatBuffer quadTexCoord;
+ private FloatBuffer quadTexCoordTransformed;
+
+ private int quadProgram;
+
+ private int quadPositionParam;
+ private int quadTexCoordParam;
+ private int textureId = -1;
+
+ static private URL screenquad_vertex =
+ BackgroundRenderer.class.getResource("/assets/shaders/BackgroundVert.glsl");
+ static private URL screenquad_fragment =
+ BackgroundRenderer.class.getResource("/assets/shaders/BackgroundFrag.glsl");
+
+ private String VERTICES_ERROR = "Unexpected number of vertices in BackgroundRenderer";
+ private String ERROR_TAG = "Error";
+ private String CREATION_ERROR = "Program creation";
+ private String PARAMETERS_ERROR = "Program parameters";
+ private String DRAW_ERROR = "Draw";
+
+ public BackgroundRenderer(Context context) {
+ int[] textures = new int[1];
+ GLES20.glGenTextures(1, textures, 0);
+ textureId = textures[0];
+ int textureTarget = GLES11Ext.GL_TEXTURE_EXTERNAL_OES;
+ GLES20.glBindTexture(textureTarget, textureId);
+ GLES20.glTexParameteri(textureTarget, GLES20.GL_TEXTURE_WRAP_S, GLES20.GL_CLAMP_TO_EDGE);
+ GLES20.glTexParameteri(textureTarget, GLES20.GL_TEXTURE_WRAP_T, GLES20.GL_CLAMP_TO_EDGE);
+ GLES20.glTexParameteri(textureTarget, GLES20.GL_TEXTURE_MIN_FILTER, GLES20.GL_NEAREST);
+ GLES20.glTexParameteri(textureTarget, GLES20.GL_TEXTURE_MAG_FILTER, GLES20.GL_NEAREST);
+
+ int numVertices = 4;
+ if (numVertices != QUAD_COORDS.length / COORDS_PER_VERTEX) {
+ throw new RuntimeException(VERTICES_ERROR);
+ }
+
+ ByteBuffer bbVertices = ByteBuffer.allocateDirect(QUAD_COORDS.length * FLOAT_SIZE);
+ bbVertices.order(ByteOrder.nativeOrder());
+ quadVertices = bbVertices.asFloatBuffer();
+ quadVertices.put(QUAD_COORDS);
+ quadVertices.position(0);
+
+ ByteBuffer bbTexCoords =
+ ByteBuffer.allocateDirect(numVertices * TEXCOORDS_PER_VERTEX * FLOAT_SIZE);
+ bbTexCoords.order(ByteOrder.nativeOrder());
+ quadTexCoord = bbTexCoords.asFloatBuffer();
+ quadTexCoord.put(QUAD_TEXCOORDS);
+ quadTexCoord.position(0);
+
+ ByteBuffer bbTexCoordsTransformed =
+ ByteBuffer.allocateDirect(numVertices * TEXCOORDS_PER_VERTEX * FLOAT_SIZE);
+ bbTexCoordsTransformed.order(ByteOrder.nativeOrder());
+ quadTexCoordTransformed = bbTexCoordsTransformed.asFloatBuffer();
+
+ int vertexShader =
+ ShaderUtils.loadGLShader(ERROR_TAG, context, GLES20.GL_VERTEX_SHADER, screenquad_vertex);
+ int fragmentShader =
+ ShaderUtils.loadGLShader(
+ ERROR_TAG, context, GLES20.GL_FRAGMENT_SHADER, screenquad_fragment);
+
+ quadProgram = GLES20.glCreateProgram();
+ GLES20.glAttachShader(quadProgram, vertexShader);
+ GLES20.glAttachShader(quadProgram, fragmentShader);
+ GLES20.glLinkProgram(quadProgram);
+ GLES20.glUseProgram(quadProgram);
+
+ ShaderUtils.checkGLError(ERROR_TAG, CREATION_ERROR);
+
+ quadPositionParam = GLES20.glGetAttribLocation(quadProgram, "a_Position");
+ quadTexCoordParam = GLES20.glGetAttribLocation(quadProgram, "a_TexCoord");
+
+ ShaderUtils.checkGLError(ERROR_TAG, PARAMETERS_ERROR);
+ }
+
+ public int getTextureId() {
+ return textureId;
+ }
+
+ public void draw(Frame frame) {
+
+ if (frame.hasDisplayGeometryChanged()) {
+ frame.transformDisplayUvCoords(quadTexCoord, quadTexCoordTransformed);
+ }
+
+ GLES20.glDisable(GLES20.GL_DEPTH_TEST);
+ GLES20.glDepthMask(false);
+
+ GLES20.glBindTexture(GLES11Ext.GL_TEXTURE_EXTERNAL_OES, textureId);
+
+ GLES20.glUseProgram(quadProgram);
+
+ GLES20.glVertexAttribPointer(
+ quadPositionParam, COORDS_PER_VERTEX, GLES20.GL_FLOAT, false, 0, quadVertices);
+
+ GLES20.glVertexAttribPointer(
+ quadTexCoordParam,
+ TEXCOORDS_PER_VERTEX,
+ GLES20.GL_FLOAT,
+ false,
+ 0,
+ quadTexCoordTransformed);
+
+ GLES20.glEnableVertexAttribArray(quadPositionParam);
+ GLES20.glEnableVertexAttribArray(quadTexCoordParam);
+
+ GLES20.glDrawArrays(GLES20.GL_TRIANGLE_STRIP, 0, 4);
+
+ GLES20.glDisableVertexAttribArray(quadPositionParam);
+ GLES20.glDisableVertexAttribArray(quadTexCoordParam);
+
+ GLES20.glDepthMask(true);
+ GLES20.glEnable(GLES20.GL_DEPTH_TEST);
+
+ ShaderUtils.checkGLError(ERROR_TAG, DRAW_ERROR);
+ }
+
+ private static final float[] QUAD_COORDS =
+ new float[]{
+ -1.0f, -1.0f, 0.0f,
+ -1.0f, +1.0f, 0.0f,
+ +1.0f, -1.0f, 0.0f,
+ +1.0f, +1.0f, 0.0f,
+ };
+
+ private static final float[] QUAD_TEXCOORDS =
+ new float[]{
+ 0.0f, 1.0f,
+ 0.0f, 0.0f,
+ 1.0f, 1.0f,
+ 1.0f, 0.0f,
+ };
+}
diff --git a/libs/processing-ar/src/main/java/processing/ar/RotationHandler.java b/libs/processing-ar/src/main/java/processing/ar/RotationHandler.java
new file mode 100644
index 000000000..e11c4b8e3
--- /dev/null
+++ b/libs/processing-ar/src/main/java/processing/ar/RotationHandler.java
@@ -0,0 +1,63 @@
+package processing.ar;
+
+
+import android.content.Context;
+import android.hardware.display.DisplayManager;
+import android.view.Display;
+import android.view.WindowManager;
+
+import com.google.ar.core.Session;
+
+
+public class RotationHandler implements DisplayManager.DisplayListener {
+ private boolean viewportChanged;
+ private int viewportWidth;
+ private int viewportHeight;
+ private final Context context;
+ private final Display display;
+
+ public RotationHandler(Context context) {
+ this.context = context;
+ WindowManager windowManager = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);
+ display = windowManager.getDefaultDisplay();
+ }
+
+ public void onResume() {
+ ((DisplayManager) context.getSystemService(Context.DISPLAY_SERVICE)).registerDisplayListener(this, null);
+ }
+
+ public void onPause() {
+ ((DisplayManager) context.getSystemService(Context.DISPLAY_SERVICE)).unregisterDisplayListener(this);
+ }
+
+ public void onSurfaceChanged(int width, int height) {
+ viewportWidth = width;
+ viewportHeight = height;
+ viewportChanged = true;
+ }
+
+ public void updateSessionIfNeeded(Session session) {
+ if (viewportChanged) {
+ int displayRotation = display.getRotation();
+ session.setDisplayGeometry(displayRotation, viewportWidth, viewportHeight);
+ viewportChanged = false;
+ }
+ }
+
+ public int getRotation() {
+ return display.getRotation();
+ }
+
+ @Override
+ public void onDisplayAdded(int displayId) {
+ }
+
+ @Override
+ public void onDisplayRemoved(int displayId) {
+ }
+
+ @Override
+ public void onDisplayChanged(int displayId) {
+ viewportChanged = true;
+ }
+}
\ No newline at end of file
diff --git a/libs/processing-ar/src/main/java/processing/ar/ShaderUtils.java b/libs/processing-ar/src/main/java/processing/ar/ShaderUtils.java
new file mode 100644
index 000000000..97209d51b
--- /dev/null
+++ b/libs/processing-ar/src/main/java/processing/ar/ShaderUtils.java
@@ -0,0 +1,60 @@
+package processing.ar;
+
+import android.content.Context;
+import android.opengl.GLES20;
+
+import processing.core.PApplet;
+import processing.core.PGraphics;
+
+import java.io.IOException;
+import java.net.URL;
+
+public class ShaderUtils {
+ public static int loadGLShader(String tag, Context context, int type, URL resUrl) {
+ String code = readRawTextFile(resUrl);
+ int shader = GLES20.glCreateShader(type);
+ GLES20.glShaderSource(shader, code);
+ GLES20.glCompileShader(shader);
+
+ final int[] compileStatus = new int[1];
+ GLES20.glGetShaderiv(shader, GLES20.GL_COMPILE_STATUS, compileStatus, 0);
+
+ if (compileStatus[0] == 0) {
+ PGraphics.showWarning("Error compiling shader: " + GLES20.glGetShaderInfoLog(shader));
+ GLES20.glDeleteShader(shader);
+ shader = 0;
+ }
+
+ if (shader == 0) {
+ throw new RuntimeException("Error creating shader.");
+ }
+
+ return shader;
+ }
+
+ public static void checkGLError(String tag, String label) {
+ int lastError = GLES20.GL_NO_ERROR;
+ int error;
+ while ((error = GLES20.glGetError()) != GLES20.GL_NO_ERROR) {
+ PGraphics.showWarning(label + ": glError " + error);
+ lastError = error;
+ }
+ if (lastError != GLES20.GL_NO_ERROR) {
+ throw new RuntimeException(label + ": glError " + lastError);
+ }
+ }
+
+ private static String readRawTextFile(URL url) {
+ try {
+ String[] sample = PApplet.loadStrings(url.openStream());
+ StringBuilder stringBuilder = new StringBuilder();
+ for (String sam : sample) {
+ stringBuilder.append(sam).append("\n");
+ }
+ return stringBuilder.toString();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ return null;
+ }
+}
diff --git a/libs/processing-core/build.gradle b/libs/processing-core/build.gradle
new file mode 100644
index 000000000..b7952ec4d
--- /dev/null
+++ b/libs/processing-core/build.gradle
@@ -0,0 +1,33 @@
+plugins {
+ id 'com.android.library'
+}
+
+android {
+
+ namespace "processing.core"
+
+ defaultConfig {
+ minSdkVersion 17
+ targetSdkVersion 33
+ }
+
+ compileOptions {
+ sourceCompatibility JavaVersion.VERSION_1_8
+ targetCompatibility JavaVersion.VERSION_1_8
+ }
+
+ buildTypes {
+ release {
+ minifyEnabled false
+ proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+ }
+ }
+}
+
+dependencies {
+ testImplementation 'junit:junit:4.13.2'
+
+ implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+ implementation 'com.google.android.support:wearable:2.9.0'
+ compileOnly 'com.google.android.wearable:wearable:2.9.0'
+}
\ No newline at end of file
diff --git a/libs/processing-core/proguard-rules.pro b/libs/processing-core/proguard-rules.pro
new file mode 100644
index 000000000..f1b424510
--- /dev/null
+++ b/libs/processing-core/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+# http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+# public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
diff --git a/libs/processing-core/src/main/AndroidManifest.xml b/libs/processing-core/src/main/AndroidManifest.xml
new file mode 100755
index 000000000..97330b776
--- /dev/null
+++ b/libs/processing-core/src/main/AndroidManifest.xml
@@ -0,0 +1 @@
+Bug 392 .
- try {
- if (extension.equals("jpg") || extension.equals("jpeg") ||
- extension.equals("gif") || extension.equals("png") ||
- extension.equals("unknown")) {
- byte bytes[] = loadBytes(filename);
- if (bytes == null) {
- return null;
- } else {
- Image awtImage = Toolkit.getDefaultToolkit().createImage(bytes);
- PImage image = loadImageMT(awtImage);
- if (image.width == -1) {
- System.err.println("The file " + filename +
- " contains bad image data, or may not be an image.");
- }
- // if it's a .gif image, test to see if it has transparency
- if (extension.equals("gif") || extension.equals("png")) {
- image.checkAlpha();
- }
- return image;
- }
- }
- } catch (Exception e) {
- // show error, but move on to the stuff below, see if it'll work
- e.printStackTrace();
- }
-
- if (loadImageFormats == null) {
- loadImageFormats = ImageIO.getReaderFormatNames();
- }
- if (loadImageFormats != null) {
- for (int i = 0; i < loadImageFormats.length; i++) {
- if (extension.equals(loadImageFormats[i])) {
- return loadImageIO(filename);
- }
- }
- }
-
- // failed, could not load image after all those attempts
- System.err.println("Could not find a method to load " + filename);
- return null;
+ return loadImage(filename);
}
- */
public PImage requestImage(String filename) {
@@ -4276,12 +4183,28 @@ public JSONObject parseJSONObject(String input) {
* @see PApplet#saveJSONArray(JSONArray, String)
*/
public JSONObject loadJSONObject(String filename) {
- return new JSONObject(createReader(filename));
+ // can't pass of createReader() to the constructor b/c of resource leak
+ BufferedReader reader = createReader(filename);
+ JSONObject outgoing = new JSONObject(reader);
+ try {
+ reader.close();
+ } catch (IOException e) { // not sure what would cause this
+ e.printStackTrace();
+ }
+ return outgoing;
}
static public JSONObject loadJSONObject(File file) {
- return new JSONObject(createReader(file));
+ // can't pass of createReader() to the constructor b/c of resource leak
+ BufferedReader reader = createReader(file);
+ JSONObject outgoing = new JSONObject(reader);
+ try {
+ reader.close();
+ } catch (IOException e) { // not sure what would cause this
+ e.printStackTrace();
+ }
+ return outgoing;
}
@@ -4327,12 +4250,28 @@ public JSONArray parseJSONArray(String input) {
* @see PApplet#saveJSONArray(JSONArray, String)
*/
public JSONArray loadJSONArray(String filename) {
- return new JSONArray(createReader(filename));
+ // can't pass of createReader() to the constructor b/c of resource leak
+ BufferedReader reader = createReader(filename);
+ JSONArray outgoing = new JSONArray(reader);
+ try {
+ reader.close();
+ } catch (IOException e) { // not sure what would cause this
+ e.printStackTrace();
+ }
+ return outgoing;
}
static public JSONArray loadJSONArray(File file) {
- return new JSONArray(createReader(file));
+ // can't pass of createReader() to the constructor b/c of resource leak
+ BufferedReader reader = createReader(file);
+ JSONArray outgoing = new JSONArray(reader);
+ try {
+ reader.close();
+ } catch (IOException e) { // not sure what would cause this
+ e.printStackTrace();
+ }
+ return outgoing;
}
@@ -5862,18 +5801,16 @@ static public int[] expand(int list[], int newSize) {
return temp;
}
-
- static public PImage[] expand(PImage list[]) {
- return expand(list, list.length << 1);
+ static public long[] expand(long list[]) {
+ return expand(list, list.length > 0 ? list.length << 1 : 1);
}
- static public PImage[] expand(PImage list[], int newSize) {
- PImage temp[] = new PImage[newSize];
+ static public long[] expand(long list[], int newSize) {
+ long temp[] = new long[newSize];
System.arraycopy(list, 0, temp, 0, Math.min(newSize, list.length));
return temp;
}
-
static public float[] expand(float list[]) {
return expand(list, list.length << 1);
}
@@ -5884,6 +5821,15 @@ static public float[] expand(float list[], int newSize) {
return temp;
}
+ static public double[] expand(double list[]) {
+ return expand(list, list.length > 0 ? list.length << 1 : 1);
+ }
+
+ static public double[] expand(double list[], int newSize) {
+ double temp[] = new double[newSize];
+ System.arraycopy(list, 0, temp, 0, Math.min(newSize, list.length));
+ return temp;
+ }
static public String[] expand(String list[]) {
return expand(list, list.length << 1);
@@ -6178,6 +6124,15 @@ static public int[] subset(int list[], int start, int count) {
return output;
}
+ static public long[] subset(long[] list, int start) {
+ return subset(list, start, list.length - start);
+ }
+
+ static public long[] subset(long[] list, int start, int count) {
+ long[] output = new long[count];
+ System.arraycopy(list, start, output, 0, count);
+ return output;
+ }
static public float[] subset(float list[], int start) {
return subset(list, start, list.length - start);
@@ -6189,6 +6144,15 @@ static public float[] subset(float list[], int start, int count) {
return output;
}
+ static public double[] subset(double[] list, int start) {
+ return subset(list, start, list.length - start);
+ }
+
+ static public double[] subset(double[] list, int start, int count) {
+ double[] output = new double[count];
+ System.arraycopy(list, start, output, 0, count);
+ return output;
+ }
static public String[] subset(String list[], int start) {
return subset(list, start, list.length - start);
@@ -6632,7 +6596,7 @@ static final public boolean parseBoolean(float what) {
* @return true if 'what' is "true" or "TRUE", false otherwise
*/
static final public boolean parseBoolean(String what) {
- return new Boolean(what).booleanValue();
+ return Boolean.valueOf(what);
}
// . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
@@ -6690,7 +6654,7 @@ static final public boolean[] parseBoolean(float what[]) {
static final public boolean[] parseBoolean(String what[]) {
boolean outgoing[] = new boolean[what.length];
for (int i = 0; i < what.length; i++) {
- outgoing[i] = new Boolean(what[i]).booleanValue();
+ outgoing[i] = Boolean.valueOf(what[i]);
}
return outgoing;
}
@@ -6979,7 +6943,7 @@ static final public float parseFloat(String what) {
static final public float parseFloat(String what, float otherwise) {
try {
- return new Float(what).floatValue();
+ return Float.valueOf(what);
} catch (NumberFormatException e) { }
return otherwise;
@@ -7029,7 +6993,7 @@ static final public float[] parseFloat(String what[], float missing) {
float output[] = new float[what.length];
for (int i = 0; i < what.length; i++) {
try {
- output[i] = new Float(what[i]).floatValue();
+ output[i] = Float.valueOf(what[i]);
} catch (NumberFormatException e) {
output[i] = missing;
}
@@ -7518,12 +7482,20 @@ public final int color(float x, float y, float z, float a) {
}
+ public int lerpColor(int c1, int c2, float amt) {
+ if (g != null) {
+ return g.lerpColor(c1, c2, amt);
+ }
+ // use the default mode (RGB) if lerpColor is called before setup()
+ return PGraphics.lerpColor(c1, c2, amt, RGB);
+ }
+
+
static public int blendColor(int c1, int c2, int mode) {
return PImage.blendColor(c1, c2, mode);
}
-
//////////////////////////////////////////////////////////////
// MAIN
@@ -8081,175 +8053,374 @@ public void updatePixels(int x1, int y1, int x2, int y2) {
//////////////////////////////////////////////////////////////
- // everything below this line is automatically generated. no touch.
- // public functions for processing.core
+ // ANDROID-SPECIFIC API
- /**
- * Store data of some kind for the renderer that requires extra metadata of
- * some kind. Usually this is a renderer-specific representation of the
- * image data, for instance a BufferedImage with tint() settings applied for
- * PGraphicsJava2D, or resized image data and OpenGL texture indices for
- * PGraphicsOpenGL.
- * @param renderer The PGraphics renderer associated to the image
- * @param storage The metadata required by the renderer
- */
- public void setCache(PImage image, Object storage) {
- g.setCache(image, storage);
+ // Wallpaper and wear API
+
+
+ public boolean wallpaperPreview() {
+ return surface.getEngine().isPreview();
}
- /**
- * Get cache storage data for the specified renderer. Because each renderer
- * will cache data in different formats, it's necessary to store cache data
- * keyed by the renderer object. Otherwise, attempting to draw the same
- * image to both a PGraphicsJava2D and a PGraphicsOpenGL will cause errors.
- * @param renderer The PGraphics renderer associated to the image
- * @return metadata stored for the specified renderer
- */
- public Object getCache(PImage image) {
- return g.getCache(image);
+ public float wallpaperOffset() {
+ return surface.getEngine().getXOffset();
}
- /**
- * Remove information associated with this renderer from the cache, if any.
- * @param renderer The PGraphics renderer whose cache data should be removed
- */
- public void removeCache(PImage image) {
- g.removeCache(image);
+ public int wallpaperHomeCount() {
+ float step = surface.getEngine().getXOffsetStep();
+ if (0 < step) {
+ return (int)(1 + 1 / step);
+ } else {
+ return 1;
+ }
}
- public void flush() {
- g.flush();
+ public boolean wearAmbient() {
+ return surface.getEngine().isInAmbientMode();
}
- public PGL beginPGL() {
- return g.beginPGL();
+ public boolean wearInteractive() {
+ return !surface.getEngine().isInAmbientMode();
}
- public void endPGL() {
- g.endPGL();
+ public boolean wearRound() {
+ return surface.getEngine().isRound();
}
- public void hint(int which) {
- g.hint(which);
+ public boolean wearSquare() {
+ return !surface.getEngine().isRound();
}
- /**
- * Start a new shape of type POLYGON
- */
- public void beginShape() {
- g.beginShape();
+ public Rect wearInsets() {
+ return surface.getEngine().getInsets();
}
- /**
- * Start a new shape.
- *
- * Differences between beginShape() and line() and point() methods.
- *
- * beginShape() is intended to be more flexible at the expense of being
- * a little more complicated to use. it handles more complicated shapes
- * that can consist of many connected lines (so you get joins) or lines
- * mixed with curves.
- *
- * The line() and point() command are for the far more common cases
- * (particularly for our audience) that simply need to draw a line
- * or a point on the screen.
- *
- * From the code side of things, line() may or may not call beginShape()
- * to do the drawing. In the beta code, they do, but in the alpha code,
- * they did not. they might be implemented one way or the other depending
- * on tradeoffs of runtime efficiency vs. implementation efficiency &mdash
- * meaning the speed that things run at vs. the speed it takes me to write
- * the code and maintain it. for beta, the latter is most important so
- * that's how things are implemented.
- */
- public void beginShape(int kind) {
- g.beginShape(kind);
+ public boolean wearLowBit() {
+ return surface.getEngine().useLowBitAmbient();
}
- /**
- * Sets whether the upcoming vertex is part of an edge.
- * Equivalent to glEdgeFlag(), for people familiar with OpenGL.
- */
- public void edge(boolean edge) {
- g.edge(edge);
+ public boolean wearBurnIn() {
+ return surface.getEngine().requireBurnInProtection();
}
- /**
- * Sets the current normal vector. Only applies with 3D rendering
- * and inside a beginShape/endShape block.
- *
- * This is for drawing three dimensional shapes and surfaces,
- * allowing you to specify a vector perpendicular to the surface
- * of the shape, which determines how lighting affects it.
- *
- * For people familiar with OpenGL, this function is basically
- * identical to glNormal3f().
- */
- public void normal(float nx, float ny, float nz) {
- g.normal(nx, ny, nz);
+ // Ray casting API
+
+
+ public PVector[] getRayFromScreen(float screenX, float screenY, PVector[] ray) {
+ return g.getRayFromScreen(screenX, screenY, ray);
}
- public void attribPosition(String name, float x, float y, float z) {
- g.attribPosition(name, x, y, z);
+ public void getRayFromScreen(float screenX, float screenY, PVector origin, PVector direction) {
+ g.getRayFromScreen(screenX, screenY, origin, direction);
}
- public void attribNormal(String name, float nx, float ny, float nz) {
- g.attribNormal(name, nx, ny, nz);
+ public boolean intersectsSphere(float r, float screenX, float screenY) {
+ return g.intersectsSphere(r, screenX, screenY);
}
- public void attribColor(String name, int color) {
- g.attribColor(name, color);
+ public boolean intersectsSphere(float r, PVector origin, PVector direction) {
+ return g.intersectsSphere(r, origin, direction);
}
- public void attrib(String name, float... values) {
- g.attrib(name, values);
+ public boolean intersectsBox(float w, float screenX, float screenY) {
+ return g.intersectsBox(w, screenX, screenY);
}
- public void attrib(String name, int... values) {
- g.attrib(name, values);
+ public boolean intersectsBox(float w, float h, float d, float screenX, float screenY) {
+ return g.intersectsBox(w, h, d, screenX, screenY);
}
- public void attrib(String name, boolean... values) {
- g.attrib(name, values);
+ public boolean intersectsBox(float size, PVector origin, PVector direction) {
+ return g.intersectsBox(size, origin, direction);
}
- /**
- * Set texture mode to either to use coordinates based on the IMAGE
- * (more intuitive for new users) or NORMALIZED (better for advanced chaps)
- */
- public void textureMode(int mode) {
- g.textureMode(mode);
+ public boolean intersectsBox(float w, float h, float d, PVector origin, PVector direction) {
+ return g.intersectsBox(w, h, d, origin, direction);
}
- public void textureWrap(int wrap) {
- g.textureWrap(wrap);
+ public PVector intersectsPlane(float screenX, float screenY) {
+ return g.intersectsPlane(screenX, screenY);
}
- /**
- * Set texture image for current shape.
- * Needs to be called between @see beginShape and @see endShape
- *
+ public PVector intersectsPlane(PVector origin, PVector direction) {
+ return g.intersectsPlane(origin, direction);
+ }
+
+
+ public void eye() {
+ g.eye();
+ }
+
+
+ public void calculate() {
+ }
+
+
+ /**
+ * Sets the coordinate system in 3D centered at (width/2, height/2)
+ * and with the Y axis pointing up.
+ */
+
+ public void cameraUp() {
+ g.cameraUp();
+ }
+
+
+ /**
+ * Returns a copy of the current object matrix.
+ * Pass in null to create a new matrix.
+ */
+ public PMatrix3D getObjectMatrix() {
+ return g.getObjectMatrix();
+ }
+
+
+ /**
+ * Copy the current object matrix into the specified target.
+ * Pass in null to create a new matrix.
+ */
+ public PMatrix3D getObjectMatrix(PMatrix3D target) {
+ return g.getObjectMatrix(target);
+ }
+
+
+ /**
+ * Returns a copy of the current eye matrix.
+ * Pass in null to create a new matrix.
+ */
+ public PMatrix3D getEyeMatrix() {
+ return g.getEyeMatrix();
+ }
+
+
+ /**
+ * Copy the current eye matrix into the specified target.
+ * Pass in null to create a new matrix.
+ */
+ public PMatrix3D getEyeMatrix(PMatrix3D target) {
+ return g.getEyeMatrix(target);
+ }
+
+
+ //////////////////////////////////////////////////////////////
+
+ // EVERYTHING BELOW THIS LINE IS AUTOMATICALLY GENERATED. DO NOT TOUCH!
+ // This includes the Javadoc comments, which are automatically copied from
+ // the PImage and PGraphics source code files.
+
+ // public functions for processing.core
+
+
+ public PGL beginPGL() {
+ return g.beginPGL();
+ }
+
+
+ public void endPGL() {
+ g.endPGL();
+ }
+
+
+ public void flush() {
+ g.flush();
+ }
+
+
+ public void hint(int which) {
+ g.hint(which);
+ }
+
+
+ /**
+ * Start a new shape of type POLYGON
+ */
+ public void beginShape() {
+ g.beginShape();
+ }
+
+
+ /**
+ * ( begin auto-generated from beginShape.xml )
+ *
+ * Using the beginShape() and endShape() functions allow
+ * creating more complex forms. beginShape() begins recording
+ * vertices for a shape and endShape() stops recording. The value of
+ * the MODE parameter tells it which types of shapes to create from
+ * the provided vertices. With no mode specified, the shape can be any
+ * irregular polygon. The parameters available for beginShape() are POINTS,
+ * LINES, TRIANGLES, TRIANGLE_FAN, TRIANGLE_STRIP, QUADS, and QUAD_STRIP.
+ * After calling the beginShape() function, a series of
+ * vertex() commands must follow. To stop drawing the shape, call
+ * endShape() . The vertex() function with two parameters
+ * specifies a position in 2D and the vertex() function with three
+ * parameters specifies a position in 3D. Each shape will be outlined with
+ * the current stroke color and filled with the fill color.
+ * translate() , rotate() , and
+ * scale() do not work within beginShape() . It is also not
+ * possible to use other shapes, such as ellipse() or rect()
+ * within beginShape() .
+ * stroke() and fill()
+ * settings to be altered per-vertex, however the default P2D renderer does
+ * not. Settings such as strokeWeight() , strokeCap() , and
+ * strokeJoin() cannot be changed while inside a
+ * beginShape() /endShape() block with any renderer.
+ *
+ * ( end auto-generated )
+ * @webref shape:vertex
+ * @param kind Either POINTS, LINES, TRIANGLES, TRIANGLE_FAN, TRIANGLE_STRIP, QUADS, or QUAD_STRIP
+ * @see PShape
+ * @see PGraphics#endShape()
+ * @see PGraphics#vertex(float, float, float, float, float)
+ * @see PGraphics#curveVertex(float, float, float)
+ * @see PGraphics#bezierVertex(float, float, float, float, float, float, float, float, float)
+ */
+ public void beginShape(int kind) {
+ g.beginShape(kind);
+ }
+
+
+ /**
+ * Sets whether the upcoming vertex is part of an edge.
+ * Equivalent to glEdgeFlag(), for people familiar with OpenGL.
+ */
+ public void edge(boolean edge) {
+ g.edge(edge);
+ }
+
+
+ /**
+ * ( begin auto-generated from normal.xml )
+ *
+ * Sets the current normal vector. This is for drawing three dimensional
+ * shapes and surfaces and specifies a vector perpendicular to the surface
+ * of the shape which determines how lighting affects it. Processing
+ * attempts to automatically assign normals to shapes, but since that's
+ * imperfect, this is a better option when you want more control. This
+ * function is identical to glNormal3f() in OpenGL.
+ *
+ * ( end auto-generated )
+ * @webref lights_camera:lights
+ * @param nx x direction
+ * @param ny y direction
+ * @param nz z direction
+ * @see PGraphics#beginShape(int)
+ * @see PGraphics#endShape(int)
+ * @see PGraphics#lights()
+ */
+ public void normal(float nx, float ny, float nz) {
+ g.normal(nx, ny, nz);
+ }
+
+
+ public void attribPosition(String name, float x, float y, float z) {
+ g.attribPosition(name, x, y, z);
+ }
+
+
+ public void attribNormal(String name, float nx, float ny, float nz) {
+ g.attribNormal(name, nx, ny, nz);
+ }
+
+
+ public void attribColor(String name, int color) {
+ g.attribColor(name, color);
+ }
+
+
+ public void attrib(String name, float... values) {
+ g.attrib(name, values);
+ }
+
+
+ public void attrib(String name, int... values) {
+ g.attrib(name, values);
+ }
+
+
+ public void attrib(String name, boolean... values) {
+ g.attrib(name, values);
+ }
+
+
+ /**
+ * ( begin auto-generated from textureMode.xml )
+ *
+ * Sets the coordinate space for texture mapping. There are two options,
+ * IMAGE, which refers to the actual coordinates of the image, and
+ * NORMAL, which refers to a normalized space of values ranging from 0
+ * to 1. The default mode is IMAGE. In IMAGE, if an image is 100 x 200
+ * pixels, mapping the image onto the entire size of a quad would require
+ * the points (0,0) (0,100) (100,200) (0,200). The same mapping in
+ * NORMAL_SPACE is (0,0) (0,1) (1,1) (0,1).
+ *
+ * ( end auto-generated )
+ * @webref image:textures
+ * @param mode either IMAGE or NORMAL
+ * @see PGraphics#texture(PImage)
+ * @see PGraphics#textureWrap(int)
+ */
+ public void textureMode(int mode) {
+ g.textureMode(mode);
+ }
+
+
+ /**
+ * ( begin auto-generated from textureWrap.xml )
+ *
+ * Description to come...
+ *
+ * ( end auto-generated from textureWrap.xml )
+ *
+ * @webref image:textures
+ * @param wrap Either CLAMP (default) or REPEAT
+ * @see PGraphics#texture(PImage)
+ * @see PGraphics#textureMode(int)
+ */
+ public void textureWrap(int wrap) {
+ g.textureWrap(wrap);
+ }
+
+
+ /**
+ * ( begin auto-generated from texture.xml )
+ *
+ * Sets a texture to be applied to vertex points. The texture()
+ * function must be called between beginShape() and
+ * endShape() and before any calls to vertex() .
+ * vertex() is used to specify the vertex coordinates for points,
+ * lines, triangles, quads, and polygons and is used exclusively within the
+ * beginShape() and endShape() function.z parameter requires the P3D
+ * parameter in combination with size as shown in the above example.texture() function declares the texture to apply to the geometry
+ * and the u and v coordinates set define the mapping of this
+ * texture to the form. By default, the coordinates used for u and
+ * v are specified in relation to the image's size in pixels, but
+ * this relation can be changed with textureMode() .
+ *
+ * ( end auto-generated )
+ * @webref shape:vertex
+ * @param x x-coordinate of the vertex
+ * @param y y-coordinate of the vertex
+ * @param z z-coordinate of the vertex
+ * @param u horizontal coordinate for the texture mapping
+ * @param v vertical coordinate for the texture mapping
+ * @see PGraphics#beginShape(int)
+ * @see PGraphics#endShape(int)
+ * @see PGraphics#bezierVertex(float, float, float, float, float, float, float, float, float)
+ * @see PGraphics#quadraticVertex(float, float, float, float, float, float)
+ * @see PGraphics#curveVertex(float, float, float)
+ * @see PGraphics#texture(PImage)
+ */
public void vertex(float x, float y, float z, float u, float v) {
g.vertex(x, y, z, u, v);
}
- /** This feature is in testing, do not use or rely upon its implementation */
- public void breakShape() {
- g.breakShape();
- }
-
-
+ /**
+ * @webref shape:vertex
+ */
public void beginContour() {
g.beginContour();
}
+ /**
+ * @webref shape:vertex
+ */
public void endContour() {
g.endContour();
}
@@ -8317,28 +8520,43 @@ public void endShape() {
}
+ /**
+ * ( begin auto-generated from endShape.xml )
+ *
+ * The endShape() function is the companion to beginShape()
+ * and may only be called after beginShape() . When endshape()
+ * is called, all of image data defined since the previous call to
+ * beginShape() is written into the image buffer. The constant CLOSE
+ * as the value for the MODE parameter to close the shape (to connect the
+ * beginning and the end).
+ *
+ * ( end auto-generated )
+ * @webref shape:vertex
+ * @param mode use CLOSE to close the shape
+ * @see PShape
+ * @see PGraphics#beginShape(int)
+ */
public void endShape(int mode) {
g.endShape(mode);
}
- public void clip(float a, float b, float c, float d) {
- g.clip(a, b, c, d);
- }
-
-
- public void noClip() {
- g.noClip();
- }
-
-
- public void blendMode(int mode) {
- g.blendMode(mode);
+ /**
+ * @webref shape
+ * @param filename name of file to load, can be .svg or .obj
+ * @see PShape
+ * @see PApplet#createShape()
+ */
+ public PShape loadShape(String filename) {
+ return g.loadShape(filename);
}
- public PShape loadShape(String filename) {
- return g.loadShape(filename);
+ /**
+ * @nowebref
+ */
+ public PShape loadShape(String filename, String options) {
+ return g.loadShape(filename, options);
}
@@ -8367,43 +8585,128 @@ public PShape createShape(int kind, float... p) {
}
+ /**
+ * ( begin auto-generated from loadShader.xml )
+ *
+ * This is a new reference entry for Processing 2.0. It will be updated shortly.
+ *
+ * ( end auto-generated )
+ *
+ * @webref rendering:shaders
+ * @param fragFilename name of fragment shader file
+ */
public PShader loadShader(String fragFilename) {
return g.loadShader(fragFilename);
}
+ /**
+ * @param vertFilename name of vertex shader file
+ */
public PShader loadShader(String fragFilename, String vertFilename) {
return g.loadShader(fragFilename, vertFilename);
}
+ /**
+ * ( begin auto-generated from shader.xml )
+ *
+ * This is a new reference entry for Processing 2.0. It will be updated shortly.
+ *
+ * ( end auto-generated )
+ *
+ * @webref rendering:shaders
+ * @param shader name of shader file
+ */
public void shader(PShader shader) {
g.shader(shader);
}
+ /**
+ * @param kind type of shader, either POINTS, LINES, or TRIANGLES
+ */
public void shader(PShader shader, int kind) {
g.shader(shader, kind);
}
+ /**
+ * ( begin auto-generated from resetShader.xml )
+ *
+ * This is a new reference entry for Processing 2.0. It will be updated shortly.
+ *
+ * ( end auto-generated )
+ *
+ * @webref rendering:shaders
+ */
public void resetShader() {
g.resetShader();
}
+ /**
+ * @param kind type of shader, either POINTS, LINES, or TRIANGLES
+ */
public void resetShader(int kind) {
g.resetShader(kind);
}
- public PShader getShader(int kind) {
- return g.getShader(kind);
+ /**
+ * @param shader the fragment shader to apply
+ */
+ public void filter(PShader shader) {
+ g.filter(shader);
}
- public void filter(PShader shader) {
- g.filter(shader);
+ /**
+ * ( begin auto-generated from clip.xml )
+ *
+ * Limits the rendering to the boundaries of a rectangle defined
+ * by the parameters. The boundaries are drawn based on the state
+ * of the imageMode() fuction, either CORNER, CORNERS, or CENTER.
+ *
+ * ( end auto-generated )
+ *
+ * @webref rendering
+ * @param a x-coordinate of the rectangle, by default
+ * @param b y-coordinate of the rectangle, by default
+ * @param c width of the rectangle, by default
+ * @param d height of the rectangle, by default
+ */
+ public void clip(float a, float b, float c, float d) {
+ g.clip(a, b, c, d);
+ }
+
+
+ /**
+ * ( begin auto-generated from noClip.xml )
+ *
+ * Disables the clipping previously started by the clip() function.
+ *
+ * ( end auto-generated )
+ *
+ * @webref rendering
+ */
+ public void noClip() {
+ g.noClip();
+ }
+
+
+ /**
+ * ( begin auto-generated from blendMode.xml )
+ *
+ * This is a new reference entry for Processing 2.0. It will be updated shortly.
+ *
+ * ( end auto-generated )
+ *
+ * @webref rendering
+ * @param mode the blending mode to use
+ */
+ public void blendMode(int mode) {
+ g.blendMode(mode);
}
@@ -8414,6 +8717,36 @@ public void bezierVertex(float x2, float y2,
}
+ /**
+ * ( begin auto-generated from bezierVertex.xml )
+ *
+ * Specifies vertex coordinates for Bezier curves. Each call to
+ * bezierVertex() defines the position of two control points and one
+ * anchor point of a Bezier curve, adding a new segment to a line or shape.
+ * The first time bezierVertex() is used within a
+ * beginShape() call, it must be prefaced with a call to
+ * vertex() to set the first anchor point. This function must be
+ * used between beginShape() and endShape() and only when
+ * there is no MODE parameter specified to beginShape() . Using the
+ * 3D version requires rendering with P3D (see the Environment reference
+ * for more information).
+ *
+ * ( end auto-generated )
+ * @webref shape:vertex
+ * @param x2 the x-coordinate of the 1st control point
+ * @param y2 the y-coordinate of the 1st control point
+ * @param z2 the z-coordinate of the 1st control point
+ * @param x3 the x-coordinate of the 2nd control point
+ * @param y3 the y-coordinate of the 2nd control point
+ * @param z3 the z-coordinate of the 2nd control point
+ * @param x4 the x-coordinate of the anchor point
+ * @param y4 the y-coordinate of the anchor point
+ * @param z4 the z-coordinate of the anchor point
+ * @see PGraphics#curveVertex(float, float, float)
+ * @see PGraphics#vertex(float, float, float, float, float)
+ * @see PGraphics#quadraticVertex(float, float, float, float, float, float)
+ * @see PGraphics#bezier(float, float, float, float, float, float, float, float, float, float, float, float)
+ */
public void bezierVertex(float x2, float y2, float z2,
float x3, float y3, float z3,
float x4, float y4, float z4) {
@@ -8421,100 +8754,356 @@ public void bezierVertex(float x2, float y2, float z2,
}
+ /**
+ * @webref shape:vertex
+ * @param cx the x-coordinate of the control point
+ * @param cy the y-coordinate of the control point
+ * @param x3 the x-coordinate of the anchor point
+ * @param y3 the y-coordinate of the anchor point
+ * @see PGraphics#curveVertex(float, float, float)
+ * @see PGraphics#vertex(float, float, float, float, float)
+ * @see PGraphics#bezierVertex(float, float, float, float, float, float)
+ * @see PGraphics#bezier(float, float, float, float, float, float, float, float, float, float, float, float)
+ */
public void quadraticVertex(float cx, float cy,
float x3, float y3) {
g.quadraticVertex(cx, cy, x3, y3);
}
+ /**
+ * @param cz the z-coordinate of the control point
+ * @param z3 the z-coordinate of the anchor point
+ */
public void quadraticVertex(float cx, float cy, float cz,
float x3, float y3, float z3) {
g.quadraticVertex(cx, cy, cz, x3, y3, z3);
}
+ /**
+ * ( begin auto-generated from curveVertex.xml )
+ *
+ * Specifies vertex coordinates for curves. This function may only be used
+ * between beginShape() and endShape() and only when there is
+ * no MODE parameter specified to beginShape() . The first and last
+ * points in a series of curveVertex() lines will be used to guide
+ * the beginning and end of a the curve. A minimum of four points is
+ * required to draw a tiny curve between the second and third points.
+ * Adding a fifth point with curveVertex() will draw the curve
+ * between the second, third, and fourth points. The curveVertex()
+ * function is an implementation of Catmull-Rom splines. Using the 3D
+ * version requires rendering with P3D (see the Environment reference for
+ * more information).
+ *
+ * ( end auto-generated )
+ *
+ * @webref shape:vertex
+ * @param x the x-coordinate of the vertex
+ * @param y the y-coordinate of the vertex
+ * @see PGraphics#curve(float, float, float, float, float, float, float, float, float, float, float, float)
+ * @see PGraphics#beginShape(int)
+ * @see PGraphics#endShape(int)
+ * @see PGraphics#vertex(float, float, float, float, float)
+ * @see PGraphics#bezier(float, float, float, float, float, float, float, float, float, float, float, float)
+ * @see PGraphics#quadraticVertex(float, float, float, float, float, float)
+ */
public void curveVertex(float x, float y) {
g.curveVertex(x, y);
}
+ /**
+ * @param z the z-coordinate of the vertex
+ */
public void curveVertex(float x, float y, float z) {
g.curveVertex(x, y, z);
}
+ /**
+ * ( begin auto-generated from point.xml )
+ *
+ * Draws a point, a coordinate in space at the dimension of one pixel. The
+ * first parameter is the horizontal value for the point, the second value
+ * is the vertical value for the point, and the optional third value is the
+ * depth value. Drawing this shape in 3D with the z parameter
+ * requires the P3D parameter in combination with size() as shown in
+ * the above example.
+ *
+ * ( end auto-generated )
+ *
+ * @webref shape:2d_primitives
+ * @param x x-coordinate of the point
+ * @param y y-coordinate of the point
+ * @see PGraphics#stroke(int)
+ */
public void point(float x, float y) {
g.point(x, y);
}
+ /**
+ * @param z z-coordinate of the point
+ */
public void point(float x, float y, float z) {
g.point(x, y, z);
}
+ /**
+ * ( begin auto-generated from line.xml )
+ *
+ * Draws a line (a direct path between two points) to the screen. The
+ * version of line() with four parameters draws the line in 2D. To
+ * color a line, use the stroke() function. A line cannot be filled,
+ * therefore the fill() function will not affect the color of a
+ * line. 2D lines are drawn with a width of one pixel by default, but this
+ * can be changed with the strokeWeight() function. The version with
+ * six parameters allows the line to be placed anywhere within XYZ space.
+ * Drawing this shape in 3D with the z parameter requires the P3D
+ * parameter in combination with size() as shown in the above example.
+ *
+ * ( end auto-generated )
+ * @webref shape:2d_primitives
+ * @param x1 x-coordinate of the first point
+ * @param y1 y-coordinate of the first point
+ * @param x2 x-coordinate of the second point
+ * @param y2 y-coordinate of the second point
+ * @see PGraphics#strokeWeight(float)
+ * @see PGraphics#strokeJoin(int)
+ * @see PGraphics#strokeCap(int)
+ * @see PGraphics#beginShape()
+ */
public void line(float x1, float y1, float x2, float y2) {
g.line(x1, y1, x2, y2);
}
+ /**
+ * @param z1 z-coordinate of the first point
+ * @param z2 z-coordinate of the second point
+ */
public void line(float x1, float y1, float z1,
float x2, float y2, float z2) {
g.line(x1, y1, z1, x2, y2, z2);
}
+ /**
+ * ( begin auto-generated from triangle.xml )
+ *
+ * A triangle is a plane created by connecting three points. The first two
+ * arguments specify the first point, the middle two arguments specify the
+ * second point, and the last two arguments specify the third point.
+ *
+ * ( end auto-generated )
+ * @webref shape:2d_primitives
+ * @param x1 x-coordinate of the first point
+ * @param y1 y-coordinate of the first point
+ * @param x2 x-coordinate of the second point
+ * @param y2 y-coordinate of the second point
+ * @param x3 x-coordinate of the third point
+ * @param y3 y-coordinate of the third point
+ * @see PApplet#beginShape()
+ */
public void triangle(float x1, float y1, float x2, float y2,
float x3, float y3) {
g.triangle(x1, y1, x2, y2, x3, y3);
}
+ /**
+ * ( begin auto-generated from quad.xml )
+ *
+ * A quad is a quadrilateral, a four sided polygon. It is similar to a
+ * rectangle, but the angles between its edges are not constrained to
+ * ninety degrees. The first pair of parameters (x1,y1) sets the first
+ * vertex and the subsequent pairs should proceed clockwise or
+ * counter-clockwise around the defined shape.
+ *
+ * ( end auto-generated )
+ * @webref shape:2d_primitives
+ * @param x1 x-coordinate of the first corner
+ * @param y1 y-coordinate of the first corner
+ * @param x2 x-coordinate of the second corner
+ * @param y2 y-coordinate of the second corner
+ * @param x3 x-coordinate of the third corner
+ * @param y3 y-coordinate of the third corner
+ * @param x4 x-coordinate of the fourth corner
+ * @param y4 y-coordinate of the fourth corner
+ */
public void quad(float x1, float y1, float x2, float y2,
float x3, float y3, float x4, float y4) {
g.quad(x1, y1, x2, y2, x3, y3, x4, y4);
}
+ /**
+ * ( begin auto-generated from rectMode.xml )
+ *
+ * Modifies the location from which rectangles draw. The default mode is
+ * rectMode(CORNER) , which specifies the location to be the upper
+ * left corner of the shape and uses the third and fourth parameters of
+ * rect() to specify the width and height. The syntax
+ * rectMode(CORNERS) uses the first and second parameters of
+ * rect() to set the location of one corner and uses the third and
+ * fourth parameters to set the opposite corner. The syntax
+ * rectMode(CENTER) draws the image from its center point and uses
+ * the third and forth parameters of rect() to specify the image's
+ * width and height. The syntax rectMode(RADIUS) draws the image
+ * from its center point and uses the third and forth parameters of
+ * rect() to specify half of the image's width and height. The
+ * parameter must be written in ALL CAPS because Processing is a case
+ * sensitive language. Note: In version 125, the mode named CENTER_RADIUS
+ * was shortened to RADIUS.
+ *
+ * ( end auto-generated )
+ * @webref shape:attributes
+ * @param mode either CORNER, CORNERS, CENTER, or RADIUS
+ * @see PGraphics#rect(float, float, float, float)
+ */
public void rectMode(int mode) {
g.rectMode(mode);
}
+ /**
+ * ( begin auto-generated from rect.xml )
+ *
+ * Draws a rectangle to the screen. A rectangle is a four-sided shape with
+ * every angle at ninety degrees. By default, the first two parameters set
+ * the location of the upper-left corner, the third sets the width, and the
+ * fourth sets the height. These parameters may be changed with the
+ * rectMode() function.
+ *
+ * ( end auto-generated )
+ *
+ * @webref shape:2d_primitives
+ * @param a x-coordinate of the rectangle by default
+ * @param b y-coordinate of the rectangle by default
+ * @param c width of the rectangle by default
+ * @param d height of the rectangle by default
+ * @see PGraphics#rectMode(int)
+ * @see PGraphics#quad(float, float, float, float, float, float, float, float)
+ */
public void rect(float a, float b, float c, float d) {
g.rect(a, b, c, d);
}
+ /**
+ * @param r radii for all four corners
+ */
public void rect(float a, float b, float c, float d, float r) {
g.rect(a, b, c, d, r);
}
+ /**
+ * @param tl radius for top-left corner
+ * @param tr radius for top-right corner
+ * @param br radius for bottom-right corner
+ * @param bl radius for bottom-left corner
+ */
public void rect(float a, float b, float c, float d,
float tl, float tr, float br, float bl) {
g.rect(a, b, c, d, tl, tr, br, bl);
}
+ /**
+ * ( begin auto-generated from square.xml )
+ *
+ * Draws a square to the screen. A square is a four-sided shape with
+ * every angle at ninety degrees and each side is the same length.
+ * By default, the first two parameters set the location of the
+ * upper-left corner, the third sets the width and height. The way
+ * these parameters are interpreted, however, may be changed with the
+ * rectMode() function.
+ *
+ * ( end auto-generated )
+ *
+ * @webref shape:2d_primitives
+ * @param x x-coordinate of the rectangle by default
+ * @param y y-coordinate of the rectangle by default
+ * @param extent width and height of the rectangle by default
+ * @see PGraphics#rect(float, float, float, float)
+ * @see PGraphics#rectMode(int)
+ */
+ public void square(float x, float y, float extent) {
+ g.square(x, y, extent);
+ }
+
+
+ /**
+ * ( begin auto-generated from ellipseMode.xml )
+ *
+ * The origin of the ellipse is modified by the ellipseMode()
+ * function. The default configuration is ellipseMode(CENTER) , which
+ * specifies the location of the ellipse as the center of the shape. The
+ * RADIUS mode is the same, but the width and height parameters to
+ * ellipse() specify the radius of the ellipse, rather than the
+ * diameter. The CORNER mode draws the shape from the upper-left
+ * corner of its bounding box. The CORNERS mode uses the four
+ * parameters to ellipse() to set two opposing corners of the
+ * ellipse's bounding box. The parameter must be written in ALL CAPS
+ * because Processing is a case-sensitive language.
+ *
+ * ( end auto-generated )
+ * @webref shape:attributes
+ * @param mode either CENTER, RADIUS, CORNER, or CORNERS
+ * @see PApplet#ellipse(float, float, float, float)
+ * @see PApplet#arc(float, float, float, float, float, float)
+ */
public void ellipseMode(int mode) {
g.ellipseMode(mode);
}
+ /**
+ * ( begin auto-generated from ellipse.xml )
+ *
+ * Draws an ellipse (oval) in the display window. An ellipse with an equal
+ * width and height is a circle. The first two parameters set
+ * the location, the third sets the width, and the fourth sets the height.
+ * The origin may be changed with the ellipseMode() function.
+ *
+ * ( end auto-generated )
+ * @webref shape:2d_primitives
+ * @param a x-coordinate of the ellipse
+ * @param b y-coordinate of the ellipse
+ * @param c width of the ellipse by default
+ * @param d height of the ellipse by default
+ * @see PApplet#ellipseMode(int)
+ * @see PApplet#arc(float, float, float, float, float, float)
+ */
public void ellipse(float a, float b, float c, float d) {
g.ellipse(a, b, c, d);
}
/**
- * Identical parameters and placement to ellipse,
- * but draws only an arc of that ellipse.
- *
- * start and stop are always radians because angleMode() was goofy.
- * ellipseMode() sets the placement.
- *
- * also tries to be smart about start < stop.
+ * ( begin auto-generated from arc.xml )
+ *
+ * Draws an arc in the display window. Arcs are drawn along the outer edge
+ * of an ellipse defined by the x , y , width and
+ * height parameters. The origin or the arc's ellipse may be changed
+ * with the ellipseMode() function. The start and stop
+ * parameters specify the angles at which to draw the arc.
+ *
+ * ( end auto-generated )
+ * @webref shape:2d_primitives
+ * @param a x-coordinate of the arc's ellipse
+ * @param b y-coordinate of the arc's ellipse
+ * @param c width of the arc's ellipse by default
+ * @param d height of the arc's ellipse by default
+ * @param start angle to start the arc, specified in radians
+ * @param stop angle to stop the arc, specified in radians
+ * @see PApplet#ellipse(float, float, float, float)
+ * @see PApplet#ellipseMode(int)
+ * @see PApplet#radians(float)
+ * @see PApplet#degrees(float)
*/
public void arc(float a, float b, float c, float d,
float start, float stop) {
@@ -8522,33 +9111,97 @@ public void arc(float a, float b, float c, float d,
}
+ /*
+ * @param mode either OPEN, CHORD, or PIE
+ */
public void arc(float a, float b, float c, float d,
float start, float stop, int mode) {
g.arc(a, b, c, d, start, stop, mode);
}
+ /**
+ * ( begin auto-generated from circle.xml )
+ *
+ * Draws a circle to the screen. By default, the first two parameters
+ * set the location of the center, and the third sets the shape's width
+ * and height. The origin may be changed with the ellipseMode()
+ * function.
+ *
+ * ( end auto-generated )
+ * @webref shape:2d_primitives
+ * @param x x-coordinate of the ellipse
+ * @param y y-coordinate of the ellipse
+ * @param extent width and height of the ellipse by default
+ * @see PApplet#ellipse(float, float, float, float)
+ * @see PApplet#ellipseMode(int)
+ */
+ public void circle(float x, float y, float extent) {
+ g.circle(x, y, extent);
+ }
+
+
+ /**
+ * ( begin auto-generated from box.xml )
+ *
+ * A box is an extruded rectangle. A box with equal dimension on all sides
+ * is a cube.
+ *
+ * ( end auto-generated )
+ *
+ * @webref shape:3d_primitives
+ * @param size dimension of the box in all dimensions (creates a cube)
+ * @see PGraphics#sphere(float)
+ */
public void box(float size) {
g.box(size);
}
+ /**
+ * @param w dimension of the box in the x-dimension
+ * @param h dimension of the box in the y-dimension
+ * @param d dimension of the box in the z-dimension
+ */
public void box(float w, float h, float d) {
g.box(w, h, d);
}
+ /**
+ * ( begin auto-generated from sphereDetail.xml )
+ *
+ * Controls the detail used to render a sphere by adjusting the number of
+ * vertices of the sphere mesh. The default resolution is 30, which creates
+ * a fairly detailed sphere definition with vertices every 360/30 = 12
+ * degrees. If you're going to render a great number of spheres per frame,
+ * it is advised to reduce the level of detail using this function. The
+ * setting stays active until sphereDetail() is called again with a
+ * new parameter and so should not be called prior to every
+ * sphere() statement, unless you wish to render spheres with
+ * different settings, e.g. using less detail for smaller spheres or ones
+ * further away from the camera. To control the detail of the horizontal
+ * and vertical resolution independently, use the version of the functions
+ * with two parameters.
+ *
+ * ( end auto-generated )
+ *
+ * Advanced
+ * Code for sphereDetail() submitted by toxi [031031].
+ * Code for enhanced u/v version from davbol [080801].
+ *
+ * @param res number of segments (minimum 3) used per full circle revolution
+ * @webref shape:3d_primitives
+ * @see PGraphics#sphere(float)
+ */
public void sphereDetail(int res) {
g.sphereDetail(res);
}
/**
- * Set the detail level for approximating a sphere. The ures and vres params
- * control the horizontal and vertical resolution.
- *
- * Code for sphereDetail() submitted by toxi [031031].
- * Code for enhanced u/v version from davbol [080801].
+ * @param ures number of segments used longitudinally per full circle revolutoin
+ * @param vres number of segments used latitudinally from top to bottom
*/
public void sphereDetail(int ures, int vres) {
g.sphereDetail(ures, vres);
@@ -8556,7 +9209,13 @@ public void sphereDetail(int ures, int vres) {
/**
- * Draw a sphere with radius r centered at coordinate 0, 0, 0.
+ * ( begin auto-generated from sphere.xml )
+ *
+ * A sphere is a hollow ball made from tessellated triangles.
+ *
+ * ( end auto-generated )
+ *
+ * Advanced
*
* Implementation notes:
*
@@ -8576,6 +9235,10 @@ public void sphereDetail(int ures, int vres) {
*
* [davbol 080801] now using separate sphereDetailU/V
*
+ *
+ * @webref shape:3d_primitives
+ * @param r the radius of the sphere
+ * @see PGraphics#sphereDetail(int)
*/
public void sphere(float r) {
g.sphere(r);
@@ -8583,12 +9246,17 @@ public void sphere(float r) {
/**
- * Evalutes quadratic bezier at point t for points a, b, c, d.
- * t varies between 0 and 1, and a and d are the on curve points,
- * b and c are the control points. this can be done once with the
- * x coordinates and a second time with the y coordinates to get
- * the location of a bezier curve at t.
- *
+ * ( begin auto-generated from bezierPoint.xml )
+ *
+ * Evaluates the Bezier at point t for points a, b, c, d. The parameter t
+ * varies between 0 and 1, a and d are points on the curve, and b and c are
+ * the control points. This can be done once with the x coordinates and a
+ * second time with the y coordinates to get the location of a bezier curve
+ * at t.
+ *
+ * ( end auto-generated )
+ *
+ *
Advanced
* For instance, to convert the following example:
* stroke(255, 102, 0);
* line(85, 20, 10, 10);
@@ -8608,6 +9276,16 @@ public void sphere(float r) {
* vertex(x, y);
* }
* endShape();
+ *
+ * @webref shape:curves
+ * @param a coordinate of first point on the curve
+ * @param b coordinate of first control point
+ * @param c coordinate of second control point
+ * @param d coordinate of second point on the curve
+ * @param t value between 0 and 1
+ * @see PGraphics#bezier(float, float, float, float, float, float, float, float, float, float, float, float)
+ * @see PGraphics#bezierVertex(float, float, float, float, float, float)
+ * @see PGraphics#curvePoint(float, float, float, float, float)
*/
public float bezierPoint(float a, float b, float c, float d, float t) {
return g.bezierPoint(a, b, c, d, t);
@@ -8615,20 +9293,74 @@ public float bezierPoint(float a, float b, float c, float d, float t) {
/**
- * Provide the tangent at the given point on the bezier curve.
- * Fix from davbol for 0136.
+ * ( begin auto-generated from bezierTangent.xml )
+ *
+ * Calculates the tangent of a point on a Bezier curve. There is a good
+ * definition of tangent on WikipediaAdvanced
+ * Code submitted by Dave Bollinger (davol) for release 0136.
+ *
+ * @webref shape:curves
+ * @param a coordinate of first point on the curve
+ * @param b coordinate of first control point
+ * @param c coordinate of second control point
+ * @param d coordinate of second point on the curve
+ * @param t value between 0 and 1
+ * @see PGraphics#bezier(float, float, float, float, float, float, float, float, float, float, float, float)
+ * @see PGraphics#bezierVertex(float, float, float, float, float, float)
+ * @see PGraphics#curvePoint(float, float, float, float, float)
*/
public float bezierTangent(float a, float b, float c, float d, float t) {
return g.bezierTangent(a, b, c, d, t);
}
+ /**
+ * ( begin auto-generated from bezierDetail.xml )
+ *
+ * Sets the resolution at which Beziers display. The default value is 20.
+ * This function is only useful when using the P3D renderer as the default
+ * P2D renderer does not use this information.
+ *
+ * ( end auto-generated )
+ *
+ * @webref shape:curves
+ * @param detail resolution of the curves
+ * @see PGraphics#curve(float, float, float, float, float, float, float, float, float, float, float, float)
+ * @see PGraphics#curveVertex(float, float, float)
+ * @see PGraphics#curveTightness(float)
+ */
public void bezierDetail(int detail) {
g.bezierDetail(detail);
}
+ public void bezier(float x1, float y1,
+ float x2, float y2,
+ float x3, float y3,
+ float x4, float y4) {
+ g.bezier(x1, y1, x2, y2, x3, y3, x4, y4);
+ }
+
+
/**
+ * ( begin auto-generated from bezier.xml )
+ *
+ * Draws a Bezier curve on the screen. These curves are defined by a series
+ * of anchor and control points. The first two parameters specify the first
+ * anchor point and the last two parameters specify the other anchor point.
+ * The middle parameters specify the control points which define the shape
+ * of the curve. Bezier curves were developed by French engineer Pierre
+ * Bezier. Using the 3D version requires rendering with P3D (see the
+ * Environment reference for more information).
+ *
+ * ( end auto-generated )
+ *
+ * Advanced
* Draw a cubic bezier curve. The first and last points are
* the on-curve points. The middle two are the 'control' points,
* or 'handles' in an application like Illustrator.
@@ -8650,15 +9382,24 @@ public void bezierDetail(int detail) {
* To draw a quadratic (instead of cubic) curve,
* use the control point twice by doubling it:
* bezier(x1, y1, cx, cy, cx, cy, x2, y2);
+ *
+ * @webref shape:curves
+ * @param x1 coordinates for the first anchor point
+ * @param y1 coordinates for the first anchor point
+ * @param z1 coordinates for the first anchor point
+ * @param x2 coordinates for the first control point
+ * @param y2 coordinates for the first control point
+ * @param z2 coordinates for the first control point
+ * @param x3 coordinates for the second control point
+ * @param y3 coordinates for the second control point
+ * @param z3 coordinates for the second control point
+ * @param x4 coordinates for the second anchor point
+ * @param y4 coordinates for the second anchor point
+ * @param z4 coordinates for the second anchor point
+ *
+ * @see PGraphics#bezierVertex(float, float, float, float, float, float)
+ * @see PGraphics#curve(float, float, float, float, float, float, float, float, float, float, float, float)
*/
- public void bezier(float x1, float y1,
- float x2, float y2,
- float x3, float y3,
- float x4, float y4) {
- g.bezier(x1, y1, x2, y2, x3, y3, x4, y4);
- }
-
-
public void bezier(float x1, float y1, float z1,
float x2, float y2, float z2,
float x3, float y3, float z3,
@@ -8668,9 +9409,24 @@ public void bezier(float x1, float y1, float z1,
/**
- * Get a location along a catmull-rom curve segment.
+ * ( begin auto-generated from curvePoint.xml )
+ *
+ * Evalutes the curve at point t for points a, b, c, d. The parameter t
+ * varies between 0 and 1, a and d are the control points, and b and c are
+ * the points on the curve. This can be done once with the x coordinates and a
+ * second time with the y coordinates to get the location of a curve at t.
+ *
+ * ( end auto-generated )
*
- * @param t Value between zero and one for how far along the segment
+ * @webref shape:curves
+ * @param a coordinate of first control point
+ * @param b coordinate of first point on the curve
+ * @param c coordinate of second point on the curve
+ * @param d coordinate of second control point
+ * @param t value between 0 and 1
+ * @see PGraphics#curve(float, float, float, float, float, float, float, float, float, float, float, float)
+ * @see PGraphics#curveVertex(float, float)
+ * @see PGraphics#bezierPoint(float, float, float, float, float)
*/
public float curvePoint(float a, float b, float c, float d, float t) {
return g.curvePoint(a, b, c, d, t);
@@ -8678,29 +9434,94 @@ public float curvePoint(float a, float b, float c, float d, float t) {
/**
- * Calculate the tangent at a t value (0..1) on a Catmull-Rom curve.
+ * ( begin auto-generated from curveTangent.xml )
+ *
+ * Calculates the tangent of a point on a curve. There's a good definition
+ * of tangent Advanced
* Code thanks to Dave Bollinger (Bug #715)
+ *
+ * @webref shape:curves
+ * @param a coordinate of first point on the curve
+ * @param b coordinate of first control point
+ * @param c coordinate of second control point
+ * @param d coordinate of second point on the curve
+ * @param t value between 0 and 1
+ * @see PGraphics#curve(float, float, float, float, float, float, float, float, float, float, float, float)
+ * @see PGraphics#curveVertex(float, float)
+ * @see PGraphics#curvePoint(float, float, float, float, float)
+ * @see PGraphics#bezierTangent(float, float, float, float, float)
*/
public float curveTangent(float a, float b, float c, float d, float t) {
return g.curveTangent(a, b, c, d, t);
}
+ /**
+ * ( begin auto-generated from curveDetail.xml )
+ *
+ * Sets the resolution at which curves display. The default value is 20.
+ * This function is only useful when using the P3D renderer as the default
+ * P2D renderer does not use this information.
+ *
+ * ( end auto-generated )
+ *
+ * @webref shape:curves
+ * @param detail resolution of the curves
+ * @see PGraphics#curve(float, float, float, float, float, float, float, float, float, float, float, float)
+ * @see PGraphics#curveVertex(float, float)
+ * @see PGraphics#curveTightness(float)
+ */
public void curveDetail(int detail) {
g.curveDetail(detail);
}
+ /**
+ * ( begin auto-generated from curveTightness.xml )
+ *
+ * Modifies the quality of forms created with curve() and
+ * curveVertex() . The parameter squishy determines how the
+ * curve fits to the vertex points. The value 0.0 is the default value for
+ * squishy (this value defines the curves to be Catmull-Rom splines)
+ * and the value 1.0 connects all the points with straight lines. Values
+ * within the range -5.0 and 5.0 will deform the curves but will leave them
+ * recognizable and as values increase in magnitude, they will continue to deform.
+ *
+ * ( end auto-generated )
+ *
+ * @webref shape:curves
+ * @param tightness amount of deformation from the original vertices
+ * @see PGraphics#curve(float, float, float, float, float, float, float, float, float, float, float, float)
+ * @see PGraphics#curveVertex(float, float)
+ */
public void curveTightness(float tightness) {
g.curveTightness(tightness);
}
/**
- * Draws a segment of Catmull-Rom curve.
- *
- * As of 0070, this function no longer doubles the first and
- * last points. The curves are a bit more boring, but it's more
+ * ( begin auto-generated from curve.xml )
+ *
+ * Draws a curved line on the screen. The first and second parameters
+ * specify the beginning control point and the last two parameters specify
+ * the ending control point. The middle parameters specify the start and
+ * stop of the curve. Longer curves can be created by putting a series of
+ * curve() functions together or using curveVertex() . An
+ * additional function called curveTightness() provides control for
+ * the visual quality of the curve. The curve() function is an
+ * implementation of Catmull-Rom splines. Using the 3D version requires
+ * rendering with P3D (see the Environment reference for more information).
+ *
+ * ( end auto-generated )
+ *
+ *
Advanced
+ * As of revision 0070, this function no longer doubles the first
+ * and last points. The curves are a bit more boring, but it's more
* mathematically correct, and properly mirrored in curvePoint().
*
* Identical to typing out:
@@ -8711,6 +9532,19 @@ public void curveTightness(float tightness) {
* curveVertex(x4, y4);
* endShape();
*
+ *
+ * @webref shape:curves
+ * @param x1 coordinates for the beginning control point
+ * @param y1 coordinates for the beginning control point
+ * @param x2 coordinates for the first point
+ * @param y2 coordinates for the first point
+ * @param x3 coordinates for the second point
+ * @param y3 coordinates for the second point
+ * @param x4 coordinates for the ending control point
+ * @param y4 coordinates for the ending control point
+ * @see PGraphics#curveVertex(float, float)
+ * @see PGraphics#curveTightness(float)
+ * @see PGraphics#bezier(float, float, float, float, float, float, float, float, float, float, float, float)
*/
public void curve(float x1, float y1,
float x2, float y2,
@@ -8720,6 +9554,12 @@ public void curve(float x1, float y1,
}
+ /**
+ * @param z1 coordinates for the beginning control point
+ * @param z2 coordinates for the first point
+ * @param z3 coordinates for the second point
+ * @param z4 coordinates for the ending control point
+ */
public void curve(float x1, float y1, float z1,
float x2, float y2, float z2,
float x3, float y3, float z3,
@@ -8729,22 +9569,83 @@ public void curve(float x1, float y1, float z1,
/**
- * The mode can only be set to CORNERS, CORNER, and CENTER.
- *
- * Support for CENTER was added in release 0146.
+ * ( begin auto-generated from imageMode.xml )
+ *
+ * Modifies the location from which images draw. The default mode is
+ * imageMode(CORNER) , which specifies the location to be the upper
+ * left corner and uses the fourth and fifth parameters of image()
+ * to set the image's width and height. The syntax
+ * imageMode(CORNERS) uses the second and third parameters of
+ * image() to set the location of one corner of the image and uses
+ * the fourth and fifth parameters to set the opposite corner. Use
+ * imageMode(CENTER) to draw images centered at the given x and y
+ * position.imageMode() must be written in ALL CAPS because
+ * Processing is a case-sensitive language.
+ *
+ * ( end auto-generated )
+ *
+ * @webref image:loading_displaying
+ * @param mode either CORNER, CORNERS, or CENTER
+ * @see PApplet#loadImage(String, String)
+ * @see PImage
+ * @see PGraphics#image(PImage, float, float, float, float)
+ * @see PGraphics#background(float, float, float, float)
*/
public void imageMode(int mode) {
g.imageMode(mode);
}
- public void image(PImage image, float x, float y) {
- g.image(image, x, y);
+ /**
+ * ( begin auto-generated from image.xml )
+ *
+ * Displays images to the screen. The images must be in the sketch's "data"
+ * directory to load correctly. Select "Add file..." from the "Sketch" menu
+ * to add the image. Processing currently works with GIF, JPEG, and Targa
+ * images. The img parameter specifies the image to display and the
+ * x and y parameters define the location of the image from
+ * its upper-left corner. The image is displayed at its original size
+ * unless the width and height parameters specify a different
+ * size.imageMode() function changes the way the parameters work. For
+ * example, a call to imageMode(CORNERS) will change the
+ * width and height parameters to define the x and y values
+ * of the opposite corner of the image.tint() function.
+ * This function will maintain transparency for GIF and PNG images.
+ *
+ * ( end auto-generated )
+ *
+ * Advanced
+ * Starting with release 0124, when using the default (JAVA2D) renderer,
+ * smooth() will also improve image quality of resized images.
+ *
+ * @webref image:loading_displaying
+ * @param img the image to display
+ * @param a x-coordinate of the image by default
+ * @param b y-coordinate of the image by default
+ * @see PApplet#loadImage(String, String)
+ * @see PImage
+ * @see PGraphics#imageMode(int)
+ * @see PGraphics#tint(float)
+ * @see PGraphics#background(float, float, float, float)
+ * @see PGraphics#alpha(int)
+ */
+ public void image(PImage img, float a, float b) {
+ g.image(img, a, b);
}
- public void image(PImage image, float x, float y, float c, float d) {
- g.image(image, x, y, c, d);
+ /**
+ * @param c width to display the image by default
+ * @param d height to display the image by default
+ */
+ public void image(PImage img, float a, float b, float c, float d) {
+ g.image(img, a, b, c, d);
}
@@ -8752,17 +9653,38 @@ public void image(PImage image, float x, float y, float c, float d) {
* Draw an image(), also specifying u/v coordinates.
* In this method, the u, v coordinates are always based on image space
* location, regardless of the current textureMode().
+ *
+ * @nowebref
*/
- public void image(PImage image,
+ public void image(PImage img,
float a, float b, float c, float d,
int u1, int v1, int u2, int v2) {
- g.image(image, a, b, c, d, u1, v1, u2, v2);
+ g.image(img, a, b, c, d, u1, v1, u2, v2);
}
/**
- * Set the orientation for the shape() command (like imageMode() or rectMode()).
- * @param mode Either CORNER, CORNERS, or CENTER.
+ * ( begin auto-generated from shapeMode.xml )
+ *
+ * Modifies the location from which shapes draw. The default mode is
+ * shapeMode(CORNER) , which specifies the location to be the upper
+ * left corner of the shape and uses the third and fourth parameters of
+ * shape() to specify the width and height. The syntax
+ * shapeMode(CORNERS) uses the first and second parameters of
+ * shape() to set the location of one corner and uses the third and
+ * fourth parameters to set the opposite corner. The syntax
+ * shapeMode(CENTER) draws the shape from its center point and uses
+ * the third and forth parameters of shape() to specify the width
+ * and height. The parameter must be written in "ALL CAPS" because
+ * Processing is a case sensitive language.
+ *
+ * ( end auto-generated )
+ *
+ * @webref shape:loading_displaying
+ * @param mode either CORNER, CORNERS, CENTER
+ * @see PShape
+ * @see PGraphics#shape(PShape)
+ * @see PGraphics#rectMode(int)
*/
public void shapeMode(int mode) {
g.shapeMode(mode);
@@ -8775,6 +9697,33 @@ public void shape(PShape shape) {
/**
+ * ( begin auto-generated from shape.xml )
+ *
+ * Displays shapes to the screen. The shapes must be in the sketch's "data"
+ * directory to load correctly. Select "Add file..." from the "Sketch" menu
+ * to add the shape. Processing currently works with SVG shapes only. The
+ * sh parameter specifies the shape to display and the x and
+ * y parameters define the location of the shape from its upper-left
+ * corner. The shape is displayed at its original size unless the
+ * width and height parameters specify a different size. The
+ * shapeMode() function changes the way the parameters work. A call
+ * to shapeMode(CORNERS) , for example, will change the width and
+ * height parameters to define the x and y values of the opposite corner of
+ * the shape.
+ * x and y parameters of the
+ * text() function.
+ * textDescent() . For multiple
+ * lines, the final line will be aligned to the bottom, with the previous
+ * lines appearing above it.
+ * text() with width and height parameters, BASELINE is
+ * ignored, and treated as TOP. (Otherwise, text would by default draw
+ * outside the box, since BASELINE is the default setting. BASELINE is not
+ * a useful drawing mode for text drawn in a rectangle.)
+ * textAscent() ,
+ * which many fonts do not specify correctly. It may be necessary to use a
+ * hack and offset by a few pixels by hand so that the offset looks
+ * correct. To do this as less of a hack, use some percentage of
+ * textAscent() or textDescent() so that the hack works even
+ * if you change the size of the font.
+ *
+ * ( end auto-generated )
+ *
+ * @webref typography:attributes
+ * @param alignX horizontal alignment, either LEFT, CENTER, or RIGHT
+ * @param alignY vertical alignment, either TOP, BOTTOM, CENTER, or BASELINE
+ * @see PApplet#loadFont(String)
+ * @see PFont
+ * @see PGraphics#text(String, float, float)
+ * @see PGraphics#textSize(float)
+ * @see PGraphics#textAscent()
+ * @see PGraphics#textDescent()
*/
public void textAlign(int alignX, int alignY) {
g.textAlign(alignX, alignY);
@@ -8807,9 +9793,17 @@ public void textAlign(int alignX, int alignY) {
/**
- * Returns the ascent of the current font at the current size.
- * This is a method, rather than a variable inside the PGraphics object
- * because it requires calculation.
+ * ( begin auto-generated from textAscent.xml )
+ *
+ * Returns ascent of the current font at its current size. This information
+ * is useful for determining the height of the font above the baseline. For
+ * example, adding the textAscent() and textDescent() values
+ * will give you the total height of the line.
+ *
+ * ( end auto-generated )
+ *
+ * @webref typography:metrics
+ * @see PGraphics#textDescent()
*/
public float textAscent() {
return g.textAscent();
@@ -8817,9 +9811,17 @@ public float textAscent() {
/**
- * Returns the descent of the current font at the current size.
- * This is a method, rather than a variable inside the PGraphics object
- * because it requires calculation.
+ * ( begin auto-generated from textDescent.xml )
+ *
+ * Returns descent of the current font at its current size. This
+ * information is useful for determining the height of the font below the
+ * baseline. For example, adding the textAscent() and
+ * textDescent() values will give you the total height of the line.
+ *
+ * ( end auto-generated )
+ *
+ * @webref typography:metrics
+ * @see PGraphics#textAscent()
*/
public float textDescent() {
return g.textDescent();
@@ -8827,9 +9829,33 @@ public float textDescent() {
/**
- * Sets the current font. The font's size will be the "natural"
- * size of this font (the size that was set when using "Create Font").
- * The leading will also be reset.
+ * ( begin auto-generated from textFont.xml )
+ *
+ * Sets the current font that will be drawn with the text()
+ * function. Fonts must be loaded with loadFont() before it can be
+ * used. This font will be used in all subsequent calls to the
+ * text() function. If no size parameter is input, the font
+ * will appear at its original size (the size it was created at with the
+ * "Create Font..." tool) until it is changed with textSize() . textFont()
+ * without the size parameter will result in the cleanest-looking text. hint(ENABLE_NATIVE_FONTS) . This will produce vector text in
+ * JAVA2D sketches and PDF output in cases where the vector data is
+ * available: when the font is still installed, or the font is created via
+ * the createFont() function (rather than the Create Font tool).
+ *
+ * ( end auto-generated )
+ *
+ * @webref typography:loading_displaying
+ * @param which any variable of the type PFont
+ * @see PApplet#createFont(String, float, boolean)
+ * @see PApplet#loadFont(String)
+ * @see PFont
+ * @see PGraphics#text(String, float, float)
+ * @see PGraphics#textSize(float)
*/
public void textFont(PFont which) {
g.textFont(which);
@@ -8837,7 +9863,7 @@ public void textFont(PFont which) {
/**
- * Useful function to set the font and size at the same time.
+ * @param size the size of the letters in units of pixels
*/
public void textFont(PFont which, float size) {
g.textFont(which, size);
@@ -8845,9 +9871,20 @@ public void textFont(PFont which, float size) {
/**
- * Set the text leading to a specific value. If using a custom
- * value for the text leading, you'll have to call textLeading()
- * again after any calls to textSize().
+ * ( begin auto-generated from textLeading.xml )
+ *
+ * Sets the spacing between lines of text in units of pixels. This setting
+ * will be used in all subsequent calls to the text() function.
+ *
+ * ( end auto-generated )
+ *
+ * @webref typography:attributes
+ * @param leading the size in pixels for spacing between lines
+ * @see PApplet#loadFont(String)
+ * @see PFont#PFont
+ * @see PGraphics#text(String, float, float)
+ * @see PGraphics#textFont(PFont)
+ * @see PGraphics#textSize(float)
*/
public void textLeading(float leading) {
g.textLeading(leading);
@@ -8855,11 +9892,36 @@ public void textLeading(float leading) {
/**
- * Sets the text rendering/placement to be either SCREEN (direct
- * to the screen, exact coordinates, only use the font's original size)
- * or MODEL (the default, where text is manipulated by translate() and
- * can have a textSize). The text size cannot be set when using
- * textMode(SCREEN), because it uses the pixels directly from the font.
+ * ( begin auto-generated from textMode.xml )
+ *
+ * Sets the way text draws to the screen. In the default configuration, the
+ * MODEL mode, it's possible to rotate, scale, and place letters in
+ * two and three dimensional space.SHAPE mode draws text using the the glyph outlines of
+ * individual characters rather than as textures. This mode is only
+ * supported with the PDF and P3D renderer settings. With the
+ * PDF renderer, you must call textMode(SHAPE) before any
+ * other drawing occurs. If the outlines are not available, then
+ * textMode(SHAPE) will be ignored and textMode(MODEL) will
+ * be used instead.textMode(SHAPE) option in P3D can be combined with
+ * beginRaw() to write vector-accurate text to 2D and 3D output
+ * files, for instance DXF or PDF . The SHAPE mode is
+ * not currently optimized for P3D , so if recording shape data, use
+ * textMode(MODEL) until you're ready to capture the geometry with beginRaw() .
+ *
+ * ( end auto-generated )
+ *
+ * @webref typography:attributes
+ * @param mode either MODEL or SHAPE
+ * @see PApplet#loadFont(String)
+ * @see PFont#PFont
+ * @see PGraphics#text(String, float, float)
+ * @see PGraphics#textFont(PFont)
+ * @see PGraphics#beginRaw(PGraphics)
+ * @see PApplet#createFont(String, float, boolean)
*/
public void textMode(int mode) {
g.textMode(mode);
@@ -8867,21 +9929,47 @@ public void textMode(int mode) {
/**
- * Sets the text size, also resets the value for the leading.
+ * ( begin auto-generated from textSize.xml )
+ *
+ * Sets the current font size. This size will be used in all subsequent
+ * calls to the text() function. Font size is measured in units of pixels.
+ *
+ * ( end auto-generated )
+ *
+ * @webref typography:attributes
+ * @param size the size of the letters in units of pixels
+ * @see PApplet#loadFont(String)
+ * @see PFont#PFont
+ * @see PGraphics#text(String, float, float)
+ * @see PGraphics#textFont(PFont)
*/
public void textSize(float size) {
g.textSize(size);
}
+ /**
+ * @param c the character to measure
+ */
public float textWidth(char c) {
return g.textWidth(c);
}
/**
- * Return the width of a line of text. If the text has multiple
- * lines, this returns the length of the longest line.
+ * ( begin auto-generated from textWidth.xml )
+ *
+ * Calculates and returns the width of any character or text string.
+ *
+ * ( end auto-generated )
+ *
+ * @webref typography:attributes
+ * @param str the String of characters to measure
+ * @see PApplet#loadFont(String)
+ * @see PFont#PFont
+ * @see PGraphics#text(String, float, float)
+ * @see PGraphics#textFont(PFont)
+ * @see PGraphics#textSize(float)
*/
public float textWidth(String str) {
return g.textWidth(str);
@@ -8889,9 +9977,47 @@ public float textWidth(String str) {
/**
- * Draw a single character on screen.
- * Extremely slow when used with textMode(SCREEN) and Java 2D,
- * because loadPixels has to be called first and updatePixels last.
+ * @nowebref
+ */
+ public float textWidth(char[] chars, int start, int length) {
+ return g.textWidth(chars, start, length);
+ }
+
+
+ /**
+ * ( begin auto-generated from text.xml )
+ *
+ * Draws text to the screen. Displays the information specified in the
+ * data or stringdata parameters on the screen in the
+ * position specified by the x and y parameters and the
+ * optional z parameter. A default font will be used unless a font
+ * is set with the textFont() function. Change the color of the text
+ * with the fill() function. The text displays in relation to the
+ * textAlign() function, which gives the option to draw to the left,
+ * right, and center of the coordinates.
+ * x2 and y2 parameters define a rectangular area to
+ * display within and may only be used with string data. For text drawn
+ * inside a rectangle, the coordinates are interpreted based on the current
+ * rectMode() setting.
+ *
+ * ( end auto-generated )
+ *
+ * @webref typography:loading_displaying
+ * @param c the alphanumeric character to be displayed
+ * @param x x-coordinate of text
+ * @param y y-coordinate of text
+ * @see PGraphics#textAlign(int, int)
+ * @see PGraphics#textFont(PFont)
+ * @see PGraphics#textMode(int)
+ * @see PGraphics#textSize(float)
+ * @see PGraphics#textLeading(float)
+ * @see PGraphics#textWidth(String)
+ * @see PGraphics#textAscent()
+ * @see PGraphics#textDescent()
+ * @see PGraphics#rectMode(int)
+ * @see PGraphics#fill(int, float)
+ * @see_external String
*/
public void text(char c, float x, float y) {
g.text(c, x, y);
@@ -8899,7 +10025,7 @@ public void text(char c, float x, float y) {
/**
- * Draw a single character on screen (with a z coordinate)
+ * @param z z-coordinate of text
*/
public void text(char c, float x, float y, float z) {
g.text(c, x, y, z);
@@ -8907,6 +10033,7 @@ public void text(char c, float x, float y, float z) {
/**
+ * Advanced
* Draw a chunk of text.
* Newlines that are \n (Unix newline or linefeed char, ascii 10)
* are honored, but \r (carriage return, Windows and Mac OS) are
@@ -8917,6 +10044,20 @@ public void text(String str, float x, float y) {
}
+ /**
+ * Advanced
+ * Method to draw text from an array of chars. This method will usually be
+ * more efficient than drawing from a String object, because the String will
+ * not be converted to a char array before drawing.
+ * @param chars the alphanumberic symbols to be displayed
+ * @param start array index at which to start writing characters
+ * @param stop array index at which to stop writing characters
+ */
+ public void text(char[] chars, int start, int stop, float x, float y) {
+ g.text(chars, start, stop, x, y);
+ }
+
+
/**
* Same as above but with a z coordinate.
*/
@@ -8925,7 +10066,14 @@ public void text(String str, float x, float y, float z) {
}
+ public void text(char[] chars, int start, int stop,
+ float x, float y, float z) {
+ g.text(chars, start, stop, x, y, z);
+ }
+
+
/**
+ * Advanced
* Draw text in a box that is constrained to a particular size.
* The current rectMode() determines what the coordinates mean
* (whether x1/y1/x2/y2 or x/y/w/h).
@@ -8937,6 +10085,11 @@ public void text(String str, float x, float y, float z) {
* Newlines that are \n (Unix newline or linefeed char, ascii 10)
* are honored, and \r (carriage return, Windows and Mac OS) are
* ignored.
+ *
+ * @param x1 by default, the x-coordinate of text, see rectMode() for more info
+ * @param y1 by default, the y-coordinate of text, see rectMode() for more info
+ * @param x2 by default, the width of the text box, see rectMode() for more info
+ * @param y2 by default, the height of the text box, see rectMode() for more info
*/
public void text(String str, float x1, float y1, float x2, float y2) {
g.text(str, x1, y1, x2, y2);
@@ -8959,6 +10112,8 @@ public void text(int num, float x, float y, float z) {
* Users who want more control should use their own nf() cmmand,
* or if they want the long, ugly version of float,
* use String.valueOf() to convert the float to a String first.
+ *
+ * @param num the numeric value to be displayed
*/
public void text(float num, float x, float y) {
g.text(num, x, y);
@@ -8971,7 +10126,101 @@ public void text(float num, float x, float y, float z) {
/**
- * Push a copy of the current transformation matrix onto the stack.
+ * ( begin auto-generated from push.xml )
+ *
+ * The push() function saves the current drawing style
+ * settings and transformations, while pop() restores these
+ * settings. Note that these functions are always used together.
+ * They allow you to change the style and transformation settings
+ * and later return to what you had. When a new state is started
+ * with push(), it builds on the current style and transform
+ * information.push() stores information related to the current
+ * transformation state and style settings controlled by the
+ * following functions: rotate() , translate() ,
+ * scale() , fill() , stroke() , tint() ,
+ * strokeWeight() , strokeCap() , strokeJoin() ,
+ * imageMode() , rectMode() , ellipseMode() ,
+ * colorMode() , textAlign() , textFont() ,
+ * textMode() , textSize() , textLeading() .push() and pop() functions were added with
+ * Processing 3.5. They can be used in place of pushMatrix() ,
+ * popMatrix() , pushStyles() , and popStyles() .
+ * The difference is that push() and pop() control both the
+ * transformations (rotate, scale, translate) and the drawing styles
+ * at the same time.
+ *
+ * ( end auto-generated )
+ *
+ * @webref structure
+ * @see PGraphics#pop()
+ */
+ public void push() {
+ g.push();
+ }
+
+
+ /**
+ * ( begin auto-generated from pop.xml )
+ *
+ * The pop() function restores the previous drawing style
+ * settings and transformations after push() has changed them.
+ * Note that these functions are always used together. They allow
+ * you to change the style and transformation settings and later
+ * return to what you had. When a new state is started with push(),
+ * it builds on the current style and transform information.push() stores information related to the current
+ * transformation state and style settings controlled by the
+ * following functions: rotate() , translate() ,
+ * scale() , fill() , stroke() , tint() ,
+ * strokeWeight() , strokeCap() , strokeJoin() ,
+ * imageMode() , rectMode() , ellipseMode() ,
+ * colorMode() , textAlign() , textFont() ,
+ * textMode() , textSize() , textLeading() .push() and pop() functions were added with
+ * Processing 3.5. They can be used in place of pushMatrix() ,
+ * popMatrix() , pushStyles() , and popStyles() .
+ * The difference is that push() and pop() control both the
+ * transformations (rotate, scale, translate) and the drawing styles
+ * at the same time.
+ *
+ * ( end auto-generated )
+ *
+ * @webref structure
+ * @see PGraphics#push()
+ */
+ public void pop() {
+ g.pop();
+ }
+
+
+ /**
+ * ( begin auto-generated from pushMatrix.xml )
+ *
+ * Pushes the current transformation matrix onto the matrix stack.
+ * Understanding pushMatrix() and popMatrix() requires
+ * understanding the concept of a matrix stack. The pushMatrix()
+ * function saves the current coordinate system to the stack and
+ * popMatrix() restores the prior coordinate system.
+ * pushMatrix() and popMatrix() are used in conjuction with
+ * the other transformation functions and may be embedded to control the
+ * scope of the transformations.
+ *
+ * ( end auto-generated )
+ *
+ * @webref transform
+ * @see PGraphics#popMatrix()
+ * @see PGraphics#translate(float, float, float)
+ * @see PGraphics#scale(float)
+ * @see PGraphics#rotate(float)
+ * @see PGraphics#rotateX(float)
+ * @see PGraphics#rotateY(float)
+ * @see PGraphics#rotateZ(float)
*/
public void pushMatrix() {
g.pushMatrix();
@@ -8979,7 +10228,20 @@ public void pushMatrix() {
/**
- * Replace the current transformation matrix with the top of the stack.
+ * ( begin auto-generated from popMatrix.xml )
+ *
+ * Pops the current transformation matrix off the matrix stack.
+ * Understanding pushing and popping requires understanding the concept of
+ * a matrix stack. The pushMatrix() function saves the current
+ * coordinate system to the stack and popMatrix() restores the prior
+ * coordinate system. pushMatrix() and popMatrix() are used
+ * in conjuction with the other transformation functions and may be
+ * embedded to control the scope of the transformations.
+ *
+ * ( end auto-generated )
+ *
+ * @webref transform
+ * @see PGraphics#pushMatrix()
*/
public void popMatrix() {
g.popMatrix();
@@ -8987,29 +10249,77 @@ public void popMatrix() {
/**
- * Translate in X and Y.
+ * ( begin auto-generated from translate.xml )
+ *
+ * Specifies an amount to displace objects within the display window. The
+ * x parameter specifies left/right translation, the y
+ * parameter specifies up/down translation, and the z parameter
+ * specifies translations toward/away from the screen. Using this function
+ * with the z parameter requires using P3D as a parameter in
+ * combination with size as shown in the above example. Transformations
+ * apply to everything that happens after and subsequent calls to the
+ * function accumulates the effect. For example, calling translate(50,
+ * 0) and then translate(20, 0) is the same as translate(70,
+ * 0) . If translate() is called within draw() , the
+ * transformation is reset when the loop begins again. This function can be
+ * further controlled by the pushMatrix() and popMatrix() .
+ *
+ * ( end auto-generated )
+ *
+ * @webref transform
+ * @param x left/right translation
+ * @param y up/down translation
+ * @see PGraphics#popMatrix()
+ * @see PGraphics#pushMatrix()
+ * @see PGraphics#rotate(float)
+ * @see PGraphics#rotateX(float)
+ * @see PGraphics#rotateY(float)
+ * @see PGraphics#rotateZ(float)
+ * @see PGraphics#scale(float, float, float)
*/
- public void translate(float tx, float ty) {
- g.translate(tx, ty);
+ public void translate(float x, float y) {
+ g.translate(x, y);
}
/**
- * Translate in X, Y, and Z.
+ * @param z forward/backward translation
*/
- public void translate(float tx, float ty, float tz) {
- g.translate(tx, ty, tz);
+ public void translate(float x, float y, float z) {
+ g.translate(x, y, z);
}
/**
- * Two dimensional rotation.
+ * ( begin auto-generated from rotate.xml )
*
- * Same as rotateZ (this is identical to a 3D rotation along the z-axis)
- * but included for clarity. It'd be weird for people drawing 2D graphics
- * to be using rotateZ. And they might kick our a-- for the confusion.
+ * Rotates a shape the amount specified by the angle parameter.
+ * Angles should be specified in radians (values from 0 to TWO_PI) or
+ * converted to radians with the radians() function.
+ * rotate(HALF_PI) and then rotate(HALF_PI) is the same as
+ * rotate(PI) . All tranformations are reset when draw()
+ * begins again.
+ * rotate() multiplies the current transformation
+ * matrix by a rotation matrix. This function can be further controlled by
+ * the pushMatrix() and popMatrix() .
+ *
+ * ( end auto-generated )
*
- * Additional background .
+ * @webref transform
+ * @param angle angle of rotation specified in radians
+ * @see PGraphics#popMatrix()
+ * @see PGraphics#pushMatrix()
+ * @see PGraphics#rotateX(float)
+ * @see PGraphics#rotateY(float)
+ * @see PGraphics#rotateZ(float)
+ * @see PGraphics#scale(float, float, float)
+ * @see PApplet#radians(float)
*/
public void rotate(float angle) {
g.rotate(angle);
@@ -9017,7 +10327,32 @@ public void rotate(float angle) {
/**
- * Rotate around the X axis.
+ * ( begin auto-generated from rotateX.xml )
+ *
+ * Rotates a shape around the x-axis the amount specified by the
+ * angle parameter. Angles should be specified in radians (values
+ * from 0 to PI*2) or converted to radians with the radians()
+ * function. Objects are always rotated around their relative position to
+ * the origin and positive numbers rotate objects in a counterclockwise
+ * direction. Transformations apply to everything that happens after and
+ * subsequent calls to the function accumulates the effect. For example,
+ * calling rotateX(PI/2) and then rotateX(PI/2) is the same
+ * as rotateX(PI) . If rotateX() is called within the
+ * draw() , the transformation is reset when the loop begins again.
+ * This function requires using P3D as a third parameter to size()
+ * as shown in the example above.
+ *
+ * ( end auto-generated )
+ *
+ * @webref transform
+ * @param angle angle of rotation specified in radians
+ * @see PGraphics#popMatrix()
+ * @see PGraphics#pushMatrix()
+ * @see PGraphics#rotate(float)
+ * @see PGraphics#rotateY(float)
+ * @see PGraphics#rotateZ(float)
+ * @see PGraphics#scale(float, float, float)
+ * @see PGraphics#translate(float, float, float)
*/
public void rotateX(float angle) {
g.rotateX(angle);
@@ -9025,7 +10360,32 @@ public void rotateX(float angle) {
/**
- * Rotate around the Y axis.
+ * ( begin auto-generated from rotateY.xml )
+ *
+ * Rotates a shape around the y-axis the amount specified by the
+ * angle parameter. Angles should be specified in radians (values
+ * from 0 to PI*2) or converted to radians with the radians()
+ * function. Objects are always rotated around their relative position to
+ * the origin and positive numbers rotate objects in a counterclockwise
+ * direction. Transformations apply to everything that happens after and
+ * subsequent calls to the function accumulates the effect. For example,
+ * calling rotateY(PI/2) and then rotateY(PI/2) is the same
+ * as rotateY(PI) . If rotateY() is called within the
+ * draw() , the transformation is reset when the loop begins again.
+ * This function requires using P3D as a third parameter to size()
+ * as shown in the examples above.
+ *
+ * ( end auto-generated )
+ *
+ * @webref transform
+ * @param angle angle of rotation specified in radians
+ * @see PGraphics#popMatrix()
+ * @see PGraphics#pushMatrix()
+ * @see PGraphics#rotate(float)
+ * @see PGraphics#rotateX(float)
+ * @see PGraphics#rotateZ(float)
+ * @see PGraphics#scale(float, float, float)
+ * @see PGraphics#translate(float, float, float)
*/
public void rotateY(float angle) {
g.rotateY(angle);
@@ -9033,12 +10393,32 @@ public void rotateY(float angle) {
/**
- * Rotate around the Z axis.
+ * ( begin auto-generated from rotateZ.xml )
*
- * The functions rotate() and rotateZ() are identical, it's just that it make
- * sense to have rotate() and then rotateX() and rotateY() when using 3D;
- * nor does it make sense to use a function called rotateZ() if you're only
- * doing things in 2D. so we just decided to have them both be the same.
+ * Rotates a shape around the z-axis the amount specified by the
+ * angle parameter. Angles should be specified in radians (values
+ * from 0 to PI*2) or converted to radians with the radians()
+ * function. Objects are always rotated around their relative position to
+ * the origin and positive numbers rotate objects in a counterclockwise
+ * direction. Transformations apply to everything that happens after and
+ * subsequent calls to the function accumulates the effect. For example,
+ * calling rotateZ(PI/2) and then rotateZ(PI/2) is the same
+ * as rotateZ(PI) . If rotateZ() is called within the
+ * draw() , the transformation is reset when the loop begins again.
+ * This function requires using P3D as a third parameter to size()
+ * as shown in the examples above.
+ *
+ * ( end auto-generated )
+ *
+ * @webref transform
+ * @param angle angle of rotation specified in radians
+ * @see PGraphics#popMatrix()
+ * @see PGraphics#pushMatrix()
+ * @see PGraphics#rotate(float)
+ * @see PGraphics#rotateX(float)
+ * @see PGraphics#rotateY(float)
+ * @see PGraphics#scale(float, float, float)
+ * @see PGraphics#translate(float, float, float)
*/
public void rotateZ(float angle) {
g.rotateZ(angle);
@@ -9046,15 +10426,45 @@ public void rotateZ(float angle) {
/**
+ * Advanced
* Rotate about a vector in space. Same as the glRotatef() function.
+ * @nowebref
+ * @param x
+ * @param y
+ * @param z
*/
- public void rotate(float angle, float vx, float vy, float vz) {
- g.rotate(angle, vx, vy, vz);
+ public void rotate(float angle, float x, float y, float z) {
+ g.rotate(angle, x, y, z);
}
/**
- * Scale in all dimensions.
+ * ( begin auto-generated from scale.xml )
+ *
+ * Increases or decreases the size of a shape by expanding and contracting
+ * vertices. Objects always scale from their relative origin to the
+ * coordinate system. Scale values are specified as decimal percentages.
+ * For example, the function call scale(2.0) increases the dimension
+ * of a shape by 200%. Transformations apply to everything that happens
+ * after and subsequent calls to the function multiply the effect. For
+ * example, calling scale(2.0) and then scale(1.5) is the
+ * same as scale(3.0) . If scale() is called within
+ * draw() , the transformation is reset when the loop begins again.
+ * Using this fuction with the z parameter requires using P3D as a
+ * parameter for size() as shown in the example above. This function
+ * can be further controlled by pushMatrix() and popMatrix() .
+ *
+ * ( end auto-generated )
+ *
+ * @webref transform
+ * @param s percentage to scale the object
+ * @see PGraphics#pushMatrix()
+ * @see PGraphics#popMatrix()
+ * @see PGraphics#translate(float, float, float)
+ * @see PGraphics#rotate(float)
+ * @see PGraphics#rotateX(float)
+ * @see PGraphics#rotateY(float)
+ * @see PGraphics#rotateZ(float)
*/
public void scale(float s) {
g.scale(s);
@@ -9062,18 +10472,22 @@ public void scale(float s) {
/**
+ * Advanced
* Scale in X and Y. Equivalent to scale(sx, sy, 1).
*
* Not recommended for use in 3D, because the z-dimension is just
* scaled by 1, since there's no way to know what else to scale it by.
+ *
+ * @param x percentage to scale the object in the x-axis
+ * @param y percentage to scale the object in the y-axis
*/
- public void scale(float sx, float sy) {
- g.scale(sx, sy);
+ public void scale(float x, float y) {
+ g.scale(x, y);
}
/**
- * Scale in X, Y, and Z.
+ * @param z percentage to scale the object in the z-axis
*/
public void scale(float x, float y, float z) {
g.scale(x, y, z);
@@ -9081,7 +10495,33 @@ public void scale(float x, float y, float z) {
/**
- * Shear along X axis
+ * ( begin auto-generated from shearX.xml )
+ *
+ * Shears a shape around the x-axis the amount specified by the
+ * angle parameter. Angles should be specified in radians (values
+ * from 0 to PI*2) or converted to radians with the radians()
+ * function. Objects are always sheared around their relative position to
+ * the origin and positive numbers shear objects in a clockwise direction.
+ * Transformations apply to everything that happens after and subsequent
+ * calls to the function accumulates the effect. For example, calling
+ * shearX(PI/2) and then shearX(PI/2) is the same as
+ * shearX(PI) . If shearX() is called within the
+ * draw() , the transformation is reset when the loop begins again.
+ * shearX() multiplies the current transformation
+ * matrix by a rotation matrix. This function can be further controlled by
+ * the pushMatrix() and popMatrix() functions.
+ *
+ * ( end auto-generated )
+ *
+ * @webref transform
+ * @param angle angle of shear specified in radians
+ * @see PGraphics#popMatrix()
+ * @see PGraphics#pushMatrix()
+ * @see PGraphics#shearY(float)
+ * @see PGraphics#scale(float, float, float)
+ * @see PGraphics#translate(float, float, float)
+ * @see PApplet#radians(float)
*/
public void shearX(float angle) {
g.shearX(angle);
@@ -9089,7 +10529,33 @@ public void shearX(float angle) {
/**
- * Skew along Y axis
+ * ( begin auto-generated from shearY.xml )
+ *
+ * Shears a shape around the y-axis the amount specified by the
+ * angle parameter. Angles should be specified in radians (values
+ * from 0 to PI*2) or converted to radians with the radians()
+ * function. Objects are always sheared around their relative position to
+ * the origin and positive numbers shear objects in a clockwise direction.
+ * Transformations apply to everything that happens after and subsequent
+ * calls to the function accumulates the effect. For example, calling
+ * shearY(PI/2) and then shearY(PI/2) is the same as
+ * shearY(PI) . If shearY() is called within the
+ * draw() , the transformation is reset when the loop begins again.
+ * shearY() multiplies the current transformation
+ * matrix by a rotation matrix. This function can be further controlled by
+ * the pushMatrix() and popMatrix() functions.
+ *
+ * ( end auto-generated )
+ *
+ * @webref transform
+ * @param angle angle of shear specified in radians
+ * @see PGraphics#popMatrix()
+ * @see PGraphics#pushMatrix()
+ * @see PGraphics#shearX(float)
+ * @see PGraphics#scale(float, float, float)
+ * @see PGraphics#translate(float, float, float)
+ * @see PApplet#radians(float)
*/
public void shearY(float angle) {
g.shearY(angle);
@@ -9097,13 +10563,41 @@ public void shearY(float angle) {
/**
- * Set the current transformation matrix to identity.
+ * ( begin auto-generated from resetMatrix.xml )
+ *
+ * Replaces the current matrix with the identity matrix. The equivalent
+ * function in OpenGL is glLoadIdentity().
+ *
+ * ( end auto-generated )
+ *
+ * @webref transform
+ * @see PGraphics#pushMatrix()
+ * @see PGraphics#popMatrix()
+ * @see PGraphics#applyMatrix(PMatrix)
+ * @see PGraphics#printMatrix()
*/
public void resetMatrix() {
g.resetMatrix();
}
+ /**
+ * ( begin auto-generated from applyMatrix.xml )
+ *
+ * Multiplies the current matrix by the one specified through the
+ * parameters. This is very slow because it will try to calculate the
+ * inverse of the transform, so avoid it whenever possible. The equivalent
+ * function in OpenGL is glMultMatrix().
+ *
+ * ( end auto-generated )
+ *
+ * @webref transform
+ * @source
+ * @see PGraphics#pushMatrix()
+ * @see PGraphics#popMatrix()
+ * @see PGraphics#resetMatrix()
+ * @see PGraphics#printMatrix()
+ */
public void applyMatrix(PMatrix source) {
g.applyMatrix(source);
}
@@ -9115,7 +10609,12 @@ public void applyMatrix(PMatrix2D source) {
/**
- * Apply a 3x2 affine transformation matrix.
+ * @param n00 numbers which define the 4x4 matrix to be multiplied
+ * @param n01 numbers which define the 4x4 matrix to be multiplied
+ * @param n02 numbers which define the 4x4 matrix to be multiplied
+ * @param n10 numbers which define the 4x4 matrix to be multiplied
+ * @param n11 numbers which define the 4x4 matrix to be multiplied
+ * @param n12 numbers which define the 4x4 matrix to be multiplied
*/
public void applyMatrix(float n00, float n01, float n02,
float n10, float n11, float n12) {
@@ -9129,7 +10628,16 @@ public void applyMatrix(PMatrix3D source) {
/**
- * Apply a 4x4 transformation matrix.
+ * @param n03 numbers which define the 4x4 matrix to be multiplied
+ * @param n13 numbers which define the 4x4 matrix to be multiplied
+ * @param n20 numbers which define the 4x4 matrix to be multiplied
+ * @param n21 numbers which define the 4x4 matrix to be multiplied
+ * @param n22 numbers which define the 4x4 matrix to be multiplied
+ * @param n23 numbers which define the 4x4 matrix to be multiplied
+ * @param n30 numbers which define the 4x4 matrix to be multiplied
+ * @param n31 numbers which define the 4x4 matrix to be multiplied
+ * @param n32 numbers which define the 4x4 matrix to be multiplied
+ * @param n33 numbers which define the 4x4 matrix to be multiplied
*/
public void applyMatrix(float n00, float n01, float n02, float n03,
float n10, float n11, float n12, float n13,
@@ -9162,42 +10670,6 @@ public PMatrix3D getMatrix(PMatrix3D target) {
}
- /**
- * Returns a copy of the current object matrix.
- * Pass in null to create a new matrix.
- */
- public PMatrix3D getObjectMatrix() {
- return g.getObjectMatrix();
- }
-
-
- /**
- * Copy the current object matrix into the specified target.
- * Pass in null to create a new matrix.
- */
- public PMatrix3D getObjectMatrix(PMatrix3D target) {
- return g.getObjectMatrix(target);
- }
-
-
- /**
- * Returns a copy of the current eye matrix.
- * Pass in null to create a new matrix.
- */
- public PMatrix3D getEyeMatrix() {
- return g.getEyeMatrix();
- }
-
-
- /**
- * Copy the current eye matrix into the specified target.
- * Pass in null to create a new matrix.
- */
- public PMatrix3D getEyeMatrix(PMatrix3D target) {
- return g.getEyeMatrix(target);
- }
-
-
/**
* Set the current transformation matrix to the contents of another.
*/
@@ -9223,33 +10695,113 @@ public void setMatrix(PMatrix3D source) {
/**
- * Print the current model (or "transformation") matrix.
+ * ( begin auto-generated from printMatrix.xml )
+ *
+ * Prints the current matrix to the Console (the text window at the bottom
+ * of Processing).
+ *
+ * ( end auto-generated )
+ *
+ * @webref transform
+ * @see PGraphics#pushMatrix()
+ * @see PGraphics#popMatrix()
+ * @see PGraphics#resetMatrix()
+ * @see PGraphics#applyMatrix(PMatrix)
*/
public void printMatrix() {
g.printMatrix();
}
- public void cameraUp() {
- g.cameraUp();
- }
-
-
+ /**
+ * ( begin auto-generated from beginCamera.xml )
+ *
+ * The beginCamera() and endCamera() functions enable
+ * advanced customization of the camera space. The functions are useful if
+ * you want to more control over camera movement, however for most users,
+ * the camera() function will be sufficient.rotate() or
+ * translate() ) that occur before them in draw() , but they
+ * will not automatically replace the camera transform itself. For this
+ * reason, camera functions should be placed at the beginning of
+ * draw() (so that transformations happen afterwards), and the
+ * camera() function can be used after beginCamera() if you
+ * want to reset the camera before applying transformations.translate() , rotate() , applyMatrix() and resetMatrix()
+ * affect the camera. beginCamera() should always be used with a
+ * following endCamera() and pairs of beginCamera() and
+ * endCamera() cannot be nested.
+ *
+ * ( end auto-generated )
+ *
+ * @webref lights_camera:camera
+ * @see PGraphics#camera()
+ * @see PGraphics#endCamera()
+ * @see PGraphics#applyMatrix(PMatrix)
+ * @see PGraphics#resetMatrix()
+ * @see PGraphics#translate(float, float, float)
+ * @see PGraphics#scale(float, float, float)
+ */
public void beginCamera() {
g.beginCamera();
}
+ /**
+ * ( begin auto-generated from endCamera.xml )
+ *
+ * The beginCamera() and endCamera() functions enable
+ * advanced customization of the camera space. Please see the reference for
+ * beginCamera() for a description of how the functions are used.
+ *
+ * ( end auto-generated )
+ *
+ * @webref lights_camera:camera
+ * @see PGraphics#beginCamera()
+ * @see PGraphics#camera(float, float, float, float, float, float, float, float, float)
+ */
public void endCamera() {
g.endCamera();
}
+ /**
+ * ( begin auto-generated from camera.xml )
+ *
+ * Sets the position of the camera through setting the eye position, the
+ * center of the scene, and which axis is facing upward. Moving the eye
+ * position and the direction it is pointing (the center of the scene)
+ * allows the images to be seen from different angles. The version without
+ * any parameters sets the camera to the default position, pointing to the
+ * center of the display window with the Y axis as up. The default values
+ * are camera(width/2.0, height/2.0, (height/2.0) / tan(PI*30.0 /
+ * 180.0), width/2.0, height/2.0, 0, 0, 1, 0) . This function is similar
+ * to gluLookAt() in OpenGL, but it first clears the current camera settings.
+ *
+ * ( end auto-generated )
+ *
+ * @webref lights_camera:camera
+ * @see PGraphics#beginCamera()
+ * @see PGraphics#endCamera()
+ * @see PGraphics#frustum(float, float, float, float, float, float)
+ */
public void camera() {
g.camera();
}
+ /**
+ * @param eyeX x-coordinate for the eye
+ * @param eyeY y-coordinate for the eye
+ * @param eyeZ z-coordinate for the eye
+ * @param centerX x-coordinate for the center of the scene
+ * @param centerY y-coordinate for the center of the scene
+ * @param centerZ z-coordinate for the center of the scene
+ * @param upX usually 0.0, 1.0, or -1.0
+ * @param upY usually 0.0, 1.0, or -1.0
+ * @param upZ usually 0.0, 1.0, or -1.0
+ */
public void camera(float eyeX, float eyeY, float eyeZ,
float centerX, float centerY, float centerZ,
float upX, float upY, float upZ) {
@@ -9257,27 +10809,58 @@ public void camera(float eyeX, float eyeY, float eyeZ,
}
+ /**
+ * ( begin auto-generated from printCamera.xml )
+ *
+ * Prints the current camera matrix to the Console (the text window at the
+ * bottom of Processing).
+ *
+ * ( end auto-generated )
+ * @webref lights_camera:camera
+ * @see PGraphics#camera(float, float, float, float, float, float, float, float, float)
+ */
public void printCamera() {
g.printCamera();
}
- public void eye() {
- g.eye();
- }
-
-
+ /**
+ * ( begin auto-generated from ortho.xml )
+ *
+ * Sets an orthographic projection and defines a parallel clipping volume.
+ * All objects with the same dimension appear the same size, regardless of
+ * whether they are near or far from the camera. The parameters to this
+ * function specify the clipping volume where left and right are the
+ * minimum and maximum x values, top and bottom are the minimum and maximum
+ * y values, and near and far are the minimum and maximum z values. If no
+ * parameters are given, the default is used: ortho(0, width, 0, height,
+ * -10, 10).
+ *
+ * ( end auto-generated )
+ *
+ * @webref lights_camera:camera
+ */
public void ortho() {
g.ortho();
}
+ /**
+ * @param left left plane of the clipping volume
+ * @param right right plane of the clipping volume
+ * @param bottom bottom plane of the clipping volume
+ * @param top top plane of the clipping volume
+ */
public void ortho(float left, float right,
float bottom, float top) {
g.ortho(left, right, bottom, top);
}
+ /**
+ * @param near maximum distance from the origin to the viewer
+ * @param far maximum distance from the origin away from the viewer
+ */
public void ortho(float left, float right,
float bottom, float top,
float near, float far) {
@@ -9285,16 +10868,61 @@ public void ortho(float left, float right,
}
+ /**
+ * ( begin auto-generated from perspective.xml )
+ *
+ * Sets a perspective projection applying foreshortening, making distant
+ * objects appear smaller than closer ones. The parameters define a viewing
+ * volume with the shape of truncated pyramid. Objects near to the front of
+ * the volume appear their actual size, while farther objects appear
+ * smaller. This projection simulates the perspective of the world more
+ * accurately than orthographic projection. The version of perspective
+ * without parameters sets the default perspective and the version with
+ * four parameters allows the programmer to set the area precisely. The
+ * default values are: perspective(PI/3.0, width/height, cameraZ/10.0,
+ * cameraZ*10.0) where cameraZ is ((height/2.0) / tan(PI*60.0/360.0));
+ *
+ * ( end auto-generated )
+ *
+ * @webref lights_camera:camera
+ */
public void perspective() {
g.perspective();
}
+ /**
+ * @param fovy field-of-view angle (in radians) for vertical direction
+ * @param aspect ratio of width to height
+ * @param zNear z-position of nearest clipping plane
+ * @param zFar z-position of farthest clipping plane
+ */
public void perspective(float fovy, float aspect, float zNear, float zFar) {
g.perspective(fovy, aspect, zNear, zFar);
}
+ /**
+ * ( begin auto-generated from frustum.xml )
+ *
+ * Sets a perspective matrix defined through the parameters. Works like
+ * glFrustum, except it wipes out the current perspective matrix rather
+ * than muliplying itself with it.
+ *
+ * ( end auto-generated )
+ *
+ * @webref lights_camera:camera
+ * @param left left coordinate of the clipping plane
+ * @param right right coordinate of the clipping plane
+ * @param bottom bottom coordinate of the clipping plane
+ * @param top top coordinate of the clipping plane
+ * @param near near component of the clipping plane; must be greater than zero
+ * @param far far component of the clipping plane; must be greater than the near value
+ * @see PGraphics#camera(float, float, float, float, float, float, float, float, float)
+ * @see PGraphics#beginCamera()
+ * @see PGraphics#endCamera()
+ * @see PGraphics#perspective(float, float, float, float)
+ */
public void frustum(float left, float right,
float bottom, float top,
float near, float far) {
@@ -9302,15 +10930,35 @@ public void frustum(float left, float right,
}
+ /**
+ * ( begin auto-generated from printProjection.xml )
+ *
+ * Prints the current projection matrix to the Console (the text window at
+ * the bottom of Processing).
+ *
+ * ( end auto-generated )
+ *
+ * @webref lights_camera:camera
+ * @see PGraphics#camera(float, float, float, float, float, float, float, float, float)
+ */
public void printProjection() {
g.printProjection();
}
/**
- * Given an x and y coordinate, returns the x position of where
- * that point would be placed on screen, once affected by translate(),
- * scale(), or any other transformations.
+ * ( begin auto-generated from screenX.xml )
+ *
+ * Takes a three-dimensional X, Y, Z position and returns the X value for
+ * where it will appear on a (two-dimensional) screen.
+ *
+ * ( end auto-generated )
+ *
+ * @webref lights_camera:coordinates
+ * @param x 3D x-coordinate to be mapped
+ * @param y 3D y-coordinate to be mapped
+ * @see PGraphics#screenY(float, float, float)
+ * @see PGraphics#screenZ(float, float, float)
*/
public float screenX(float x, float y) {
return g.screenX(x, y);
@@ -9318,9 +10966,18 @@ public float screenX(float x, float y) {
/**
- * Given an x and y coordinate, returns the y position of where
- * that point would be placed on screen, once affected by translate(),
- * scale(), or any other transformations.
+ * ( begin auto-generated from screenY.xml )
+ *
+ * Takes a three-dimensional X, Y, Z position and returns the Y value for
+ * where it will appear on a (two-dimensional) screen.
+ *
+ * ( end auto-generated )
+ *
+ * @webref lights_camera:coordinates
+ * @param x 3D x-coordinate to be mapped
+ * @param y 3D y-coordinate to be mapped
+ * @see PGraphics#screenX(float, float, float)
+ * @see PGraphics#screenZ(float, float, float)
*/
public float screenY(float x, float y) {
return g.screenY(x, y);
@@ -9328,11 +10985,7 @@ public float screenY(float x, float y) {
/**
- * Maps a three dimensional point to its placement on-screen.
- *
- * Given an (x, y, z) coordinate, returns the x position of where
- * that point would be placed on screen, once affected by translate(),
- * scale(), or any other transformations.
+ * @param z 3D z-coordinate to be mapped
*/
public float screenX(float x, float y, float z) {
return g.screenX(x, y, z);
@@ -9340,11 +10993,7 @@ public float screenX(float x, float y, float z) {
/**
- * Maps a three dimensional point to its placement on-screen.
- *
- * Given an (x, y, z) coordinate, returns the y position of where
- * that point would be placed on screen, once affected by translate(),
- * scale(), or any other transformations.
+ * @param z 3D z-coordinate to be mapped
*/
public float screenY(float x, float y, float z) {
return g.screenY(x, y, z);
@@ -9352,15 +11001,19 @@ public float screenY(float x, float y, float z) {
/**
- * Maps a three dimensional point to its placement on-screen.
- *
- * Given an (x, y, z) coordinate, returns its z value.
- * This value can be used to determine if an (x, y, z) coordinate
- * is in front or in back of another (x, y, z) coordinate.
- * The units are based on how the zbuffer is set up, and don't
- * relate to anything "real". They're only useful for in
- * comparison to another value obtained from screenZ(),
- * or directly out of the zbuffer[].
+ * ( begin auto-generated from screenZ.xml )
+ *
+ * Takes a three-dimensional X, Y, Z position and returns the Z value for
+ * where it will appear on a (two-dimensional) screen.
+ *
+ * ( end auto-generated )
+ *
+ * @webref lights_camera:coordinates
+ * @param x 3D x-coordinate to be mapped
+ * @param y 3D y-coordinate to be mapped
+ * @param z 3D z-coordinate to be mapped
+ * @see PGraphics#screenX(float, float, float)
+ * @see PGraphics#screenY(float, float, float)
*/
public float screenZ(float x, float y, float z) {
return g.screenZ(x, y, z);
@@ -9368,13 +11021,29 @@ public float screenZ(float x, float y, float z) {
/**
- * Returns the model space x value for an x, y, z coordinate.
- *
- * This will give you a coordinate after it has been transformed
- * by translate(), rotate(), and camera(), but not yet transformed
- * by the projection matrix. For instance, his can be useful for
- * figuring out how points in 3D space relate to the edge
- * coordinates of a shape.
+ * ( begin auto-generated from modelX.xml )
+ *
+ * Returns the three-dimensional X, Y, Z position in model space. This
+ * returns the X value for a given coordinate based on the current set of
+ * transformations (scale, rotate, translate, etc.) The X value can be used
+ * to place an object in space relative to the location of the original
+ * point once the transformations are no longer in use.
+ * modelX() , modelY() , and
+ * modelZ() functions record the location of a box in space after
+ * being placed using a series of translate and rotate commands. After
+ * popMatrix() is called, those transformations no longer apply, but the
+ * (x, y, z) coordinate returned by the model functions is used to place
+ * another box in the same location.
+ *
+ * ( end auto-generated )
+ *
+ * @webref lights_camera:coordinates
+ * @param x 3D x-coordinate to be mapped
+ * @param y 3D y-coordinate to be mapped
+ * @param z 3D z-coordinate to be mapped
+ * @see PGraphics#modelY(float, float, float)
+ * @see PGraphics#modelZ(float, float, float)
*/
public float modelX(float x, float y, float z) {
return g.modelX(x, y, z);
@@ -9382,7 +11051,29 @@ public float modelX(float x, float y, float z) {
/**
- * Returns the model space y value for an x, y, z coordinate.
+ * ( begin auto-generated from modelY.xml )
+ *
+ * Returns the three-dimensional X, Y, Z position in model space. This
+ * returns the Y value for a given coordinate based on the current set of
+ * transformations (scale, rotate, translate, etc.) The Y value can be used
+ * to place an object in space relative to the location of the original
+ * point once the transformations are no longer in use.modelX() , modelY() , and
+ * modelZ() functions record the location of a box in space after
+ * being placed using a series of translate and rotate commands. After
+ * popMatrix() is called, those transformations no longer apply, but the
+ * (x, y, z) coordinate returned by the model functions is used to place
+ * another box in the same location.
+ *
+ * ( end auto-generated )
+ *
+ * @webref lights_camera:coordinates
+ * @param x 3D x-coordinate to be mapped
+ * @param y 3D y-coordinate to be mapped
+ * @param z 3D z-coordinate to be mapped
+ * @see PGraphics#modelX(float, float, float)
+ * @see PGraphics#modelZ(float, float, float)
*/
public float modelY(float x, float y, float z) {
return g.modelY(x, y, z);
@@ -9390,18 +11081,79 @@ public float modelY(float x, float y, float z) {
/**
- * Returns the model space z value for an x, y, z coordinate.
+ * ( begin auto-generated from modelZ.xml )
+ *
+ * Returns the three-dimensional X, Y, Z position in model space. This
+ * returns the Z value for a given coordinate based on the current set of
+ * transformations (scale, rotate, translate, etc.) The Z value can be used
+ * to place an object in space relative to the location of the original
+ * point once the transformations are no longer in use.modelX() , modelY() , and
+ * modelZ() functions record the location of a box in space after
+ * being placed using a series of translate and rotate commands. After
+ * popMatrix() is called, those transformations no longer apply, but the
+ * (x, y, z) coordinate returned by the model functions is used to place
+ * another box in the same location.
+ *
+ * ( end auto-generated )
+ *
+ * @webref lights_camera:coordinates
+ * @param x 3D x-coordinate to be mapped
+ * @param y 3D y-coordinate to be mapped
+ * @param z 3D z-coordinate to be mapped
+ * @see PGraphics#modelX(float, float, float)
+ * @see PGraphics#modelY(float, float, float)
*/
public float modelZ(float x, float y, float z) {
return g.modelZ(x, y, z);
}
+ /**
+ * ( begin auto-generated from pushStyle.xml )
+ *
+ * The pushStyle() function saves the current style settings and
+ * popStyle() restores the prior settings. Note that these functions
+ * are always used together. They allow you to change the style settings
+ * and later return to what you had. When a new style is started with
+ * pushStyle() , it builds on the current style information. The
+ * pushStyle() and popStyle() functions can be embedded to
+ * provide more control (see the second example above for a demonstration.)
+ * pushStyle() function saves the current style settings and
+ * popStyle() restores the prior settings; these functions are
+ * always used together. They allow you to change the style settings and
+ * later return to what you had. When a new style is started with
+ * pushStyle() , it builds on the current style information. The
+ * pushStyle() and popStyle() functions can be embedded to
+ * provide more control (see the second example above for a demonstration.)
+ *
+ * ( end auto-generated )
+ *
+ * @webref structure
+ * @see PGraphics#pushStyle()
+ */
public void popStyle() {
g.popStyle();
}
@@ -9412,40 +11164,153 @@ public void style(PStyle s) {
}
+ /**
+ * ( begin auto-generated from strokeWeight.xml )
+ *
+ * Sets the width of the stroke used for lines, points, and the border
+ * around shapes. All widths are set in units of pixels.
+ * see
+ * Issue 123 ). With P3D, the minimum and maximum values for
+ * strokeWeight() are controlled by the graphics card and the
+ * operating system's OpenGL implementation. For instance, the thickness
+ * may not go higher than 10 pixels.
+ *
+ * ( end auto-generated )
+ *
+ * @webref shape:attributes
+ * @param weight the weight (in pixels) of the stroke
+ * @see PGraphics#stroke(int, float)
+ * @see PGraphics#strokeJoin(int)
+ * @see PGraphics#strokeCap(int)
+ */
public void strokeWeight(float weight) {
g.strokeWeight(weight);
}
+ /**
+ * ( begin auto-generated from strokeJoin.xml )
+ *
+ * Sets the style of the joints which connect line segments. These joints
+ * are either mitered, beveled, or rounded and specified with the
+ * corresponding parameters MITER, BEVEL, and ROUND. The default joint is
+ * MITER.
+ * see
+ * Issue 123 ). More information about the renderers can be found in the
+ * size() reference.
+ *
+ * ( end auto-generated )
+ *
+ * @webref shape:attributes
+ * @param join either MITER, BEVEL, ROUND
+ * @see PGraphics#stroke(int, float)
+ * @see PGraphics#strokeWeight(float)
+ * @see PGraphics#strokeCap(int)
+ */
public void strokeJoin(int join) {
g.strokeJoin(join);
}
+ /**
+ * ( begin auto-generated from strokeCap.xml )
+ *
+ * Sets the style for rendering line endings. These ends are either
+ * squared, extended, or rounded and specified with the corresponding
+ * parameters SQUARE, PROJECT, and ROUND. The default cap is ROUND.
+ * see
+ * Issue 123 ). More information about the renderers can be found in the
+ * size() reference.
+ *
+ * ( end auto-generated )
+ *
+ * @webref shape:attributes
+ * @param cap either SQUARE, PROJECT, or ROUND
+ * @see PGraphics#stroke(int, float)
+ * @see PGraphics#strokeWeight(float)
+ * @see PGraphics#strokeJoin(int)
+ * @see PApplet#size(int, int, String, String)
+ */
public void strokeCap(int cap) {
g.strokeCap(cap);
}
+ /**
+ * ( begin auto-generated from noStroke.xml )
+ *
+ * Disables drawing the stroke (outline). If both noStroke() and
+ * noFill() are called, nothing will be drawn to the screen.
+ *
+ * ( end auto-generated )
+ *
+ * @webref color:setting
+ * @see PGraphics#stroke(int, float)
+ * @see PGraphics#fill(float, float, float, float)
+ * @see PGraphics#noFill()
+ */
public void noStroke() {
g.noStroke();
}
/**
- * Set the tint to either a grayscale or ARGB value.
- * See notes attached to the fill() function.
+ * ( begin auto-generated from stroke.xml )
+ *
+ * Sets the color used to draw lines and borders around shapes. This color
+ * is either specified in terms of the RGB or HSB color depending on the
+ * current colorMode() (the default color space is RGB, with each
+ * value in the range from 0 to 255).
+ * colorMode() . The default
+ * maximum value is 255.
+ *
+ * ( end auto-generated )
+ *
+ * @param rgb color value in hexadecimal notation
+ * @see PGraphics#noStroke()
+ * @see PGraphics#strokeWeight(float)
+ * @see PGraphics#strokeJoin(int)
+ * @see PGraphics#strokeCap(int)
+ * @see PGraphics#fill(int, float)
+ * @see PGraphics#noFill()
+ * @see PGraphics#tint(int, float)
+ * @see PGraphics#background(float, float, float, float)
+ * @see PGraphics#colorMode(int, float, float, float, float)
*/
public void stroke(int rgb) {
g.stroke(rgb);
}
+ /**
+ * @param alpha opacity of the stroke
+ */
public void stroke(int rgb, float alpha) {
g.stroke(rgb, alpha);
}
+ /**
+ * @param gray specifies a value between white and black
+ */
public void stroke(float gray) {
g.stroke(gray);
}
@@ -9456,34 +11321,90 @@ public void stroke(float gray, float alpha) {
}
- public void stroke(float x, float y, float z) {
- g.stroke(x, y, z);
+ /**
+ * @param v1 red or hue value (depending on current color mode)
+ * @param v2 green or saturation value (depending on current color mode)
+ * @param v3 blue or brightness value (depending on current color mode)
+ * @webref color:setting
+ */
+ public void stroke(float v1, float v2, float v3) {
+ g.stroke(v1, v2, v3);
}
- public void stroke(float x, float y, float z, float a) {
- g.stroke(x, y, z, a);
+ public void stroke(float v1, float v2, float v3, float alpha) {
+ g.stroke(v1, v2, v3, alpha);
}
+ /**
+ * ( begin auto-generated from noTint.xml )
+ *
+ * Removes the current fill value for displaying images and reverts to
+ * displaying images with their original hues.
+ *
+ * ( end auto-generated )
+ *
+ * @webref image:loading_displaying
+ * @usage web_application
+ * @see PGraphics#tint(float, float, float, float)
+ * @see PGraphics#image(PImage, float, float, float, float)
+ */
public void noTint() {
g.noTint();
}
/**
- * Set the tint to either a grayscale or ARGB value.
+ * ( begin auto-generated from tint.xml )
+ *
+ * Sets the fill value for displaying images. Images can be tinted to
+ * specified colors or made transparent by setting the alpha.colorMode() has been
+ * used).colorMode() . The default
+ * maximum value is 255.tint() function is also used to control the coloring of
+ * textures in 3D.
+ *
+ * ( end auto-generated )
+ *
+ * @webref image:loading_displaying
+ * @usage web_application
+ * @param rgb color value in hexadecimal notation
+ * @see PGraphics#noTint()
+ * @see PGraphics#image(PImage, float, float, float, float)
*/
public void tint(int rgb) {
g.tint(rgb);
}
+ /**
+ * @param alpha opacity of the image
+ */
public void tint(int rgb, float alpha) {
g.tint(rgb, alpha);
}
+ /**
+ * @param gray specifies a value between white and black
+ */
public void tint(float gray) {
g.tint(gray);
}
@@ -9494,34 +11415,91 @@ public void tint(float gray, float alpha) {
}
- public void tint(float x, float y, float z) {
- g.tint(x, y, z);
+ /**
+ * @param v1 red or hue value (depending on current color mode)
+ * @param v2 green or saturation value (depending on current color mode)
+ * @param v3 blue or brightness value (depending on current color mode)
+ */
+ public void tint(float v1, float v2, float v3) {
+ g.tint(v1, v2, v3);
}
- public void tint(float x, float y, float z, float a) {
- g.tint(x, y, z, a);
+ public void tint(float v1, float v2, float v3, float alpha) {
+ g.tint(v1, v2, v3, alpha);
}
+ /**
+ * ( begin auto-generated from noFill.xml )
+ *
+ * Disables filling geometry. If both noStroke() and noFill()
+ * are called, nothing will be drawn to the screen.
+ *
+ * ( end auto-generated )
+ *
+ * @webref color:setting
+ * @usage web_application
+ * @see PGraphics#fill(float, float, float, float)
+ * @see PGraphics#stroke(int, float)
+ * @see PGraphics#noStroke()
+ */
public void noFill() {
g.noFill();
}
/**
- * Set the fill to either a grayscale value or an ARGB int.
+ * ( begin auto-generated from fill.xml )
+ *
+ * Sets the color used to fill shapes. For example, if you run fill(204,
+ * 102, 0) , all subsequent shapes will be filled with orange. This
+ * color is either specified in terms of the RGB or HSB color depending on
+ * the current colorMode() (the default color space is RGB, with
+ * each value in the range from 0 to 255).
+ * colorMode() . The default
+ * maximum value is 255.
+ * emissive() , specular() ,
+ * and shininess() in setting the material properties of shapes.
+ *
+ * ( end auto-generated )
+ *
+ * @webref lights_camera:material_properties
+ * @usage web_application
+ * @param rgb any value of the color datatype
+ * @see PGraphics#emissive(float, float, float)
+ * @see PGraphics#specular(float, float, float)
+ * @see PGraphics#shininess(float)
+ */
public void ambient(int rgb) {
g.ambient(rgb);
}
+ /**
+ * @param gray number specifying value between white and black
+ */
public void ambient(float gray) {
g.ambient(gray);
}
- public void ambient(float x, float y, float z) {
- g.ambient(x, y, z);
+ /**
+ * @param v1 red or hue value (depending on current color mode)
+ * @param v2 green or saturation value (depending on current color mode)
+ * @param v3 blue or brightness value (depending on current color mode)
+ */
+ public void ambient(float v1, float v2, float v3) {
+ g.ambient(v1, v2, v3);
}
+ /**
+ * ( begin auto-generated from specular.xml )
+ *
+ * Sets the specular color of the materials used for shapes drawn to the
+ * screen, which sets the color of hightlights. Specular refers to light
+ * which bounces off a surface in a perferred direction (rather than
+ * bouncing in all directions like a diffuse light). Used in combination
+ * with emissive() , ambient() , and shininess() in
+ * setting the material properties of shapes.
+ *
+ * ( end auto-generated )
+ *
+ * @webref lights_camera:material_properties
+ * @usage web_application
+ * @param rgb color to set
+ * @see PGraphics#lightSpecular(float, float, float)
+ * @see PGraphics#ambient(float, float, float)
+ * @see PGraphics#emissive(float, float, float)
+ * @see PGraphics#shininess(float)
+ */
public void specular(int rgb) {
g.specular(rgb);
}
+ /**
+ * gray number specifying value between white and black
+ *
+ * @param gray value between black and white, by default 0 to 255
+ */
public void specular(float gray) {
g.specular(gray);
}
- public void specular(float x, float y, float z) {
- g.specular(x, y, z);
+ /**
+ * @param v1 red or hue value (depending on current color mode)
+ * @param v2 green or saturation value (depending on current color mode)
+ * @param v3 blue or brightness value (depending on current color mode)
+ */
+ public void specular(float v1, float v2, float v3) {
+ g.specular(v1, v2, v3);
}
+ /**
+ * ( begin auto-generated from shininess.xml )
+ *
+ * Sets the amount of gloss in the surface of shapes. Used in combination
+ * with ambient() , specular() , and emissive() in
+ * setting the material properties of shapes.
+ *
+ * ( end auto-generated )
+ *
+ * @webref lights_camera:material_properties
+ * @usage web_application
+ * @param shine degree of shininess
+ * @see PGraphics#emissive(float, float, float)
+ * @see PGraphics#ambient(float, float, float)
+ * @see PGraphics#specular(float, float, float)
+ */
public void shininess(float shine) {
g.shininess(shine);
}
+ /**
+ * ( begin auto-generated from emissive.xml )
+ *
+ * Sets the emissive color of the material used for drawing shapes drawn to
+ * the screen. Used in combination with ambient() ,
+ * specular() , and shininess() in setting the material
+ * properties of shapes.
+ *
+ * ( end auto-generated )
+ *
+ * @webref lights_camera:material_properties
+ * @usage web_application
+ * @param rgb color to set
+ * @see PGraphics#ambient(float, float, float)
+ * @see PGraphics#specular(float, float, float)
+ * @see PGraphics#shininess(float)
+ */
public void emissive(int rgb) {
g.emissive(rgb);
}
+ /**
+ * gray number specifying value between white and black
+ *
+ * @param gray value between black and white, by default 0 to 255
+ */
public void emissive(float gray) {
g.emissive(gray);
}
- public void emissive(float x, float y, float z) {
- g.emissive(x, y, z);
+ /**
+ * @param v1 red or hue value (depending on current color mode)
+ * @param v2 green or saturation value (depending on current color mode)
+ * @param v3 blue or brightness value (depending on current color mode)
+ */
+ public void emissive(float v1, float v2, float v3) {
+ g.emissive(v1, v2, v3);
}
+ /**
+ * ( begin auto-generated from lights.xml )
+ *
+ * Sets the default ambient light, directional light, falloff, and specular
+ * values. The defaults are ambientLight(128, 128, 128) and
+ * directionalLight(128, 128, 128, 0, 0, -1), lightFalloff(1, 0, 0), and
+ * lightSpecular(0, 0, 0). Lights need to be included in the draw() to
+ * remain persistent in a looping program. Placing them in the setup() of a
+ * looping program will cause them to only have an effect the first time
+ * through the loop.
+ *
+ * ( end auto-generated )
+ *
+ * @webref lights_camera:lights
+ * @usage web_application
+ * @see PGraphics#ambientLight(float, float, float, float, float, float)
+ * @see PGraphics#directionalLight(float, float, float, float, float, float)
+ * @see PGraphics#pointLight(float, float, float, float, float, float)
+ * @see PGraphics#spotLight(float, float, float, float, float, float, float, float, float, float, float)
+ * @see PGraphics#noLights()
+ */
public void lights() {
g.lights();
}
+ /**
+ * ( begin auto-generated from noLights.xml )
+ *
+ * Disable all lighting. Lighting is turned off by default and enabled with
+ * the lights() function. This function can be used to disable
+ * lighting so that 2D geometry (which does not require lighting) can be
+ * drawn after a set of lighted 3D geometry.
+ *
+ * ( end auto-generated )
+ *
+ * @webref lights_camera:lights
+ * @usage web_application
+ * @see PGraphics#lights()
+ */
public void noLights() {
g.noLights();
}
- public void ambientLight(float red, float green, float blue) {
- g.ambientLight(red, green, blue);
+ /**
+ * ( begin auto-generated from ambientLight.xml )
+ *
+ * Adds an ambient light. Ambient light doesn't come from a specific
+ * direction, the rays have light have bounced around so much that objects
+ * are evenly lit from all sides. Ambient lights are almost always used in
+ * combination with other types of lights. Lights need to be included in
+ * the draw() to remain persistent in a looping program. Placing
+ * them in the setup() of a looping program will cause them to only
+ * have an effect the first time through the loop. The effect of the
+ * parameters is determined by the current color mode.
+ *
+ * ( end auto-generated )
+ *
+ * @webref lights_camera:lights
+ * @usage web_application
+ * @param v1 red or hue value (depending on current color mode)
+ * @param v2 green or saturation value (depending on current color mode)
+ * @param v3 blue or brightness value (depending on current color mode)
+ * @see PGraphics#lights()
+ * @see PGraphics#directionalLight(float, float, float, float, float, float)
+ * @see PGraphics#pointLight(float, float, float, float, float, float)
+ * @see PGraphics#spotLight(float, float, float, float, float, float, float, float, float, float, float)
+ */
+ public void ambientLight(float v1, float v2, float v3) {
+ g.ambientLight(v1, v2, v3);
}
- public void ambientLight(float red, float green, float blue,
+ /**
+ * @param x x-coordinate of the light
+ * @param y y-coordinate of the light
+ * @param z z-coordinate of the light
+ */
+ public void ambientLight(float v1, float v2, float v3,
float x, float y, float z) {
- g.ambientLight(red, green, blue, x, y, z);
+ g.ambientLight(v1, v2, v3, x, y, z);
}
- public void directionalLight(float red, float green, float blue,
+ /**
+ * ( begin auto-generated from directionalLight.xml )
+ *
+ * Adds a directional light. Directional light comes from one direction and
+ * is stronger when hitting a surface squarely and weaker if it hits at a a
+ * gentle angle. After hitting a surface, a directional lights scatters in
+ * all directions. Lights need to be included in the draw() to
+ * remain persistent in a looping program. Placing them in the
+ * setup() of a looping program will cause them to only have an
+ * effect the first time through the loop. The affect of the v1 ,
+ * v2 , and v3 parameters is determined by the current color
+ * mode. The nx , ny , and nz parameters specify the
+ * direction the light is facing. For example, setting ny to -1 will
+ * cause the geometry to be lit from below (the light is facing directly upward).
+ *
+ * ( end auto-generated )
+ *
+ * @webref lights_camera:lights
+ * @usage web_application
+ * @param v1 red or hue value (depending on current color mode)
+ * @param v2 green or saturation value (depending on current color mode)
+ * @param v3 blue or brightness value (depending on current color mode)
+ * @param nx direction along the x-axis
+ * @param ny direction along the y-axis
+ * @param nz direction along the z-axis
+ * @see PGraphics#lights()
+ * @see PGraphics#ambientLight(float, float, float, float, float, float)
+ * @see PGraphics#pointLight(float, float, float, float, float, float)
+ * @see PGraphics#spotLight(float, float, float, float, float, float, float, float, float, float, float)
+ */
+ public void directionalLight(float v1, float v2, float v3,
float nx, float ny, float nz) {
- g.directionalLight(red, green, blue, nx, ny, nz);
+ g.directionalLight(v1, v2, v3, nx, ny, nz);
}
- public void pointLight(float red, float green, float blue,
+ /**
+ * ( begin auto-generated from pointLight.xml )
+ *
+ * Adds a point light. Lights need to be included in the draw() to
+ * remain persistent in a looping program. Placing them in the
+ * setup() of a looping program will cause them to only have an
+ * effect the first time through the loop. The affect of the v1 ,
+ * v2 , and v3 parameters is determined by the current color
+ * mode. The x , y , and z parameters set the position
+ * of the light.
+ *
+ * ( end auto-generated )
+ *
+ * @webref lights_camera:lights
+ * @usage web_application
+ * @param v1 red or hue value (depending on current color mode)
+ * @param v2 green or saturation value (depending on current color mode)
+ * @param v3 blue or brightness value (depending on current color mode)
+ * @param x x-coordinate of the light
+ * @param y y-coordinate of the light
+ * @param z z-coordinate of the light
+ * @see PGraphics#lights()
+ * @see PGraphics#directionalLight(float, float, float, float, float, float)
+ * @see PGraphics#ambientLight(float, float, float, float, float, float)
+ * @see PGraphics#spotLight(float, float, float, float, float, float, float, float, float, float, float)
+ */
+ public void pointLight(float v1, float v2, float v3,
float x, float y, float z) {
- g.pointLight(red, green, blue, x, y, z);
+ g.pointLight(v1, v2, v3, x, y, z);
}
- public void spotLight(float red, float green, float blue,
+ /**
+ * ( begin auto-generated from spotLight.xml )
+ *
+ * Adds a spot light. Lights need to be included in the draw() to
+ * remain persistent in a looping program. Placing them in the
+ * setup() of a looping program will cause them to only have an
+ * effect the first time through the loop. The affect of the v1 ,
+ * v2 , and v3 parameters is determined by the current color
+ * mode. The x , y , and z parameters specify the
+ * position of the light and nx , ny , nz specify the
+ * direction or light. The angle parameter affects angle of the
+ * spotlight cone.
+ *
+ * ( end auto-generated )
+ *
+ * @webref lights_camera:lights
+ * @usage web_application
+ * @param v1 red or hue value (depending on current color mode)
+ * @param v2 green or saturation value (depending on current color mode)
+ * @param v3 blue or brightness value (depending on current color mode)
+ * @param x x-coordinate of the light
+ * @param y y-coordinate of the light
+ * @param z z-coordinate of the light
+ * @param nx direction along the x axis
+ * @param ny direction along the y axis
+ * @param nz direction along the z axis
+ * @param angle angle of the spotlight cone
+ * @param concentration exponent determining the center bias of the cone
+ * @see PGraphics#lights()
+ * @see PGraphics#directionalLight(float, float, float, float, float, float)
+ * @see PGraphics#pointLight(float, float, float, float, float, float)
+ * @see PGraphics#ambientLight(float, float, float, float, float, float)
+ */
+ public void spotLight(float v1, float v2, float v3,
float x, float y, float z,
float nx, float ny, float nz,
float angle, float concentration) {
- g.spotLight(red, green, blue, x, y, z, nx, ny, nz, angle, concentration);
+ g.spotLight(v1, v2, v3, x, y, z, nx, ny, nz, angle, concentration);
}
+ /**
+ * ( begin auto-generated from lightFalloff.xml )
+ *
+ * Sets the falloff rates for point lights, spot lights, and ambient
+ * lights. The parameters are used to determine the falloff with the
+ * following equation:fill() , it affects only the elements
+ * which are created after it in the code. The default value if
+ * LightFalloff(1.0, 0.0, 0.0) . Thinking about an ambient light with
+ * a falloff can be tricky. It is used, for example, if you wanted a region
+ * of your scene to be lit ambiently one color and another region to be lit
+ * ambiently by another color, you would use an ambient light with location
+ * and falloff. You can think of it as a point light that doesn't care
+ * which direction a surface is facing.
+ *
+ * ( end auto-generated )
+ *
+ * @webref lights_camera:lights
+ * @usage web_application
+ * @param constant constant value or determining falloff
+ * @param linear linear value for determining falloff
+ * @param quadratic quadratic value for determining falloff
+ * @see PGraphics#lights()
+ * @see PGraphics#ambientLight(float, float, float, float, float, float)
+ * @see PGraphics#pointLight(float, float, float, float, float, float)
+ * @see PGraphics#spotLight(float, float, float, float, float, float, float, float, float, float, float)
+ * @see PGraphics#lightSpecular(float, float, float)
+ */
public void lightFalloff(float constant, float linear, float quadratic) {
g.lightFalloff(constant, linear, quadratic);
}
- public void lightSpecular(float x, float y, float z) {
- g.lightSpecular(x, y, z);
+ /**
+ * ( begin auto-generated from lightSpecular.xml )
+ *
+ * Sets the specular color for lights. Like fill() , it affects only
+ * the elements which are created after it in the code. Specular refers to
+ * light which bounces off a surface in a perferred direction (rather than
+ * bouncing in all directions like a diffuse light) and is used for
+ * creating highlights. The specular quality of a light interacts with the
+ * specular material qualities set through the specular() and
+ * shininess() functions.
+ *
+ * ( end auto-generated )
+ *
+ * @webref lights_camera:lights
+ * @usage web_application
+ * @param v1 red or hue value (depending on current color mode)
+ * @param v2 green or saturation value (depending on current color mode)
+ * @param v3 blue or brightness value (depending on current color mode)
+ * @see PGraphics#specular(float, float, float)
+ * @see PGraphics#lights()
+ * @see PGraphics#ambientLight(float, float, float, float, float, float)
+ * @see PGraphics#pointLight(float, float, float, float, float, float)
+ * @see PGraphics#spotLight(float, float, float, float, float, float, float, float, float, float, float)
+ */
+ public void lightSpecular(float v1, float v2, float v3) {
+ g.lightSpecular(v1, v2, v3);
}
/**
- * Set the background to a gray or ARGB color.
- *
- * For the main drawing surface, the alpha value will be ignored. However,
- * alpha can be used on PGraphics objects from createGraphics(). This is
- * the only way to set all the pixels partially transparent, for instance.
- *
- * Note that background() should be called before any transformations occur,
- * because some implementations may require the current transformation matrix
- * to be identity before drawing.
+ * ( begin auto-generated from background.xml )
+ *
+ * The background() function sets the color used for the background
+ * of the Processing window. The default background is light gray. In the
+ * draw() function, the background color is used to clear the
+ * display window at the beginning of each frame.
+ * tint() setting.
+ * createGraphics() .
+ *
+ * ( end auto-generated )
+ *
+ *
Advanced
+ * Clear the background with a color that includes an alpha value. This can
+ * only be used with objects created by createGraphics(), because the main
+ * drawing surface cannot be set transparent.
+ * It might be tempting to use this function to partially clear the screen
+ * on each frame, however that's not how this function works. When calling
+ * background(), the pixels will be replaced with pixels that have that level
+ * of transparency. To do a semi-transparent overlay, use fill() with alpha
+ * and draw a rectangle.
+ *
+ * @webref color:setting
+ * @usage web_application
+ * @param rgb any value of the color datatype
+ * @see PGraphics#stroke(float)
+ * @see PGraphics#fill(float)
+ * @see PGraphics#tint(float)
+ * @see PGraphics#colorMode(int)
*/
public void background(int rgb) {
g.background(rgb);
@@ -9660,7 +11976,7 @@ public void background(int rgb) {
/**
- * See notes about alpha in background(x, y, z, a).
+ * @param alpha opacity of the background
*/
public void background(int rgb, float alpha) {
g.background(rgb, alpha);
@@ -9668,47 +11984,36 @@ public void background(int rgb, float alpha) {
/**
- * Set the background to a grayscale value, based on the
- * current colorMode.
+ * @param gray specifies a value between white and black
*/
public void background(float gray) {
g.background(gray);
}
- /**
- * See notes about alpha in background(x, y, z, a).
- */
public void background(float gray, float alpha) {
g.background(gray, alpha);
}
/**
- * Set the background to an r, g, b or h, s, b value,
- * based on the current colorMode.
+ * @param v1 red or hue value (depending on the current color mode)
+ * @param v2 green or saturation value (depending on the current color mode)
+ * @param v3 blue or brightness value (depending on the current color mode)
*/
- public void background(float x, float y, float z) {
- g.background(x, y, z);
+ public void background(float v1, float v2, float v3) {
+ g.background(v1, v2, v3);
}
- /**
- * Clear the background with a color that includes an alpha value. This can
- * only be used with objects created by createGraphics(), because the main
- * drawing surface cannot be set transparent.
- *
- * It might be tempting to use this function to partially clear the screen
- * on each frame, however that's not how this function works. When calling
- * background(), the pixels will be replaced with pixels that have that level
- * of transparency. To do a semi-transparent overlay, use fill() with alpha
- * and draw a rectangle.
- */
- public void background(float x, float y, float z, float a) {
- g.background(x, y, z, a);
+ public void background(float v1, float v2, float v3, float alpha) {
+ g.background(v1, v2, v3, alpha);
}
+ /**
+ * @webref color:setting
+ */
public void clear() {
g.clear();
}
@@ -9717,94 +12022,255 @@ public void clear() {
/**
* Takes an RGB or ARGB image and sets it as the background.
* The width and height of the image must be the same size as the sketch.
- * Use image.resize(width, height) to make short work of such a task.
- *
+ * Use image.resize(width, height) to make short work of such a task.
+ * behavior. Use image.filter(OPAQUE) to handle this easily.fill() , stroke() , background() , and
+ * color() are defined by values between 0 and 255 using the RGB
+ * color model. The colorMode() function is used to change the
+ * numerical range used for specifying colors and to switch color systems.
+ * For example, calling colorMode(RGB, 1.0) will specify that values
+ * are specified between 0 and 1. The limits for defining colors are
+ * altered by setting the parameters range1, range2, range3, and range 4.
+ *
+ * ( end auto-generated )
+ *
+ * @webref color:setting
+ * @usage web_application
+ * @param mode Either RGB or HSB, corresponding to Red/Green/Blue and Hue/Saturation/Brightness
+ * @see PGraphics#background(float)
+ * @see PGraphics#fill(float)
+ * @see PGraphics#stroke(float)
+ */
public void colorMode(int mode) {
g.colorMode(mode);
}
+ /**
+ * @param max range for all color elements
+ */
public void colorMode(int mode, float max) {
g.colorMode(mode, max);
}
/**
- * Set the colorMode and the maximum values for (r, g, b)
- * or (h, s, b).
- *
- * Note that this doesn't set the maximum for the alpha value,
- * which might be confusing if for instance you switched to
- *
colorMode(HSB, 360, 100, 100);
- * because the alpha values were still between 0 and 255.
+ * @param max1 range for the red or hue depending on the current color mode
+ * @param max2 range for the green or saturation depending on the current color mode
+ * @param max3 range for the blue or brightness depending on the current color mode
*/
- public void colorMode(int mode, float maxX, float maxY, float maxZ) {
- g.colorMode(mode, maxX, maxY, maxZ);
+ public void colorMode(int mode, float max1, float max2, float max3) {
+ g.colorMode(mode, max1, max2, max3);
}
+ /**
+ * @param maxA range for the alpha
+ */
public void colorMode(int mode,
- float maxX, float maxY, float maxZ, float maxA) {
- g.colorMode(mode, maxX, maxY, maxZ, maxA);
- }
-
-
- public final float alpha(int what) {
- return g.alpha(what);
+ float max1, float max2, float max3, float maxA) {
+ g.colorMode(mode, max1, max2, max3, maxA);
}
- public final float red(int what) {
- return g.red(what);
+ /**
+ * ( begin auto-generated from alpha.xml )
+ *
+ * Extracts the alpha value from a color.
+ *
+ * ( end auto-generated )
+ * @webref color:creating_reading
+ * @usage web_application
+ * @param rgb any value of the color datatype
+ * @see PGraphics#red(int)
+ * @see PGraphics#green(int)
+ * @see PGraphics#blue(int)
+ * @see PGraphics#hue(int)
+ * @see PGraphics#saturation(int)
+ * @see PGraphics#brightness(int)
+ */
+ public final float alpha(int rgb) {
+ return g.alpha(rgb);
}
- public final float green(int what) {
- return g.green(what);
+ /**
+ * ( begin auto-generated from red.xml )
+ *
+ * Extracts the red value from a color, scaled to match current
+ * colorMode() . This value is always returned as a float so be
+ * careful not to assign it to an int value.colorMode(RGB, 255) , but
+ * with greater speed, use the >> (right shift) operator with a bit
+ * mask. For example, the following two lines of code are equivalent:float r1 = red(myColor);
+ *
+ * ( end auto-generated )
+ *
+ * @webref color:creating_reading
+ * @usage web_application
+ * @param rgb any value of the color datatype
+ * @see PGraphics#green(int)
+ * @see PGraphics#blue(int)
+ * @see PGraphics#alpha(int)
+ * @see PGraphics#hue(int)
+ * @see PGraphics#saturation(int)
+ * @see PGraphics#brightness(int)
+ * @see_external rightshift
+ */
+ public final float red(int rgb) {
+ return g.red(rgb);
}
- public final float blue(int what) {
- return g.blue(what);
+ /**
+ * ( begin auto-generated from green.xml )
+ *
+ * Extracts the green value from a color, scaled to match current
+ * colorMode() . This value is always returned as a float so be
+ * careful not to assign it to an int value.green()
+ * function is easy to use and undestand, but is slower than another
+ * technique. To achieve the same results when working in colorMode(RGB,
+ * 255) , but with greater speed, use the >> (right shift)
+ * operator with a bit mask. For example, the following two lines of code
+ * are equivalent:float r1 = green(myColor);
+ *
+ * ( end auto-generated )
+ *
+ * @webref color:creating_reading
+ * @usage web_application
+ * @param rgb any value of the color datatype
+ * @see PGraphics#red(int)
+ * @see PGraphics#blue(int)
+ * @see PGraphics#alpha(int)
+ * @see PGraphics#hue(int)
+ * @see PGraphics#saturation(int)
+ * @see PGraphics#brightness(int)
+ * @see_external rightshift
+ */
+ public final float green(int rgb) {
+ return g.green(rgb);
}
- public final float hue(int what) {
- return g.hue(what);
+ /**
+ * ( begin auto-generated from blue.xml )
+ *
+ * Extracts the blue value from a color, scaled to match current
+ * colorMode() . This value is always returned as a float so be
+ * careful not to assign it to an int value.blue()
+ * function is easy to use and undestand, but is slower than another
+ * technique. To achieve the same results when working in colorMode(RGB,
+ * 255) , but with greater speed, use a bit mask to remove the other
+ * color components. For example, the following two lines of code are
+ * equivalent:float r1 = blue(myColor);
+ *
+ * ( end auto-generated )
+ *
+ * @webref color:creating_reading
+ * @usage web_application
+ * @param rgb any value of the color datatype
+ * @see PGraphics#red(int)
+ * @see PGraphics#green(int)
+ * @see PGraphics#alpha(int)
+ * @see PGraphics#hue(int)
+ * @see PGraphics#saturation(int)
+ * @see PGraphics#brightness(int)
+ * @see_external rightshift
+ */
+ public final float blue(int rgb) {
+ return g.blue(rgb);
}
- public final float saturation(int what) {
- return g.saturation(what);
+ /**
+ * ( begin auto-generated from hue.xml )
+ *
+ * Extracts the hue value from a color.
+ *
+ * ( end auto-generated )
+ * @webref color:creating_reading
+ * @usage web_application
+ * @param rgb any value of the color datatype
+ * @see PGraphics#red(int)
+ * @see PGraphics#green(int)
+ * @see PGraphics#blue(int)
+ * @see PGraphics#alpha(int)
+ * @see PGraphics#saturation(int)
+ * @see PGraphics#brightness(int)
+ */
+ public final float hue(int rgb) {
+ return g.hue(rgb);
}
- public final float brightness(int what) {
- return g.brightness(what);
+ /**
+ * ( begin auto-generated from saturation.xml )
+ *
+ * Extracts the saturation value from a color.
+ *
+ * ( end auto-generated )
+ * @webref color:creating_reading
+ * @usage web_application
+ * @param rgb any value of the color datatype
+ * @see PGraphics#red(int)
+ * @see PGraphics#green(int)
+ * @see PGraphics#blue(int)
+ * @see PGraphics#alpha(int)
+ * @see PGraphics#hue(int)
+ * @see PGraphics#brightness(int)
+ */
+ public final float saturation(int rgb) {
+ return g.saturation(rgb);
}
/**
- * Interpolate between two colors, using the current color mode.
+ * ( begin auto-generated from brightness.xml )
+ *
+ * Extracts the brightness value from a color.
+ *
+ * ( end auto-generated )
+ *
+ * @webref color:creating_reading
+ * @usage web_application
+ * @param rgb any value of the color datatype
+ * @see PGraphics#red(int)
+ * @see PGraphics#green(int)
+ * @see PGraphics#blue(int)
+ * @see PGraphics#alpha(int)
+ * @see PGraphics#hue(int)
+ * @see PGraphics#saturation(int)
*/
- public int lerpColor(int c1, int c2, float amt) {
- return g.lerpColor(c1, c2, amt);
+ public final float brightness(int rgb) {
+ return g.brightness(rgb);
}
/**
+ * @nowebref
* Interpolate between two colors. Like lerp(), but for the
* individual color components of a color supplied as an int value.
*/
@@ -9861,40 +12327,30 @@ static public void showMissingWarning(String method) {
/**
- * Return true if this renderer should be drawn to the screen. Defaults to
- * returning true, since nearly all renderers are on-screen beasts. But can
- * be overridden for subclasses like PDF so that a window doesn't open up.
- * x
+ * and y parameters to get the value of one pixel. Get a section of
+ * the display window by specifying an additional width and
+ * height parameter. When getting an image, the x and
+ * y parameters define the coordinates for the upper-left corner of
+ * the image, regardless of the current imageMode() .colorMode(HSB) , the
+ * numbers returned will be in RGB format.get(x, y) is easy, but
+ * not as fast as grabbing the data directly from pixels[] . The
+ * equivalent statement to get(x, y) using pixels[] is
+ * pixels[y*width+x] . See the reference for pixels[] for more information.
+ *
+ * ( end auto-generated )
+ *
+ * Advanced
* Returns an ARGB "color" type (a packed 32 bit int with the color.
* If the coordinate is outside the image, zero is returned
* (black, but completely transparent).
@@ -9911,16 +12367,21 @@ public void setNative(Object nativeObject) {
* is inside the bounds, and then has to check to see what image
* type it is. If you want things to be more efficient, access the
* pixels[] array directly.
+ *
+ * @webref image:pixels
+ * @brief Reads the color of any pixel or grabs a rectangle of pixels
+ * @usage web_application
+ * @param x x-coordinate of the pixel
+ * @param y y-coordinate of the pixel
+ * @see PApplet#set(int, int, int)
+ * @see PApplet#pixels
+ * @see PApplet#copy(PImage, int, int, int, int, int, int, int, int)
*/
public int get(int x, int y) {
return g.get(x, y);
}
- /**
- * Grab a subsection of a PImage, and copy it into a fresh PImage.
- * As of release 0149, no longer honors imageMode() for the coordinates.
- */
/**
* @param w width of pixel rectangle to get
* @param h height of pixel rectangle to get
@@ -9932,14 +12393,48 @@ public PImage get(int x, int y, int w, int h) {
/**
* Returns a copy of this PImage. Equivalent to get(0, 0, width, height).
+ * Deprecated, just use copy() instead.
*/
public PImage get() {
return g.get();
}
+ public PImage copy() {
+ return g.copy();
+ }
+
+
/**
- * Set a single pixel to the specified color.
+ * ( begin auto-generated from PImage_set.xml )
+ *
+ * Changes the color of any pixel or writes an image directly into the
+ * display window.x and y parameters specify the pixel to change and the
+ * color parameter specifies the color value. The color parameter is
+ * affected by the current color mode (the default is RGB values from 0 to
+ * 255). When setting an image, the x and y parameters define
+ * the coordinates for the upper-left corner of the image, regardless of
+ * the current imageMode() .
+ * set(x, y) is easy, but
+ * not as fast as putting the data directly into pixels[] . The
+ * equivalent statement to set(x, y, #000000) using pixels[]
+ * is pixels[y*width+x] = #000000 . See the reference for
+ * pixels[] for more information.
+ *
+ * ( end auto-generated )
+ *
+ * @webref image:pixels
+ * @brief writes a color to any pixel or writes an image into another
+ * @usage web_application
+ * @param x x-coordinate of the pixel
+ * @param y y-coordinate of the pixel
+ * @param c any value of the color datatype
+ * @see PImage#get(int, int, int, int)
+ * @see PImage#pixels
+ * @see PImage#copy(PImage, int, int, int, int, int, int, int, int)
*/
public void set(int x, int y, int c) {
g.set(x, y, c);
@@ -9947,9 +12442,12 @@ public void set(int x, int y, int c) {
/**
+ * Advanced
* Efficient method of drawing an image's pixels directly to this surface.
* No variations are employed, meaning that any scale, tint, or imageMode
* settings will be ignored.
+ *
+ * @param img image to copy into the original image
*/
public void set(int x, int y, PImage img) {
g.set(x, y, img);
@@ -9957,6 +12455,23 @@ public void set(int x, int y, PImage img) {
/**
+ * ( begin auto-generated from PImage_mask.xml )
+ *
+ * Masks part of an image from displaying by loading another image and
+ * using it as an alpha channel. This mask image should only contain
+ * grayscale data, but only the blue color channel is used. The mask image
+ * needs to be the same size as the image to which it is applied.Advanced
+ *
* Set alpha channel for an image. Black colors in the source
* image will make the destination image completely transparent,
* and white will make things fully opaque. Gray values will
@@ -9966,23 +12481,54 @@ public void set(int x, int y, PImage img) {
* used as the alpha color. For a fully grayscale image, this
* is correct, but for a color image it's not 100% accurate.
* For a more accurate conversion, first use filter(GRAY)
- * which will make the image into a "correct" grayscake by
+ * which will make the image into a "correct" grayscale by
* performing a proper luminance-based conversion.
+ *
+ * @webref pimage:method
+ * @usage web_application
+ * @param img image to use as the mask
+ * @brief Masks part of an image with another image as an alpha channel
*/
- public void mask(int alpha[]) {
- g.mask(alpha);
+ public void mask(PImage img) {
+ g.mask(img);
}
- /**
- * Set alpha channel for an image using another image as the source.
- */
- public void mask(PImage alpha) {
- g.mask(alpha);
+ public void filter(int kind) {
+ g.filter(kind);
}
/**
+ * ( begin auto-generated from PImage_filter.xml )
+ *
+ * Filters an image as defined by one of the following modes:Advanced
* Method to apply a variety of basic filters to this image.
*
*
@@ -9999,27 +12545,12 @@ public void mask(PImage alpha) {
*
* Gaussian blur code contributed by
* Mario Klingemann
- */
- public void filter(int kind) {
- g.filter(kind);
- }
-
-
- /**
- * Method to apply a variety of basic filters to this image.
- * These filters all take a parameter.
- *
- *
- * filter(BLUR, int radius) performs a gaussian blur of the
- * specified radius.
- * filter(POSTERIZE, int levels) will posterize the image to
- * between 2 and 255 levels.
- * filter(THRESHOLD, float center) allows you to set the
- * center point for the threshold. It takes a value from 0 to 1.0.
- *
- * Gaussian blur code contributed by
- * Mario Klingemann
- * and later updated by toxi for better speed.
+ *
+ * @webref image:pixels
+ * @brief Converts the image to grayscale or black and white
+ * @usage web_application
+ * @param kind Either THRESHOLD, GRAY, OPAQUE, INVERT, POSTERIZE, BLUR, ERODE, or DILATE
+ * @param param unique for each, see above
*/
public void filter(int kind, float param) {
g.filter(kind, param);
@@ -10027,8 +12558,31 @@ public void filter(int kind, float param) {
/**
- * Copy things from one area of this image
- * to another area in the same image.
+ * ( begin auto-generated from PImage_copy.xml )
+ *
+ * Copies a region of pixels from one image into another. If the source and
+ * destination regions aren't the same size, it will automatically resize
+ * source pixels to fit the specified target region. No alpha information
+ * is used in the process, however if the source image has an alpha channel
+ * set, it will be copied as well.
+ * imageMode() .
+ *
+ * ( end auto-generated )
+ *
+ * @webref image:pixels
+ * @brief Copies the entire image
+ * @usage web_application
+ * @param sx X coordinate of the source's upper left corner
+ * @param sy Y coordinate of the source's upper left corner
+ * @param sw source image width
+ * @param sh source image height
+ * @param dx X coordinate of the destination's upper left corner
+ * @param dy Y coordinate of the destination's upper left corner
+ * @param dw destination image width
+ * @param dh destination image height
+ * @see PGraphics#alpha(int)
+ * @see PImage#blend(PImage, int, int, int, int, int, int, int, int, int)
*/
public void copy(int sx, int sy, int sw, int sh,
int dx, int dy, int dw, int dh) {
@@ -10037,7 +12591,7 @@ public void copy(int sx, int sy, int sw, int sh,
/**
- * Copies area of one image into another PImage object.
+ * @param src an image variable referring to the source image.
*/
public void copy(PImage src,
int sx, int sy, int sw, int sh,
@@ -10046,10 +12600,6 @@ public void copy(PImage src,
}
- /**
- * Blends one area of this image to another area.
- * @see processing.core.PImage#blendColor(int,int,int)
- */
public void blend(int sx, int sy, int sw, int sh,
int dx, int dy, int dw, int dh, int mode) {
g.blend(sx, sy, sw, sh, dx, dy, dw, dh, mode);
@@ -10057,8 +12607,72 @@ public void blend(int sx, int sy, int sw, int sh,
/**
- * Copies area of one image into another PImage object.
- * @see processing.core.PImage#blendColor(int,int,int)
+ * ( begin auto-generated from PImage_blend.xml )
+ *
+ * Blends a region of pixels into the image specified by the img
+ * parameter. These copies utilize full alpha channel support and a choice
+ * of the following modes to blend the colors of source pixels (A) with the
+ * ones of pixels in the destination image (B):srcImg parameter is not used, the
+ * display window is used as the source image.imageMode() .
+ *
+ * ( end auto-generated )
+ *
+ * @webref image:pixels
+ * @brief Copies a pixel or rectangle of pixels using different blending modes
+ * @param src an image variable referring to the source image
+ * @param sx X coordinate of the source's upper left corner
+ * @param sy Y coordinate of the source's upper left corner
+ * @param sw source image width
+ * @param sh source image height
+ * @param dx X coordinate of the destinations's upper left corner
+ * @param dy Y coordinate of the destinations's upper left corner
+ * @param dw destination image width
+ * @param dh destination image height
+ * @param mode Either BLEND, ADD, SUBTRACT, LIGHTEST, DARKEST, DIFFERENCE, EXCLUSION, MULTIPLY, SCREEN, OVERLAY, HARD_LIGHT, SOFT_LIGHT, DODGE, BURN
+ *
+ * @see PApplet#alpha(int)
+ * @see PImage#copy(PImage, int, int, int, int, int, int, int, int)
+ * @see PImage#blendColor(int,int,int)
*/
public void blend(PImage src,
int sx, int sy, int sw, int sh,
diff --git a/core/src/processing/core/PConstants.java b/libs/processing-core/src/main/java/processing/core/PConstants.java
similarity index 97%
rename from core/src/processing/core/PConstants.java
rename to libs/processing-core/src/main/java/processing/core/PConstants.java
index 05519d2a9..14753a133 100644
--- a/core/src/processing/core/PConstants.java
+++ b/libs/processing-core/src/main/java/processing/core/PConstants.java
@@ -3,7 +3,7 @@
/*
Part of the Processing project - http://processing.org
- Copyright (c) 2012-16 The Processing Foundation
+ Copyright (c) 2012-21 The Processing Foundation
Copyright (c) 2004-12 Ben Fry and Casey Reas
Copyright (c) 2001-04 Massachusetts Institute of Technology
@@ -46,10 +46,14 @@ public interface PConstants {
// built-in rendering options
static final String JAVA2D = "processing.core.PGraphicsAndroid2D";
static final String P2D = "processing.opengl.PGraphics2D";
+ static final String P2DX = "processing.opengl.PGraphics2DX";
static final String P3D = "processing.opengl.PGraphics3D";
static final String OPENGL = P3D;
- static final String STEREO = "processing.vr.PGraphicsVRStereo";
- static final String MONO = "processing.vr.PGraphicsVRMono";
+ static final String STEREO = "processing.vr.VRGraphicsStereo";
+ static final String MONO = "processing.vr.VRGraphicsMono";
+ static final String VR = STEREO;
+ static final String AR = "processing.ar.ARGraphics";
+ static final String ARCORE = AR;
// The PDF and DXF renderers are not available for Android.
diff --git a/core/src/processing/core/PFont.java b/libs/processing-core/src/main/java/processing/core/PFont.java
similarity index 99%
rename from core/src/processing/core/PFont.java
rename to libs/processing-core/src/main/java/processing/core/PFont.java
index 6d30c539c..48a01b3cc 100644
--- a/core/src/processing/core/PFont.java
+++ b/libs/processing-core/src/main/java/processing/core/PFont.java
@@ -3,7 +3,7 @@
/*
Part of the Processing project - http://processing.org
- Copyright (c) 2012-16 The Processing Foundation
+ Copyright (c) 2012-21 The Processing Foundation
Copyright (c) 2004-12 Ben Fry and Casey Reas
Copyright (c) 2001-04 Massachusetts Institute of Technology
diff --git a/core/src/processing/core/PGraphics.java b/libs/processing-core/src/main/java/processing/core/PGraphics.java
similarity index 97%
rename from core/src/processing/core/PGraphics.java
rename to libs/processing-core/src/main/java/processing/core/PGraphics.java
index e8598a711..dc1657cb2 100644
--- a/core/src/processing/core/PGraphics.java
+++ b/libs/processing-core/src/main/java/processing/core/PGraphics.java
@@ -3,7 +3,7 @@
/*
Part of the Processing project - http://processing.org
- Copyright (c) 2012-16 The Processing Foundation
+ Copyright (c) 2012-21 The Processing Foundation
Copyright (c) 2004-12 Ben Fry and Casey Reas
Copyright (c) 2001-04 Massachusetts Institute of Technology
@@ -760,10 +760,10 @@ public PSurface createSurface(AppComponent component, SurfaceHolder holder, bool
* image data, for instance a BufferedImage with tint() settings applied for
* PGraphicsJava2D, or resized image data and OpenGL texture indices for
* PGraphicsOpenGL.
- * @param renderer The PGraphics renderer associated to the image
+ * @param image The image to be stored
* @param storage The metadata required by the renderer
*/
- public void setCache(PImage image, Object storage) {
+ public void setCache(PImage image, Object storage) { // ignore
cacheMap.put(image, storage);
}
@@ -773,24 +773,22 @@ public void setCache(PImage image, Object storage) {
* will cache data in different formats, it's necessary to store cache data
* keyed by the renderer object. Otherwise, attempting to draw the same
* image to both a PGraphicsJava2D and a PGraphicsOpenGL will cause errors.
- * @param renderer The PGraphics renderer associated to the image
* @return metadata stored for the specified renderer
*/
- public Object getCache(PImage image) {
+ public Object getCache(PImage image) { // ignore
return cacheMap.get(image);
}
/**
* Remove information associated with this renderer from the cache, if any.
- * @param renderer The PGraphics renderer whose cache data should be removed
+ * @param image The image whose cache data should be removed
*/
- public void removeCache(PImage image) {
+ public void removeCache(PImage image) { // ignore
cacheMap.remove(image);
}
-
//////////////////////////////////////////////////////////////
// FRAME
@@ -1584,6 +1582,12 @@ public PShape loadShape(String filename) {
}
+ public PShape loadShape(String filename, String options) {
+ showMissingWarning("loadShape");
+ return null;
+ }
+
+
//////////////////////////////////////////////////////////////
// SHAPE CREATION
@@ -2206,6 +2210,10 @@ protected void rectImpl(float x1, float y1, float x2, float y2,
}
+ public void square(float x, float y, float extent) {
+ rect(x, y, extent, extent);
+ }
+
//////////////////////////////////////////////////////////////
@@ -2325,6 +2333,10 @@ protected void arcImpl(float x, float y, float w, float h,
}
+ public void circle(float x, float y, float extent) {
+ ellipse(x, y, extent, extent);
+ }
+
//////////////////////////////////////////////////////////////
@@ -3382,6 +3394,11 @@ public float textWidth(String str) {
}
+ public float textWidth(char[] chars, int start, int length) {
+ return textWidthImpl(chars, start, start + length);
+ }
+
+
/**
* Implementation of returning the text width of
* the chars [start, stop) in the buffer.
@@ -3452,14 +3469,6 @@ public void text(char c, float x, float y, float z) {
}
-// /**
-// * Write text where we just left off.
-// */
-// public void text(String str) {
-// text(str, textX, textY, textZ);
-// }
-
-
/**
* Draw a chunk of text.
* Newlines that are \n (Unix newline or linefeed char, ascii 10)
@@ -3517,6 +3526,52 @@ public void text(String str, float x, float y) {
}
+ /**
+ * Method to draw text from an array of chars. This method will usually be
+ * more efficient than drawing from a String object, because the String will
+ * not be converted to a char array before drawing.
+ */
+ public void text(char[] chars, int start, int stop, float x, float y) {
+ // If multiple lines, sum the height of the additional lines
+ float high = 0; //-textAscent();
+ for (int i = start; i < stop; i++) {
+ if (chars[i] == '\n') {
+ high += textLeading;
+ }
+ }
+ if (textAlignY == CENTER) {
+ // for a single line, this adds half the textAscent to y
+ // for multiple lines, subtract half the additional height
+ //y += (textAscent() - textDescent() - high)/2;
+ y += (textAscent() - high)/2;
+ } else if (textAlignY == TOP) {
+ // for a single line, need to add textAscent to y
+ // for multiple lines, no different
+ y += textAscent();
+ } else if (textAlignY == BOTTOM) {
+ // for a single line, this is just offset by the descent
+ // for multiple lines, subtract leading for each line
+ y -= textDescent() + high;
+ //} else if (textAlignY == BASELINE) {
+ // do nothing
+ }
+
+// int start = 0;
+ int index = 0;
+ while (index < stop) { //length) {
+ if (chars[index] == '\n') {
+ textLineAlignImpl(chars, start, index, x, y);
+ start = index + 1;
+ y += textLeading;
+ }
+ index++;
+ }
+ if (start < stop) { //length) {
+ textLineAlignImpl(chars, start, index, x, y);
+ }
+ }
+
+
/**
* Same as above but with a z coordinate.
*/
@@ -3535,6 +3590,17 @@ public void text(String str, float x, float y, float z) {
}
+ public void text(char[] chars, int start, int stop,
+ float x, float y, float z) {
+ if (z != 0) translate(0, 0, z); // slow!
+
+ text(chars, start, stop, x, y);
+// textZ = z;
+
+ if (z != 0) translate(0, 0, -z); // inaccurate!
+ }
+
+
/**
* Draw text in a box that is constrained to a particular size.
* The current rectMode() determines what the coordinates mean
@@ -3861,6 +3927,22 @@ protected void textCharModelImpl(PImage glyph,
}
+ //////////////////////////////////////////////////////////////
+
+ // PARITY WITH P5.JS
+
+
+ public void push() {
+ pushStyle();
+ pushMatrix();
+ }
+
+
+ public void pop() {
+ popStyle();
+ popMatrix();
+ }
+
//////////////////////////////////////////////////////////////
@@ -4352,6 +4434,69 @@ public float modelZ(float x, float y, float z) {
}
+ //////////////////////////////////////////////////////////////
+
+ // RAY CASTING
+
+
+ public PVector[] getRayFromScreen(float screenX, float screenY, PVector[] ray) {
+ showMissingWarning("getRayFromScreen");
+ return null;
+ }
+
+
+ public void getRayFromScreen(float screenX, float screenY, PVector origin, PVector direction) {
+ showMissingWarning("getRayFromScreen");
+ }
+
+
+ public boolean intersectsSphere(float r, float screenX, float screenY) {
+ showMissingWarning("intersectsSphere");
+ return false;
+ }
+
+
+ public boolean intersectsSphere(float r, PVector origin, PVector direction) {
+ showMissingWarning("intersectsSphere");
+ return false;
+ }
+
+
+ public boolean intersectsBox(float size, float screenX, float screenY) {
+ showMissingWarning("intersectsBox");
+ return false;
+ }
+
+
+ public boolean intersectsBox(float w, float h, float d, float screenX, float screenY) {
+ showMissingWarning("intersectsBox");
+ return false;
+ }
+
+
+ public boolean intersectsBox(float size, PVector origin, PVector direction) {
+ showMissingWarning("intersectsBox");
+ return false;
+ }
+
+
+ public boolean intersectsBox(float w, float h, float d, PVector origin, PVector direction) {
+ showMissingWarning("intersectsBox");
+ return false;
+ }
+
+
+ public PVector intersectsPlane(float screenX, float screenY) {
+ showMissingWarning("intersectsPlane");
+ return null;
+ }
+
+
+ public PVector intersectsPlane(PVector origin, PVector direction) {
+ showMissingWarning("intersectsPlane");
+ return null;
+ }
+
//////////////////////////////////////////////////////////////
@@ -5557,13 +5702,16 @@ public int lerpColor(int c1, int c2, float amt) {
static float[] lerpColorHSB1;
static float[] lerpColorHSB2;
- static float[] lerpColorHSB3;
+ static float[] lerpColorHSB3;
/**
* Interpolate between two colors. Like lerp(), but for the
* individual color components of a color supplied as an int value.
*/
static public int lerpColor(int c1, int c2, float amt, int mode) {
+ if (amt < 0) amt = 0;
+ if (amt > 1) amt = 1;
+
if (mode == RGB) {
float a1 = ((c1 >> 24) & 0xff);
float r1 = (c1 >> 16) & 0xff;
@@ -5574,10 +5722,10 @@ static public int lerpColor(int c1, int c2, float amt, int mode) {
float g2 = (c2 >> 8) & 0xff;
float b2 = c2 & 0xff;
- return (((int) (a1 + (a2-a1)*amt) << 24) |
- ((int) (r1 + (r2-r1)*amt) << 16) |
- ((int) (g1 + (g2-g1)*amt) << 8) |
- ((int) (b1 + (b2-b1)*amt)));
+ return ((PApplet.round(a1 + (a2-a1)*amt) << 24) |
+ (PApplet.round(r1 + (r2-r1)*amt) << 16) |
+ (PApplet.round(g1 + (g2-g1)*amt) << 8) |
+ (PApplet.round(b1 + (b2-b1)*amt)));
} else if (mode == HSB) {
if (lerpColorHSB1 == null) {
@@ -5588,7 +5736,7 @@ static public int lerpColor(int c1, int c2, float amt, int mode) {
float a1 = (c1 >> 24) & 0xff;
float a2 = (c2 >> 24) & 0xff;
- int alfa = ((int) (a1 + (a2-a1)*amt)) << 24;
+ int alfa = (PApplet.round(a1 + (a2-a1)*amt)) << 24;
Color.RGBToHSV((c1 >> 16) & 0xff, (c1 >> 8) & 0xff, c1 & 0xff,
lerpColorHSB1);
@@ -5620,23 +5768,21 @@ static public int lerpColor(int c1, int c2, float amt, int mode) {
}
float ho = (PApplet.lerp(lerpColorHSB1[0], lerpColorHSB2[0], amt)) % 1.0f;
*/
+ // float ho = PApplet.lerp(lerpColorHSB1[0], lerpColorHSB2[0], amt);
+ // float so = PApplet.lerp(lerpColorHSB1[1], lerpColorHSB2[1], amt);
+ // float bo = PApplet.lerp(lerpColorHSB1[2], lerpColorHSB2[2], amt);
-// float ho = PActivity.lerp(lerpColorHSB1[0], lerpColorHSB2[0], amt);
-// float so = PActivity.lerp(lerpColorHSB1[1], lerpColorHSB2[1], amt);
-// float bo = PActivity.lerp(lerpColorHSB1[2], lerpColorHSB2[2], amt);
-// return alfa | (Color.HSVtoRGB(ho, so, bo) & 0xFFFFFF);
-// return Color.HSVToColor(alfa, new float[] { ho, so, bo });
+ // return alfa | (Color.RGBToHSV(ho, so, bo) & 0xFFFFFF);
lerpColorHSB3[0] = PApplet.lerp(lerpColorHSB1[0], lerpColorHSB2[0], amt);
lerpColorHSB3[1] = PApplet.lerp(lerpColorHSB1[1], lerpColorHSB2[1], amt);
lerpColorHSB3[2] = PApplet.lerp(lerpColorHSB1[2], lerpColorHSB2[2], amt);
- return Color.HSVToColor(alfa, lerpColorHSB3);
+ return Color.HSVToColor(alfa, lerpColorHSB3);
}
return 0;
}
-
//////////////////////////////////////////////////////////////
// BEGINRAW/ENDRAW
diff --git a/core/src/processing/core/PImage.java b/libs/processing-core/src/main/java/processing/core/PImage.java
similarity index 99%
rename from core/src/processing/core/PImage.java
rename to libs/processing-core/src/main/java/processing/core/PImage.java
index b491cc814..8eceaf2c4 100644
--- a/core/src/processing/core/PImage.java
+++ b/libs/processing-core/src/main/java/processing/core/PImage.java
@@ -3,7 +3,7 @@
/*
Part of the Processing project - http://processing.org
- Copyright (c) 2012-16 The Processing Foundation
+ Copyright (c) 2012-21 The Processing Foundation
Copyright (c) 2004-12 Ben Fry and Casey Reas
Copyright (c) 2001-04 Massachusetts Institute of Technology
@@ -563,6 +563,11 @@ public PImage get() {
}
+ public PImage copy() {
+ return get(0, 0, pixelWidth, pixelHeight);
+ }
+
+
/**
* Set a single pixel to the specified color.
*/
diff --git a/core/src/processing/core/PMatrix.java b/libs/processing-core/src/main/java/processing/core/PMatrix.java
similarity index 98%
rename from core/src/processing/core/PMatrix.java
rename to libs/processing-core/src/main/java/processing/core/PMatrix.java
index 52e14a823..1c6fabc3f 100644
--- a/core/src/processing/core/PMatrix.java
+++ b/libs/processing-core/src/main/java/processing/core/PMatrix.java
@@ -3,7 +3,7 @@
/*
Part of the Processing project - http://processing.org
- Copyright (c) 2012-16 The Processing Foundation
+ Copyright (c) 2012-21 The Processing Foundation
Copyright (c) 2005-12 Ben Fry and Casey Reas
This library is free software; you can redistribute it and/or
diff --git a/core/src/processing/core/PMatrix2D.java b/libs/processing-core/src/main/java/processing/core/PMatrix2D.java
similarity index 99%
rename from core/src/processing/core/PMatrix2D.java
rename to libs/processing-core/src/main/java/processing/core/PMatrix2D.java
index 31226e78a..8d13979b7 100644
--- a/core/src/processing/core/PMatrix2D.java
+++ b/libs/processing-core/src/main/java/processing/core/PMatrix2D.java
@@ -3,7 +3,7 @@
/*
Part of the Processing project - http://processing.org
- Copyright (c) 2012-16 The Processing Foundation
+ Copyright (c) 2012-21 The Processing Foundation
Copyright (c) 2005-12 Ben Fry and Casey Reas
This library is free software; you can redistribute it and/or
diff --git a/core/src/processing/core/PMatrix3D.java b/libs/processing-core/src/main/java/processing/core/PMatrix3D.java
similarity index 99%
rename from core/src/processing/core/PMatrix3D.java
rename to libs/processing-core/src/main/java/processing/core/PMatrix3D.java
index fbd662821..9167af1f0 100644
--- a/core/src/processing/core/PMatrix3D.java
+++ b/libs/processing-core/src/main/java/processing/core/PMatrix3D.java
@@ -3,7 +3,7 @@
/*
Part of the Processing project - http://processing.org
- Copyright (c) 2012-16 The Processing Foundation
+ Copyright (c) 2012-21 The Processing Foundation
Copyright (c) 2005-12 Ben Fry and Casey Reas
This library is free software; you can redistribute it and/or
diff --git a/core/src/processing/core/PShape.java b/libs/processing-core/src/main/java/processing/core/PShape.java
similarity index 90%
rename from core/src/processing/core/PShape.java
rename to libs/processing-core/src/main/java/processing/core/PShape.java
index 68267d35b..a609a9e4e 100644
--- a/core/src/processing/core/PShape.java
+++ b/libs/processing-core/src/main/java/processing/core/PShape.java
@@ -3,7 +3,7 @@
/*
Part of the Processing project - http://processing.org
- Copyright (c) 2012-16 The Processing Foundation
+ Copyright (c) 2012-21 The Processing Foundation
Copyright (c) 2006-12 Ben Fry and Casey Reas
This library is free software; you can redistribute it and/or
@@ -23,11 +23,12 @@
package processing.core;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+
import java.util.HashMap;
import java.util.Map;
-import processing.core.PApplet;
-
/**
* ( begin auto-generated from PShape.xml )
@@ -85,12 +86,16 @@ public class PShape implements PConstants {
// /** Generic, only draws its child objects. */
// static public final int GROUP = 0;
// GROUP now inherited from PConstants, and is still zero
+
+ // These constants were updated in 3.0b6 so that they could be distinguished
+ // from others in PConstants and improve how some typos were handled.
+ // https://github.com/processing/processing/issues/3776
/** A line, ellipse, arc, image, etc. */
- static public final int PRIMITIVE = 1;
+ static public final int PRIMITIVE = 101;
/** A series of vertex, curveVertex, and bezierVertex calls. */
- static public final int PATH = 2;
+ static public final int PATH = 102;
/** Collections of vertices created with beginShape(). */
- static public final int GEOMETRY = 3;
+ static public final int GEOMETRY = 103;
/** The shape type, one of GROUP, PRIMITIVE, PATH, or GEOMETRY. */
protected int family;
@@ -103,6 +108,7 @@ public class PShape implements PConstants {
/** Texture or image data associated with this shape. */
protected PImage image;
+ protected String imagePath = null;
public static final String OUTSIDE_BEGIN_END_ERROR =
"%1$s can only be called between beginShape() and endShape()";
@@ -119,11 +125,9 @@ public class PShape implements PConstants {
public static final String NOT_A_SIMPLE_VERTEX =
"%1$s can not be called on quadratic or bezier vertices";
- // boundary box of this shape
- //protected float x;
- //protected float y;
- //protected float width;
- //protected float height;
+ static public final String PER_VERTEX_UNSUPPORTED =
+ "This renderer does not support %1$s for individual vertices";
+
/**
* ( begin auto-generated from PShape_width.xml )
*
@@ -338,10 +342,8 @@ public PShape(PGraphics g, int family) {
// curveDetail = pg.curveDetail;
// curveTightness = pg.curveTightness;
- // The rect and ellipse modes are set to CORNER since it is the expected
- // mode for svg shapes.
- rectMode = CORNER;
- ellipseMode = CORNER;
+ rectMode = g.rectMode;
+ ellipseMode = g.ellipseMode;
// normalX = normalY = 0;
// normalZ = 1;
@@ -710,8 +712,7 @@ public void vertex(float x, float y, float u, float v) {
public void vertex(float x, float y, float z) {
- // why not?
- vertex(x, y);
+ vertex(x, y); // maybe? maybe not?
}
@@ -1550,6 +1551,9 @@ static protected void copyMatrix(PShape src, PShape dest) {
// TODO unapproved
static protected void copyStyles(PShape src, PShape dest) {
+ dest.ellipseMode = src.ellipseMode;
+ dest.rectMode = src.rectMode;
+
if (src.stroke) {
dest.stroke = true;
dest.strokeColor = src.strokeColor;
@@ -1604,9 +1608,9 @@ protected void drawImpl(PGraphics g) {
} else if (family == PRIMITIVE) {
drawPrimitive(g);
} else if (family == GEOMETRY) {
- // same as path
- drawPath(g);
-// drawGeometry(g);
+ // Not same as path: `kind` matters.
+// drawPath(g);
+ drawGeometry(g);
} else if (family == PATH) {
drawPath(g);
}
@@ -1645,26 +1649,54 @@ protected void drawPrimitive(PGraphics g) {
params[6], params[7]);
} else if (kind == RECT) {
+
+ if (imagePath != null){
+ loadImage(g);
+ }
if (image != null) {
+ int oldMode = g.imageMode;
g.imageMode(CORNER);
g.image(image, params[0], params[1], params[2], params[3]);
+ g.imageMode(oldMode);
} else {
- if(params.length != 5){
- g.rectMode(CORNER);
- }
- else{
- g.rectMode((int) params[4]);
+ int oldMode = g.rectMode;
+ g.rectMode(rectMode);
+ if (params.length == 4) {
+ g.rect(params[0], params[1],
+ params[2], params[3]);
+ } else if (params.length == 5) {
+ g.rect(params[0], params[1],
+ params[2], params[3],
+ params[4]);
+ } else if (params.length == 8) {
+ g.rect(params[0], params[1],
+ params[2], params[3],
+ params[4], params[5],
+ params[6], params[7]);
}
- g.rect(params[0], params[1], params[2], params[3]);
+ g.rectMode(oldMode);
}
-
} else if (kind == ELLIPSE) {
- g.ellipseMode(CORNER);
- g.ellipse(params[0], params[1], params[2], params[3]);
+ int oldMode = g.ellipseMode;
+ g.ellipseMode(ellipseMode);
+ g.ellipse(params[0], params[1],
+ params[2], params[3]);
+ g.ellipseMode(oldMode);
} else if (kind == ARC) {
- g.ellipseMode(CORNER);
- g.arc(params[0], params[1], params[2], params[3], params[4], params[5]);
+ int oldMode = g.ellipseMode;
+ g.ellipseMode(ellipseMode);
+ if (params.length == 6) {
+ g.arc(params[0], params[1],
+ params[2], params[3],
+ params[4], params[5]);
+ } else if (params.length == 7) {
+ g.arc(params[0], params[1],
+ params[2], params[3],
+ params[4], params[5],
+ (int) params[6]);
+ }
+ g.ellipseMode(oldMode);
} else if (kind == BOX) {
if (params.length == 1) {
@@ -1856,6 +1888,90 @@ protected void drawPath(PGraphics g) {
}
+ private void loadImage(PGraphics g){
+ if (this.imagePath.startsWith("data:image")){
+ loadBase64Image();
+ }
+
+ if (this.imagePath.startsWith("file://")){
+ loadFileSystemImage(g);
+ }
+ this.imagePath = null;
+ }
+
+ private void loadFileSystemImage(PGraphics g){
+ imagePath = imagePath.substring(7);
+ PImage loadedImage = g.parent.loadImage(imagePath);
+ if (loadedImage == null){
+ System.err.println("Error loading image file: " + imagePath);
+ } else{
+ setTexture(loadedImage);
+ }
+ }
+
+ private void loadBase64Image(){
+ String[] parts = this.imagePath.split(";base64,");
+ String extension = parts[0].substring(11);
+ String encodedData = parts[1];
+
+// byte[] decodedBytes = DatatypeConverter.parseBase64Binary(encodedData);
+ byte[] decodedBytes = parseHexBinary(encodedData);
+
+ if(decodedBytes == null){
+ System.err.println("Decode Error on image: " + imagePath.substring(0, 20));
+ return;
+ }
+
+// Image awtImage = new ImageIcon(decodedBytes).getImage();
+ BitmapFactory.Options options = new BitmapFactory.Options();
+ options.inMutable = true;
+ Bitmap bmp = BitmapFactory.decodeByteArray(decodedBytes, 0, decodedBytes.length, options);
+
+// if (awtImage instanceof BufferedImage) {
+// BufferedImage buffImage = (BufferedImage) awtImage;
+// int space = buffImage.getColorModel().getColorSpace().getType();
+// if (space == ColorSpace.TYPE_CMYK) {
+// return;
+// }
+// }
+
+ PImage loadedImage = new PImage(bmp);
+ if (loadedImage.width == -1) {
+ // error...
+ }
+
+ // if it's a .gif image, test to see if it has transparency
+ if (extension.equals("gif") || extension.equals("png") ||
+ extension.equals("unknown")) {
+ loadedImage.checkAlpha();
+ }
+
+ setTexture(loadedImage);
+ }
+
+
+ // Replacement for DatatypeConverter
+ // https://github.com/hierynomus/sshj/issues/366#issue-261511648
+ private static byte[] parseHexBinary(String s)
+ throws IllegalArgumentException {
+ if (s == null) {
+ return new byte[0];
+ }
+ s = s.trim();
+ int length = s.length();
+
+ if (length % 2 != 0) {
+ throw new IllegalArgumentException("Invalid hex string length.");
+ }
+
+ byte[] result = new byte[length / 2];
+ for (int i = 0; i < length; i += 2) {
+ result[i/2] = (byte) Integer.parseInt(s.substring(i, i + 2), 16);
+ }
+ return result;
+ }
+
+
// . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
@@ -2016,7 +2132,7 @@ public void addName(String nom, PShape shape) {
parent.addName(nom, shape);
} else {
if (nameTable == null) {
- nameTable = new HashMap();
+ nameTable = new HashMap<>();
}
nameTable.put(nom, shape);
}
@@ -2348,7 +2464,9 @@ public int getFill(int index) {
}
}
-
+ /**
+ * @nowebref
+ */
public void setFill(boolean fill) {
if (openShape) {
PGraphics.showWarning(INSIDE_BEGIN_END_ERROR, "setFill()");
@@ -2359,6 +2477,24 @@ public void setFill(boolean fill) {
}
+ /**
+ * ( begin auto-generated from PShape_setFill.xml )
+ *
+ * The setFill() method defines the fill color of a PShape .
+ * This method is used after shapes are created or when a shape is defined explicitly
+ * (e.g. createShape(RECT, 20, 20, 80, 80) ) as shown in the above example.
+ * When a shape is created with beginShape() and endShape() , its
+ * attributes may be changed with fill() and stroke() within
+ * beginShape() and endShape() . However, after the shape is
+ * created, only the setFill() method can define a new fill value for
+ * the PShape .
+ *
+ * ( end auto-generated )
+ *
+ * @webref
+ * @param fill
+ * @brief Set the fill value
+ */
public void setFill(int fill) {
if (openShape) {
PGraphics.showWarning(INSIDE_BEGIN_END_ERROR, "setFill()");
@@ -2367,28 +2503,33 @@ public void setFill(int fill) {
this.fillColor = fill;
- if (vertices != null) {
- for (int i = 0; i < vertices.length; i++) {
+ if (vertices != null && perVertexStyles) {
+ for (int i = 0; i < vertexCount; i++) {
setFill(i, fill);
}
}
}
-
+ /**
+ * @nowebref
+ */
public void setFill(int index, int fill) {
if (openShape) {
PGraphics.showWarning(INSIDE_BEGIN_END_ERROR, "setFill()");
return;
}
+ if (!perVertexStyles) {
+ PGraphics.showWarning(PER_VERTEX_UNSUPPORTED, "setFill()");
+ return;
+ }
+
// make sure we allocated the vertices array and that vertex exists
- if (vertices == null ||
- index >= vertices.length) {
+ if (vertices == null || index >= vertices.length) {
PGraphics.showWarning(NO_SUCH_VERTEX_ERROR + " (" + index + ")", "getFill()");
return;
}
-
if (image == null) {
vertices[index][PGraphics.A] = ((fill >> 24) & 0xFF) / 255.0f;
vertices[index][PGraphics.R] = ((fill >> 16) & 0xFF) / 255.0f;
@@ -2400,8 +2541,7 @@ public void setFill(int index, int fill) {
public int getTint(int index) {
// make sure we allocated the vertices array and that vertex exists
- if (vertices == null ||
- index >= vertices.length) {
+ if (vertices == null || index >= vertices.length) {
PGraphics.showWarning(NO_SUCH_VERTEX_ERROR + " (" + index + ")", "getTint()");
return this.tintColor;
}
@@ -2482,6 +2622,9 @@ public int getStroke(int index) {
}
+ /**
+ * @nowebref
+ */
public void setStroke(boolean stroke) {
if (openShape) {
PGraphics.showWarning(INSIDE_BEGIN_END_ERROR, "setStroke()");
@@ -2492,6 +2635,24 @@ public void setStroke(boolean stroke) {
}
+ /**
+ * ( begin auto-generated from PShape_setStroke.xml )
+ *
+ * The setStroke() method defines the outline color of a PShape .
+ * This method is used after shapes are created or when a shape is defined
+ * explicitly (e.g. createShape(RECT, 20, 20, 80, 80) ) as shown in
+ * the above example. When a shape is created with beginShape() and
+ * endShape() , its attributes may be changed with fill() and
+ * stroke() within beginShape() and endShape() .
+ * However, after the shape is created, only the setStroke() method
+ * can define a new stroke value for the PShape .
+ *
+ * ( end auto-generated )
+ *
+ * @webref
+ * @param stroke
+ * @brief Set the stroke value
+ */
public void setStroke(int stroke) {
if (openShape) {
PGraphics.showWarning(INSIDE_BEGIN_END_ERROR, "setStroke()");
@@ -2499,23 +2660,31 @@ public void setStroke(int stroke) {
}
strokeColor = stroke;
- if (vertices != null) {
- for (int i = 0; i < vertices.length; i++) {
+
+ if (vertices != null && perVertexStyles) {
+ for (int i = 0; i < vertices.length; i++) {
setStroke(i, stroke);
}
}
}
+ /**
+ * @nowebref
+ */
public void setStroke(int index, int stroke) {
if (openShape) {
PGraphics.showWarning(INSIDE_BEGIN_END_ERROR, "setStroke()");
return;
}
+ if (!perVertexStyles) {
+ PGraphics.showWarning(PER_VERTEX_UNSUPPORTED, "setStroke()");
+ return;
+ }
+
// make sure we allocated the vertices array and that vertex exists
- if (vertices == null ||
- index >= vertices.length) {
+ if (vertices == null || index >= vertices.length) {
PGraphics.showWarning(NO_SUCH_VERTEX_ERROR + " (" + index + ")", "setStroke()");
return;
}
@@ -2529,8 +2698,7 @@ public void setStroke(int index, int stroke) {
public float getStrokeWeight(int index) {
// make sure we allocated the vertices array and that vertex exists
- if (vertices == null ||
- index >= vertices.length) {
+ if (vertices == null || index >= vertices.length) {
PGraphics.showWarning(NO_SUCH_VERTEX_ERROR + " (" + index + ")", "getStrokeWeight()");
return strokeWeight;
}
@@ -2548,8 +2716,8 @@ public void setStrokeWeight(float weight) {
strokeWeight = weight;
- if (vertices != null) {
- for (int i = 0; i < vertices.length; i++) {
+ if (vertices != null && perVertexStyles) {
+ for (int i = 0; i < vertexCount; i++) {
setStrokeWeight(i, weight);
}
}
@@ -2562,9 +2730,13 @@ public void setStrokeWeight(int index, float weight) {
return;
}
+ if (!perVertexStyles) {
+ PGraphics.showWarning(PER_VERTEX_UNSUPPORTED, "setStrokeWeight()");
+ return;
+ }
+
// make sure we allocated the vertices array and that vertex exists
- if (vertices == null ||
- index >= vertices.length) {
+ if (vertices == null || index >= vertices.length) {
PGraphics.showWarning(NO_SUCH_VERTEX_ERROR + " (" + index + ")", "setStrokeWeight()");
return;
}
@@ -2596,8 +2768,7 @@ public void setStrokeCap(int cap) {
public int getAmbient(int index) {
// make sure we allocated the vertices array and that vertex exists
- if (vertices == null ||
- index >= vertices.length) {
+ if (vertices == null || index >= vertices.length) {
PGraphics.showWarning(NO_SUCH_VERTEX_ERROR + " (" + index + ")", "getAmbient()");
return ambientColor;
}
@@ -2632,8 +2803,7 @@ public void setAmbient(int index, int ambient) {
}
// make sure we allocated the vertices array and that vertex exists
- if (vertices == null ||
- index >= vertices.length) {
+ if (vertices == null || index >= vertices.length) {
PGraphics.showWarning(NO_SUCH_VERTEX_ERROR + " (" + index + ")", "setAmbient()");
return;
}
@@ -2646,8 +2816,7 @@ public void setAmbient(int index, int ambient) {
public int getSpecular(int index) {
// make sure we allocated the vertices array and that vertex exists
- if (vertices == null ||
- index >= vertices.length) {
+ if (vertices == null || index >= vertices.length) {
PGraphics.showWarning(NO_SUCH_VERTEX_ERROR + " (" + index + ")", "getSpecular()");
return specularColor;
}
@@ -2682,8 +2851,7 @@ public void setSpecular(int index, int specular) {
}
// make sure we allocated the vertices array and that vertex exists
- if (vertices == null ||
- index >= vertices.length) {
+ if (vertices == null || index >= vertices.length) {
PGraphics.showWarning(NO_SUCH_VERTEX_ERROR + " (" + index + ")", "setSpecular()");
return;
}
@@ -2696,8 +2864,7 @@ public void setSpecular(int index, int specular) {
public int getEmissive(int index) {
// make sure we allocated the vertices array and that vertex exists
- if (vertices == null ||
- index >= vertices.length) {
+ if (vertices == null || index >= vertices.length) {
PGraphics.showWarning(NO_SUCH_VERTEX_ERROR + " (" + index + ")", "getEmissive()");
return emissiveColor;
}
@@ -2822,13 +2989,28 @@ public boolean isClosed() {
// . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
- // http://www.ecse.rpi.edu/Homepages/wrf/Research/Short_Notes/pnpoly.html
+ /**
+ * Return true if this x, y coordinate is part of this shape. Only works
+ * with PATH shapes or GROUP shapes that contain other GROUPs or PATHs.
+ */
public boolean contains(float x, float y) {
if (family == PATH) {
+ PVector p = new PVector(x, y);
+ if (matrix != null) {
+ // apply the inverse transformation matrix to the point coordinates
+ PMatrix inverseCoords = matrix.get();
+ // TODO why is this called twice? [fry 190724]
+ // commit was https://github.com/processing/processing/commit/027fc7a4f8e8d0a435366eae754304eea282512a
+ inverseCoords.invert(); // maybe cache this?
+ inverseCoords.invert(); // maybe cache this?
+ inverseCoords.mult(new PVector(x, y), p);
+ }
+
+ // http://www.ecse.rpi.edu/Homepages/wrf/Research/Short_Notes/pnpoly.html
boolean c = false;
for (int i = 0, j = vertexCount-1; i < vertexCount; j = i++) {
- if (((vertices[i][Y] > y) != (vertices[j][Y] > y)) &&
- (x <
+ if (((vertices[i][Y] > p.y) != (vertices[j][Y] > p.y)) &&
+ (p.x <
(vertices[j][X]-vertices[i][X]) *
(y-vertices[i][Y]) /
(vertices[j][1]-vertices[i][Y]) +
@@ -2837,7 +3019,18 @@ public boolean contains(float x, float y) {
}
}
return c;
+
+ } else if (family == GROUP) {
+ // If this is a group, loop through children until we find one that
+ // contains the supplied coordinates. If a child does not support
+ // contains() throw a warning and continue.
+ for (int i = 0; i < childCount; i++) {
+ if (children[i].contains(x, y)) return true;
+ }
+ return false;
+
} else {
+ // https://github.com/processing/processing/issues/1280
throw new IllegalArgumentException("The contains() method is only implemented for paths.");
}
}
@@ -2871,8 +3064,8 @@ public boolean contains(float x, float y) {
* @webref pshape:method
* @usage web_application
* @brief Displaces the shape
- * @param tx left/right translation
- * @param ty up/down translation
+ * @param x left/right translation
+ * @param y up/down translation
* @see PShape#rotate(float)
* @see PShape#scale(float)
* @see PShape#resetMatrix()
@@ -2883,7 +3076,7 @@ public void translate(float x, float y) {
}
/**
- * @param tz forward/back translation
+ * @param z forward/back translation
*/
public void translate(float x, float y, float z) {
checkMatrix(3);
@@ -3373,4 +3566,4 @@ protected void colorCalcARGB(int argb, float alpha) {
calcAlpha = (calcAi != 255);
}
-}
\ No newline at end of file
+}
diff --git a/core/src/processing/core/PShapeOBJ.java b/libs/processing-core/src/main/java/processing/core/PShapeOBJ.java
similarity index 75%
rename from core/src/processing/core/PShapeOBJ.java
rename to libs/processing-core/src/main/java/processing/core/PShapeOBJ.java
index ca4d953f5..470f3820a 100644
--- a/core/src/processing/core/PShapeOBJ.java
+++ b/libs/processing-core/src/main/java/processing/core/PShapeOBJ.java
@@ -3,7 +3,7 @@
/*
Part of the Processing project - http://processing.org
- Copyright (c) 2012-16 The Processing Foundation
+ Copyright (c) 2012-21 The Processing Foundation
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -23,9 +23,10 @@
package processing.core;
import java.io.BufferedReader;
+import java.io.File;
import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.Hashtable;
+
/**
* This class is not part of the Processing API and should not be used
@@ -45,18 +46,21 @@ public class PShapeOBJ extends PShape {
* Initializes a new OBJ Object with the given filename.
*/
public PShapeOBJ(PApplet parent, String filename) {
- this(parent, parent.createReader(filename));
+ this(parent, parent.createReader(filename), getBasePath(parent, filename));
}
-
public PShapeOBJ(PApplet parent, BufferedReader reader) {
+ this(parent, reader, "");
+ }
+
+ public PShapeOBJ(PApplet parent, BufferedReader reader, String basePath) {
ArrayList faces = new ArrayList();
ArrayList materials = new ArrayList();
ArrayList coords = new ArrayList();
ArrayList normals = new ArrayList();
ArrayList texcoords = new ArrayList();
- parseOBJ(parent, reader,
- faces, materials, coords, normals, texcoords);
+ parseOBJ(parent, basePath,
+ reader, faces, materials, coords, normals, texcoords);
// The OBJ geometry is stored with each face in a separate child shape.
parent = null;
@@ -95,10 +99,10 @@ protected PShapeOBJ(OBJFace face, OBJMaterial mtl,
vertexCount = face.vertIdx.size();
vertices = new float[vertexCount][12];
for (int j = 0; j < face.vertIdx.size(); j++){
- int vertIdx, normIdx, texIdx;
- PVector vert, norms, tex;
+ int vertIdx, normIdx;
+ PVector vert, norms;
- vert = norms = tex = null;
+ vert = norms = null;
vertIdx = face.vertIdx.get(j).intValue() - 1;
vert = coords.get(vertIdx);
@@ -110,13 +114,6 @@ protected PShapeOBJ(OBJFace face, OBJMaterial mtl,
}
}
- if (j < face.texIdx.size()) {
- texIdx = face.texIdx.get(j).intValue() - 1;
- if (-1 < texIdx) {
- tex = texcoords.get(texIdx);
- }
- }
-
vertices[j][X] = vert.x;
vertices[j][Y] = vert.y;
vertices[j][Z] = vert.z;
@@ -132,13 +129,23 @@ protected PShapeOBJ(OBJFace face, OBJMaterial mtl,
vertices[j][PGraphics.NZ] = norms.z;
}
- if (tex != null) {
- vertices[j][PGraphics.U] = tex.x;
- vertices[j][PGraphics.V] = tex.y;
- }
-
if (mtl != null && mtl.kdMap != null) {
+ // This face is textured.
+ int texIdx;
+ PVector tex = null;
+
+ if (j < face.texIdx.size()) {
+ texIdx = face.texIdx.get(j).intValue() - 1;
+ if (-1 < texIdx) {
+ tex = texcoords.get(texIdx);
+ }
+ }
+
image = mtl.kdMap;
+ if (tex != null) {
+ vertices[j][PGraphics.U] = tex.x;
+ vertices[j][PGraphics.V] = tex.y;
+ }
}
}
}
@@ -168,14 +175,14 @@ protected void addChildren(ArrayList faces,
}
- static protected void parseOBJ(PApplet parent,
+ static protected void parseOBJ(PApplet parent, String path,
BufferedReader reader,
ArrayList faces,
ArrayList materials,
ArrayList coords,
ArrayList normals,
ArrayList texcoords) {
- Map mtlTable = new HashMap();
+ Hashtable mtlTable = new Hashtable();
int mtlIdxCur = -1;
boolean readv, readvn, readvt;
try {
@@ -184,7 +191,7 @@ static protected void parseOBJ(PApplet parent,
String line;
String gname = "object";
while ((line = reader.readLine()) != null) {
- // Parse the line.
+ // Parse the line.
line = line.trim();
if (line.equals("") || line.indexOf('#') == 0) {
// Empty line of comment, ignore line
@@ -231,20 +238,22 @@ static protected void parseOBJ(PApplet parent,
// uv, inverting v to take into account Processing's inverted Y axis
// with respect to OpenGL.
PVector tempv = new PVector(Float.valueOf(parts[1]).floatValue(),
- 1 - Float.valueOf(parts[2]).
- floatValue());
+ 1 - Float.valueOf(parts[2]).floatValue());
texcoords.add(tempv);
readvt = true;
} else if (parts[0].equals("o")) {
// Object name is ignored, for now.
} else if (parts[0].equals("mtllib")) {
-
if (parts[1] != null) {
String fn = parts[1];
+ if (fn.indexOf(File.separator) == -1 && !path.equals("")) {
+ // Relative file name, adding the base path.
+ fn = path + File.separator + fn;
+ }
BufferedReader mreader = parent.createReader(fn);
if (mreader != null) {
- parseMTL(parent, fn, mreader, materials, mtlTable);
- mreader.close();
+ parseMTL(parent, path,
+ mreader, materials, mtlTable);
}
}
} else if (parts[0].equals("g")) {
@@ -332,10 +341,10 @@ static protected void parseOBJ(PApplet parent,
}
- static protected void parseMTL(PApplet parent, String mtlfn,
+ static protected void parseMTL(PApplet parent, String path,
BufferedReader reader,
ArrayList materials,
- Map materialsHash) {
+ Hashtable materialsHash) {
try {
String line;
OBJMaterial currentMtl = null;
@@ -348,46 +357,39 @@ static protected void parseMTL(PApplet parent, String mtlfn,
if (parts[0].equals("newmtl")) {
// Starting new material.
String mtlname = parts[1];
- currentMtl = addMaterial(mtlname, materials, materialsHash);
- } else {
- if (currentMtl == null) {
- currentMtl = addMaterial("material" + materials.size(),
- materials, materialsHash);
- }
- if (parts[0].equals("map_Kd") && parts.length > 1) {
- // Loading texture map.
- String texname = parts[1];
- currentMtl.kdMap = parent.loadImage(texname);
- if (currentMtl.kdMap == null) {
- System.err.println("The texture map \"" + texname + "\" " +
- "in the materials definition file \"" + mtlfn + "\" " +
- "is missing or inaccessible, make sure " +
- "the URL is valid or that the file has been " +
- "added to your sketch and is readable.");
- }
- } else if (parts[0].equals("Ka") && parts.length > 3) {
- // The ambient color of the material
- currentMtl.ka.x = Float.valueOf(parts[1]).floatValue();
- currentMtl.ka.y = Float.valueOf(parts[2]).floatValue();
- currentMtl.ka.z = Float.valueOf(parts[3]).floatValue();
- } else if (parts[0].equals("Kd") && parts.length > 3) {
- // The diffuse color of the material
- currentMtl.kd.x = Float.valueOf(parts[1]).floatValue();
- currentMtl.kd.y = Float.valueOf(parts[2]).floatValue();
- currentMtl.kd.z = Float.valueOf(parts[3]).floatValue();
- } else if (parts[0].equals("Ks") && parts.length > 3) {
- // The specular color weighted by the specular coefficient
- currentMtl.ks.x = Float.valueOf(parts[1]).floatValue();
- currentMtl.ks.y = Float.valueOf(parts[2]).floatValue();
- currentMtl.ks.z = Float.valueOf(parts[3]).floatValue();
- } else if ((parts[0].equals("d") ||
- parts[0].equals("Tr")) && parts.length > 1) {
- // Reading the alpha transparency.
- currentMtl.d = Float.valueOf(parts[1]).floatValue();
- } else if (parts[0].equals("Ns") && parts.length > 1) {
- // The specular component of the Phong shading model
- currentMtl.ns = Float.valueOf(parts[1]).floatValue();
+ currentMtl = new OBJMaterial(mtlname);
+ materialsHash.put(mtlname, Integer.valueOf(materials.size()));
+ materials.add(currentMtl);
+ } else if (parts[0].equals("map_Kd") && parts.length > 1) {
+ // Loading texture map.
+ String texname = parts[1];
+ if (texname.indexOf(File.separator) == -1 && !path.equals("")) {
+ // Relative file name, adding the base path.
+ texname = path + File.separator + texname;
}
+ currentMtl.kdMap = parent.loadImage(texname);
+ } else if (parts[0].equals("Ka") && parts.length > 3) {
+ // The ambient color of the material
+ currentMtl.ka.x = Float.valueOf(parts[1]).floatValue();
+ currentMtl.ka.y = Float.valueOf(parts[2]).floatValue();
+ currentMtl.ka.z = Float.valueOf(parts[3]).floatValue();
+ } else if (parts[0].equals("Kd") && parts.length > 3) {
+ // The diffuse color of the material
+ currentMtl.kd.x = Float.valueOf(parts[1]).floatValue();
+ currentMtl.kd.y = Float.valueOf(parts[2]).floatValue();
+ currentMtl.kd.z = Float.valueOf(parts[3]).floatValue();
+ } else if (parts[0].equals("Ks") && parts.length > 3) {
+ // The specular color weighted by the specular coefficient
+ currentMtl.ks.x = Float.valueOf(parts[1]).floatValue();
+ currentMtl.ks.y = Float.valueOf(parts[2]).floatValue();
+ currentMtl.ks.z = Float.valueOf(parts[3]).floatValue();
+ } else if ((parts[0].equals("d") ||
+ parts[0].equals("Tr")) && parts.length > 1) {
+ // Reading the alpha transparency.
+ currentMtl.d = Float.valueOf(parts[1]).floatValue();
+ } else if (parts[0].equals("Ns") && parts.length > 1) {
+ // The specular component of the Phong shading model
+ currentMtl.ns = Float.valueOf(parts[1]).floatValue();
}
}
}
@@ -396,27 +398,19 @@ static protected void parseMTL(PApplet parent, String mtlfn,
}
}
- protected static OBJMaterial addMaterial(String mtlname,
- ArrayList materials,
- Map materialsHash) {
- OBJMaterial currentMtl = new OBJMaterial(mtlname);
- materialsHash.put(mtlname, Integer.valueOf(materials.size()));
- materials.add(currentMtl);
- return currentMtl;
- }
protected static int rgbaValue(PVector color) {
return 0xFF000000 | ((int)(color.x * 255) << 16) |
- ((int)(color.y * 255) << 8) |
- (int)(color.z * 255);
+ ((int)(color.y * 255) << 8) |
+ (int)(color.z * 255);
}
protected static int rgbaValue(PVector color, float alpha) {
return ((int)(alpha * 255) << 24) |
- ((int)(color.x * 255) << 16) |
- ((int)(color.y * 255) << 8) |
- (int)(color.z * 255);
+ ((int)(color.x * 255) << 16) |
+ ((int)(color.y * 255) << 8) |
+ (int)(color.z * 255);
}
@@ -438,6 +432,14 @@ static protected class OBJFace {
}
+ static protected String getBasePath(PApplet parent, String filename) {
+ if (-1 < filename.indexOf(File.separator)) {
+ return filename.substring(0, filename.lastIndexOf(File.separator));
+ }
+ return "";
+ }
+
+
// Stores a material defined in an MTL file.
static protected class OBJMaterial {
String name;
@@ -462,4 +464,5 @@ static protected class OBJMaterial {
kdMap = null;
}
}
-}
\ No newline at end of file
+}
+
diff --git a/core/src/processing/core/PShapeSVG.java b/libs/processing-core/src/main/java/processing/core/PShapeSVG.java
similarity index 70%
rename from core/src/processing/core/PShapeSVG.java
rename to libs/processing-core/src/main/java/processing/core/PShapeSVG.java
index bcbf15f63..33bd932b8 100644
--- a/core/src/processing/core/PShapeSVG.java
+++ b/libs/processing-core/src/main/java/processing/core/PShapeSVG.java
@@ -3,7 +3,7 @@
/*
Part of the Processing project - http://processing.org
- Copyright (c) 2012-16 The Processing Foundation
+ Copyright (c) 2012-21 The Processing Foundation
Copyright (c) 2006-12 Ben Fry and Casey Reas
Copyright (c) 2004-06 Michael Chang
@@ -24,11 +24,21 @@
package processing.core;
-
+//import static java.awt.Font.BOLD;
+//import static java.awt.Font.ITALIC;
+//import static java.awt.Font.PLAIN;
import processing.data.*;
-import java.util.HashMap;
+
+// TODO replace these with PMatrix2D
+import android.graphics.Matrix;
+//import java.awt.geom.AffineTransform;
+//import java.awt.geom.Point2D;
+
import java.util.Map;
-import android.graphics.*;
+import java.util.HashMap;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
/**
* This class is not part of the Processing API and should not be used
@@ -156,14 +166,14 @@ protected PShapeSVG(PShapeSVG parent, XML properties, boolean parseKids) {
// Negative size is illegal.
if (width < 0 || height < 0)
throw new RuntimeException(": width (" + width +
- ") and height (" + height + ") must not be negative.");
+ ") and height (" + height + ") must not be negative.");
// It's technically valid to have width or height == 0. Not specified at
// all is what to test for.
if ((unitWidth == null || unitHeight == null) && viewBoxStr == null) {
//throw new RuntimeException("width/height not specified");
PGraphics.showWarning("The width and/or height is not " +
- "readable in the tag of this file.");
+ "readable in the tag of this file.");
// For the spec, the default is 100% and 100%. For purposes
// here, insert a dummy value because this is prolly just a
// font or something for which the w/h doesn't matter.
@@ -326,6 +336,10 @@ protected PShape parseChild(XML elem) {
shape = createShape(this, elem, true);
shape.parseRect();
+ } else if (name.equals("image")) {
+ shape = createShape(this, elem, true);
+ shape.parseImage();
+
} else if (name.equals("polygon")) {
shape = createShape(this, elem, true);
shape.parsePoly(true);
@@ -354,8 +368,11 @@ protected PShape parseChild(XML elem) {
// return new FontGlyph(this, elem);
} else if (name.equals("text")) { // || name.equals("font")) {
- PGraphics.showWarning("Text and fonts in SVG files are " +
- "not currently supported, convert text to outlines instead.");
+ return new Text(this, elem);
+
+ } else if (name.equals("tspan")) {
+// return new LineOfText(this, elem);
+ PGraphics.showWarning("tspan elements are not supported.");
} else if (name.equals("filter")) {
PGraphics.showWarning("Filters are not supported.");
@@ -390,10 +407,10 @@ protected void parseLine() {
kind = LINE;
family = PRIMITIVE;
params = new float[] {
- getFloatWithUnit(element, "x1", svgWidth),
- getFloatWithUnit(element, "y1", svgHeight),
- getFloatWithUnit(element, "x2", svgWidth),
- getFloatWithUnit(element, "y2", svgHeight)
+ getFloatWithUnit(element, "x1", svgWidth),
+ getFloatWithUnit(element, "y1", svgHeight),
+ getFloatWithUnit(element, "x2", svgWidth),
+ getFloatWithUnit(element, "y2", svgHeight)
};
}
@@ -429,14 +446,29 @@ protected void parseRect() {
kind = RECT;
family = PRIMITIVE;
params = new float[] {
- getFloatWithUnit(element, "x", svgWidth),
- getFloatWithUnit(element, "y", svgHeight),
- getFloatWithUnit(element, "width", svgWidth),
- getFloatWithUnit(element, "height", svgHeight)
+ getFloatWithUnit(element, "x", svgWidth),
+ getFloatWithUnit(element, "y", svgHeight),
+ getFloatWithUnit(element, "width", svgWidth),
+ getFloatWithUnit(element, "height", svgHeight)
};
}
+ protected void parseImage() {
+ kind = RECT;
+ textureMode = NORMAL;
+
+ family = PRIMITIVE;
+ params = new float[] {
+ getFloatWithUnit(element, "x", svgWidth),
+ getFloatWithUnit(element, "y", svgHeight),
+ getFloatWithUnit(element, "width", svgWidth),
+ getFloatWithUnit(element, "height", svgHeight)
+ };
+
+ this.imagePath = element.getString("xlink:href");
+ }
+
/**
* Parse a polyline or polygon from an SVG file.
* Syntax defined at http://www.w3.org/TR/SVG/shapes.html#PointsBNF
@@ -448,14 +480,27 @@ protected void parsePoly(boolean close) {
String pointsAttr = element.getString("points");
if (pointsAttr != null) {
- String[] pointsBuffer = PApplet.splitTokens(pointsAttr);
- vertexCount = pointsBuffer.length;
+ Pattern pattern = Pattern.compile("([+-]?[\\d]+(\\.[\\d]+)?([eE][+-][\\d]+)?)(,?\\s*)([+-]?[\\d]+(\\.[\\d]+)?([eE][+-][\\d]+)?)");
+ Matcher matcher = pattern.matcher(pointsAttr);
+ vertexCount = 0;
+ while (matcher.find()) {
+ vertexCount++;
+ }
+ matcher.reset();
vertices = new float[vertexCount][2];
for (int i = 0; i < vertexCount; i++) {
- String pb[] = PApplet.splitTokens(pointsBuffer[i], ", \t\r\n");
- vertices[i][X] = Float.parseFloat(pb[0]);
- vertices[i][Y] = Float.parseFloat(pb[1]);
+ matcher.find();
+ vertices[i][X] = Float.parseFloat(matcher.group(1));
+ vertices[i][Y] = Float.parseFloat(matcher.group(5));
}
+// String[] pointsBuffer = PApplet.splitTokens(pointsAttr);
+// vertexCount = pointsBuffer.length;
+// vertices = new float[vertexCount][2];
+// for (int i = 0; i < vertexCount; i++) {
+// String pb[] = PApplet.splitTokens(pointsBuffer[i], ", \t\r\n");
+// vertices[i][X] = Float.parseFloat(pb[0]);
+// vertices[i][Y] = Float.parseFloat(pb[1]);
+// }
}
}
@@ -514,7 +559,7 @@ protected void parsePath() {
// use whitespace constant to get rid of extra spaces and CR or LF
String[] pathTokens =
- PApplet.splitTokens(pathBuffer.toString(), "|" + WHITESPACE);
+ PApplet.splitTokens(pathBuffer.toString(), "|" + WHITESPACE);
vertices = new float[pathTokens.length][2];
vertexCodes = new int[pathTokens.length];
@@ -540,302 +585,302 @@ protected void parsePath() {
}
switch (c) {
- case 'M': // M - move to (absolute)
- cx = PApplet.parseFloat(pathTokens[i + 1]);
- cy = PApplet.parseFloat(pathTokens[i + 2]);
- movetoX = cx;
- movetoY = cy;
- parsePathMoveto(cx, cy);
- implicitCommand = 'L';
- i += 3;
- break;
+ case 'M': // M - move to (absolute)
+ cx = PApplet.parseFloat(pathTokens[i + 1]);
+ cy = PApplet.parseFloat(pathTokens[i + 2]);
+ movetoX = cx;
+ movetoY = cy;
+ parsePathMoveto(cx, cy);
+ implicitCommand = 'L';
+ i += 3;
+ break;
+
+ case 'm': // m - move to (relative)
+ cx = cx + PApplet.parseFloat(pathTokens[i + 1]);
+ cy = cy + PApplet.parseFloat(pathTokens[i + 2]);
+ movetoX = cx;
+ movetoY = cy;
+ parsePathMoveto(cx, cy);
+ implicitCommand = 'l';
+ i += 3;
+ break;
+
+ case 'L':
+ cx = PApplet.parseFloat(pathTokens[i + 1]);
+ cy = PApplet.parseFloat(pathTokens[i + 2]);
+ parsePathLineto(cx, cy);
+ i += 3;
+ break;
+
+ case 'l':
+ cx = cx + PApplet.parseFloat(pathTokens[i + 1]);
+ cy = cy + PApplet.parseFloat(pathTokens[i + 2]);
+ parsePathLineto(cx, cy);
+ i += 3;
+ break;
- case 'm': // m - move to (relative)
- cx = cx + PApplet.parseFloat(pathTokens[i + 1]);
- cy = cy + PApplet.parseFloat(pathTokens[i + 2]);
- movetoX = cx;
- movetoY = cy;
- parsePathMoveto(cx, cy);
- implicitCommand = 'l';
- i += 3;
- break;
+ // horizontal lineto absolute
+ case 'H':
+ cx = PApplet.parseFloat(pathTokens[i + 1]);
+ parsePathLineto(cx, cy);
+ i += 2;
+ break;
- case 'L':
- cx = PApplet.parseFloat(pathTokens[i + 1]);
- cy = PApplet.parseFloat(pathTokens[i + 2]);
- parsePathLineto(cx, cy);
- i += 3;
- break;
+ // horizontal lineto relative
+ case 'h':
+ cx = cx + PApplet.parseFloat(pathTokens[i + 1]);
+ parsePathLineto(cx, cy);
+ i += 2;
+ break;
+
+ case 'V':
+ cy = PApplet.parseFloat(pathTokens[i + 1]);
+ parsePathLineto(cx, cy);
+ i += 2;
+ break;
+
+ case 'v':
+ cy = cy + PApplet.parseFloat(pathTokens[i + 1]);
+ parsePathLineto(cx, cy);
+ i += 2;
+ break;
- case 'l':
- cx = cx + PApplet.parseFloat(pathTokens[i + 1]);
- cy = cy + PApplet.parseFloat(pathTokens[i + 2]);
- parsePathLineto(cx, cy);
- i += 3;
+ // C - curve to (absolute)
+ case 'C': {
+ float ctrlX1 = PApplet.parseFloat(pathTokens[i + 1]);
+ float ctrlY1 = PApplet.parseFloat(pathTokens[i + 2]);
+ float ctrlX2 = PApplet.parseFloat(pathTokens[i + 3]);
+ float ctrlY2 = PApplet.parseFloat(pathTokens[i + 4]);
+ float endX = PApplet.parseFloat(pathTokens[i + 5]);
+ float endY = PApplet.parseFloat(pathTokens[i + 6]);
+ parsePathCurveto(ctrlX1, ctrlY1, ctrlX2, ctrlY2, endX, endY);
+ cx = endX;
+ cy = endY;
+ i += 7;
+ prevCurve = true;
+ }
break;
- // horizontal lineto absolute
- case 'H':
- cx = PApplet.parseFloat(pathTokens[i + 1]);
- parsePathLineto(cx, cy);
- i += 2;
+ // c - curve to (relative)
+ case 'c': {
+ float ctrlX1 = cx + PApplet.parseFloat(pathTokens[i + 1]);
+ float ctrlY1 = cy + PApplet.parseFloat(pathTokens[i + 2]);
+ float ctrlX2 = cx + PApplet.parseFloat(pathTokens[i + 3]);
+ float ctrlY2 = cy + PApplet.parseFloat(pathTokens[i + 4]);
+ float endX = cx + PApplet.parseFloat(pathTokens[i + 5]);
+ float endY = cy + PApplet.parseFloat(pathTokens[i + 6]);
+ parsePathCurveto(ctrlX1, ctrlY1, ctrlX2, ctrlY2, endX, endY);
+ cx = endX;
+ cy = endY;
+ i += 7;
+ prevCurve = true;
+ }
break;
- // horizontal lineto relative
- case 'h':
- cx = cx + PApplet.parseFloat(pathTokens[i + 1]);
- parsePathLineto(cx, cy);
- i += 2;
+ // S - curve to shorthand (absolute)
+ // Draws a cubic Bézier curve from the current point to (x,y). The first
+ // control point is assumed to be the reflection of the second control
+ // point on the previous command relative to the current point.
+ // (x2,y2) is the second control point (i.e., the control point
+ // at the end of the curve). S (uppercase) indicates that absolute
+ // coordinates will follow; s (lowercase) indicates that relative
+ // coordinates will follow. Multiple sets of coordinates may be specified
+ // to draw a polybézier. At the end of the command, the new current point
+ // becomes the final (x,y) coordinate pair used in the polybézier.
+ case 'S': {
+ // (If there is no previous command or if the previous command was not
+ // an C, c, S or s, assume the first control point is coincident with
+ // the current point.)
+ if (!prevCurve) {
+ ctrlX = cx;
+ ctrlY = cy;
+ } else {
+ float ppx = vertices[vertexCount-2][X];
+ float ppy = vertices[vertexCount-2][Y];
+ float px = vertices[vertexCount-1][X];
+ float py = vertices[vertexCount-1][Y];
+ ctrlX = px + (px - ppx);
+ ctrlY = py + (py - ppy);
+ }
+ float ctrlX2 = PApplet.parseFloat(pathTokens[i + 1]);
+ float ctrlY2 = PApplet.parseFloat(pathTokens[i + 2]);
+ float endX = PApplet.parseFloat(pathTokens[i + 3]);
+ float endY = PApplet.parseFloat(pathTokens[i + 4]);
+ parsePathCurveto(ctrlX, ctrlY, ctrlX2, ctrlY2, endX, endY);
+ cx = endX;
+ cy = endY;
+ i += 5;
+ prevCurve = true;
+ }
break;
- case 'V':
- cy = PApplet.parseFloat(pathTokens[i + 1]);
- parsePathLineto(cx, cy);
- i += 2;
+ // s - curve to shorthand (relative)
+ case 's': {
+ if (!prevCurve) {
+ ctrlX = cx;
+ ctrlY = cy;
+ } else {
+ float ppx = vertices[vertexCount-2][X];
+ float ppy = vertices[vertexCount-2][Y];
+ float px = vertices[vertexCount-1][X];
+ float py = vertices[vertexCount-1][Y];
+ ctrlX = px + (px - ppx);
+ ctrlY = py + (py - ppy);
+ }
+ float ctrlX2 = cx + PApplet.parseFloat(pathTokens[i + 1]);
+ float ctrlY2 = cy + PApplet.parseFloat(pathTokens[i + 2]);
+ float endX = cx + PApplet.parseFloat(pathTokens[i + 3]);
+ float endY = cy + PApplet.parseFloat(pathTokens[i + 4]);
+ parsePathCurveto(ctrlX, ctrlY, ctrlX2, ctrlY2, endX, endY);
+ cx = endX;
+ cy = endY;
+ i += 5;
+ prevCurve = true;
+ }
break;
- case 'v':
- cy = cy + PApplet.parseFloat(pathTokens[i + 1]);
- parsePathLineto(cx, cy);
- i += 2;
+ // Q - quadratic curve to (absolute)
+ // Draws a quadratic Bézier curve from the current point to (x,y) using
+ // (x1,y1) as the control point. Q (uppercase) indicates that absolute
+ // coordinates will follow; q (lowercase) indicates that relative
+ // coordinates will follow. Multiple sets of coordinates may be specified
+ // to draw a polybézier. At the end of the command, the new current point
+ // becomes the final (x,y) coordinate pair used in the polybézier.
+ case 'Q': {
+ ctrlX = PApplet.parseFloat(pathTokens[i + 1]);
+ ctrlY = PApplet.parseFloat(pathTokens[i + 2]);
+ float endX = PApplet.parseFloat(pathTokens[i + 3]);
+ float endY = PApplet.parseFloat(pathTokens[i + 4]);
+ //parsePathQuadto(cx, cy, ctrlX, ctrlY, endX, endY);
+ parsePathQuadto(ctrlX, ctrlY, endX, endY);
+ cx = endX;
+ cy = endY;
+ i += 5;
+ prevCurve = true;
+ }
break;
- // C - curve to (absolute)
- case 'C': {
- float ctrlX1 = PApplet.parseFloat(pathTokens[i + 1]);
- float ctrlY1 = PApplet.parseFloat(pathTokens[i + 2]);
- float ctrlX2 = PApplet.parseFloat(pathTokens[i + 3]);
- float ctrlY2 = PApplet.parseFloat(pathTokens[i + 4]);
- float endX = PApplet.parseFloat(pathTokens[i + 5]);
- float endY = PApplet.parseFloat(pathTokens[i + 6]);
- parsePathCurveto(ctrlX1, ctrlY1, ctrlX2, ctrlY2, endX, endY);
- cx = endX;
- cy = endY;
- i += 7;
- prevCurve = true;
- }
- break;
-
- // c - curve to (relative)
- case 'c': {
- float ctrlX1 = cx + PApplet.parseFloat(pathTokens[i + 1]);
- float ctrlY1 = cy + PApplet.parseFloat(pathTokens[i + 2]);
- float ctrlX2 = cx + PApplet.parseFloat(pathTokens[i + 3]);
- float ctrlY2 = cy + PApplet.parseFloat(pathTokens[i + 4]);
- float endX = cx + PApplet.parseFloat(pathTokens[i + 5]);
- float endY = cy + PApplet.parseFloat(pathTokens[i + 6]);
- parsePathCurveto(ctrlX1, ctrlY1, ctrlX2, ctrlY2, endX, endY);
- cx = endX;
- cy = endY;
- i += 7;
- prevCurve = true;
- }
- break;
-
- // S - curve to shorthand (absolute)
- // Draws a cubic Bézier curve from the current point to (x,y). The first
- // control point is assumed to be the reflection of the second control
- // point on the previous command relative to the current point.
- // (x2,y2) is the second control point (i.e., the control point
- // at the end of the curve). S (uppercase) indicates that absolute
- // coordinates will follow; s (lowercase) indicates that relative
- // coordinates will follow. Multiple sets of coordinates may be specified
- // to draw a polybézier. At the end of the command, the new current point
- // becomes the final (x,y) coordinate pair used in the polybézier.
- case 'S': {
- // (If there is no previous command or if the previous command was not
- // an C, c, S or s, assume the first control point is coincident with
- // the current point.)
- if (!prevCurve) {
- ctrlX = cx;
- ctrlY = cy;
- } else {
- float ppx = vertices[vertexCount-2][X];
- float ppy = vertices[vertexCount-2][Y];
- float px = vertices[vertexCount-1][X];
- float py = vertices[vertexCount-1][Y];
- ctrlX = px + (px - ppx);
- ctrlY = py + (py - ppy);
+ // q - quadratic curve to (relative)
+ case 'q': {
+ ctrlX = cx + PApplet.parseFloat(pathTokens[i + 1]);
+ ctrlY = cy + PApplet.parseFloat(pathTokens[i + 2]);
+ float endX = cx + PApplet.parseFloat(pathTokens[i + 3]);
+ float endY = cy + PApplet.parseFloat(pathTokens[i + 4]);
+ //parsePathQuadto(cx, cy, ctrlX, ctrlY, endX, endY);
+ parsePathQuadto(ctrlX, ctrlY, endX, endY);
+ cx = endX;
+ cy = endY;
+ i += 5;
+ prevCurve = true;
}
- float ctrlX2 = PApplet.parseFloat(pathTokens[i + 1]);
- float ctrlY2 = PApplet.parseFloat(pathTokens[i + 2]);
- float endX = PApplet.parseFloat(pathTokens[i + 3]);
- float endY = PApplet.parseFloat(pathTokens[i + 4]);
- parsePathCurveto(ctrlX, ctrlY, ctrlX2, ctrlY2, endX, endY);
- cx = endX;
- cy = endY;
- i += 5;
- prevCurve = true;
- }
- break;
+ break;
- // s - curve to shorthand (relative)
- case 's': {
- if (!prevCurve) {
- ctrlX = cx;
- ctrlY = cy;
- } else {
- float ppx = vertices[vertexCount-2][X];
- float ppy = vertices[vertexCount-2][Y];
- float px = vertices[vertexCount-1][X];
- float py = vertices[vertexCount-1][Y];
- ctrlX = px + (px - ppx);
- ctrlY = py + (py - ppy);
- }
- float ctrlX2 = cx + PApplet.parseFloat(pathTokens[i + 1]);
- float ctrlY2 = cy + PApplet.parseFloat(pathTokens[i + 2]);
- float endX = cx + PApplet.parseFloat(pathTokens[i + 3]);
- float endY = cy + PApplet.parseFloat(pathTokens[i + 4]);
- parsePathCurveto(ctrlX, ctrlY, ctrlX2, ctrlY2, endX, endY);
- cx = endX;
- cy = endY;
- i += 5;
- prevCurve = true;
- }
- break;
-
- // Q - quadratic curve to (absolute)
- // Draws a quadratic Bézier curve from the current point to (x,y) using
- // (x1,y1) as the control point. Q (uppercase) indicates that absolute
- // coordinates will follow; q (lowercase) indicates that relative
- // coordinates will follow. Multiple sets of coordinates may be specified
- // to draw a polybézier. At the end of the command, the new current point
- // becomes the final (x,y) coordinate pair used in the polybézier.
- case 'Q': {
- ctrlX = PApplet.parseFloat(pathTokens[i + 1]);
- ctrlY = PApplet.parseFloat(pathTokens[i + 2]);
- float endX = PApplet.parseFloat(pathTokens[i + 3]);
- float endY = PApplet.parseFloat(pathTokens[i + 4]);
- //parsePathQuadto(cx, cy, ctrlX, ctrlY, endX, endY);
- parsePathQuadto(ctrlX, ctrlY, endX, endY);
- cx = endX;
- cy = endY;
- i += 5;
- prevCurve = true;
- }
- break;
-
- // q - quadratic curve to (relative)
- case 'q': {
- ctrlX = cx + PApplet.parseFloat(pathTokens[i + 1]);
- ctrlY = cy + PApplet.parseFloat(pathTokens[i + 2]);
- float endX = cx + PApplet.parseFloat(pathTokens[i + 3]);
- float endY = cy + PApplet.parseFloat(pathTokens[i + 4]);
- //parsePathQuadto(cx, cy, ctrlX, ctrlY, endX, endY);
- parsePathQuadto(ctrlX, ctrlY, endX, endY);
- cx = endX;
- cy = endY;
- i += 5;
- prevCurve = true;
- }
- break;
-
- // T - quadratic curveto shorthand (absolute)
- // The control point is assumed to be the reflection of the control
- // point on the previous command relative to the current point.
- case 'T': {
- // If there is no previous command or if the previous command was
- // not a Q, q, T or t, assume the control point is coincident
- // with the current point.
- if (!prevCurve) {
- ctrlX = cx;
- ctrlY = cy;
- } else {
- float ppx = vertices[vertexCount-2][X];
- float ppy = vertices[vertexCount-2][Y];
- float px = vertices[vertexCount-1][X];
- float py = vertices[vertexCount-1][Y];
- ctrlX = px + (px - ppx);
- ctrlY = py + (py - ppy);
+ // T - quadratic curveto shorthand (absolute)
+ // The control point is assumed to be the reflection of the control
+ // point on the previous command relative to the current point.
+ case 'T': {
+ // If there is no previous command or if the previous command was
+ // not a Q, q, T or t, assume the control point is coincident
+ // with the current point.
+ if (!prevCurve) {
+ ctrlX = cx;
+ ctrlY = cy;
+ } else {
+ float ppx = vertices[vertexCount-2][X];
+ float ppy = vertices[vertexCount-2][Y];
+ float px = vertices[vertexCount-1][X];
+ float py = vertices[vertexCount-1][Y];
+ ctrlX = px + (px - ppx);
+ ctrlY = py + (py - ppy);
+ }
+ float endX = PApplet.parseFloat(pathTokens[i + 1]);
+ float endY = PApplet.parseFloat(pathTokens[i + 2]);
+ //parsePathQuadto(cx, cy, ctrlX, ctrlY, endX, endY);
+ parsePathQuadto(ctrlX, ctrlY, endX, endY);
+ cx = endX;
+ cy = endY;
+ i += 3;
+ prevCurve = true;
}
- float endX = PApplet.parseFloat(pathTokens[i + 1]);
- float endY = PApplet.parseFloat(pathTokens[i + 2]);
- //parsePathQuadto(cx, cy, ctrlX, ctrlY, endX, endY);
- parsePathQuadto(ctrlX, ctrlY, endX, endY);
- cx = endX;
- cy = endY;
- i += 3;
- prevCurve = true;
- }
break;
// t - quadratic curveto shorthand (relative)
- case 't': {
- if (!prevCurve) {
- ctrlX = cx;
- ctrlY = cy;
- } else {
- float ppx = vertices[vertexCount-2][X];
- float ppy = vertices[vertexCount-2][Y];
- float px = vertices[vertexCount-1][X];
- float py = vertices[vertexCount-1][Y];
- ctrlX = px + (px - ppx);
- ctrlY = py + (py - ppy);
+ case 't': {
+ if (!prevCurve) {
+ ctrlX = cx;
+ ctrlY = cy;
+ } else {
+ float ppx = vertices[vertexCount-2][X];
+ float ppy = vertices[vertexCount-2][Y];
+ float px = vertices[vertexCount-1][X];
+ float py = vertices[vertexCount-1][Y];
+ ctrlX = px + (px - ppx);
+ ctrlY = py + (py - ppy);
+ }
+ float endX = cx + PApplet.parseFloat(pathTokens[i + 1]);
+ float endY = cy + PApplet.parseFloat(pathTokens[i + 2]);
+ //parsePathQuadto(cx, cy, ctrlX, ctrlY, endX, endY);
+ parsePathQuadto(ctrlX, ctrlY, endX, endY);
+ cx = endX;
+ cy = endY;
+ i += 3;
+ prevCurve = true;
}
- float endX = cx + PApplet.parseFloat(pathTokens[i + 1]);
- float endY = cy + PApplet.parseFloat(pathTokens[i + 2]);
- //parsePathQuadto(cx, cy, ctrlX, ctrlY, endX, endY);
- parsePathQuadto(ctrlX, ctrlY, endX, endY);
- cx = endX;
- cy = endY;
- i += 3;
- prevCurve = true;
- }
break;
- // A - elliptical arc to (absolute)
- case 'A': {
- float rx = PApplet.parseFloat(pathTokens[i + 1]);
- float ry = PApplet.parseFloat(pathTokens[i + 2]);
- float angle = PApplet.parseFloat(pathTokens[i + 3]);
- boolean fa = PApplet.parseFloat(pathTokens[i + 4]) != 0;
- boolean fs = PApplet.parseFloat(pathTokens[i + 5]) != 0;
- float endX = PApplet.parseFloat(pathTokens[i + 6]);
- float endY = PApplet.parseFloat(pathTokens[i + 7]);
- parsePathArcto(cx, cy, rx, ry, angle, fa, fs, endX, endY);
- cx = endX;
- cy = endY;
- i += 8;
- prevCurve = true;
- }
- break;
-
- // a - elliptical arc to (relative)
- case 'a': {
- float rx = PApplet.parseFloat(pathTokens[i + 1]);
- float ry = PApplet.parseFloat(pathTokens[i + 2]);
- float angle = PApplet.parseFloat(pathTokens[i + 3]);
- boolean fa = PApplet.parseFloat(pathTokens[i + 4]) != 0;
- boolean fs = PApplet.parseFloat(pathTokens[i + 5]) != 0;
- float endX = cx + PApplet.parseFloat(pathTokens[i + 6]);
- float endY = cy + PApplet.parseFloat(pathTokens[i + 7]);
- parsePathArcto(cx, cy, rx, ry, angle, fa, fs, endX, endY);
- cx = endX;
- cy = endY;
- i += 8;
- prevCurve = true;
- }
- break;
-
- case 'Z':
- case 'z':
- // since closing the path, the 'current' point needs
- // to return back to the last moveto location.
- // http://code.google.com/p/processing/issues/detail?id=1058
- cx = movetoX;
- cy = movetoY;
- close = true;
- i++;
+ // A - elliptical arc to (absolute)
+ case 'A': {
+ float rx = PApplet.parseFloat(pathTokens[i + 1]);
+ float ry = PApplet.parseFloat(pathTokens[i + 2]);
+ float angle = PApplet.parseFloat(pathTokens[i + 3]);
+ boolean fa = PApplet.parseFloat(pathTokens[i + 4]) != 0;
+ boolean fs = PApplet.parseFloat(pathTokens[i + 5]) != 0;
+ float endX = PApplet.parseFloat(pathTokens[i + 6]);
+ float endY = PApplet.parseFloat(pathTokens[i + 7]);
+ parsePathArcto(cx, cy, rx, ry, angle, fa, fs, endX, endY);
+ cx = endX;
+ cy = endY;
+ i += 8;
+ prevCurve = true;
+ }
break;
- default:
- String parsed =
- PApplet.join(PApplet.subset(pathTokens, 0, i), ",");
- String unparsed =
- PApplet.join(PApplet.subset(pathTokens, i), ",");
- System.err.println("parsed: " + parsed);
- System.err.println("unparsed: " + unparsed);
- throw new RuntimeException("shape command not handled: " + pathTokens[i]);
+ // a - elliptical arc to (relative)
+ case 'a': {
+ float rx = PApplet.parseFloat(pathTokens[i + 1]);
+ float ry = PApplet.parseFloat(pathTokens[i + 2]);
+ float angle = PApplet.parseFloat(pathTokens[i + 3]);
+ boolean fa = PApplet.parseFloat(pathTokens[i + 4]) != 0;
+ boolean fs = PApplet.parseFloat(pathTokens[i + 5]) != 0;
+ float endX = cx + PApplet.parseFloat(pathTokens[i + 6]);
+ float endY = cy + PApplet.parseFloat(pathTokens[i + 7]);
+ parsePathArcto(cx, cy, rx, ry, angle, fa, fs, endX, endY);
+ cx = endX;
+ cy = endY;
+ i += 8;
+ prevCurve = true;
+ }
+ break;
+
+ case 'Z':
+ case 'z':
+ // since closing the path, the 'current' point needs
+ // to return back to the last moveto location.
+ // http://code.google.com/p/processing/issues/detail?id=1058
+ cx = movetoX;
+ cy = movetoY;
+ close = true;
+ i++;
+ break;
+
+ default:
+ String parsed =
+ PApplet.join(PApplet.subset(pathTokens, 0, i), ",");
+ String unparsed =
+ PApplet.join(PApplet.subset(pathTokens, i), ",");
+ System.err.println("parsed: " + parsed);
+ System.err.println("unparsed: " + unparsed);
+ throw new RuntimeException("shape command not handled: " + pathTokens[i]);
}
// prevCommand = c;
}
@@ -952,7 +997,7 @@ private void parsePathArcto(float x1, float y1,
ry *= sqrtA; cyr = 0;
} else {
float k = ((fa == fs) ? -1f : 1f) *
- PApplet.sqrt((rx*rx * ry*ry) / ((rx*rx * y1r*y1r) + (ry*ry * x1r*x1r)) - 1f);
+ PApplet.sqrt((rx*rx * ry*ry) / ((rx*rx * y1r*y1r) + (ry*ry * x1r*x1r)) - 1f);
cxr = k * rx * y1r / ry;
cyr = -k * ry * x1r / rx;
}
@@ -976,7 +1021,7 @@ private void parsePathArcto(float x1, float y1,
float inc = phiDelta / segmentCount;
float a = PApplet.sin(inc) *
- (PApplet.sqrt(4 + 3 * PApplet.sq(PApplet.tan(inc / 2))) - 1) / 3;
+ (PApplet.sqrt(4 + 3 * PApplet.sq(PApplet.tan(inc / 2))) - 1) / 3;
float sinPhi1 = PApplet.sin(phi1), cosPhi1 = PApplet.cos(phi1);
@@ -1297,23 +1342,23 @@ static protected int parseSimpleColor(String colorText) {
* than the (unlikely to be useful) entire 147-color system used in SVG.
*/
static protected IntDict colorNames = new IntDict(new Object[][] {
- { "aqua", 0x00ffff },
- { "black", 0x000000 },
- { "blue", 0x0000ff },
- { "fuchsia", 0xff00ff },
- { "gray", 0x808080 },
- { "grey", 0x808080 },
- { "green", 0x008000 },
- { "lime", 0x00ff00 },
- { "maroon", 0x800000 },
- { "navy", 0x000080 },
- { "olive", 0x808000 },
- { "purple", 0x800080 },
- { "red", 0xff0000 },
- { "silver", 0xc0c0c0 },
- { "teal", 0x008080 },
- { "white", 0xffffff },
- { "yellow", 0xffff00 }
+ { "aqua", 0x00ffff },
+ { "black", 0x000000 },
+ { "blue", 0x0000ff },
+ { "fuchsia", 0xff00ff },
+ { "gray", 0x808080 },
+ { "grey", 0x808080 },
+ { "green", 0x008000 },
+ { "lime", 0x00ff00 },
+ { "maroon", 0x800000 },
+ { "navy", 0x000080 },
+ { "olive", 0x808000 },
+ { "purple", 0x800080 },
+ { "red", 0xff0000 },
+ { "silver", 0xc0c0c0 },
+ { "teal", 0x008080 },
+ { "white", 0xffffff },
+ { "yellow", 0xffff00 }
});
/*
@@ -1483,7 +1528,7 @@ public Gradient(PShapeSVG parent, XML properties) {
if (opacityStr == null) opacityStr = "1";
}
int tupacity = PApplet.constrain(
- (int)(PApplet.parseFloat(opacityStr) * 255), 0, 255);
+ (int)(PApplet.parseFloat(opacityStr) * 255), 0, 255);
color[count] = (tupacity << 24) | parseSimpleColor(colorStr);
count++;
}
@@ -1506,16 +1551,16 @@ public LinearGradient(PShapeSVG parent, XML properties) {
this.y2 = getFloatWithUnit(properties, "y2", svgHeight);
String transformStr =
- properties.getString("gradientTransform");
+ properties.getString("gradientTransform");
if (transformStr != null) {
float t[] = parseTransform(transformStr).get(null);
//this.transform = new AffineTransform(t[0], t[3], t[1], t[4], t[2], t[5]);
transform = new Matrix();
transform.setValues(new float[] { // TODO don't create temp floats
- t[0], t[1], t[2],
- t[3], t[4], t[5],
- 0, 0, 1
+ t[0], t[1], t[2],
+ t[3], t[4], t[5],
+ 0, 0, 1
});
// Point2D t1 = transform.transform(new Point2D.Float(x1, y1), null);
@@ -1549,16 +1594,16 @@ public RadialGradient(PShapeSVG parent, XML properties) {
this.r = getFloatWithUnit(properties, "r", svgSizeXY);
String transformStr =
- properties.getString("gradientTransform");
+ properties.getString("gradientTransform");
if (transformStr != null) {
float t[] = parseTransform(transformStr).get(null);
// this.transform = new AffineTransform(t[0], t[3], t[1], t[4], t[2], t[5]);
transform = new Matrix();
transform.setValues(new float[] { // TODO don't create temp floats
- t[0], t[1], t[2],
- t[3], t[4], t[5],
- 0, 0, 1
+ t[0], t[1], t[2],
+ t[3], t[4], t[5],
+ 0, 0, 1
});
// Point2D t1 = transform.transform(new Point2D.Float(cx, cy), null);
@@ -1582,7 +1627,183 @@ public RadialGradient(PShapeSVG parent, XML properties) {
// . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
- public static class Font extends PShapeSVG {
+// static private float TEXT_QUALITY = 1;
+ public static final int PLAIN = 0;
+ public static final int BOLD = 1;
+ public static final int ITALIC = 2;
+
+ static private PFont parseFont(XML properties) {
+ String fontFamily = null;
+ float size = 10;
+ int weight = PLAIN; // 0
+ int italic = 0;
+
+ if (properties.hasAttribute("style")) {
+ String styleText = properties.getString("style");
+ String[] styleTokens = PApplet.splitTokens(styleText, ";");
+
+ //PApplet.println(styleTokens);
+ for (int i = 0; i < styleTokens.length; i++) {
+ String[] tokens = PApplet.splitTokens(styleTokens[i], ":");
+ //PApplet.println(tokens);
+
+ tokens[0] = PApplet.trim(tokens[0]);
+
+ if (tokens[0].equals("font-style")) {
+ // PApplet.println("font-style: " + tokens[1]);
+ if (tokens[1].contains("italic")) {
+ italic = ITALIC;
+ }
+ } else if (tokens[0].equals("font-variant")) {
+ // PApplet.println("font-variant: " + tokens[1]);
+ // setFillOpacity(tokens[1]);
+
+ } else if (tokens[0].equals("font-weight")) {
+ // PApplet.println("font-weight: " + tokens[1]);
+
+ if (tokens[1].contains("bold")) {
+ weight = BOLD;
+ // PApplet.println("Bold weight ! ");
+ }
+
+
+ } else if (tokens[0].equals("font-stretch")) {
+ // not supported.
+
+ } else if (tokens[0].equals("font-size")) {
+ // PApplet.println("font-size: " + tokens[1]);
+ size = Float.parseFloat(tokens[1].split("px")[0]);
+ // PApplet.println("font-size-parsed: " + size);
+ } else if (tokens[0].equals("line-height")) {
+ // not supported
+
+ } else if (tokens[0].equals("font-family")) {
+ // PApplet.println("Font-family: " + tokens[1]);
+ fontFamily = tokens[1];
+
+ } else if (tokens[0].equals("text-align")) {
+ // not supported
+
+ } else if (tokens[0].equals("letter-spacing")) {
+ // not supported
+
+ } else if (tokens[0].equals("word-spacing")) {
+ // not supported
+
+ } else if (tokens[0].equals("writing-mode")) {
+ // not supported
+
+ } else if (tokens[0].equals("text-anchor")) {
+ // not supported
+
+ } else {
+ // Other attributes are not yet implemented
+ }
+ }
+ }
+ if (fontFamily == null) {
+ return null;
+ }
+// size = size * TEXT_QUALITY;
+
+ return createFont(fontFamily, weight | italic, size, true);
+ }
+
+
+ static protected PFont createFont(String name, int weight,
+ float size, boolean smooth) {
+ //System.out.println("Try to create a font of " + name + " family, " + weight);
+// java.awt.Font baseFont = new java.awt.Font(name, weight, (int) size);
+
+ //System.out.println("Resulting family : " + baseFont.getFamily() + " " + baseFont.getStyle());
+// return new PFont(baseFont.deriveFont(size), smooth, null);
+ return null;
+ }
+
+
+ // . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
+
+
+ static public class Text extends PShapeSVG {
+ protected PFont font;
+
+ public Text(PShapeSVG parent, XML properties) {
+ super(parent, properties, true);
+
+ // get location
+ float x = Float.parseFloat(properties.getString("x"));
+ float y = Float.parseFloat(properties.getString("y"));
+
+ if (matrix == null) {
+ matrix = new PMatrix2D();
+ }
+ matrix.translate(x, y);
+
+ family = GROUP;
+
+ font = parseFont(properties);
+ }
+ }
+
+
+ // . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
+
+
+ static public class LineOfText extends PShapeSVG {
+ String textToDisplay;
+ PFont font;
+
+ public LineOfText(PShapeSVG parent, XML properties) {
+ // TODO: child should ideally be parsed too for inline content.
+ super(parent, properties, false);
+
+ //get location
+ float x = Float.parseFloat(properties.getString("x"));
+ float y = Float.parseFloat(properties.getString("y"));
+
+ float parentX = Float.parseFloat(parent.element.getString("x"));
+ float parentY = Float.parseFloat(parent.element.getString("y"));
+
+ if (matrix == null) matrix = new PMatrix2D();
+ matrix.translate(x - parentX, (y - parentY) / 2f);
+
+ // get the first properties
+ parseColors(properties);
+ font = parseFont(properties);
+
+ // cleaned up syntax but removing b/c unused [fry 190118]
+ //boolean isLine = properties.getString("role").equals("line");
+
+ if (this.childCount > 0) {
+ // no inline content yet.
+ }
+
+ String text = properties.getContent();
+ textToDisplay = text;
+ }
+
+ @Override
+ public void drawImpl(PGraphics g) {
+ if (font == null) {
+ font = ((Text) parent).font;
+ if (font == null) {
+ return;
+ }
+ }
+
+ pre(g);
+// g.textFont(font, font.size / TEXT_QUALITY);
+ g.textFont(font, font.size);
+ g.text(textToDisplay, 0, 0);
+ post(g);
+ }
+ }
+
+
+ // . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
+
+
+ static public class Font extends PShapeSVG {
public FontFace face;
public Map namedGlyphs;
@@ -1603,8 +1824,8 @@ public Font(PShapeSVG parent, XML properties) {
horizAdvX = properties.getInt("horiz-adv-x", 0);
- namedGlyphs = new HashMap();
- unicodeGlyphs = new HashMap();
+ namedGlyphs = new HashMap<>();
+ unicodeGlyphs = new HashMap<>();
glyphCount = 0;
glyphs = new FontGlyph[elements.length];
@@ -1699,7 +1920,7 @@ public float textWidth(String str, float size) {
static class FontFace extends PShapeSVG {
int horizOriginX; // dflt 0
int horizOriginY; // dflt 0
-// int horizAdvX; // no dflt?
+ // int horizAdvX; // no dflt?
int vertOriginX; // dflt horizAdvX/2
int vertOriginY; // dflt ascent
int vertAdvY; // dflt 1em (unitsPerEm value)
@@ -1733,7 +1954,7 @@ protected void drawShape() {
// . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
- public static class FontGlyph extends PShapeSVG { // extends Path
+ static public class FontGlyph extends PShapeSVG { // extends Path
public String name;
char unicode;
int horizAdvX;
@@ -1751,7 +1972,7 @@ public FontGlyph(PShapeSVG parent, XML properties, Font font) {
//System.out.println("unicode for " + name + " is " + u);
} else {
System.err.println("unicode for " + name +
- " is more than one char: " + u);
+ " is more than one char: " + u);
}
}
if (properties.hasAttribute("horiz-adv-x")) {
diff --git a/core/src/processing/core/PStyle.java b/libs/processing-core/src/main/java/processing/core/PStyle.java
similarity index 92%
rename from core/src/processing/core/PStyle.java
rename to libs/processing-core/src/main/java/processing/core/PStyle.java
index e52ddc3f2..f5e1ecffb 100644
--- a/core/src/processing/core/PStyle.java
+++ b/libs/processing-core/src/main/java/processing/core/PStyle.java
@@ -3,7 +3,9 @@
/*
Part of the Processing project - http://processing.org
- Copyright (c) 2008-10 Ben Fry and Casey Reas
+ Copyright (c) 2012-21 The Processing Foundation
+ Copyright (c) 2006-12 Ben Fry and Casey Reas
+ Copyright (c) 2004-06 Michael Chang
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
diff --git a/core/src/processing/core/PSurface.java b/libs/processing-core/src/main/java/processing/core/PSurface.java
similarity index 98%
rename from core/src/processing/core/PSurface.java
rename to libs/processing-core/src/main/java/processing/core/PSurface.java
index 4cc0dc74f..4a2ec763b 100644
--- a/core/src/processing/core/PSurface.java
+++ b/libs/processing-core/src/main/java/processing/core/PSurface.java
@@ -3,7 +3,7 @@
/*
Part of the Processing project - http://processing.org
- Copyright (c) 2016 The Processing Foundation
+ Copyright (c) 2016-21 The Processing Foundation
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -22,9 +22,6 @@
package processing.core;
-import java.io.File;
-import java.io.InputStream;
-
import android.app.Activity;
import android.content.Context;
import android.content.Intent;
@@ -36,6 +33,10 @@
import android.view.SurfaceView;
import android.view.View;
import android.view.ViewGroup;
+
+import java.io.File;
+import java.io.InputStream;
+
import processing.android.AppComponent;
import processing.android.ServiceEngine;
diff --git a/core/src/processing/core/PSurfaceNone.java b/libs/processing-core/src/main/java/processing/core/PSurfaceNone.java
similarity index 97%
rename from core/src/processing/core/PSurfaceNone.java
rename to libs/processing-core/src/main/java/processing/core/PSurfaceNone.java
index cd350b873..5858ed1f7 100644
--- a/core/src/processing/core/PSurfaceNone.java
+++ b/libs/processing-core/src/main/java/processing/core/PSurfaceNone.java
@@ -3,7 +3,7 @@
/*
Part of the Processing project - http://processing.org
- Copyright (c) 2016 The Processing Foundation
+ Copyright (c) 2016-21 The Processing Foundation
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -32,10 +32,6 @@
import android.os.Bundle;
import android.os.Handler;
import android.os.Looper;
-import android.service.wallpaper.WallpaperService;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.content.ContextCompat;
-import android.support.wearable.watchface.WatchFaceService;
import android.view.LayoutInflater;
import android.view.SurfaceHolder;
import android.view.SurfaceView;
@@ -44,7 +40,13 @@
import android.view.ViewGroup.LayoutParams;
import android.widget.LinearLayout;
import android.widget.RelativeLayout;
-import android.support.v4.os.ResultReceiver;
+import android.os.ResultReceiver;
+
+import android.service.wallpaper.WallpaperService;
+import android.support.wearable.watchface.WatchFaceService;
+
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
import java.io.File;
import java.io.FileNotFoundException;
@@ -75,7 +77,7 @@ public class PSurfaceNone implements PSurface, PConstants {
protected boolean requestedThreadStart = false;
protected Thread thread;
protected boolean paused;
- protected Object pauseObject = new Object();
+ protected final Object pauseObject = new Object();
protected float frameRateTarget = 60;
protected long frameRatePeriod = 1000000000L / 60L;
@@ -330,8 +332,7 @@ public InputStream openFileInput(String filename) {
try {
return activity.openFileInput(filename);
} catch (FileNotFoundException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ System.err.println("Cannot open file " + filename);
}
}
return null;
@@ -529,7 +530,9 @@ public void run() { // not good to make this synchronized, locks things up
try {
Thread.sleep(sleepTime / 1000000L, (int) (sleepTime % 1000000L));
noDelays = 0; // Got some sleep, not delaying anymore
- } catch (InterruptedException ex) { }
+ } catch (InterruptedException ex) {
+ System.err.println("Cannot properly set the timing for the draw animation.");
+ }
overSleepTime = (System.nanoTime() - afterTime) - sleepTime;
diff --git a/core/src/processing/core/PVector.java b/libs/processing-core/src/main/java/processing/core/PVector.java
similarity index 99%
rename from core/src/processing/core/PVector.java
rename to libs/processing-core/src/main/java/processing/core/PVector.java
index 7e652127c..d1c074f92 100644
--- a/core/src/processing/core/PVector.java
+++ b/libs/processing-core/src/main/java/processing/core/PVector.java
@@ -3,7 +3,7 @@
/*
Part of the Processing project - http://processing.org
- Copyright (c) 2012-16 The Processing Foundation
+ Copyright (c) 2012-21 The Processing Foundation
Copyright (c) 2008-12 Ben Fry and Casey Reas
Copyright (c) 2008 Dan Shiffman
diff --git a/libs/processing-core/src/main/java/processing/data/DoubleDict.java b/libs/processing-core/src/main/java/processing/data/DoubleDict.java
new file mode 100644
index 000000000..f2a9adf10
--- /dev/null
+++ b/libs/processing-core/src/main/java/processing/data/DoubleDict.java
@@ -0,0 +1,850 @@
+package processing.data;
+
+import java.io.*;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.NoSuchElementException;
+
+import processing.core.PApplet;
+
+
+/**
+ * A simple table class to use a String as a lookup for an double value.
+ *
+ * @webref data:composite
+ * @see IntDict
+ * @see StringDict
+ */
+public class DoubleDict {
+
+ /** Number of elements in the table */
+ protected int count;
+
+ protected String[] keys;
+ protected double[] values;
+
+ /** Internal implementation for faster lookups */
+ private HashMap indices = new HashMap<>();
+
+
+ public DoubleDict() {
+ count = 0;
+ keys = new String[10];
+ values = new double[10];
+ }
+
+
+ /**
+ * Create a new lookup with a specific size. This is more efficient than not
+ * specifying a size. Use it when you know the rough size of the thing you're creating.
+ *
+ * @nowebref
+ */
+ public DoubleDict(int length) {
+ count = 0;
+ keys = new String[length];
+ values = new double[length];
+ }
+
+
+ /**
+ * Read a set of entries from a Reader that has each key/value pair on
+ * a single line, separated by a tab.
+ *
+ * @nowebref
+ */
+ public DoubleDict(BufferedReader reader) {
+ String[] lines = PApplet.loadStrings(reader);
+ keys = new String[lines.length];
+ values = new double[lines.length];
+
+ for (int i = 0; i < lines.length; i++) {
+ String[] pieces = PApplet.split(lines[i], '\t');
+ if (pieces.length == 2) {
+ keys[count] = pieces[0];
+ values[count] = PApplet.parseFloat(pieces[1]);
+ indices.put(pieces[0], count);
+ count++;
+ }
+ }
+ }
+
+
+ /**
+ * @nowebref
+ */
+ public DoubleDict(String[] keys, double[] values) {
+ if (keys.length != values.length) {
+ throw new IllegalArgumentException("key and value arrays must be the same length");
+ }
+ this.keys = keys;
+ this.values = values;
+ count = keys.length;
+ for (int i = 0; i < count; i++) {
+ indices.put(keys[i], i);
+ }
+ }
+
+
+ /**
+ * Constructor to allow (more intuitive) inline initialization, e.g.:
+ *
+ * new FloatDict(new Object[][] {
+ * { "key1", 1 },
+ * { "key2", 2 }
+ * });
+ *
+ */
+ public DoubleDict(Object[][] pairs) {
+ count = pairs.length;
+ this.keys = new String[count];
+ this.values = new double[count];
+ for (int i = 0; i < count; i++) {
+ keys[i] = (String) pairs[i][0];
+ values[i] = (Float) pairs[i][1];
+ indices.put(keys[i], i);
+ }
+ }
+
+
+ public DoubleDict(Map incoming) {
+ count = incoming.size();
+ keys = new String[count];
+ values = new double[count];
+ int index = 0;
+ for (Map.Entry e : incoming.entrySet()) {
+ keys[index] = e.getKey();
+ values[index] = e.getValue();
+ indices.put(keys[index], index);
+ index++;
+ }
+ }
+
+
+ /**
+ * @webref doubledict:method
+ * @brief Returns the number of key/value pairs
+ */
+ public int size() {
+ return count;
+ }
+
+
+ /**
+ * Resize the internal data, this can only be used to shrink the list.
+ * Helpful for situations like sorting and then grabbing the top 50 entries.
+ */
+ public void resize(int length) {
+ if (length == count) return;
+
+ if (length > count) {
+ throw new IllegalArgumentException("resize() can only be used to shrink the dictionary");
+ }
+ if (length < 1) {
+ throw new IllegalArgumentException("resize(" + length + ") is too small, use 1 or higher");
+ }
+
+ String[] newKeys = new String[length];
+ double[] newValues = new double[length];
+ PApplet.arrayCopy(keys, newKeys, length);
+ PApplet.arrayCopy(values, newValues, length);
+ keys = newKeys;
+ values = newValues;
+ count = length;
+ resetIndices();
+ }
+
+
+ /**
+ * Remove all entries.
+ *
+ * @webref doubledict:method
+ * @brief Remove all entries
+ */
+ public void clear() {
+ count = 0;
+ indices = new HashMap<>();
+ }
+
+
+ private void resetIndices() {
+ indices = new HashMap<>(count);
+ for (int i = 0; i < count; i++) {
+ indices.put(keys[i], i);
+ }
+ }
+
+
+ // . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
+
+
+ public class Entry {
+ public String key;
+ public double value;
+
+ Entry(String key, double value) {
+ this.key = key;
+ this.value = value;
+ }
+ }
+
+
+ public Iterable entries() {
+ return new Iterable() {
+
+ public Iterator iterator() {
+ return entryIterator();
+ }
+ };
+ }
+
+
+ public Iterator entryIterator() {
+ return new Iterator() {
+ int index = -1;
+
+ public void remove() {
+ removeIndex(index);
+ index--;
+ }
+
+ public Entry next() {
+ ++index;
+ Entry e = new Entry(keys[index], values[index]);
+ return e;
+ }
+
+ public boolean hasNext() {
+ return index+1 < size();
+ }
+ };
+ }
+
+
+ // . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
+
+
+ public String key(int index) {
+ return keys[index];
+ }
+
+
+ protected void crop() {
+ if (count != keys.length) {
+ keys = PApplet.subset(keys, 0, count);
+ values = PApplet.subset(values, 0, count);
+ }
+ }
+
+
+ public Iterable keys() {
+ return new Iterable() {
+
+ @Override
+ public Iterator iterator() {
+ return keyIterator();
+ }
+ };
+ }
+
+
+ // Use this to iterate when you want to be able to remove elements along the way
+ public Iterator keyIterator() {
+ return new Iterator() {
+ int index = -1;
+
+ public void remove() {
+ removeIndex(index);
+ index--;
+ }
+
+ public String next() {
+ return key(++index);
+ }
+
+ public boolean hasNext() {
+ return index+1 < size();
+ }
+ };
+ }
+
+
+ /**
+ * Return a copy of the internal keys array. This array can be modified.
+ *
+ * @webref doubledict:method
+ * @brief Return a copy of the internal keys array
+ */
+ public String[] keyArray() {
+ crop();
+ return keyArray(null);
+ }
+
+
+ public String[] keyArray(String[] outgoing) {
+ if (outgoing == null || outgoing.length != count) {
+ outgoing = new String[count];
+ }
+ System.arraycopy(keys, 0, outgoing, 0, count);
+ return outgoing;
+ }
+
+
+ public double value(int index) {
+ return values[index];
+ }
+
+
+ /**
+ * @webref doubledict:method
+ * @brief Return the internal array being used to store the values
+ */
+ public Iterable values() {
+ return new Iterable() {
+
+ @Override
+ public Iterator iterator() {
+ return valueIterator();
+ }
+ };
+ }
+
+
+ public Iterator valueIterator() {
+ return new Iterator() {
+ int index = -1;
+
+ public void remove() {
+ removeIndex(index);
+ index--;
+ }
+
+ public Double next() {
+ return value(++index);
+ }
+
+ public boolean hasNext() {
+ return index+1 < size();
+ }
+ };
+ }
+
+
+ /**
+ * Create a new array and copy each of the values into it.
+ *
+ * @webref doubledict:method
+ * @brief Create a new array and copy each of the values into it
+ */
+ public double[] valueArray() {
+ crop();
+ return valueArray(null);
+ }
+
+
+ /**
+ * Fill an already-allocated array with the values (more efficient than
+ * creating a new array each time). If 'array' is null, or not the same
+ * size as the number of values, a new array will be allocated and returned.
+ */
+ public double[] valueArray(double[] array) {
+ if (array == null || array.length != size()) {
+ array = new double[count];
+ }
+ System.arraycopy(values, 0, array, 0, count);
+ return array;
+ }
+
+
+ /**
+ * Return a value for the specified key.
+ *
+ * @webref doubledict:method
+ * @brief Return a value for the specified key
+ */
+ public double get(String key) {
+ int index = index(key);
+ if (index == -1) {
+ throw new IllegalArgumentException("No key named '" + key + "'");
+ }
+ return values[index];
+ }
+
+
+ public double get(String key, double alternate) {
+ int index = index(key);
+ if (index == -1) {
+ return alternate;
+ }
+ return values[index];
+ }
+
+
+ /**
+ * @webref doubledict:method
+ * @brief Create a new key/value pair or change the value of one
+ */
+ public void set(String key, double amount) {
+ int index = index(key);
+ if (index == -1) {
+ create(key, amount);
+ } else {
+ values[index] = amount;
+ }
+ }
+
+
+ public void setIndex(int index, String key, double value) {
+ if (index < 0 || index >= count) {
+ throw new ArrayIndexOutOfBoundsException(index);
+ }
+ keys[index] = key;
+ values[index] = value;
+ }
+
+
+ /**
+ * @webref doubledict:method
+ * @brief Check if a key is a part of the data structure
+ */
+ public boolean hasKey(String key) {
+ return index(key) != -1;
+ }
+
+
+ /**
+ * @webref doubledict:method
+ * @brief Add to a value
+ */
+ public void add(String key, double amount) {
+ int index = index(key);
+ if (index == -1) {
+ create(key, amount);
+ } else {
+ values[index] += amount;
+ }
+ }
+
+
+ /**
+ * @webref doubledict:method
+ * @brief Subtract from a value
+ */
+ public void sub(String key, double amount) {
+ add(key, -amount);
+ }
+
+
+ /**
+ * @webref doubledict:method
+ * @brief Multiply a value
+ */
+ public void mult(String key, double amount) {
+ int index = index(key);
+ if (index != -1) {
+ values[index] *= amount;
+ }
+ }
+
+
+ /**
+ * @webref doubledict:method
+ * @brief Divide a value
+ */
+ public void div(String key, double amount) {
+ int index = index(key);
+ if (index != -1) {
+ values[index] /= amount;
+ }
+ }
+
+
+ private void checkMinMax(String functionName) {
+ if (count == 0) {
+ String msg =
+ String.format("Cannot use %s() on an empty %s.",
+ functionName, getClass().getSimpleName());
+ throw new RuntimeException(msg);
+ }
+ }
+
+
+ /**
+ * @webref doublelist:method
+ * @brief Return the smallest value
+ */
+ public int minIndex() {
+ //checkMinMax("minIndex");
+ if (count == 0) return -1;
+
+ // Will still return NaN if there are 1 or more entries, and they're all NaN
+ double m = Float.NaN;
+ int mi = -1;
+ for (int i = 0; i < count; i++) {
+ // find one good value to start
+ if (values[i] == values[i]) {
+ m = values[i];
+ mi = i;
+
+ // calculate the rest
+ for (int j = i+1; j < count; j++) {
+ double d = values[j];
+ if ((d == d) && (d < m)) {
+ m = values[j];
+ mi = j;
+ }
+ }
+ break;
+ }
+ }
+ return mi;
+ }
+
+
+ // return the key for the minimum value
+ public String minKey() {
+ checkMinMax("minKey");
+ int index = minIndex();
+ if (index == -1) {
+ return null;
+ }
+ return keys[index];
+ }
+
+
+ // return the minimum value, or throw an error if there are no values
+ public double minValue() {
+ checkMinMax("minValue");
+ int index = minIndex();
+ if (index == -1) {
+ return Float.NaN;
+ }
+ return values[index];
+ }
+
+
+ /**
+ * @webref doublelist:method
+ * @brief Return the largest value
+ */
+ // The index of the entry that has the max value. Reference above is incorrect.
+ public int maxIndex() {
+ //checkMinMax("maxIndex");
+ if (count == 0) {
+ return -1;
+ }
+ // Will still return NaN if there is 1 or more entries, and they're all NaN
+ double m = Double.NaN;
+ int mi = -1;
+ for (int i = 0; i < count; i++) {
+ // find one good value to start
+ if (values[i] == values[i]) {
+ m = values[i];
+ mi = i;
+
+ // calculate the rest
+ for (int j = i+1; j < count; j++) {
+ double d = values[j];
+ if (!Double.isNaN(d) && (d > m)) {
+ m = values[j];
+ mi = j;
+ }
+ }
+ break;
+ }
+ }
+ return mi;
+ }
+
+
+ /** The key for a max value; null if empty or everything is NaN (no max). */
+ public String maxKey() {
+ //checkMinMax("maxKey");
+ int index = maxIndex();
+ if (index == -1) {
+ return null;
+ }
+ return keys[index];
+ }
+
+
+ /** The max value. (Or NaN if no entries or they're all NaN.) */
+ public double maxValue() {
+ //checkMinMax("maxValue");
+ int index = maxIndex();
+ if (index == -1) {
+ return Float.NaN;
+ }
+ return values[index];
+ }
+
+
+ public double sum() {
+ double sum = 0;
+ for (int i = 0; i < count; i++) {
+ sum += values[i];
+ }
+ return sum;
+ }
+
+
+ public int index(String what) {
+ Integer found = indices.get(what);
+ return (found == null) ? -1 : found.intValue();
+ }
+
+
+ protected void create(String what, double much) {
+ if (count == keys.length) {
+ keys = PApplet.expand(keys);
+ values = PApplet.expand(values);
+ }
+ indices.put(what, Integer.valueOf(count));
+ keys[count] = what;
+ values[count] = much;
+ count++;
+ }
+
+
+ /**
+ * @webref doubledict:method
+ * @brief Remove a key/value pair
+ */
+ public double remove(String key) {
+ int index = index(key);
+ if (index == -1) {
+ throw new NoSuchElementException("'" + key + "' not found");
+ }
+ double value = values[index];
+ removeIndex(index);
+ return value;
+ }
+
+
+ public double removeIndex(int index) {
+ if (index < 0 || index >= count) {
+ throw new ArrayIndexOutOfBoundsException(index);
+ }
+ double value = values[index];
+ indices.remove(keys[index]);
+ for (int i = index; i < count-1; i++) {
+ keys[i] = keys[i+1];
+ values[i] = values[i+1];
+ indices.put(keys[i], i);
+ }
+ count--;
+ keys[count] = null;
+ values[count] = 0;
+ return value;
+ }
+
+
+ public void swap(int a, int b) {
+ String tkey = keys[a];
+ double tvalue = values[a];
+ keys[a] = keys[b];
+ values[a] = values[b];
+ keys[b] = tkey;
+ values[b] = tvalue;
+
+// indices.put(keys[a], Integer.valueOf(a));
+// indices.put(keys[b], Integer.valueOf(b));
+ }
+
+
+ /**
+ * Sort the keys alphabetically (ignoring case). Uses the value as a
+ * tie-breaker (only really possible with a key that has a case change).
+ *
+ * @webref doubledict:method
+ * @brief Sort the keys alphabetically
+ */
+ public void sortKeys() {
+ sortImpl(true, false, true);
+ }
+
+
+ /**
+ * @webref doubledict:method
+ * @brief Sort the keys alphabetically in reverse
+ */
+ public void sortKeysReverse() {
+ sortImpl(true, true, true);
+ }
+
+
+ /**
+ * Sort by values in descending order (largest value will be at [0]).
+ *
+ * @webref doubledict:method
+ * @brief Sort by values in ascending order
+ */
+ public void sortValues() {
+ sortValues(true);
+ }
+
+
+ /**
+ * Set true to ensure that the order returned is identical. Slightly
+ * slower because the tie-breaker for identical values compares the keys.
+ * @param stable
+ */
+ public void sortValues(boolean stable) {
+ sortImpl(false, false, stable);
+ }
+
+
+ /**
+ * @webref doubledict:method
+ * @brief Sort by values in descending order
+ */
+ public void sortValuesReverse() {
+ sortValuesReverse(true);
+ }
+
+
+ public void sortValuesReverse(boolean stable) {
+ sortImpl(false, true, stable);
+ }
+
+
+ protected void sortImpl(final boolean useKeys, final boolean reverse,
+ final boolean stable) {
+ Sort s = new Sort() {
+ @Override
+ public int size() {
+ if (useKeys) {
+ return count; // don't worry about NaN values
+
+ } else if (count == 0) { // skip the NaN check, it'll AIOOBE
+ return 0;
+
+ } else { // first move NaN values to the end of the list
+ int right = count - 1;
+ while (values[right] != values[right]) {
+ right--;
+ if (right == -1) {
+ return 0; // all values are NaN
+ }
+ }
+ for (int i = right; i >= 0; --i) {
+ if (Double.isNaN(values[i])) {
+ swap(i, right);
+ --right;
+ }
+ }
+ return right + 1;
+ }
+ }
+
+ @Override
+ public int compare(int a, int b) {
+ double diff = 0;
+ if (useKeys) {
+ diff = keys[a].compareToIgnoreCase(keys[b]);
+ if (diff == 0) {
+ diff = values[a] - values[b];
+ }
+ } else { // sort values
+ diff = values[a] - values[b];
+ if (diff == 0 && stable) {
+ diff = keys[a].compareToIgnoreCase(keys[b]);
+ }
+ }
+ if (diff == 0) {
+ return 0;
+ } else if (reverse) {
+ return diff < 0 ? 1 : -1;
+ } else {
+ return diff < 0 ? -1 : 1;
+ }
+ }
+
+ @Override
+ public void swap(int a, int b) {
+ DoubleDict.this.swap(a, b);
+ }
+ };
+ s.run();
+
+ // Set the indices after sort/swaps (performance fix 160411)
+ resetIndices();
+ }
+
+
+ /**
+ * Sum all of the values in this dictionary, then return a new FloatDict of
+ * each key, divided by the total sum. The total for all values will be ~1.0.
+ * @return a FloatDict with the original keys, mapped to their pct of the total
+ */
+ public DoubleDict getPercent() {
+ double sum = sum();
+ DoubleDict outgoing = new DoubleDict();
+ for (int i = 0; i < size(); i++) {
+ double percent = value(i) / sum;
+ outgoing.set(key(i), percent);
+ }
+ return outgoing;
+ }
+
+
+ /** Returns a duplicate copy of this object. */
+ public DoubleDict copy() {
+ DoubleDict outgoing = new DoubleDict(count);
+ System.arraycopy(keys, 0, outgoing.keys, 0, count);
+ System.arraycopy(values, 0, outgoing.values, 0, count);
+ for (int i = 0; i < count; i++) {
+ outgoing.indices.put(keys[i], i);
+ }
+ outgoing.count = count;
+ return outgoing;
+ }
+
+
+ public void print() {
+ for (int i = 0; i < size(); i++) {
+ System.out.println(keys[i] + " = " + values[i]);
+ }
+ }
+
+
+ /**
+ * Save tab-delimited entries to a file (TSV format, UTF-8 encoding)
+ */
+ public void save(File file) {
+ PrintWriter writer = PApplet.createWriter(file);
+ write(writer);
+ writer.close();
+ }
+
+
+ /**
+ * Write tab-delimited entries out to
+ * @param writer
+ */
+ public void write(PrintWriter writer) {
+ for (int i = 0; i < count; i++) {
+ writer.println(keys[i] + "\t" + values[i]);
+ }
+ writer.flush();
+ }
+
+
+ /**
+ * Return this dictionary as a String in JSON format.
+ */
+ public String toJSON() {
+ StringList items = new StringList();
+ for (int i = 0; i < count; i++) {
+ items.append(JSONObject.quote(keys[i])+ ": " + values[i]);
+ }
+ return "{ " + items.join(", ") + " }";
+ }
+
+
+ @Override
+ public String toString() {
+ return getClass().getSimpleName() + " size=" + size() + " " + toJSON();
+ }
+}
diff --git a/libs/processing-core/src/main/java/processing/data/DoubleList.java b/libs/processing-core/src/main/java/processing/data/DoubleList.java
new file mode 100644
index 000000000..ae47a8442
--- /dev/null
+++ b/libs/processing-core/src/main/java/processing/data/DoubleList.java
@@ -0,0 +1,928 @@
+package processing.data;
+
+import java.io.File;
+import java.io.PrintWriter;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.Random;
+
+import processing.core.PApplet;
+
+
+/**
+ * Helper class for a list of floats. Lists are designed to have some of the
+ * features of ArrayLists, but to maintain the simplicity and efficiency of
+ * working with arrays.
+ *
+ * Functions like sort() and shuffle() always act on the list itself. To get
+ * a sorted copy, use list.copy().sort().
+ *
+ * @webref data:composite
+ * @see IntList
+ * @see StringList
+ */
+public class DoubleList implements Iterable {
+ int count;
+ double[] data;
+
+
+ public DoubleList() {
+ data = new double[10];
+ }
+
+
+ /**
+ * @nowebref
+ */
+ public DoubleList(int length) {
+ data = new double[length];
+ }
+
+
+ /**
+ * @nowebref
+ */
+ public DoubleList(double[] list) {
+ count = list.length;
+ data = new double[count];
+ System.arraycopy(list, 0, data, 0, count);
+ }
+
+
+ /**
+ * Construct an FloatList from an iterable pile of objects.
+ * For instance, a double array, an array of strings, who knows).
+ * Un-parseable or null values will be set to NaN.
+ * @nowebref
+ */
+ public DoubleList(Iterable iter) {
+ this(10);
+ for (Object o : iter) {
+ if (o == null) {
+ append(Double.NaN);
+ } else if (o instanceof Number) {
+ append(((Number) o).doubleValue());
+ } else {
+ append(PApplet.parseFloat(o.toString().trim()));
+ }
+ }
+ crop();
+ }
+
+
+ /**
+ * Construct an FloatList from a random pile of objects.
+ * Un-parseable or null values will be set to NaN.
+ */
+ public DoubleList(Object... items) {
+ // nuts, no good way to pass missingValue to this fn (varargs must be last)
+ final double missingValue = Double.NaN;
+
+ count = items.length;
+ data = new double[count];
+ int index = 0;
+ for (Object o : items) {
+ double value = missingValue;
+ if (o != null) {
+ if (o instanceof Number) {
+ value = ((Number) o).doubleValue();
+ } else {
+ try {
+ value = Double.parseDouble(o.toString().trim());
+ } catch (NumberFormatException nfe) {
+ value = missingValue;
+ }
+ }
+ }
+ data[index++] = value;
+ }
+ }
+
+
+ /**
+ * Improve efficiency by removing allocated but unused entries from the
+ * internal array used to store the data. Set to private, though it could
+ * be useful to have this public if lists are frequently making drastic
+ * size changes (from very large to very small).
+ */
+ private void crop() {
+ if (count != data.length) {
+ data = PApplet.subset(data, 0, count);
+ }
+ }
+
+
+ /**
+ * Get the length of the list.
+ *
+ * @webref doublelist:method
+ * @brief Get the length of the list
+ */
+ public int size() {
+ return count;
+ }
+
+
+ public void resize(int length) {
+ if (length > data.length) {
+ double[] temp = new double[length];
+ System.arraycopy(data, 0, temp, 0, count);
+ data = temp;
+
+ } else if (length > count) {
+ Arrays.fill(data, count, length, 0);
+ }
+ count = length;
+ }
+
+
+ /**
+ * Remove all entries from the list.
+ *
+ * @webref doublelist:method
+ * @brief Remove all entries from the list
+ */
+ public void clear() {
+ count = 0;
+ }
+
+
+ /**
+ * Get an entry at a particular index.
+ *
+ * @webref doublelist:method
+ * @brief Get an entry at a particular index
+ */
+ public double get(int index) {
+ if (index >= count) {
+ throw new ArrayIndexOutOfBoundsException(index);
+ }
+ return data[index];
+ }
+
+
+ /**
+ * Set the entry at a particular index. If the index is past the length of
+ * the list, it'll expand the list to accommodate, and fill the intermediate
+ * entries with 0s.
+ *
+ * @webref doublelist:method
+ * @brief Set the entry at a particular index
+ */
+ public void set(int index, double what) {
+ if (index >= count) {
+ data = PApplet.expand(data, index+1);
+ for (int i = count; i < index; i++) {
+ data[i] = 0;
+ }
+ count = index+1;
+ }
+ data[index] = what;
+ }
+
+
+ /** Just an alias for append(), but matches pop() */
+ public void push(double value) {
+ append(value);
+ }
+
+
+ public double pop() {
+ if (count == 0) {
+ throw new RuntimeException("Can't call pop() on an empty list");
+ }
+ double value = get(count-1);
+ count--;
+ return value;
+ }
+
+
+ /**
+ * Remove an element from the specified index.
+ *
+ * @webref doublelist:method
+ * @brief Remove an element from the specified index
+ */
+ public double remove(int index) {
+ if (index < 0 || index >= count) {
+ throw new ArrayIndexOutOfBoundsException(index);
+ }
+ double entry = data[index];
+// int[] outgoing = new int[count - 1];
+// System.arraycopy(data, 0, outgoing, 0, index);
+// count--;
+// System.arraycopy(data, index + 1, outgoing, 0, count - index);
+// data = outgoing;
+ // For most cases, this actually appears to be faster
+ // than arraycopy() on an array copying into itself.
+ for (int i = index; i < count-1; i++) {
+ data[i] = data[i+1];
+ }
+ count--;
+ return entry;
+ }
+
+
+ // Remove the first instance of a particular value,
+ // and return the index at which it was found.
+ public int removeValue(int value) {
+ int index = index(value);
+ if (index != -1) {
+ remove(index);
+ return index;
+ }
+ return -1;
+ }
+
+
+ // Remove all instances of a particular value,
+ // and return the number of values found and removed
+ public int removeValues(int value) {
+ int ii = 0;
+ if (Double.isNaN(value)) {
+ for (int i = 0; i < count; i++) {
+ if (!Double.isNaN(data[i])) {
+ data[ii++] = data[i];
+ }
+ }
+ } else {
+ for (int i = 0; i < count; i++) {
+ if (data[i] != value) {
+ data[ii++] = data[i];
+ }
+ }
+ }
+ int removed = count - ii;
+ count = ii;
+ return removed;
+ }
+
+
+ /** Replace the first instance of a particular value */
+ public boolean replaceValue(double value, double newValue) {
+ if (Double.isNaN(value)) {
+ for (int i = 0; i < count; i++) {
+ if (Double.isNaN(data[i])) {
+ data[i] = newValue;
+ return true;
+ }
+ }
+ } else {
+ int index = index(value);
+ if (index != -1) {
+ data[index] = newValue;
+ return true;
+ }
+ }
+ return false;
+ }
+
+
+ /** Replace all instances of a particular value */
+ public boolean replaceValues(double value, double newValue) {
+ boolean changed = false;
+ if (Double.isNaN(value)) {
+ for (int i = 0; i < count; i++) {
+ if (Double.isNaN(data[i])) {
+ data[i] = newValue;
+ changed = true;
+ }
+ }
+ } else {
+ for (int i = 0; i < count; i++) {
+ if (data[i] == value) {
+ data[i] = newValue;
+ changed = true;
+ }
+ }
+ }
+ return changed;
+ }
+
+
+
+ /**
+ * Add a new entry to the list.
+ *
+ * @webref doublelist:method
+ * @brief Add a new entry to the list
+ */
+ public void append(double value) {
+ if (count == data.length) {
+ data = PApplet.expand(data);
+ }
+ data[count++] = value;
+ }
+
+
+ public void append(double[] values) {
+ for (double v : values) {
+ append(v);
+ }
+ }
+
+
+ public void append(DoubleList list) {
+ for (double v : list.values()) { // will concat the list...
+ append(v);
+ }
+ }
+
+
+ /** Add this value, but only if it's not already in the list. */
+ public void appendUnique(double value) {
+ if (!hasValue(value)) {
+ append(value);
+ }
+ }
+
+
+// public void insert(int index, int value) {
+// if (index+1 > count) {
+// if (index+1 < data.length) {
+// }
+// }
+// if (index >= data.length) {
+// data = PApplet.expand(data, index+1);
+// data[index] = value;
+// count = index+1;
+//
+// } else if (count == data.length) {
+// if (index >= count) {
+// //int[] temp = new int[count << 1];
+// System.arraycopy(data, 0, temp, 0, index);
+// temp[index] = value;
+// System.arraycopy(data, index, temp, index+1, count - index);
+// data = temp;
+//
+// } else {
+// // data[] has room to grow
+// // for() loop believed to be faster than System.arraycopy over itself
+// for (int i = count; i > index; --i) {
+// data[i] = data[i-1];
+// }
+// data[index] = value;
+// count++;
+// }
+// }
+
+
+ public void insert(int index, double value) {
+ insert(index, new double[] { value });
+ }
+
+
+ // same as splice
+ public void insert(int index, double[] values) {
+ if (index < 0) {
+ throw new IllegalArgumentException("insert() index cannot be negative: it was " + index);
+ }
+ if (index >= data.length) {
+ throw new IllegalArgumentException("insert() index " + index + " is past the end of this list");
+ }
+
+ double[] temp = new double[count + values.length];
+
+ // Copy the old values, but not more than already exist
+ System.arraycopy(data, 0, temp, 0, Math.min(count, index));
+
+ // Copy the new values into the proper place
+ System.arraycopy(values, 0, temp, index, values.length);
+
+// if (index < count) {
+ // The index was inside count, so it's a true splice/insert
+ System.arraycopy(data, index, temp, index+values.length, count - index);
+ count = count + values.length;
+// } else {
+// // The index was past 'count', so the new count is weirder
+// count = index + values.length;
+// }
+ data = temp;
+ }
+
+
+ public void insert(int index, DoubleList list) {
+ insert(index, list.values());
+ }
+
+
+ // below are aborted attempts at more optimized versions of the code
+ // that are harder to read and debug...
+
+// if (index + values.length >= count) {
+// // We're past the current 'count', check to see if we're still allocated
+// // index 9, data.length = 10, values.length = 1
+// if (index + values.length < data.length) {
+// // There's still room for these entries, even though it's past 'count'.
+// // First clear out the entries leading up to it, however.
+// for (int i = count; i < index; i++) {
+// data[i] = 0;
+// }
+// data[index] =
+// }
+// if (index >= data.length) {
+// int length = index + values.length;
+// int[] temp = new int[length];
+// System.arraycopy(data, 0, temp, 0, count);
+// System.arraycopy(values, 0, temp, index, values.length);
+// data = temp;
+// count = data.length;
+// } else {
+//
+// }
+//
+// } else if (count == data.length) {
+// int[] temp = new int[count << 1];
+// System.arraycopy(data, 0, temp, 0, index);
+// temp[index] = value;
+// System.arraycopy(data, index, temp, index+1, count - index);
+// data = temp;
+//
+// } else {
+// // data[] has room to grow
+// // for() loop believed to be faster than System.arraycopy over itself
+// for (int i = count; i > index; --i) {
+// data[i] = data[i-1];
+// }
+// data[index] = value;
+// count++;
+// }
+
+
+ /** Return the first index of a particular value. */
+ public int index(double what) {
+ /*
+ if (indexCache != null) {
+ try {
+ return indexCache.get(what);
+ } catch (Exception e) { // not there
+ return -1;
+ }
+ }
+ */
+ for (int i = 0; i < count; i++) {
+ if (data[i] == what) {
+ return i;
+ }
+ }
+ return -1;
+ }
+
+
+ /**
+ * @webref doublelist:method
+ * @brief Check if a number is a part of the list
+ */
+ public boolean hasValue(double value) {
+ if (Double.isNaN(value)) {
+ for (int i = 0; i < count; i++) {
+ if (Double.isNaN(data[i])) {
+ return true;
+ }
+ }
+ } else {
+ for (int i = 0; i < count; i++) {
+ if (data[i] == value) {
+ return true;
+ }
+ }
+ }
+ return false;
+ }
+
+
+ private void boundsProblem(int index, String method) {
+ final String msg = String.format("The list size is %d. " +
+ "You cannot %s() to element %d.", count, method, index);
+ throw new ArrayIndexOutOfBoundsException(msg);
+ }
+
+
+ /**
+ * @webref doublelist:method
+ * @brief Add to a value
+ */
+ public void add(int index, double amount) {
+ if (index < count) {
+ data[index] += amount;
+ } else {
+ boundsProblem(index, "add");
+ }
+ }
+
+
+ /**
+ * @webref doublelist:method
+ * @brief Subtract from a value
+ */
+ public void sub(int index, double amount) {
+ if (index < count) {
+ data[index] -= amount;
+ } else {
+ boundsProblem(index, "sub");
+ }
+ }
+
+
+ /**
+ * @webref doublelist:method
+ * @brief Multiply a value
+ */
+ public void mult(int index, double amount) {
+ if (index < count) {
+ data[index] *= amount;
+ } else {
+ boundsProblem(index, "mult");
+ }
+ }
+
+
+ /**
+ * @webref doublelist:method
+ * @brief Divide a value
+ */
+ public void div(int index, double amount) {
+ if (index < count) {
+ data[index] /= amount;
+ } else {
+ boundsProblem(index, "div");
+ }
+ }
+
+
+ private void checkMinMax(String functionName) {
+ if (count == 0) {
+ String msg =
+ String.format("Cannot use %s() on an empty %s.",
+ functionName, getClass().getSimpleName());
+ throw new RuntimeException(msg);
+ }
+ }
+
+
+ /**
+ * @webref doublelist:method
+ * @brief Return the smallest value
+ */
+ public double min() {
+ checkMinMax("min");
+ int index = minIndex();
+ return index == -1 ? Double.NaN : data[index];
+ }
+
+
+ public int minIndex() {
+ checkMinMax("minIndex");
+ double m = Double.NaN;
+ int mi = -1;
+ for (int i = 0; i < count; i++) {
+ // find one good value to start
+ if (data[i] == data[i]) {
+ m = data[i];
+ mi = i;
+
+ // calculate the rest
+ for (int j = i+1; j < count; j++) {
+ double d = data[j];
+ if (!Double.isNaN(d) && (d < m)) {
+ m = data[j];
+ mi = j;
+ }
+ }
+ break;
+ }
+ }
+ return mi;
+ }
+
+
+ /**
+ * @webref doublelist:method
+ * @brief Return the largest value
+ */
+ public double max() {
+ checkMinMax("max");
+ int index = maxIndex();
+ return index == -1 ? Double.NaN : data[index];
+ }
+
+
+ public int maxIndex() {
+ checkMinMax("maxIndex");
+ double m = Double.NaN;
+ int mi = -1;
+ for (int i = 0; i < count; i++) {
+ // find one good value to start
+ if (data[i] == data[i]) {
+ m = data[i];
+ mi = i;
+
+ // calculate the rest
+ for (int j = i+1; j < count; j++) {
+ double d = data[j];
+ if (!Double.isNaN(d) && (d > m)) {
+ m = data[j];
+ mi = j;
+ }
+ }
+ break;
+ }
+ }
+ return mi;
+ }
+
+
+ public double sum() {
+ double sum = 0;
+ for (int i = 0; i < count; i++) {
+ sum += data[i];
+ }
+ return sum;
+ }
+
+
+ /**
+ * Sorts the array in place.
+ *
+ * @webref doublelist:method
+ * @brief Sorts an array, lowest to highest
+ */
+ public void sort() {
+ Arrays.sort(data, 0, count);
+ }
+
+
+ /**
+ * Reverse sort, orders values from highest to lowest
+ *
+ * @webref doublelist:method
+ * @brief Reverse sort, orders values from highest to lowest
+ */
+ public void sortReverse() {
+ new Sort() {
+ @Override
+ public int size() {
+ // if empty, don't even mess with the NaN check, it'll AIOOBE
+ if (count == 0) {
+ return 0;
+ }
+ // move NaN values to the end of the list and don't sort them
+ int right = count - 1;
+ while (data[right] != data[right]) {
+ right--;
+ if (right == -1) { // all values are NaN
+ return 0;
+ }
+ }
+ for (int i = right; i >= 0; --i) {
+ double v = data[i];
+ if (v != v) {
+ data[i] = data[right];
+ data[right] = v;
+ --right;
+ }
+ }
+ return right + 1;
+ }
+
+ @Override
+ public int compare(int a, int b) {
+ double diff = data[b] - data[a];
+ return diff == 0 ? 0 : (diff < 0 ? -1 : 1);
+ }
+
+ @Override
+ public void swap(int a, int b) {
+ double temp = data[a];
+ data[a] = data[b];
+ data[b] = temp;
+ }
+ }.run();
+ }
+
+
+ // use insert()
+// public void splice(int index, int value) {
+// }
+
+
+// public void subset(int start) {
+// subset(start, count - start);
+// }
+
+
+// public void subset(int start, int num) {
+// for (int i = 0; i < num; i++) {
+// data[i] = data[i+start];
+// }
+// count = num;
+// }
+
+
+ /**
+ * @webref doublelist:method
+ * @brief Reverse the order of the list elements
+ */
+ public void reverse() {
+ int ii = count - 1;
+ for (int i = 0; i < count/2; i++) {
+ double t = data[i];
+ data[i] = data[ii];
+ data[ii] = t;
+ --ii;
+ }
+ }
+
+
+ /**
+ * Randomize the order of the list elements. Note that this does not
+ * obey the randomSeed() function in PApplet.
+ *
+ * @webref doublelist:method
+ * @brief Randomize the order of the list elements
+ */
+ public void shuffle() {
+ Random r = new Random();
+ int num = count;
+ while (num > 1) {
+ int value = r.nextInt(num);
+ num--;
+ double temp = data[num];
+ data[num] = data[value];
+ data[value] = temp;
+ }
+ }
+
+
+ /**
+ * Randomize the list order using the random() function from the specified
+ * sketch, allowing shuffle() to use its current randomSeed() setting.
+ */
+ public void shuffle(PApplet sketch) {
+ int num = count;
+ while (num > 1) {
+ int value = (int) sketch.random(num);
+ num--;
+ double temp = data[num];
+ data[num] = data[value];
+ data[value] = temp;
+ }
+ }
+
+
+ public DoubleList copy() {
+ DoubleList outgoing = new DoubleList(data);
+ outgoing.count = count;
+ return outgoing;
+ }
+
+
+ /**
+ * Returns the actual array being used to store the data. For advanced users,
+ * this is the fastest way to access a large list. Suitable for iterating
+ * with a for() loop, but modifying the list will have terrible consequences.
+ */
+ public double[] values() {
+ crop();
+ return data;
+ }
+
+
+ /** Implemented this way so that we can use a FloatList in a for loop. */
+ @Override
+ public Iterator iterator() {
+// }
+//
+//
+// public Iterator valueIterator() {
+ return new Iterator() {
+ int index = -1;
+
+ public void remove() {
+ DoubleList.this.remove(index);
+ index--;
+ }
+
+ public Double next() {
+ return data[++index];
+ }
+
+ public boolean hasNext() {
+ return index+1 < count;
+ }
+ };
+ }
+
+
+ /**
+ * Create a new array with a copy of all the values.
+ * @return an array sized by the length of the list with each of the values.
+ * @webref doublelist:method
+ * @brief Create a new array with a copy of all the values
+ */
+ public double[] array() {
+ return array(null);
+ }
+
+
+ /**
+ * Copy values into the specified array. If the specified array is null or
+ * not the same size, a new array will be allocated.
+ * @param array
+ */
+ public double[] array(double[] array) {
+ if (array == null || array.length != count) {
+ array = new double[count];
+ }
+ System.arraycopy(data, 0, array, 0, count);
+ return array;
+ }
+
+
+ /**
+ * Returns a normalized version of this array. Called getPercent() for
+ * consistency with the Dict classes. It's a getter method because it needs
+ * to returns a new list (because IntList/Dict can't do percentages or
+ * normalization in place on int values).
+ */
+ public DoubleList getPercent() {
+ double sum = 0;
+ for (double value : array()) {
+ sum += value;
+ }
+ DoubleList outgoing = new DoubleList(count);
+ for (int i = 0; i < count; i++) {
+ double percent = data[i] / sum;
+ outgoing.set(i, percent);
+ }
+ return outgoing;
+ }
+
+
+ public DoubleList getSubset(int start) {
+ return getSubset(start, count - start);
+ }
+
+
+ public DoubleList getSubset(int start, int num) {
+ double[] subset = new double[num];
+ System.arraycopy(data, start, subset, 0, num);
+ return new DoubleList(subset);
+ }
+
+
+ public String join(String separator) {
+ if (count == 0) {
+ return "";
+ }
+ StringBuilder sb = new StringBuilder();
+ sb.append(data[0]);
+ for (int i = 1; i < count; i++) {
+ sb.append(separator);
+ sb.append(data[i]);
+ }
+ return sb.toString();
+ }
+
+
+ public void print() {
+ for (int i = 0; i < count; i++) {
+ System.out.format("[%d] %f%n", i, data[i]);
+ }
+ }
+
+
+ /**
+ * Save tab-delimited entries to a file (TSV format, UTF-8 encoding)
+ */
+ public void save(File file) {
+ PrintWriter writer = PApplet.createWriter(file);
+ write(writer);
+ writer.close();
+ }
+
+
+ /**
+ * Write entries to a PrintWriter, one per line
+ */
+ public void write(PrintWriter writer) {
+ for (int i = 0; i < count; i++) {
+ writer.println(data[i]);
+ }
+ writer.flush();
+ }
+
+
+ /**
+ * Return this dictionary as a String in JSON format.
+ */
+ public String toJSON() {
+ return "[ " + join(", ") + " ]";
+ }
+
+
+ @Override
+ public String toString() {
+ return getClass().getSimpleName() + " size=" + size() + " " + toJSON();
+ }
+}
diff --git a/core/src/processing/data/FloatDict.java b/libs/processing-core/src/main/java/processing/data/FloatDict.java
similarity index 95%
rename from core/src/processing/data/FloatDict.java
rename to libs/processing-core/src/main/java/processing/data/FloatDict.java
index f7c7406aa..9495563ad 100644
--- a/core/src/processing/data/FloatDict.java
+++ b/libs/processing-core/src/main/java/processing/data/FloatDict.java
@@ -3,6 +3,7 @@
import java.io.*;
import java.util.HashMap;
import java.util.Iterator;
+import java.util.NoSuchElementException;
import processing.core.PApplet;
@@ -447,7 +448,7 @@ public void div(String key, float amount) {
private void checkMinMax(String functionName) {
if (count == 0) {
String msg =
- String.format("Cannot use %s() on an empty %s.",
+ String.format("Cannot use %s() on an empty %s.",
functionName, getClass().getSimpleName());
throw new RuntimeException(msg);
}
@@ -607,21 +608,22 @@ protected void create(String what, float much) {
* @webref floatdict:method
* @brief Remove a key/value pair
*/
- public int remove(String key) {
+ public float remove(String key) {
int index = index(key);
- if (index != -1) {
- removeIndex(index);
+ if (index == -1) {
+ throw new NoSuchElementException("'" + key + "' not found");
}
- return index;
+ float value = values[index];
+ removeIndex(index);
+ return value;
}
- public String removeIndex(int index) {
+ public float removeIndex(int index) {
if (index < 0 || index >= count) {
throw new ArrayIndexOutOfBoundsException(index);
}
- String key = keys[index];
- //System.out.println("index is " + which + " and " + keys[which]);
+ float value = values[index];
indices.remove(keys[index]);
for (int i = index; i < count-1; i++) {
keys[i] = keys[i+1];
@@ -631,7 +633,7 @@ public String removeIndex(int index) {
count--;
keys[count] = null;
values[count] = 0;
- return key;
+ return value;
}
@@ -734,7 +736,7 @@ public int size() {
}
@Override
- public float compare(int a, int b) {
+ public int compare(int a, int b) {
float diff = 0;
if (useKeys) {
diff = keys[a].compareToIgnoreCase(keys[b]);
@@ -747,7 +749,13 @@ public float compare(int a, int b) {
diff = keys[a].compareToIgnoreCase(keys[b]);
}
}
- return reverse ? -diff : diff;
+ if (diff == 0) {
+ return 0;
+ } else if (reverse) {
+ return diff < 0 ? 1 : -1;
+ } else {
+ return diff < 0 ? -1 : 1;
+ }
}
@Override
@@ -798,6 +806,16 @@ public void print() {
}
+ /**
+ * Save tab-delimited entries to a file (TSV format, UTF-8 encoding)
+ */
+ public void save(File file) {
+ PrintWriter writer = PApplet.createWriter(file);
+ write(writer);
+ writer.close();
+ }
+
+
/**
* Write tab-delimited entries out to
* @param writer
@@ -826,4 +844,4 @@ public String toJSON() {
public String toString() {
return getClass().getSimpleName() + " size=" + size() + " " + toJSON();
}
-}
\ No newline at end of file
+}
diff --git a/core/src/processing/data/FloatList.java b/libs/processing-core/src/main/java/processing/data/FloatList.java
similarity index 95%
rename from core/src/processing/data/FloatList.java
rename to libs/processing-core/src/main/java/processing/data/FloatList.java
index 35aec44ad..863b05658 100644
--- a/core/src/processing/data/FloatList.java
+++ b/libs/processing-core/src/main/java/processing/data/FloatList.java
@@ -1,27 +1,7 @@
-/* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */
-
-/*
- Part of the Processing project - http://processing.org
-
- Copyright (c) 2013-16 The Processing Foundation
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation, version 2.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty
- of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- See the GNU Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General
- Public License along with this library; if not, write to the
- Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- Boston, MA 02111-1307 USA
-*/
-
package processing.data;
+import java.io.File;
+import java.io.PrintWriter;
import java.util.Arrays;
import java.util.Iterator;
import java.util.Random;
@@ -649,11 +629,23 @@ public int maxIndex() {
public float sum() {
- double outgoing = 0;
+ double amount = sumDouble();
+ if (amount > Float.MAX_VALUE) {
+ throw new RuntimeException("sum() exceeds " + Float.MAX_VALUE + ", use sumDouble()");
+ }
+ if (amount < -Float.MAX_VALUE) {
+ throw new RuntimeException("sum() lower than " + -Float.MAX_VALUE + ", use sumDouble()");
+ }
+ return (float) amount;
+ }
+
+
+ public double sumDouble() {
+ double sum = 0;
for (int i = 0; i < count; i++) {
- outgoing += data[i];
+ sum += data[i];
}
- return (float) outgoing;
+ return sum;
}
@@ -702,8 +694,9 @@ public int size() {
}
@Override
- public float compare(int a, int b) {
- return data[b] - data[a];
+ public int compare(int a, int b) {
+ float diff = data[b] - data[a];
+ return diff == 0 ? 0 : (diff < 0 ? -1 : 1);
}
@Override
@@ -907,6 +900,27 @@ public void print() {
}
+ /**
+ * Save tab-delimited entries to a file (TSV format, UTF-8 encoding)
+ */
+ public void save(File file) {
+ PrintWriter writer = PApplet.createWriter(file);
+ write(writer);
+ writer.close();
+ }
+
+
+ /**
+ * Write entries to a PrintWriter, one per line
+ */
+ public void write(PrintWriter writer) {
+ for (int i = 0; i < count; i++) {
+ writer.println(data[i]);
+ }
+ writer.flush();
+ }
+
+
/**
* Return this dictionary as a String in JSON format.
*/
diff --git a/core/src/processing/data/IntDict.java b/libs/processing-core/src/main/java/processing/data/IntDict.java
similarity index 96%
rename from core/src/processing/data/IntDict.java
rename to libs/processing-core/src/main/java/processing/data/IntDict.java
index 41b8502c9..96913591f 100644
--- a/core/src/processing/data/IntDict.java
+++ b/libs/processing-core/src/main/java/processing/data/IntDict.java
@@ -3,6 +3,7 @@
import java.io.*;
import java.util.HashMap;
import java.util.Iterator;
+import java.util.NoSuchElementException;
import processing.core.PApplet;
@@ -471,7 +472,7 @@ public void div(String key, int amount) {
private void checkMinMax(String functionName) {
if (count == 0) {
String msg =
- String.format("Cannot use %s() on an empty %s.",
+ String.format("Cannot use %s() on an empty %s.",
functionName, getClass().getSimpleName());
throw new RuntimeException(msg);
}
@@ -593,19 +594,20 @@ protected void create(String what, int much) {
*/
public int remove(String key) {
int index = index(key);
- if (index != -1) {
- removeIndex(index);
+ if (index == -1) {
+ throw new NoSuchElementException("'" + key + "' not found");
}
- return index;
+ int value = values[index];
+ removeIndex(index);
+ return value;
}
- public String removeIndex(int index) {
+ public int removeIndex(int index) {
if (index < 0 || index >= count) {
throw new ArrayIndexOutOfBoundsException(index);
}
- //System.out.println("index is " + which + " and " + keys[which]);
- String key = keys[index];
+ int value = values[index];
indices.remove(keys[index]);
for (int i = index; i < count-1; i++) {
keys[i] = keys[i+1];
@@ -615,7 +617,7 @@ public String removeIndex(int index) {
count--;
keys[count] = null;
values[count] = 0;
- return key;
+ return value;
}
@@ -701,7 +703,7 @@ public int size() {
}
@Override
- public float compare(int a, int b) {
+ public int compare(int a, int b) {
int diff = 0;
if (useKeys) {
diff = keys[a].compareToIgnoreCase(keys[b]);
@@ -766,8 +768,17 @@ public void print() {
/**
- * Write tab-delimited entries out to
- * @param writer
+ * Save tab-delimited entries to a file (TSV format, UTF-8 encoding)
+ */
+ public void save(File file) {
+ PrintWriter writer = PApplet.createWriter(file);
+ write(writer);
+ writer.close();
+ }
+
+
+ /**
+ * Write tab-delimited entries to a PrintWriter
*/
public void write(PrintWriter writer) {
for (int i = 0; i < count; i++) {
@@ -793,4 +804,4 @@ public String toJSON() {
public String toString() {
return getClass().getSimpleName() + " size=" + size() + " " + toJSON();
}
-}
\ No newline at end of file
+}
diff --git a/core/src/processing/data/IntList.java b/libs/processing-core/src/main/java/processing/data/IntList.java
similarity index 94%
rename from core/src/processing/data/IntList.java
rename to libs/processing-core/src/main/java/processing/data/IntList.java
index 0d5f8956c..dc2c89916 100644
--- a/core/src/processing/data/IntList.java
+++ b/libs/processing-core/src/main/java/processing/data/IntList.java
@@ -1,27 +1,7 @@
-/* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */
-
-/*
- Part of the Processing project - http://processing.org
-
- Copyright (c) 2013-16 The Processing Foundation
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation, version 2.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty
- of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- See the GNU Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General
- Public License along with this library; if not, write to the
- Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- Boston, MA 02111-1307 USA
-*/
-
package processing.data;
+import java.io.File;
+import java.io.PrintWriter;
import java.util.Arrays;
import java.util.Iterator;
import java.util.Random;
@@ -618,11 +598,23 @@ public int maxIndex() {
public int sum() {
- int outgoing = 0;
+ long amount = sumLong();
+ if (amount > Integer.MAX_VALUE) {
+ throw new RuntimeException("sum() exceeds " + Integer.MAX_VALUE + ", use sumLong()");
+ }
+ if (amount < Integer.MIN_VALUE) {
+ throw new RuntimeException("sum() less than " + Integer.MIN_VALUE + ", use sumLong()");
+ }
+ return (int) amount;
+ }
+
+
+ public long sumLong() {
+ long sum = 0;
for (int i = 0; i < count; i++) {
- outgoing += data[i];
+ sum += data[i];
}
- return outgoing;
+ return sum;
}
@@ -651,7 +643,7 @@ public int size() {
}
@Override
- public float compare(int a, int b) {
+ public int compare(int a, int b) {
return data[b] - data[a];
}
@@ -862,6 +854,19 @@ public FloatList getPercent() {
}
+// /**
+// * Count the number of times each entry is found in this list.
+// * Converts each entry to a String so it can be used as a key.
+// */
+// public IntDict getTally() {
+// IntDict outgoing = new IntDict();
+// for (int i = 0; i < count; i++) {
+// outgoing.increment(String.valueOf(data[i]));
+// }
+// return outgoing;
+// }
+
+
public IntList getSubset(int start) {
return getSubset(start, count - start);
}
@@ -895,6 +900,27 @@ public void print() {
}
+ /**
+ * Save tab-delimited entries to a file (TSV format, UTF-8 encoding)
+ */
+ public void save(File file) {
+ PrintWriter writer = PApplet.createWriter(file);
+ write(writer);
+ writer.close();
+ }
+
+
+ /**
+ * Write entries to a PrintWriter, one per line
+ */
+ public void write(PrintWriter writer) {
+ for (int i = 0; i < count; i++) {
+ writer.println(data[i]);
+ }
+ writer.flush();
+ }
+
+
/**
* Return this dictionary as a String in JSON format.
*/
diff --git a/core/src/processing/data/JSONArray.java b/libs/processing-core/src/main/java/processing/data/JSONArray.java
similarity index 97%
rename from core/src/processing/data/JSONArray.java
rename to libs/processing-core/src/main/java/processing/data/JSONArray.java
index b43c6fe0a..ea8276bd8 100644
--- a/core/src/processing/data/JSONArray.java
+++ b/libs/processing-core/src/main/java/processing/data/JSONArray.java
@@ -144,17 +144,17 @@ protected JSONArray(JSONTokener x) {
myArrayList.add(x.nextValue());
}
switch (x.nextClean()) {
- case ';':
- case ',':
- if (x.nextClean() == ']') {
- return;
- }
- x.back();
- break;
- case ']':
+ case ';':
+ case ',':
+ if (x.nextClean() == ']') {
return;
- default:
- throw new RuntimeException("Expected a ',' or ']'");
+ }
+ x.back();
+ break;
+ case ']':
+ return;
+ default:
+ throw new RuntimeException("Expected a ',' or ']'");
}
}
}
@@ -323,8 +323,8 @@ public int getInt(int index) {
Object object = this.get(index);
try {
return object instanceof Number
- ? ((Number)object).intValue()
- : Integer.parseInt((String)object);
+ ? ((Number)object).intValue()
+ : Integer.parseInt((String)object);
} catch (Exception e) {
throw new RuntimeException("JSONArray[" + index + "] is not a number.");
}
@@ -360,8 +360,8 @@ public long getLong(int index) {
Object object = this.get(index);
try {
return object instanceof Number
- ? ((Number)object).longValue()
- : Long.parseLong((String)object);
+ ? ((Number)object).longValue()
+ : Long.parseLong((String)object);
} catch (Exception e) {
throw new RuntimeException("JSONArray[" + index + "] is not a number.");
}
@@ -422,8 +422,8 @@ public double getDouble(int index) {
Object object = this.get(index);
try {
return object instanceof Number
- ? ((Number)object).doubleValue()
- : Double.parseDouble((String)object);
+ ? ((Number)object).doubleValue()
+ : Double.parseDouble((String)object);
} catch (Exception e) {
throw new RuntimeException("JSONArray[" + index + "] is not a number.");
}
@@ -465,12 +465,12 @@ public double getDouble(int index, double defaultValue) {
public boolean getBoolean(int index) {
Object object = this.get(index);
if (object.equals(Boolean.FALSE) ||
- (object instanceof String &&
- ((String)object).equalsIgnoreCase("false"))) {
+ (object instanceof String &&
+ ((String)object).equalsIgnoreCase("false"))) {
return false;
} else if (object.equals(Boolean.TRUE) ||
- (object instanceof String &&
- ((String)object).equalsIgnoreCase("true"))) {
+ (object instanceof String &&
+ ((String)object).equalsIgnoreCase("true"))) {
return true;
}
throw new RuntimeException("JSONArray[" + index + "] is not a boolean.");
@@ -1205,7 +1205,7 @@ protected Writer writeInternal(Writer writer, int indentFactor, int indent) {
if (length == 1) {
JSONObject.writeValue(writer, this.myArrayList.get(0),
- indentFactor, indent);
+ indentFactor, indent);
// thisFactor, indent);
} else if (length != 0) {
final int newIndent = indent + thisFactor;
@@ -1221,7 +1221,7 @@ protected Writer writeInternal(Writer writer, int indentFactor, int indent) {
// JSONObject.writeValue(writer, this.myArrayList.get(i),
// thisFactor, newIndent);
JSONObject.writeValue(writer, this.myArrayList.get(i),
- indentFactor, newIndent);
+ indentFactor, newIndent);
commanate = true;
}
if (indentFactor != -1) {
@@ -1257,4 +1257,4 @@ public String join(String separator) {
}
return sb.toString();
}
-}
\ No newline at end of file
+}
diff --git a/core/src/processing/data/JSONObject.java b/libs/processing-core/src/main/java/processing/data/JSONObject.java
similarity index 93%
rename from core/src/processing/data/JSONObject.java
rename to libs/processing-core/src/main/java/processing/data/JSONObject.java
index 627737ef4..cc7a22de0 100644
--- a/core/src/processing/data/JSONObject.java
+++ b/libs/processing-core/src/main/java/processing/data/JSONObject.java
@@ -123,7 +123,7 @@ public class JSONObject {
* string objects. This is used by JSONObject.put(string, object).
*/
private static HashMap keyPool =
- new HashMap<>(keyPoolSize);
+ new HashMap<>(keyPoolSize);
// . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
@@ -244,13 +244,13 @@ protected JSONObject(JSONTokener x) {
for (;;) {
c = x.nextClean();
switch (c) {
- case 0:
- throw new RuntimeException("A JSONObject text must end with '}'");
- case '}':
- return;
- default:
- x.back();
- key = x.nextValue().toString();
+ case 0:
+ throw new RuntimeException("A JSONObject text must end with '}'");
+ case '}':
+ return;
+ default:
+ x.back();
+ key = x.nextValue().toString();
}
// The key is followed by ':'. We will also tolerate '=' or '=>'.
@@ -268,17 +268,17 @@ protected JSONObject(JSONTokener x) {
// Pairs are separated by ','. We will also tolerate ';'.
switch (x.nextClean()) {
- case ';':
- case ',':
- if (x.nextClean() == '}') {
- return;
- }
- x.back();
- break;
- case '}':
+ case ';':
+ case ',':
+ if (x.nextClean() == '}') {
return;
- default:
- throw new RuntimeException("Expected a ',' or '}'");
+ }
+ x.back();
+ break;
+ case '}':
+ return;
+ default:
+ throw new RuntimeException("Expected a ',' or '}'");
}
}
}
@@ -518,7 +518,7 @@ static protected String doubleToString(double d) {
String string = Double.toString(d);
if (string.indexOf('.') > 0 && string.indexOf('e') < 0 &&
- string.indexOf('E') < 0) {
+ string.indexOf('E') < 0) {
while (string.endsWith("0")) {
string = string.substring(0, string.length() - 1);
}
@@ -612,7 +612,7 @@ public int getInt(String key) {
}
try {
return object instanceof Number ?
- ((Number)object).intValue() : Integer.parseInt((String)object);
+ ((Number)object).intValue() : Integer.parseInt((String)object);
} catch (Exception e) {
throw new RuntimeException("JSONObject[" + quote(key) + "] is not an int.");
}
@@ -650,8 +650,8 @@ public long getLong(String key) {
Object object = this.get(key);
try {
return object instanceof Number
- ? ((Number)object).longValue()
- : Long.parseLong((String)object);
+ ? ((Number)object).longValue()
+ : Long.parseLong((String)object);
} catch (Exception e) {
throw new RuntimeException("JSONObject[" + quote(key) + "] is not a long.", e);
}
@@ -710,8 +710,8 @@ public double getDouble(String key) {
Object object = this.get(key);
try {
return object instanceof Number
- ? ((Number)object).doubleValue()
- : Double.parseDouble((String)object);
+ ? ((Number)object).doubleValue()
+ : Double.parseDouble((String)object);
} catch (Exception e) {
throw new RuntimeException("JSONObject[" + quote(key) + "] is not a number.");
}
@@ -752,12 +752,12 @@ public double getDouble(String key, double defaultValue) {
public boolean getBoolean(String key) {
Object object = this.get(key);
if (object.equals(Boolean.FALSE) ||
- (object instanceof String &&
- ((String)object).equalsIgnoreCase("false"))) {
+ (object instanceof String &&
+ ((String)object).equalsIgnoreCase("false"))) {
return false;
} else if (object.equals(Boolean.TRUE) ||
- (object instanceof String &&
- ((String)object).equalsIgnoreCase("true"))) {
+ (object instanceof String &&
+ ((String)object).equalsIgnoreCase("true"))) {
return true;
}
throw new RuntimeException("JSONObject[" + quote(key) + "] is not a Boolean.");
@@ -989,7 +989,7 @@ private static String numberToString(Number number) {
String string = number.toString();
if (string.indexOf('.') > 0 && string.indexOf('e') < 0 &&
- string.indexOf('E') < 0) {
+ string.indexOf('E') < 0) {
while (string.endsWith("0")) {
string = string.substring(0, string.length() - 1);
}
@@ -1115,43 +1115,43 @@ private void populateMap(Object bean) {
boolean includeSuperClass = klass.getClassLoader() != null;
Method[] methods = includeSuperClass
- ? klass.getMethods()
- : klass.getDeclaredMethods();
- for (int i = 0; i < methods.length; i += 1) {
- try {
- Method method = methods[i];
- if (Modifier.isPublic(method.getModifiers())) {
- String name = method.getName();
- String key = "";
- if (name.startsWith("get")) {
- if ("getClass".equals(name) ||
- "getDeclaringClass".equals(name)) {
- key = "";
- } else {
- key = name.substring(3);
+ ? klass.getMethods()
+ : klass.getDeclaredMethods();
+ for (int i = 0; i < methods.length; i += 1) {
+ try {
+ Method method = methods[i];
+ if (Modifier.isPublic(method.getModifiers())) {
+ String name = method.getName();
+ String key = "";
+ if (name.startsWith("get")) {
+ if ("getClass".equals(name) ||
+ "getDeclaringClass".equals(name)) {
+ key = "";
+ } else {
+ key = name.substring(3);
+ }
+ } else if (name.startsWith("is")) {
+ key = name.substring(2);
}
- } else if (name.startsWith("is")) {
- key = name.substring(2);
- }
- if (key.length() > 0 &&
- Character.isUpperCase(key.charAt(0)) &&
- method.getParameterTypes().length == 0) {
- if (key.length() == 1) {
- key = key.toLowerCase();
- } else if (!Character.isUpperCase(key.charAt(1))) {
- key = key.substring(0, 1).toLowerCase() +
- key.substring(1);
- }
-
- Object result = method.invoke(bean, (Object[])null);
- if (result != null) {
- this.map.put(key, wrap(result));
+ if (key.length() > 0 &&
+ Character.isUpperCase(key.charAt(0)) &&
+ method.getParameterTypes().length == 0) {
+ if (key.length() == 1) {
+ key = key.toLowerCase();
+ } else if (!Character.isUpperCase(key.charAt(1))) {
+ key = key.substring(0, 1).toLowerCase() +
+ key.substring(1);
+ }
+
+ Object result = method.invoke(bean, (Object[])null);
+ if (result != null) {
+ this.map.put(key, wrap(result));
+ }
}
}
+ } catch (Exception ignore) {
}
- } catch (Exception ignore) {
}
- }
}
@@ -1387,7 +1387,7 @@ private JSONObject putOnce(String key, Object value) {
* @param string A String
* @return A String correctly formatted for insertion in a JSON text.
*/
- static protected String quote(String string) {
+ static public String quote(String string) {
StringWriter sw = new StringWriter();
synchronized (sw.getBuffer()) {
try {
@@ -1399,7 +1399,7 @@ static protected String quote(String string) {
}
}
- static protected Writer quote(String string, Writer w) throws IOException {
+ static public Writer quote(String string, Writer w) throws IOException {
if (string == null || string.length() == 0) {
w.write("\"\"");
return w;
@@ -1416,42 +1416,42 @@ static protected Writer quote(String string, Writer w) throws IOException {
b = c;
c = string.charAt(i);
switch (c) {
- case '\\':
- case '"':
+ case '\\':
+ case '"':
+ w.write('\\');
+ w.write(c);
+ break;
+ case '/':
+ if (b == '<') {
w.write('\\');
+ }
+ w.write(c);
+ break;
+ case '\b':
+ w.write("\\b");
+ break;
+ case '\t':
+ w.write("\\t");
+ break;
+ case '\n':
+ w.write("\\n");
+ break;
+ case '\f':
+ w.write("\\f");
+ break;
+ case '\r':
+ w.write("\\r");
+ break;
+ default:
+ if (c < ' ' || (c >= '\u0080' && c < '\u00a0')
+ || (c >= '\u2000' && c < '\u2100')) {
+ w.write("\\u");
+ hhhh = Integer.toHexString(c);
+ w.write("0000", 0, 4 - hhhh.length());
+ w.write(hhhh);
+ } else {
w.write(c);
- break;
- case '/':
- if (b == '<') {
- w.write('\\');
- }
- w.write(c);
- break;
- case '\b':
- w.write("\\b");
- break;
- case '\t':
- w.write("\\t");
- break;
- case '\n':
- w.write("\\n");
- break;
- case '\f':
- w.write("\\f");
- break;
- case '\r':
- w.write("\\r");
- break;
- default:
- if (c < ' ' || (c >= '\u0080' && c < '\u00a0')
- || (c >= '\u2000' && c < '\u2100')) {
- w.write("\\u");
- hhhh = Integer.toHexString(c);
- w.write("0000", 0, 4 - hhhh.length());
- w.write(hhhh);
- } else {
- w.write(c);
- }
+ }
}
}
w.write('"');
@@ -1503,7 +1503,7 @@ static protected Object stringToValue(String string) {
if ((b >= '0' && b <= '9') || b == '.' || b == '-' || b == '+') {
try {
if (string.indexOf('.') > -1 ||
- string.indexOf('e') > -1 || string.indexOf('E') > -1) {
+ string.indexOf('e') > -1 || string.indexOf('E') > -1) {
d = Double.valueOf(string);
if (!d.isInfinite() && !d.isNaN()) {
return d;
@@ -1534,12 +1534,12 @@ static protected void testValidity(Object o) {
if (o instanceof Double) {
if (((Double)o).isInfinite() || ((Double)o).isNaN()) {
throw new RuntimeException(
- "JSON does not allow non-finite numbers.");
+ "JSON does not allow non-finite numbers.");
}
} else if (o instanceof Float) {
if (((Float)o).isInfinite() || ((Float)o).isNaN()) {
throw new RuntimeException(
- "JSON does not allow non-finite numbers.");
+ "JSON does not allow non-finite numbers.");
}
}
}
@@ -1682,7 +1682,7 @@ static protected String valueToString(Object value) {
return numberToString((Number) value);
}
if (value instanceof Boolean || value instanceof JSONObject ||
- value instanceof JSONArray) {
+ value instanceof JSONArray) {
return value.toString();
}
if (value instanceof Map) {
@@ -1715,12 +1715,12 @@ static protected Object wrap(Object object) {
return NULL;
}
if (object instanceof JSONObject || object instanceof JSONArray ||
- NULL.equals(object) || /*object instanceof JSONString ||*/
- object instanceof Byte || object instanceof Character ||
- object instanceof Short || object instanceof Integer ||
- object instanceof Long || object instanceof Boolean ||
- object instanceof Float || object instanceof Double ||
- object instanceof String) {
+ NULL.equals(object) || /*object instanceof JSONString ||*/
+ object instanceof Byte || object instanceof Character ||
+ object instanceof Short || object instanceof Integer ||
+ object instanceof Long || object instanceof Boolean ||
+ object instanceof Float || object instanceof Double ||
+ object instanceof String) {
return object;
}
@@ -1735,16 +1735,16 @@ static protected Object wrap(Object object) {
}
Package objectPackage = object.getClass().getPackage();
String objectPackageName = objectPackage != null
- ? objectPackage.getName()
- : "";
- if (
- objectPackageName.startsWith("java.") ||
- objectPackageName.startsWith("javax.") ||
- object.getClass().getClassLoader() == null
- ) {
- return object.toString();
- }
- return new JSONObject(object);
+ ? objectPackage.getName()
+ : "";
+ if (
+ objectPackageName.startsWith("java.") ||
+ objectPackageName.startsWith("javax.") ||
+ object.getClass().getClassLoader() == null
+ ) {
+ return object.toString();
+ }
+ return new JSONObject(object);
} catch(Exception exception) {
return null;
}
@@ -1777,7 +1777,7 @@ static final Writer writeValue(Writer writer, Object value,
new JSONObject(value).writeInternal(writer, indentFactor, indent);
} else if (value instanceof Collection) {
new JSONArray(value).writeInternal(writer, indentFactor,
- indent);
+ indent);
} else if (value.getClass().isArray()) {
new JSONArray(value).writeInternal(writer, indentFactor, indent);
} else if (value instanceof Number) {
@@ -2279,4 +2279,4 @@ protected Writer writeInternal(Writer writer, int indentFactor, int indent) {
// this.line + "]";
// }
// }
-}
\ No newline at end of file
+}
diff --git a/core/src/processing/data/JSONTokener.java b/libs/processing-core/src/main/java/processing/data/JSONTokener.java
similarity index 100%
rename from core/src/processing/data/JSONTokener.java
rename to libs/processing-core/src/main/java/processing/data/JSONTokener.java
diff --git a/libs/processing-core/src/main/java/processing/data/LongDict.java b/libs/processing-core/src/main/java/processing/data/LongDict.java
new file mode 100644
index 000000000..529246862
--- /dev/null
+++ b/libs/processing-core/src/main/java/processing/data/LongDict.java
@@ -0,0 +1,802 @@
+package processing.data;
+
+import java.io.*;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.NoSuchElementException;
+
+import processing.core.PApplet;
+
+
+/**
+ * A simple class to use a String as a lookup for an int value.
+ *
+ * @webref data:composite
+ * @see FloatDict
+ * @see StringDict
+ */
+public class LongDict {
+
+ /** Number of elements in the table */
+ protected int count;
+
+ protected String[] keys;
+ protected long[] values;
+
+ /** Internal implementation for faster lookups */
+ private HashMap indices = new HashMap<>();
+
+
+ public LongDict() {
+ count = 0;
+ keys = new String[10];
+ values = new long[10];
+ }
+
+
+ /**
+ * Create a new lookup with a specific size. This is more efficient than not
+ * specifying a size. Use it when you know the rough size of the thing you're creating.
+ *
+ * @nowebref
+ */
+ public LongDict(int length) {
+ count = 0;
+ keys = new String[length];
+ values = new long[length];
+ }
+
+
+ /**
+ * Read a set of entries from a Reader that has each key/value pair on
+ * a single line, separated by a tab.
+ *
+ * @nowebref
+ */
+ public LongDict(BufferedReader reader) {
+ String[] lines = PApplet.loadStrings(reader);
+ keys = new String[lines.length];
+ values = new long[lines.length];
+
+ for (int i = 0; i < lines.length; i++) {
+ String[] pieces = PApplet.split(lines[i], '\t');
+ if (pieces.length == 2) {
+ keys[count] = pieces[0];
+ values[count] = PApplet.parseInt(pieces[1]);
+ indices.put(pieces[0], count);
+ count++;
+ }
+ }
+ }
+
+ /**
+ * @nowebref
+ */
+ public LongDict(String[] keys, long[] values) {
+ if (keys.length != values.length) {
+ throw new IllegalArgumentException("key and value arrays must be the same length");
+ }
+ this.keys = keys;
+ this.values = values;
+ count = keys.length;
+ for (int i = 0; i < count; i++) {
+ indices.put(keys[i], i);
+ }
+ }
+
+
+ /**
+ * Constructor to allow (more intuitive) inline initialization, e.g.:
+ *
+ * new FloatDict(new Object[][] {
+ * { "key1", 1 },
+ * { "key2", 2 }
+ * });
+ *
+ */
+ public LongDict(Object[][] pairs) {
+ count = pairs.length;
+ this.keys = new String[count];
+ this.values = new long[count];
+ for (int i = 0; i < count; i++) {
+ keys[i] = (String) pairs[i][0];
+ values[i] = (Integer) pairs[i][1];
+ indices.put(keys[i], i);
+ }
+ }
+
+
+ /**
+ * Returns the number of key/value pairs
+ *
+ * @webref intdict:method
+ * @brief Returns the number of key/value pairs
+ */
+ public int size() {
+ return count;
+ }
+
+
+ /**
+ * Resize the internal data, this can only be used to shrink the list.
+ * Helpful for situations like sorting and then grabbing the top 50 entries.
+ */
+ public void resize(int length) {
+ if (length > count) {
+ throw new IllegalArgumentException("resize() can only be used to shrink the dictionary");
+ }
+ if (length < 1) {
+ throw new IllegalArgumentException("resize(" + length + ") is too small, use 1 or higher");
+ }
+
+ String[] newKeys = new String[length];
+ long[] newValues = new long[length];
+ PApplet.arrayCopy(keys, newKeys, length);
+ PApplet.arrayCopy(values, newValues, length);
+ keys = newKeys;
+ values = newValues;
+ count = length;
+ resetIndices();
+ }
+
+
+ /**
+ * Remove all entries.
+ *
+ * @webref intdict:method
+ * @brief Remove all entries
+ */
+ public void clear() {
+ count = 0;
+ indices = new HashMap<>();
+ }
+
+
+ private void resetIndices() {
+ indices = new HashMap<>(count);
+ for (int i = 0; i < count; i++) {
+ indices.put(keys[i], i);
+ }
+ }
+
+
+ // . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
+
+
+ public class Entry {
+ public String key;
+ public long value;
+
+ Entry(String key, long value) {
+ this.key = key;
+ this.value = value;
+ }
+ }
+
+
+ public Iterable entries() {
+ return new Iterable() {
+
+ public Iterator iterator() {
+ return entryIterator();
+ }
+ };
+ }
+
+
+ public Iterator entryIterator() {
+ return new Iterator() {
+ int index = -1;
+
+ public void remove() {
+ removeIndex(index);
+ index--;
+ }
+
+ public Entry next() {
+ ++index;
+ Entry e = new Entry(keys[index], values[index]);
+ return e;
+ }
+
+ public boolean hasNext() {
+ return index+1 < size();
+ }
+ };
+ }
+
+
+ // . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
+
+
+ public String key(int index) {
+ return keys[index];
+ }
+
+
+ protected void crop() {
+ if (count != keys.length) {
+ keys = PApplet.subset(keys, 0, count);
+ values = PApplet.subset(values, 0, count);
+ }
+ }
+
+
+ public Iterable keys() {
+ return new Iterable() {
+
+ @Override
+ public Iterator iterator() {
+ return keyIterator();
+ }
+ };
+ }
+
+
+ // Use this to iterate when you want to be able to remove elements along the way
+ public Iterator keyIterator() {
+ return new Iterator() {
+ int index = -1;
+
+ public void remove() {
+ removeIndex(index);
+ index--;
+ }
+
+ public String next() {
+ return key(++index);
+ }
+
+ public boolean hasNext() {
+ return index+1 < size();
+ }
+ };
+ }
+
+
+ /**
+ * Return a copy of the internal keys array. This array can be modified.
+ *
+ * @webref intdict:method
+ * @brief Return a copy of the internal keys array
+ */
+ public String[] keyArray() {
+ crop();
+ return keyArray(null);
+ }
+
+
+ public String[] keyArray(String[] outgoing) {
+ if (outgoing == null || outgoing.length != count) {
+ outgoing = new String[count];
+ }
+ System.arraycopy(keys, 0, outgoing, 0, count);
+ return outgoing;
+ }
+
+
+ public long value(int index) {
+ return values[index];
+ }
+
+
+ /**
+ * @webref intdict:method
+ * @brief Return the internal array being used to store the values
+ */
+ public Iterable values() {
+ return new Iterable() {
+
+ @Override
+ public Iterator iterator() {
+ return valueIterator();
+ }
+ };
+ }
+
+
+ public Iterator valueIterator() {
+ return new Iterator() {
+ int index = -1;
+
+ public void remove() {
+ removeIndex(index);
+ index--;
+ }
+
+ public Long next() {
+ return value(++index);
+ }
+
+ public boolean hasNext() {
+ return index+1 < size();
+ }
+ };
+ }
+
+
+ /**
+ * Create a new array and copy each of the values into it.
+ *
+ * @webref intdict:method
+ * @brief Create a new array and copy each of the values into it
+ */
+ public int[] valueArray() {
+ crop();
+ return valueArray(null);
+ }
+
+
+ /**
+ * Fill an already-allocated array with the values (more efficient than
+ * creating a new array each time). If 'array' is null, or not the same
+ * size as the number of values, a new array will be allocated and returned.
+ *
+ * @param array values to copy into the array
+ */
+ public int[] valueArray(int[] array) {
+ if (array == null || array.length != size()) {
+ array = new int[count];
+ }
+ System.arraycopy(values, 0, array, 0, count);
+ return array;
+ }
+
+
+ /**
+ * Return a value for the specified key.
+ *
+ * @webref intdict:method
+ * @brief Return a value for the specified key
+ */
+ public long get(String key) {
+ int index = index(key);
+ if (index == -1) {
+ throw new IllegalArgumentException("No key named '" + key + "'");
+ }
+ return values[index];
+ }
+
+
+ public long get(String key, long alternate) {
+ int index = index(key);
+ if (index == -1) return alternate;
+ return values[index];
+ }
+
+
+ /**
+ * Create a new key/value pair or change the value of one.
+ *
+ * @webref intdict:method
+ * @brief Create a new key/value pair or change the value of one
+ */
+ public void set(String key, long amount) {
+ int index = index(key);
+ if (index == -1) {
+ create(key, amount);
+ } else {
+ values[index] = amount;
+ }
+ }
+
+
+ public void setIndex(int index, String key, long value) {
+ if (index < 0 || index >= count) {
+ throw new ArrayIndexOutOfBoundsException(index);
+ }
+ keys[index] = key;
+ values[index] = value;
+ }
+
+
+ /**
+ * @webref intdict:method
+ * @brief Check if a key is a part of the data structure
+ */
+ public boolean hasKey(String key) {
+ return index(key) != -1;
+ }
+
+
+ /**
+ * Increase the value associated with a specific key by 1.
+ *
+ * @webref intdict:method
+ * @brief Increase the value of a specific key value by 1
+ */
+ public void increment(String key) {
+ add(key, 1);
+ }
+
+
+ /**
+ * Merge another dictionary into this one. Calling this increment()
+ * since it doesn't make sense in practice for the other dictionary types,
+ * even though it's technically an add().
+ */
+ public void increment(LongDict dict) {
+ for (int i = 0; i < dict.count; i++) {
+ add(dict.key(i), dict.value(i));
+ }
+ }
+
+
+ /**
+ * @webref intdict:method
+ * @brief Add to a value
+ */
+ public void add(String key, long amount) {
+ int index = index(key);
+ if (index == -1) {
+ create(key, amount);
+ } else {
+ values[index] += amount;
+ }
+ }
+
+
+ /**
+ * @webref intdict:method
+ * @brief Subtract from a value
+ */
+ public void sub(String key, long amount) {
+ add(key, -amount);
+ }
+
+
+ /**
+ * @webref intdict:method
+ * @brief Multiply a value
+ */
+ public void mult(String key, long amount) {
+ int index = index(key);
+ if (index != -1) {
+ values[index] *= amount;
+ }
+ }
+
+
+ /**
+ * @webref intdict:method
+ * @brief Divide a value
+ */
+ public void div(String key, long amount) {
+ int index = index(key);
+ if (index != -1) {
+ values[index] /= amount;
+ }
+ }
+
+
+ private void checkMinMax(String functionName) {
+ if (count == 0) {
+ String msg =
+ String.format("Cannot use %s() on an empty %s.",
+ functionName, getClass().getSimpleName());
+ throw new RuntimeException(msg);
+ }
+ }
+
+
+ // return the index of the minimum value
+ public int minIndex() {
+ //checkMinMax("minIndex");
+ if (count == 0) return -1;
+
+ int index = 0;
+ long value = values[0];
+ for (int i = 1; i < count; i++) {
+ if (values[i] < value) {
+ index = i;
+ value = values[i];
+ }
+ }
+ return index;
+ }
+
+
+ // return the key for the minimum value
+ public String minKey() {
+ checkMinMax("minKey");
+ int index = minIndex();
+ if (index == -1) {
+ return null;
+ }
+ return keys[index];
+ }
+
+
+ // return the minimum value, or throw an error if there are no values
+ public long minValue() {
+ checkMinMax("minValue");
+ return values[minIndex()];
+ }
+
+
+ // return the index of the max value
+ public int maxIndex() {
+ //checkMinMax("maxIndex");
+ if (count == 0) {
+ return -1;
+ }
+ int index = 0;
+ long value = values[0];
+ for (int i = 1; i < count; i++) {
+ if (values[i] > value) {
+ index = i;
+ value = values[i];
+ }
+ }
+ return index;
+ }
+
+
+ /** return the key corresponding to the maximum value or null if no entries */
+ public String maxKey() {
+ //checkMinMax("maxKey");
+ int index = maxIndex();
+ if (index == -1) {
+ return null;
+ }
+ return keys[index];
+ }
+
+
+ // return the maximum value or throw an error if zero length
+ public long maxValue() {
+ checkMinMax("maxIndex");
+ return values[maxIndex()];
+ }
+
+
+ public long sum() {
+ long sum = 0;
+ for (int i = 0; i < count; i++) {
+ sum += values[i];
+ }
+ return sum;
+ }
+
+
+ public int index(String what) {
+ Integer found = indices.get(what);
+ return (found == null) ? -1 : found.intValue();
+ }
+
+
+ protected void create(String what, long much) {
+ if (count == keys.length) {
+ keys = PApplet.expand(keys);
+ values = PApplet.expand(values);
+ }
+ indices.put(what, Integer.valueOf(count));
+ keys[count] = what;
+ values[count] = much;
+ count++;
+ }
+
+
+ /**
+ * @webref intdict:method
+ * @brief Remove a key/value pair
+ */
+ public long remove(String key) {
+ int index = index(key);
+ if (index == -1) {
+ throw new NoSuchElementException("'" + key + "' not found");
+ }
+ long value = values[index];
+ removeIndex(index);
+ return value;
+ }
+
+
+ public long removeIndex(int index) {
+ if (index < 0 || index >= count) {
+ throw new ArrayIndexOutOfBoundsException(index);
+ }
+ long value = values[index];
+ indices.remove(keys[index]);
+ for (int i = index; i < count-1; i++) {
+ keys[i] = keys[i+1];
+ values[i] = values[i+1];
+ indices.put(keys[i], i);
+ }
+ count--;
+ keys[count] = null;
+ values[count] = 0;
+ return value;
+ }
+
+
+ public void swap(int a, int b) {
+ String tkey = keys[a];
+ long tvalue = values[a];
+ keys[a] = keys[b];
+ values[a] = values[b];
+ keys[b] = tkey;
+ values[b] = tvalue;
+
+// indices.put(keys[a], Integer.valueOf(a));
+// indices.put(keys[b], Integer.valueOf(b));
+ }
+
+
+ /**
+ * Sort the keys alphabetically (ignoring case). Uses the value as a
+ * tie-breaker (only really possible with a key that has a case change).
+ *
+ * @webref intdict:method
+ * @brief Sort the keys alphabetically
+ */
+ public void sortKeys() {
+ sortImpl(true, false, true);
+ }
+
+ /**
+ * Sort the keys alphabetically in reverse (ignoring case). Uses the value as a
+ * tie-breaker (only really possible with a key that has a case change).
+ *
+ * @webref intdict:method
+ * @brief Sort the keys alphabetically in reverse
+ */
+ public void sortKeysReverse() {
+ sortImpl(true, true, true);
+ }
+
+
+ /**
+ * Sort by values in ascending order. The smallest value will be at [0].
+ *
+ * @webref intdict:method
+ * @brief Sort by values in ascending order
+ */
+ public void sortValues() {
+ sortValues(true);
+ }
+
+
+ /**
+ * Set true to ensure that the order returned is identical. Slightly
+ * slower because the tie-breaker for identical values compares the keys.
+ * @param stable
+ */
+ public void sortValues(boolean stable) {
+ sortImpl(false, false, stable);
+ }
+
+
+ /**
+ * Sort by values in descending order. The largest value will be at [0].
+ *
+ * @webref intdict:method
+ * @brief Sort by values in descending order
+ */
+ public void sortValuesReverse() {
+ sortValuesReverse(true);
+ }
+
+
+ public void sortValuesReverse(boolean stable) {
+ sortImpl(false, true, stable);
+ }
+
+
+ protected void sortImpl(final boolean useKeys, final boolean reverse,
+ final boolean stable) {
+ Sort s = new Sort() {
+ @Override
+ public int size() {
+ return count;
+ }
+
+ @Override
+ public int compare(int a, int b) {
+ long diff = 0;
+ if (useKeys) {
+ diff = keys[a].compareToIgnoreCase(keys[b]);
+ if (diff == 0) {
+ diff = values[a] - values[b];
+ }
+ } else { // sort values
+ diff = values[a] - values[b];
+ if (diff == 0 && stable) {
+ diff = keys[a].compareToIgnoreCase(keys[b]);
+ }
+ }
+ if (diff == 0) {
+ return 0;
+ } else if (reverse) {
+ return diff < 0 ? 1 : -1;
+ } else {
+ return diff < 0 ? -1 : 1;
+ }
+ }
+
+ @Override
+ public void swap(int a, int b) {
+ LongDict.this.swap(a, b);
+ }
+ };
+ s.run();
+
+ // Set the indices after sort/swaps (performance fix 160411)
+ resetIndices();
+ }
+
+
+ /**
+ * Sum all of the values in this dictionary, then return a new FloatDict of
+ * each key, divided by the total sum. The total for all values will be ~1.0.
+ * @return an IntDict with the original keys, mapped to their pct of the total
+ */
+ public FloatDict getPercent() {
+ double sum = sum(); // a little more accuracy
+ FloatDict outgoing = new FloatDict();
+ for (int i = 0; i < size(); i++) {
+ double percent = value(i) / sum;
+ outgoing.set(key(i), (float) percent);
+ }
+ return outgoing;
+ }
+
+
+ /** Returns a duplicate copy of this object. */
+ public LongDict copy() {
+ LongDict outgoing = new LongDict(count);
+ System.arraycopy(keys, 0, outgoing.keys, 0, count);
+ System.arraycopy(values, 0, outgoing.values, 0, count);
+ for (int i = 0; i < count; i++) {
+ outgoing.indices.put(keys[i], i);
+ }
+ outgoing.count = count;
+ return outgoing;
+ }
+
+
+ public void print() {
+ for (int i = 0; i < size(); i++) {
+ System.out.println(keys[i] + " = " + values[i]);
+ }
+ }
+
+
+ /**
+ * Save tab-delimited entries to a file (TSV format, UTF-8 encoding)
+ */
+ public void save(File file) {
+ PrintWriter writer = PApplet.createWriter(file);
+ write(writer);
+ writer.close();
+ }
+
+
+ /**
+ * Write tab-delimited entries to a PrintWriter
+ */
+ public void write(PrintWriter writer) {
+ for (int i = 0; i < count; i++) {
+ writer.println(keys[i] + "\t" + values[i]);
+ }
+ writer.flush();
+ }
+
+
+ /**
+ * Return this dictionary as a String in JSON format.
+ */
+ public String toJSON() {
+ StringList items = new StringList();
+ for (int i = 0; i < count; i++) {
+ items.append(JSONObject.quote(keys[i])+ ": " + values[i]);
+ }
+ return "{ " + items.join(", ") + " }";
+ }
+
+
+ @Override
+ public String toString() {
+ return getClass().getSimpleName() + " size=" + size() + " " + toJSON();
+ }
+}
diff --git a/libs/processing-core/src/main/java/processing/data/LongList.java b/libs/processing-core/src/main/java/processing/data/LongList.java
new file mode 100644
index 000000000..77bbd8b15
--- /dev/null
+++ b/libs/processing-core/src/main/java/processing/data/LongList.java
@@ -0,0 +1,937 @@
+package processing.data;
+
+import java.io.File;
+import java.io.PrintWriter;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.Random;
+
+import processing.core.PApplet;
+
+
+// splice, slice, subset, concat, reverse
+
+// trim, join for String versions
+
+
+/**
+ * Helper class for a list of ints. Lists are designed to have some of the
+ * features of ArrayLists, but to maintain the simplicity and efficiency of
+ * working with arrays.
+ *
+ * Functions like sort() and shuffle() always act on the list itself. To get
+ * a sorted copy, use list.copy().sort().
+ *
+ * @webref data:composite
+ * @see FloatList
+ * @see StringList
+ */
+public class LongList implements Iterable {
+ protected int count;
+ protected long[] data;
+
+
+ public LongList() {
+ data = new long[10];
+ }
+
+
+ /**
+ * @nowebref
+ */
+ public LongList(int length) {
+ data = new long[length];
+ }
+
+
+ /**
+ * @nowebref
+ */
+ public LongList(int[] source) {
+ count = source.length;
+ data = new long[count];
+ System.arraycopy(source, 0, data, 0, count);
+ }
+
+
+ /**
+ * Construct an IntList from an iterable pile of objects.
+ * For instance, a float array, an array of strings, who knows).
+ * Un-parseable or null values will be set to 0.
+ * @nowebref
+ */
+ public LongList(Iterable iter) {
+ this(10);
+ for (Object o : iter) {
+ if (o == null) {
+ append(0); // missing value default
+ } else if (o instanceof Number) {
+ append(((Number) o).intValue());
+ } else {
+ append(PApplet.parseInt(o.toString().trim()));
+ }
+ }
+ crop();
+ }
+
+
+ /**
+ * Construct an IntList from a random pile of objects.
+ * Un-parseable or null values will be set to zero.
+ */
+ public LongList(Object... items) {
+ final int missingValue = 0; // nuts, can't be last/final/second arg
+
+ count = items.length;
+ data = new long[count];
+ int index = 0;
+ for (Object o : items) {
+ int value = missingValue;
+ if (o != null) {
+ if (o instanceof Number) {
+ value = ((Number) o).intValue();
+ } else {
+ value = PApplet.parseInt(o.toString().trim(), missingValue);
+ }
+ }
+ data[index++] = value;
+ }
+ }
+
+
+ static public LongList fromRange(int stop) {
+ return fromRange(0, stop);
+ }
+
+
+ static public LongList fromRange(int start, int stop) {
+ int count = stop - start;
+ LongList newbie = new LongList(count);
+ for (int i = 0; i < count; i++) {
+ newbie.set(i, start+i);
+ }
+ return newbie;
+ }
+
+
+ /**
+ * Improve efficiency by removing allocated but unused entries from the
+ * internal array used to store the data. Set to private, though it could
+ * be useful to have this public if lists are frequently making drastic
+ * size changes (from very large to very small).
+ */
+ private void crop() {
+ if (count != data.length) {
+ data = PApplet.subset(data, 0, count);
+ }
+ }
+
+
+ /**
+ * Get the length of the list.
+ *
+ * @webref intlist:method
+ * @brief Get the length of the list
+ */
+ public int size() {
+ return count;
+ }
+
+
+ public void resize(int length) {
+ if (length > data.length) {
+ long[] temp = new long[length];
+ System.arraycopy(data, 0, temp, 0, count);
+ data = temp;
+
+ } else if (length > count) {
+ Arrays.fill(data, count, length, 0);
+ }
+ count = length;
+ }
+
+
+ /**
+ * Remove all entries from the list.
+ *
+ * @webref intlist:method
+ * @brief Remove all entries from the list
+ */
+ public void clear() {
+ count = 0;
+ }
+
+
+ /**
+ * Get an entry at a particular index.
+ *
+ * @webref intlist:method
+ * @brief Get an entry at a particular index
+ */
+ public long get(int index) {
+ if (index >= this.count) {
+ throw new ArrayIndexOutOfBoundsException(index);
+ }
+ return data[index];
+ }
+
+
+ /**
+ * Set the entry at a particular index. If the index is past the length of
+ * the list, it'll expand the list to accommodate, and fill the intermediate
+ * entries with 0s.
+ *
+ * @webref intlist:method
+ * @brief Set the entry at a particular index
+ */
+ public void set(int index, int what) {
+ if (index >= count) {
+ data = PApplet.expand(data, index+1);
+ for (int i = count; i < index; i++) {
+ data[i] = 0;
+ }
+ count = index+1;
+ }
+ data[index] = what;
+ }
+
+
+ /** Just an alias for append(), but matches pop() */
+ public void push(int value) {
+ append(value);
+ }
+
+
+ public long pop() {
+ if (count == 0) {
+ throw new RuntimeException("Can't call pop() on an empty list");
+ }
+ long value = get(count-1);
+ count--;
+ return value;
+ }
+
+
+ /**
+ * Remove an element from the specified index
+ *
+ * @webref intlist:method
+ * @brief Remove an element from the specified index
+ */
+ public long remove(int index) {
+ if (index < 0 || index >= count) {
+ throw new ArrayIndexOutOfBoundsException(index);
+ }
+ long entry = data[index];
+// int[] outgoing = new int[count - 1];
+// System.arraycopy(data, 0, outgoing, 0, index);
+// count--;
+// System.arraycopy(data, index + 1, outgoing, 0, count - index);
+// data = outgoing;
+ // For most cases, this actually appears to be faster
+ // than arraycopy() on an array copying into itself.
+ for (int i = index; i < count-1; i++) {
+ data[i] = data[i+1];
+ }
+ count--;
+ return entry;
+ }
+
+
+ // Remove the first instance of a particular value,
+ // and return the index at which it was found.
+ public int removeValue(int value) {
+ int index = index(value);
+ if (index != -1) {
+ remove(index);
+ return index;
+ }
+ return -1;
+ }
+
+
+ // Remove all instances of a particular value,
+ // and return the number of values found and removed
+ public int removeValues(int value) {
+ int ii = 0;
+ for (int i = 0; i < count; i++) {
+ if (data[i] != value) {
+ data[ii++] = data[i];
+ }
+ }
+ int removed = count - ii;
+ count = ii;
+ return removed;
+ }
+
+
+ /**
+ * Add a new entry to the list.
+ *
+ * @webref intlist:method
+ * @brief Add a new entry to the list
+ */
+ public void append(long value) {
+ if (count == data.length) {
+ data = PApplet.expand(data);
+ }
+ data[count++] = value;
+ }
+
+
+ public void append(int[] values) {
+ for (int v : values) {
+ append(v);
+ }
+ }
+
+
+ public void append(LongList list) {
+ for (long v : list.values()) { // will concat the list...
+ append(v);
+ }
+ }
+
+
+ /** Add this value, but only if it's not already in the list. */
+ public void appendUnique(int value) {
+ if (!hasValue(value)) {
+ append(value);
+ }
+ }
+
+
+// public void insert(int index, int value) {
+// if (index+1 > count) {
+// if (index+1 < data.length) {
+// }
+// }
+// if (index >= data.length) {
+// data = PApplet.expand(data, index+1);
+// data[index] = value;
+// count = index+1;
+//
+// } else if (count == data.length) {
+// if (index >= count) {
+// //int[] temp = new int[count << 1];
+// System.arraycopy(data, 0, temp, 0, index);
+// temp[index] = value;
+// System.arraycopy(data, index, temp, index+1, count - index);
+// data = temp;
+//
+// } else {
+// // data[] has room to grow
+// // for() loop believed to be faster than System.arraycopy over itself
+// for (int i = count; i > index; --i) {
+// data[i] = data[i-1];
+// }
+// data[index] = value;
+// count++;
+// }
+// }
+
+
+ public void insert(int index, long value) {
+ insert(index, new long[] { value });
+ }
+
+
+ // same as splice
+ public void insert(int index, long[] values) {
+ if (index < 0) {
+ throw new IllegalArgumentException("insert() index cannot be negative: it was " + index);
+ }
+ if (index >= data.length) {
+ throw new IllegalArgumentException("insert() index " + index + " is past the end of this list");
+ }
+
+ long[] temp = new long[count + values.length];
+
+ // Copy the old values, but not more than already exist
+ System.arraycopy(data, 0, temp, 0, Math.min(count, index));
+
+ // Copy the new values into the proper place
+ System.arraycopy(values, 0, temp, index, values.length);
+
+// if (index < count) {
+ // The index was inside count, so it's a true splice/insert
+ System.arraycopy(data, index, temp, index+values.length, count - index);
+ count = count + values.length;
+// } else {
+// // The index was past 'count', so the new count is weirder
+// count = index + values.length;
+// }
+ data = temp;
+ }
+
+
+ public void insert(int index, LongList list) {
+ insert(index, list.values());
+ }
+
+
+ // below are aborted attempts at more optimized versions of the code
+ // that are harder to read and debug...
+
+// if (index + values.length >= count) {
+// // We're past the current 'count', check to see if we're still allocated
+// // index 9, data.length = 10, values.length = 1
+// if (index + values.length < data.length) {
+// // There's still room for these entries, even though it's past 'count'.
+// // First clear out the entries leading up to it, however.
+// for (int i = count; i < index; i++) {
+// data[i] = 0;
+// }
+// data[index] =
+// }
+// if (index >= data.length) {
+// int length = index + values.length;
+// int[] temp = new int[length];
+// System.arraycopy(data, 0, temp, 0, count);
+// System.arraycopy(values, 0, temp, index, values.length);
+// data = temp;
+// count = data.length;
+// } else {
+//
+// }
+//
+// } else if (count == data.length) {
+// int[] temp = new int[count << 1];
+// System.arraycopy(data, 0, temp, 0, index);
+// temp[index] = value;
+// System.arraycopy(data, index, temp, index+1, count - index);
+// data = temp;
+//
+// } else {
+// // data[] has room to grow
+// // for() loop believed to be faster than System.arraycopy over itself
+// for (int i = count; i > index; --i) {
+// data[i] = data[i-1];
+// }
+// data[index] = value;
+// count++;
+// }
+
+
+ /** Return the first index of a particular value. */
+ public int index(int what) {
+ /*
+ if (indexCache != null) {
+ try {
+ return indexCache.get(what);
+ } catch (Exception e) { // not there
+ return -1;
+ }
+ }
+ */
+ for (int i = 0; i < count; i++) {
+ if (data[i] == what) {
+ return i;
+ }
+ }
+ return -1;
+ }
+
+
+ // !!! TODO this is not yet correct, because it's not being reset when
+ // the rest of the entries are changed
+// protected void cacheIndices() {
+// indexCache = new HashMap();
+// for (int i = 0; i < count; i++) {
+// indexCache.put(data[i], i);
+// }
+// }
+
+ /**
+ * @webref intlist:method
+ * @brief Check if a number is a part of the list
+ */
+ public boolean hasValue(int value) {
+// if (indexCache == null) {
+// cacheIndices();
+// }
+// return index(what) != -1;
+ for (int i = 0; i < count; i++) {
+ if (data[i] == value) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ /**
+ * @webref intlist:method
+ * @brief Add one to a value
+ */
+ public void increment(int index) {
+ if (count <= index) {
+ resize(index + 1);
+ }
+ data[index]++;
+ }
+
+
+ private void boundsProblem(int index, String method) {
+ final String msg = String.format("The list size is %d. " +
+ "You cannot %s() to element %d.", count, method, index);
+ throw new ArrayIndexOutOfBoundsException(msg);
+ }
+
+
+ /**
+ * @webref intlist:method
+ * @brief Add to a value
+ */
+ public void add(int index, int amount) {
+ if (index < count) {
+ data[index] += amount;
+ } else {
+ boundsProblem(index, "add");
+ }
+ }
+
+ /**
+ * @webref intlist:method
+ * @brief Subtract from a value
+ */
+ public void sub(int index, int amount) {
+ if (index < count) {
+ data[index] -= amount;
+ } else {
+ boundsProblem(index, "sub");
+ }
+ }
+
+ /**
+ * @webref intlist:method
+ * @brief Multiply a value
+ */
+ public void mult(int index, int amount) {
+ if (index < count) {
+ data[index] *= amount;
+ } else {
+ boundsProblem(index, "mult");
+ }
+ }
+
+ /**
+ * @webref intlist:method
+ * @brief Divide a value
+ */
+ public void div(int index, int amount) {
+ if (index < count) {
+ data[index] /= amount;
+ } else {
+ boundsProblem(index, "div");
+ }
+ }
+
+
+ private void checkMinMax(String functionName) {
+ if (count == 0) {
+ String msg =
+ String.format("Cannot use %s() on an empty %s.",
+ functionName, getClass().getSimpleName());
+ throw new RuntimeException(msg);
+ }
+ }
+
+
+ /**
+ * @webref intlist:method
+ * @brief Return the smallest value
+ */
+ public long min() {
+ checkMinMax("min");
+ long outgoing = data[0];
+ for (int i = 1; i < count; i++) {
+ if (data[i] < outgoing) outgoing = data[i];
+ }
+ return outgoing;
+ }
+
+
+ // returns the index of the minimum value.
+ // if there are ties, it returns the first one found.
+ public int minIndex() {
+ checkMinMax("minIndex");
+ long value = data[0];
+ int index = 0;
+ for (int i = 1; i < count; i++) {
+ if (data[i] < value) {
+ value = data[i];
+ index = i;
+ }
+ }
+ return index;
+ }
+
+
+ /**
+ * @webref intlist:method
+ * @brief Return the largest value
+ */
+ public long max() {
+ checkMinMax("max");
+ long outgoing = data[0];
+ for (int i = 1; i < count; i++) {
+ if (data[i] > outgoing) outgoing = data[i];
+ }
+ return outgoing;
+ }
+
+
+ // returns the index of the maximum value.
+ // if there are ties, it returns the first one found.
+ public int maxIndex() {
+ checkMinMax("maxIndex");
+ long value = data[0];
+ int index = 0;
+ for (int i = 1; i < count; i++) {
+ if (data[i] > value) {
+ value = data[i];
+ index = i;
+ }
+ }
+ return index;
+ }
+
+
+ public int sum() {
+ long amount = sumLong();
+ if (amount > Integer.MAX_VALUE) {
+ throw new RuntimeException("sum() exceeds " + Integer.MAX_VALUE + ", use sumLong()");
+ }
+ if (amount < Integer.MIN_VALUE) {
+ throw new RuntimeException("sum() less than " + Integer.MIN_VALUE + ", use sumLong()");
+ }
+ return (int) amount;
+ }
+
+
+ public long sumLong() {
+ long sum = 0;
+ for (int i = 0; i < count; i++) {
+ sum += data[i];
+ }
+ return sum;
+ }
+
+
+ /**
+ * Sorts the array in place.
+ *
+ * @webref intlist:method
+ * @brief Sorts the array, lowest to highest
+ */
+ public void sort() {
+ Arrays.sort(data, 0, count);
+ }
+
+
+ /**
+ * Reverse sort, orders values from highest to lowest.
+ *
+ * @webref intlist:method
+ * @brief Reverse sort, orders values from highest to lowest
+ */
+ public void sortReverse() {
+ new Sort() {
+ @Override
+ public int size() {
+ return count;
+ }
+
+ @Override
+ public int compare(int a, int b) {
+ long diff = data[b] - data[a];
+ return diff == 0 ? 0 : (diff < 0 ? -1 : 1);
+ }
+
+ @Override
+ public void swap(int a, int b) {
+ long temp = data[a];
+ data[a] = data[b];
+ data[b] = temp;
+ }
+ }.run();
+ }
+
+
+ // use insert()
+// public void splice(int index, int value) {
+// }
+
+
+// public void subset(int start) {
+// subset(start, count - start);
+// }
+//
+//
+// public void subset(int start, int num) {
+// for (int i = 0; i < num; i++) {
+// data[i] = data[i+start];
+// }
+// count = num;
+// }
+
+ /**
+ * @webref intlist:method
+ * @brief Reverse the order of the list elements
+ */
+ public void reverse() {
+ int ii = count - 1;
+ for (int i = 0; i < count/2; i++) {
+ long t = data[i];
+ data[i] = data[ii];
+ data[ii] = t;
+ --ii;
+ }
+ }
+
+
+ /**
+ * Randomize the order of the list elements. Note that this does not
+ * obey the randomSeed() function in PApplet.
+ *
+ * @webref intlist:method
+ * @brief Randomize the order of the list elements
+ */
+ public void shuffle() {
+ Random r = new Random();
+ int num = count;
+ while (num > 1) {
+ int value = r.nextInt(num);
+ num--;
+ long temp = data[num];
+ data[num] = data[value];
+ data[value] = temp;
+ }
+ }
+
+
+ /**
+ * Randomize the list order using the random() function from the specified
+ * sketch, allowing shuffle() to use its current randomSeed() setting.
+ */
+ public void shuffle(PApplet sketch) {
+ int num = count;
+ while (num > 1) {
+ int value = (int) sketch.random(num);
+ num--;
+ long temp = data[num];
+ data[num] = data[value];
+ data[value] = temp;
+ }
+ }
+
+
+ public LongList copy() {
+ LongList outgoing = new LongList(data);
+ outgoing.count = count;
+ return outgoing;
+ }
+
+
+ /**
+ * Returns the actual array being used to store the data. For advanced users,
+ * this is the fastest way to access a large list. Suitable for iterating
+ * with a for() loop, but modifying the list will have terrible consequences.
+ */
+ public long[] values() {
+ crop();
+ return data;
+ }
+
+
+ @Override
+ public Iterator iterator() {
+// public Iterator valueIterator() {
+ return new Iterator() {
+ int index = -1;
+
+ public void remove() {
+ LongList.this.remove(index);
+ index--;
+ }
+
+ public Long next() {
+ return data[++index];
+ }
+
+ public boolean hasNext() {
+ return index+1 < count;
+ }
+ };
+ }
+
+
+ /**
+ * Create a new array with a copy of all the values.
+ *
+ * @return an array sized by the length of the list with each of the values.
+ * @webref intlist:method
+ * @brief Create a new array with a copy of all the values
+ */
+ public int[] array() {
+ return array(null);
+ }
+
+
+ /**
+ * Copy values into the specified array. If the specified array is null or
+ * not the same size, a new array will be allocated.
+ * @param array
+ */
+ public int[] array(int[] array) {
+ if (array == null || array.length != count) {
+ array = new int[count];
+ }
+ System.arraycopy(data, 0, array, 0, count);
+ return array;
+ }
+
+
+// public int[] toIntArray() {
+// int[] outgoing = new int[count];
+// for (int i = 0; i < count; i++) {
+// outgoing[i] = (int) data[i];
+// }
+// return outgoing;
+// }
+
+
+// public long[] toLongArray() {
+// long[] outgoing = new long[count];
+// for (int i = 0; i < count; i++) {
+// outgoing[i] = (long) data[i];
+// }
+// return outgoing;
+// }
+
+
+// public float[] toFloatArray() {
+// float[] outgoing = new float[count];
+// System.arraycopy(data, 0, outgoing, 0, count);
+// return outgoing;
+// }
+
+
+// public double[] toDoubleArray() {
+// double[] outgoing = new double[count];
+// for (int i = 0; i < count; i++) {
+// outgoing[i] = data[i];
+// }
+// return outgoing;
+// }
+
+
+// public String[] toStringArray() {
+// String[] outgoing = new String[count];
+// for (int i = 0; i < count; i++) {
+// outgoing[i] = String.valueOf(data[i]);
+// }
+// return outgoing;
+// }
+
+
+ /**
+ * Returns a normalized version of this array. Called getPercent() for
+ * consistency with the Dict classes. It's a getter method because it needs
+ * to returns a new list (because IntList/Dict can't do percentages or
+ * normalization in place on int values).
+ */
+ public FloatList getPercent() {
+ double sum = 0;
+ for (float value : array()) {
+ sum += value;
+ }
+ FloatList outgoing = new FloatList(count);
+ for (int i = 0; i < count; i++) {
+ double percent = data[i] / sum;
+ outgoing.set(i, (float) percent);
+ }
+ return outgoing;
+ }
+
+
+// /**
+// * Count the number of times each entry is found in this list.
+// * Converts each entry to a String so it can be used as a key.
+// */
+// public IntDict getTally() {
+// IntDict outgoing = new IntDict();
+// for (int i = 0; i < count; i++) {
+// outgoing.increment(String.valueOf(data[i]));
+// }
+// return outgoing;
+// }
+
+
+ public LongList getSubset(int start) {
+ return getSubset(start, count - start);
+ }
+
+
+ public LongList getSubset(int start, int num) {
+ int[] subset = new int[num];
+ System.arraycopy(data, start, subset, 0, num);
+ return new LongList(subset);
+ }
+
+
+ public String join(String separator) {
+ if (count == 0) {
+ return "";
+ }
+ StringBuilder sb = new StringBuilder();
+ sb.append(data[0]);
+ for (int i = 1; i < count; i++) {
+ sb.append(separator);
+ sb.append(data[i]);
+ }
+ return sb.toString();
+ }
+
+
+ public void print() {
+ for (int i = 0; i < count; i++) {
+ System.out.format("[%d] %d%n", i, data[i]);
+ }
+ }
+
+
+ /**
+ * Save tab-delimited entries to a file (TSV format, UTF-8 encoding)
+ */
+ public void save(File file) {
+ PrintWriter writer = PApplet.createWriter(file);
+ write(writer);
+ writer.close();
+ }
+
+
+ /**
+ * Write entries to a PrintWriter, one per line
+ */
+ public void write(PrintWriter writer) {
+ for (int i = 0; i < count; i++) {
+ writer.println(data[i]);
+ }
+ writer.flush();
+ }
+
+
+ /**
+ * Return this dictionary as a String in JSON format.
+ */
+ public String toJSON() {
+ return "[ " + join(", ") + " ]";
+ }
+
+
+ @Override
+ public String toString() {
+ return getClass().getSimpleName() + " size=" + size() + " " + toJSON();
+ }
+}
diff --git a/libs/processing-core/src/main/java/processing/data/Sort.java b/libs/processing-core/src/main/java/processing/data/Sort.java
new file mode 100644
index 000000000..a83fea551
--- /dev/null
+++ b/libs/processing-core/src/main/java/processing/data/Sort.java
@@ -0,0 +1,46 @@
+package processing.data;
+
+
+/**
+ * Internal sorter used by several data classes.
+ * Advanced users only, not official API.
+ */
+public abstract class Sort implements Runnable {
+
+ public Sort() { }
+
+
+ public void run() {
+ int c = size();
+ if (c > 1) {
+ sort(0, c - 1);
+ }
+ }
+
+
+ protected void sort(int i, int j) {
+ int pivotIndex = (i+j)/2;
+ swap(pivotIndex, j);
+ int k = partition(i-1, j);
+ swap(k, j);
+ if ((k-i) > 1) sort(i, k-1);
+ if ((j-k) > 1) sort(k+1, j);
+ }
+
+
+ protected int partition(int left, int right) {
+ int pivot = right;
+ do {
+ while (compare(++left, pivot) < 0) { }
+ while ((right != 0) && (compare(--right, pivot) > 0)) { }
+ swap(left, right);
+ } while (left < right);
+ swap(left, right);
+ return left;
+ }
+
+
+ abstract public int size();
+ abstract public int compare(int a, int b);
+ abstract public void swap(int a, int b);
+}
\ No newline at end of file
diff --git a/core/src/processing/data/StringDict.java b/libs/processing-core/src/main/java/processing/data/StringDict.java
similarity index 95%
rename from core/src/processing/data/StringDict.java
rename to libs/processing-core/src/main/java/processing/data/StringDict.java
index 9718f9bd0..c66a61e4d 100644
--- a/core/src/processing/data/StringDict.java
+++ b/libs/processing-core/src/main/java/processing/data/StringDict.java
@@ -3,6 +3,7 @@
import java.io.*;
import java.util.HashMap;
import java.util.Iterator;
+import java.util.NoSuchElementException;
import processing.core.PApplet;
@@ -433,12 +434,14 @@ protected void create(String key, String value) {
* @webref stringdict:method
* @brief Remove a key/value pair
*/
- public int remove(String key) {
+ public String remove(String key) {
int index = index(key);
- if (index != -1) {
- removeIndex(index);
+ if (index == -1) {
+ throw new NoSuchElementException("'" + key + "' not found");
}
- return index;
+ String value = values[index];
+ removeIndex(index);
+ return value;
}
@@ -446,9 +449,8 @@ public String removeIndex(int index) {
if (index < 0 || index >= count) {
throw new ArrayIndexOutOfBoundsException(index);
}
- //System.out.println("index is " + which + " and " + keys[which]);
- String key = keys[index];
- indices.remove(key);
+ String value = values[index];
+ indices.remove(keys[index]);
for (int i = index; i < count-1; i++) {
keys[i] = keys[i+1];
values[i] = values[i+1];
@@ -457,10 +459,11 @@ public String removeIndex(int index) {
count--;
keys[count] = null;
values[count] = null;
- return key;
+ return value;
}
+
public void swap(int a, int b) {
String tkey = keys[a];
String tvalue = values[a];
@@ -522,7 +525,7 @@ public int size() {
}
@Override
- public float compare(int a, int b) {
+ public int compare(int a, int b) {
int diff = 0;
if (useKeys) {
diff = keys[a].compareToIgnoreCase(keys[b]);
@@ -571,8 +574,17 @@ public void print() {
/**
- * Write tab-delimited entries out to
- * @param writer
+ * Save tab-delimited entries to a file (TSV format, UTF-8 encoding)
+ */
+ public void save(File file) {
+ PrintWriter writer = PApplet.createWriter(file);
+ write(writer);
+ writer.close();
+ }
+
+
+ /**
+ * Write tab-delimited entries to a PrintWriter
*/
public void write(PrintWriter writer) {
for (int i = 0; i < count; i++) {
@@ -598,4 +610,4 @@ public String toJSON() {
public String toString() {
return getClass().getSimpleName() + " size=" + size() + " " + toJSON();
}
-}
\ No newline at end of file
+}
diff --git a/core/src/processing/data/StringList.java b/libs/processing-core/src/main/java/processing/data/StringList.java
similarity index 94%
rename from core/src/processing/data/StringList.java
rename to libs/processing-core/src/main/java/processing/data/StringList.java
index 49925c1e9..c4de6d33c 100644
--- a/core/src/processing/data/StringList.java
+++ b/libs/processing-core/src/main/java/processing/data/StringList.java
@@ -1,27 +1,7 @@
-/* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */
-
-/*
- Part of the Processing project - http://processing.org
-
- Copyright (c) 2013-16 The Processing Foundation
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation, version 2.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty
- of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- See the GNU Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General
- Public License along with this library; if not, write to the
- Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- Boston, MA 02111-1307 USA
-*/
-
package processing.data;
+import java.io.File;
+import java.io.PrintWriter;
import java.util.Arrays;
import java.util.Iterator;
import java.util.Random;
@@ -536,8 +516,8 @@ public int size() {
}
@Override
- public float compare(int a, int b) {
- float diff = data[a].compareToIgnoreCase(data[b]);
+ public int compare(int a, int b) {
+ int diff = data[a].compareToIgnoreCase(data[b]);
return reverse ? -diff : diff;
}
@@ -778,6 +758,27 @@ public void print() {
}
+ /**
+ * Save tab-delimited entries to a file (TSV format, UTF-8 encoding)
+ */
+ public void save(File file) {
+ PrintWriter writer = PApplet.createWriter(file);
+ write(writer);
+ writer.close();
+ }
+
+
+ /**
+ * Write entries to a PrintWriter, one per line
+ */
+ public void write(PrintWriter writer) {
+ for (int i = 0; i < count; i++) {
+ writer.println(data[i]);
+ }
+ writer.flush();
+ }
+
+
/**
* Return this dictionary as a String in JSON format.
*/
diff --git a/core/src/processing/data/Table.java b/libs/processing-core/src/main/java/processing/data/Table.java
similarity index 93%
rename from core/src/processing/data/Table.java
rename to libs/processing-core/src/main/java/processing/data/Table.java
index 5845c57f8..2048376cf 100644
--- a/core/src/processing/data/Table.java
+++ b/libs/processing-core/src/main/java/processing/data/Table.java
@@ -3,7 +3,8 @@
/*
Part of the Processing project - http://processing.org
- Copyright (c) 2011-13 Ben Fry and Casey Reas
+ Copyright (c) 2012-21 The Processing Foundation
+ Copyright (c) 2011-12 Ben Fry and Casey Reas
Copyright (c) 2006-11 Ben Fry
This library is free software; you can redistribute it and/or
@@ -124,7 +125,7 @@ public Table(File file, String options) throws IOException {
// uses createInput() to handle .gz (and eventually .bz2) files
init();
parse(PApplet.createInput(file),
- extensionOptions(true, file.getName(), options));
+ extensionOptions(true, file.getName(), options));
}
/**
@@ -210,22 +211,22 @@ public Table(ResultSet rs) {
int type = rsmd.getColumnType(col + 1);
switch (type) { // TODO these aren't tested. nor are they complete.
- case Types.INTEGER:
- case Types.TINYINT:
- case Types.SMALLINT:
- setColumnType(col, INT);
- break;
- case Types.BIGINT:
- setColumnType(col, LONG);
- break;
- case Types.FLOAT:
- setColumnType(col, FLOAT);
- break;
- case Types.DECIMAL:
- case Types.DOUBLE:
- case Types.REAL:
- setColumnType(col, DOUBLE);
- break;
+ case Types.INTEGER:
+ case Types.TINYINT:
+ case Types.SMALLINT:
+ setColumnType(col, INT);
+ break;
+ case Types.BIGINT:
+ setColumnType(col, LONG);
+ break;
+ case Types.FLOAT:
+ setColumnType(col, FLOAT);
+ break;
+ case Types.DECIMAL:
+ case Types.DOUBLE:
+ case Types.REAL:
+ setColumnType(col, DOUBLE);
+ break;
}
}
@@ -233,12 +234,12 @@ public Table(ResultSet rs) {
while (rs.next()) {
for (int col = 0; col < columnCount; col++) {
switch (columnTypes[col]) {
- case STRING: setString(row, col, rs.getString(col+1)); break;
- case INT: setInt(row, col, rs.getInt(col+1)); break;
- case LONG: setLong(row, col, rs.getLong(col+1)); break;
- case FLOAT: setFloat(row, col, rs.getFloat(col+1)); break;
- case DOUBLE: setDouble(row, col, rs.getDouble(col+1)); break;
- default: throw new IllegalArgumentException("column type " + columnTypes[col] + " not supported.");
+ case STRING: setString(row, col, rs.getString(col+1)); break;
+ case INT: setInt(row, col, rs.getInt(col+1)); break;
+ case LONG: setLong(row, col, rs.getLong(col+1)); break;
+ case FLOAT: setFloat(row, col, rs.getFloat(col+1)); break;
+ case DOUBLE: setDouble(row, col, rs.getDouble(col+1)); break;
+ default: throw new IllegalArgumentException("column type " + columnTypes[col] + " not supported.");
}
}
row++;
@@ -562,7 +563,7 @@ static class CommaSeparatedLine {
String[] pieces;
int pieceCount;
- // int offset;
+// int offset;
int start; //, stop;
String[] handle(String line, BufferedReader reader) throws IOException {
@@ -851,7 +852,7 @@ protected void odsParse(InputStream input, String worksheet, boolean header) {
//
//
XML[] sheets =
- xml.getChildren("office:body/office:spreadsheet/table:table");
+ xml.getChildren("office:body/office:spreadsheet/table:table");
boolean found = false;
for (XML sheet : sheets) {
@@ -869,7 +870,7 @@ protected void odsParse(InputStream input, String worksheet, boolean header) {
throw new RuntimeException("No worksheets found in the ODS file.");
} else {
throw new RuntimeException("No worksheet named " + worksheet +
- " found in the ODS file.");
+ " found in the ODS file.");
}
}
} catch (UnsupportedEncodingException e) {
@@ -1127,7 +1128,7 @@ public void parseInto(Object enclosingObject, String fieldName) {
// Only bother setting if it's true,
// otherwise false by default anyway.
if (content.toLowerCase().equals("true") ||
- content.equals("1")) {
+ content.equals("1")) {
field.setBoolean(item, true);
}
}
@@ -1173,7 +1174,7 @@ public void parseInto(Object enclosingObject, String fieldName) {
public boolean save(File file, String options) throws IOException {
return save(PApplet.createOutput(file),
- Table.extensionOptions(false, file.getName(), options));
+ Table.extensionOptions(false, file.getName(), options));
}
@@ -1309,8 +1310,8 @@ protected void writeEntryCSV(PrintWriter writer, String entry) {
// add quotes if commas or CR/LF are in the entry
} else if (entry.indexOf(',') != -1 ||
- entry.indexOf('\n') != -1 ||
- entry.indexOf('\r') != -1) {
+ entry.indexOf('\n') != -1 ||
+ entry.indexOf('\r') != -1) {
writer.print('\"');
writer.print(entry);
writer.print('\"');
@@ -1318,8 +1319,8 @@ protected void writeEntryCSV(PrintWriter writer, String entry) {
// add quotes if leading or trailing space
} else if ((entry.length() > 0) &&
- (entry.charAt(0) == ' ' ||
- entry.charAt(entry.length() - 1) == ' ')) {
+ (entry.charAt(0) == ' ' ||
+ entry.charAt(entry.length() - 1) == ' ')) {
writer.print('\"');
writer.print(entry);
writer.print('\"');
@@ -1414,14 +1415,14 @@ protected void saveODS(OutputStream os) throws IOException {
ZipEntry entry = new ZipEntry("META-INF/manifest.xml");
String[] lines = new String[] {
- xmlHeader,
- "",
- " ",
- " ",
- " ",
- " ",
- " ",
- " "
+ xmlHeader,
+ "",
+ " ",
+ " ",
+ " ",
+ " ",
+ " ",
+ " "
};
zos.putNextEntry(entry);
zos.write(PApplet.join(lines, "\n").getBytes());
@@ -1476,12 +1477,12 @@ protected void saveODS(OutputStream os) throws IOException {
*/
final String[] dummyFiles = new String[] {
- "meta.xml", "settings.xml", "styles.xml"
+ "meta.xml", "settings.xml", "styles.xml"
};
lines = new String[] {
- xmlHeader,
- "",
- " ",
- " ",
- " "
+ xmlHeader,
+ "",
+ " ",
+ " ",
+ " "
});
//zos.write(PApplet.join(lines, "\n").getBytes());
@@ -1541,10 +1542,10 @@ protected void saveODS(OutputStream os) throws IOException {
//lines = new String[] {
writeUTF(zos, new String[] {
- " ",
- " ",
- " ",
- ""
+ " ",
+ " ",
+ " ",
+ ""
});
//zos.write(PApplet.join(lines, "\n").getBytes());
zos.closeEntry();
@@ -1581,17 +1582,17 @@ void saveStringODS(OutputStream output, String text) throws IOException {
}
writeUTF(output,
- " ",
- " " + sanitized + " ",
- " ");
+ " ",
+ " " + sanitized + " ",
+ " ");
}
void saveNumberODS(OutputStream output, String text) throws IOException {
writeUTF(output,
- " ",
- " " + text + " ",
- " ");
+ " ",
+ " " + text + " ",
+ " ");
}
@@ -1646,35 +1647,35 @@ protected void saveBinary(OutputStream os) throws IOException {
for (TableRow row : rows()) {
for (int col = 0; col < getColumnCount(); col++) {
switch (columnTypes[col]) {
- case STRING:
- String str = row.getString(col);
- if (str == null) {
- output.writeBoolean(false);
- } else {
- output.writeBoolean(true);
- output.writeUTF(str);
- }
- break;
- case INT:
- output.writeInt(row.getInt(col));
- break;
- case LONG:
- output.writeLong(row.getLong(col));
- break;
- case FLOAT:
- output.writeFloat(row.getFloat(col));
- break;
- case DOUBLE:
- output.writeDouble(row.getDouble(col));
- break;
- case CATEGORY:
- String peace = row.getString(col);
- if (peace.equals(missingString)) {
- output.writeInt(missingCategory);
- } else {
- output.writeInt(columnCategories[col].index(peace));
- }
- break;
+ case STRING:
+ String str = row.getString(col);
+ if (str == null) {
+ output.writeBoolean(false);
+ } else {
+ output.writeBoolean(true);
+ output.writeUTF(str);
+ }
+ break;
+ case INT:
+ output.writeInt(row.getInt(col));
+ break;
+ case LONG:
+ output.writeLong(row.getLong(col));
+ break;
+ case FLOAT:
+ output.writeFloat(row.getFloat(col));
+ break;
+ case DOUBLE:
+ output.writeDouble(row.getDouble(col));
+ break;
+ case CATEGORY:
+ String peace = row.getString(col);
+ if (peace.equals(missingString)) {
+ output.writeInt(missingCategory);
+ } else {
+ output.writeInt(columnCategories[col].index(peace));
+ }
+ break;
}
}
}
@@ -1708,26 +1709,26 @@ protected void loadBinary(InputStream is) throws IOException {
int newType = input.readInt();
columnTypes[column] = newType;
switch (newType) {
- case INT:
- columns[column] = new int[rowCount];
- break;
- case LONG:
- columns[column] = new long[rowCount];;
- break;
- case FLOAT:
- columns[column] = new float[rowCount];;
- break;
- case DOUBLE:
- columns[column] = new double[rowCount];;
- break;
- case STRING:
- columns[column] = new String[rowCount];;
- break;
- case CATEGORY:
- columns[column] = new int[rowCount];;
- break;
- default:
- throw new IllegalArgumentException(newType + " is not a valid column type.");
+ case INT:
+ columns[column] = new int[rowCount];
+ break;
+ case LONG:
+ columns[column] = new long[rowCount];;
+ break;
+ case FLOAT:
+ columns[column] = new float[rowCount];;
+ break;
+ case DOUBLE:
+ columns[column] = new double[rowCount];;
+ break;
+ case STRING:
+ columns[column] = new String[rowCount];;
+ break;
+ case CATEGORY:
+ columns[column] = new int[rowCount];;
+ break;
+ default:
+ throw new IllegalArgumentException(newType + " is not a valid column type.");
}
}
@@ -1751,30 +1752,30 @@ protected void loadBinary(InputStream is) throws IOException {
for (int row = 0; row < rowCount; row++) {
for (int col = 0; col < columnCount; col++) {
switch (columnTypes[col]) {
- case STRING:
- String str = null;
- if (input.readBoolean()) {
- str = input.readUTF();
- }
- setString(row, col, str);
- break;
- case INT:
- setInt(row, col, input.readInt());
- break;
- case LONG:
- setLong(row, col, input.readLong());
- break;
- case FLOAT:
- setFloat(row, col, input.readFloat());
- break;
- case DOUBLE:
- setDouble(row, col, input.readDouble());
- break;
- case CATEGORY:
- int index = input.readInt();
- //String name = columnCategories[col].key(index);
- setInt(row, col, index);
- break;
+ case STRING:
+ String str = null;
+ if (input.readBoolean()) {
+ str = input.readUTF();
+ }
+ setString(row, col, str);
+ break;
+ case INT:
+ setInt(row, col, input.readInt());
+ break;
+ case LONG:
+ setLong(row, col, input.readLong());
+ break;
+ case FLOAT:
+ setFloat(row, col, input.readFloat());
+ break;
+ case DOUBLE:
+ setDouble(row, col, input.readDouble());
+ break;
+ case CATEGORY:
+ int index = input.readInt();
+ //String name = columnCategories[col].key(index);
+ setInt(row, col, index);
+ break;
}
}
}
@@ -1860,7 +1861,7 @@ public void insertColumn(int index, String title, int type) {
}
}
- /**
+ /**
* @webref table:method
* @brief Removes a column from a table
* @param columnName the title of the column to be removed
@@ -1870,7 +1871,7 @@ public void removeColumn(String columnName) {
removeColumn(getColumnIndex(columnName));
}
- /**
+ /**
* @param column the index number of the column to be removed
*/
public void removeColumn(int column) {
@@ -1935,7 +1936,7 @@ public void setColumnCount(int newCount) {
}
columnTypes = PApplet.expand(columnTypes, newCount);
columnCategories = (HashMapBlows[])
- PApplet.expand(columnCategories, newCount);
+ PApplet.expand(columnCategories, newCount);
}
}
@@ -2311,7 +2312,7 @@ public void setRowCount(int newCount) {
}
- /**
+ /**
* @webref table:method
* @brief Adds a row to a table
* @see Table#removeRow(int)
@@ -2324,7 +2325,7 @@ public TableRow addRow() {
}
- /**
+ /**
* @param source a reference to the original row to be duplicated
*/
public TableRow addRow(TableRow source) {
@@ -2338,38 +2339,38 @@ public TableRow setRow(int row, TableRow source) {
for (int col = 0; col < Math.min(source.getColumnCount(), columns.length); col++) {
switch (columnTypes[col]) {
- case INT:
- setInt(row, col, source.getInt(col));
- break;
- case LONG:
- setLong(row, col, source.getLong(col));
- break;
- case FLOAT:
- setFloat(row, col, source.getFloat(col));
- break;
- case DOUBLE:
- setDouble(row, col, source.getDouble(col));
- break;
- case STRING:
- setString(row, col, source.getString(col));
- break;
- case CATEGORY:
- int index = source.getInt(col);
- setInt(row, col, index);
- if (!columnCategories[col].hasCategory(index)) {
- columnCategories[col].setCategory(index, source.getString(col));
- }
- break;
+ case INT:
+ setInt(row, col, source.getInt(col));
+ break;
+ case LONG:
+ setLong(row, col, source.getLong(col));
+ break;
+ case FLOAT:
+ setFloat(row, col, source.getFloat(col));
+ break;
+ case DOUBLE:
+ setDouble(row, col, source.getDouble(col));
+ break;
+ case STRING:
+ setString(row, col, source.getString(col));
+ break;
+ case CATEGORY:
+ int index = source.getInt(col);
+ setInt(row, col, index);
+ if (!columnCategories[col].hasCategory(index)) {
+ columnCategories[col].setCategory(index, source.getString(col));
+ }
+ break;
- default:
- throw new RuntimeException("no types");
+ default:
+ throw new RuntimeException("no types");
}
}
return new RowPointer(this, row);
}
- /**
+ /**
* @nowebref
*/
public TableRow addRow(Object[] columnData) {
@@ -2428,10 +2429,13 @@ public void insertRow(int insert, Object[] columnData) {
}
}
}
+ // Need to increment before setRow(), because it calls ensureBounds()
+ // https://github.com/processing/processing/issues/5406
+ ++rowCount;
setRow(insert, columnData);
- rowCount++;
}
+
/**
* @webref table:method
* @brief Removes a row from a table
@@ -3060,13 +3064,13 @@ public void remove() {
public int getInt(int row, int column) {
checkBounds(row, column);
if (columnTypes[column] == INT ||
- columnTypes[column] == CATEGORY) {
+ columnTypes[column] == CATEGORY) {
int[] intData = (int[]) columns[column];
return intData[row];
}
String str = getString(row, column);
return (str == null || str.equals(missingString)) ?
- missingInt : PApplet.parseInt(str, missingInt);
+ missingInt : PApplet.parseInt(str, missingInt);
}
/**
@@ -3102,7 +3106,7 @@ public void setInt(int row, int column, int value) {
} else {
ensureBounds(row, column);
if (columnTypes[column] != INT &&
- columnTypes[column] != CATEGORY) {
+ columnTypes[column] != CATEGORY) {
throw new IllegalArgumentException("Column " + column + " is not an int column.");
}
int[] intData = (int[]) columns[column];
@@ -3767,7 +3771,7 @@ public int matchRowIndex(String regexp, int column) {
String[] stringData = (String[]) columns[column];
for (int row = 0; row < rowCount; row++) {
if (stringData[row] != null &&
- PApplet.match(stringData[row], regexp) != null) {
+ PApplet.match(stringData[row], regexp) != null) {
return row;
}
}
@@ -3775,7 +3779,7 @@ public int matchRowIndex(String regexp, int column) {
for (int row = 0; row < rowCount; row++) {
String str = getString(row, column);
if (str != null &&
- PApplet.match(str, regexp) != null) {
+ PApplet.match(str, regexp) != null) {
return row;
}
}
@@ -3809,7 +3813,7 @@ public int[] matchRowIndices(String regexp, int column) {
String[] stringData = (String[]) columns[column];
for (int row = 0; row < rowCount; row++) {
if (stringData[row] != null &&
- PApplet.match(stringData[row], regexp) != null) {
+ PApplet.match(stringData[row], regexp) != null) {
outgoing[count++] = row;
}
}
@@ -3817,7 +3821,7 @@ public int[] matchRowIndices(String regexp, int column) {
for (int row = 0; row < rowCount; row++) {
String str = getString(row, column);
if (str != null &&
- PApplet.match(str, regexp) != null) {
+ PApplet.match(str, regexp) != null) {
outgoing[count++] = row;
}
}
@@ -4330,25 +4334,36 @@ public int size() {
}
@Override
- public float compare(int index1, int index2) {
+ public int compare(int index1, int index2) {
int a = reverse ? order[index2] : order[index1];
int b = reverse ? order[index1] : order[index2];
switch (getColumnType(column)) {
- case INT:
- return getInt(a, column) - getInt(b, column);
- case LONG:
- return getLong(a, column) - getLong(b, column);
- case FLOAT:
- return getFloat(a, column) - getFloat(b, column);
- case DOUBLE:
- return (float) (getDouble(a, column) - getDouble(b, column));
- case STRING:
- return getString(a, column).compareToIgnoreCase(getString(b, column));
- case CATEGORY:
- return getInt(a, column) - getInt(b, column);
- default:
- throw new IllegalArgumentException("Invalid column type: " + getColumnType(column));
+ case INT:
+ return getInt(a, column) - getInt(b, column);
+ case LONG:
+ long diffl = getLong(a, column) - getLong(b, column);
+ return diffl == 0 ? 0 : (diffl < 0 ? -1 : 1);
+ case FLOAT:
+ float difff = getFloat(a, column) - getFloat(b, column);
+ return difff == 0 ? 0 : (difff < 0 ? -1 : 1);
+ case DOUBLE:
+ double diffd = getDouble(a, column) - getDouble(b, column);
+ return diffd == 0 ? 0 : (diffd < 0 ? -1 : 1);
+ case STRING:
+ String string1 = getString(a, column);
+ if (string1 == null) {
+ string1 = ""; // avoid NPE when cells are left empty
+ }
+ String string2 = getString(b, column);
+ if (string2 == null) {
+ string2 = "";
+ }
+ return string1.compareToIgnoreCase(string2);
+ case CATEGORY:
+ return getInt(a, column) - getInt(b, column);
+ default:
+ throw new IllegalArgumentException("Invalid column type: " + getColumnType(column));
}
}
@@ -4365,47 +4380,47 @@ public void swap(int a, int b) {
//Object[] newColumns = new Object[getColumnCount()];
for (int col = 0; col < getColumnCount(); col++) {
switch (getColumnType(col)) {
- case INT:
- case CATEGORY:
- int[] oldInt = (int[]) columns[col];
- int[] newInt = new int[rowCount];
- for (int row = 0; row < getRowCount(); row++) {
- newInt[row] = oldInt[order[row]];
- }
- columns[col] = newInt;
- break;
- case LONG:
- long[] oldLong = (long[]) columns[col];
- long[] newLong = new long[rowCount];
- for (int row = 0; row < getRowCount(); row++) {
- newLong[row] = oldLong[order[row]];
- }
- columns[col] = newLong;
- break;
- case FLOAT:
- float[] oldFloat = (float[]) columns[col];
- float[] newFloat = new float[rowCount];
- for (int row = 0; row < getRowCount(); row++) {
- newFloat[row] = oldFloat[order[row]];
- }
- columns[col] = newFloat;
- break;
- case DOUBLE:
- double[] oldDouble = (double[]) columns[col];
- double[] newDouble = new double[rowCount];
- for (int row = 0; row < getRowCount(); row++) {
- newDouble[row] = oldDouble[order[row]];
- }
- columns[col] = newDouble;
- break;
- case STRING:
- String[] oldString = (String[]) columns[col];
- String[] newString = new String[rowCount];
- for (int row = 0; row < getRowCount(); row++) {
- newString[row] = oldString[order[row]];
- }
- columns[col] = newString;
- break;
+ case INT:
+ case CATEGORY:
+ int[] oldInt = (int[]) columns[col];
+ int[] newInt = new int[rowCount];
+ for (int row = 0; row < getRowCount(); row++) {
+ newInt[row] = oldInt[order[row]];
+ }
+ columns[col] = newInt;
+ break;
+ case LONG:
+ long[] oldLong = (long[]) columns[col];
+ long[] newLong = new long[rowCount];
+ for (int row = 0; row < getRowCount(); row++) {
+ newLong[row] = oldLong[order[row]];
+ }
+ columns[col] = newLong;
+ break;
+ case FLOAT:
+ float[] oldFloat = (float[]) columns[col];
+ float[] newFloat = new float[rowCount];
+ for (int row = 0; row < getRowCount(); row++) {
+ newFloat[row] = oldFloat[order[row]];
+ }
+ columns[col] = newFloat;
+ break;
+ case DOUBLE:
+ double[] oldDouble = (double[]) columns[col];
+ double[] newDouble = new double[rowCount];
+ for (int row = 0; row < getRowCount(); row++) {
+ newDouble[row] = oldDouble[order[row]];
+ }
+ columns[col] = newDouble;
+ break;
+ case STRING:
+ String[] oldString = (String[]) columns[col];
+ String[] newString = new String[rowCount];
+ for (int row = 0; row < getRowCount(); row++) {
+ newString[row] = oldString[order[row]];
+ }
+ columns[col] = newString;
+ break;
}
}
}
@@ -4485,37 +4500,37 @@ public StringList getStringList(int column) {
public IntDict getIntDict(String keyColumnName, String valueColumnName) {
return new IntDict(getStringColumn(keyColumnName),
- getIntColumn(valueColumnName));
+ getIntColumn(valueColumnName));
}
public IntDict getIntDict(int keyColumn, int valueColumn) {
return new IntDict(getStringColumn(keyColumn),
- getIntColumn(valueColumn));
+ getIntColumn(valueColumn));
}
public FloatDict getFloatDict(String keyColumnName, String valueColumnName) {
return new FloatDict(getStringColumn(keyColumnName),
- getFloatColumn(valueColumnName));
+ getFloatColumn(valueColumnName));
}
public FloatDict getFloatDict(int keyColumn, int valueColumn) {
return new FloatDict(getStringColumn(keyColumn),
- getFloatColumn(valueColumn));
+ getFloatColumn(valueColumn));
}
public StringDict getStringDict(String keyColumnName, String valueColumnName) {
return new StringDict(getStringColumn(keyColumnName),
- getStringColumn(valueColumnName));
+ getStringColumn(valueColumnName));
}
public StringDict getStringDict(int keyColumn, int valueColumn) {
return new StringDict(getStringColumn(keyColumn),
- getStringColumn(valueColumn));
+ getStringColumn(valueColumn));
}
@@ -4614,7 +4629,7 @@ public Map getRowMap(int column) {
// }
- // public StringIntPairs getColumnRowLookup(int col) {
+ // public StringIntPairs getColumnRowLookup(int col) {
// StringIntPairs sc = new StringIntPairs();
// String[] column = getStringColumn(col);
// for (int i = 0; i < column.length; i++) {
@@ -4801,64 +4816,64 @@ protected void convertBasic(BufferedReader reader, boolean tsv,
protected void convertRow(DataOutputStream output, String[] pieces) throws IOException {
if (pieces.length > getColumnCount()) {
throw new IllegalArgumentException("Row with too many columns: " +
- PApplet.join(pieces, ","));
+ PApplet.join(pieces, ","));
}
// pieces.length may be less than columns.length, so loop over pieces
for (int col = 0; col < pieces.length; col++) {
switch (columnTypes[col]) {
- case STRING:
- output.writeUTF(pieces[col]);
- break;
- case INT:
- output.writeInt(PApplet.parseInt(pieces[col], missingInt));
- break;
- case LONG:
- try {
- output.writeLong(Long.parseLong(pieces[col]));
- } catch (NumberFormatException nfe) {
- output.writeLong(missingLong);
- }
- break;
- case FLOAT:
- output.writeFloat(PApplet.parseFloat(pieces[col], missingFloat));
- break;
- case DOUBLE:
- try {
- output.writeDouble(Double.parseDouble(pieces[col]));
- } catch (NumberFormatException nfe) {
- output.writeDouble(missingDouble);
- }
- break;
- case CATEGORY:
- String peace = pieces[col];
- if (peace.equals(missingString)) {
- output.writeInt(missingCategory);
- } else {
- output.writeInt(columnCategories[col].index(peace));
- }
- break;
+ case STRING:
+ output.writeUTF(pieces[col]);
+ break;
+ case INT:
+ output.writeInt(PApplet.parseInt(pieces[col], missingInt));
+ break;
+ case LONG:
+ try {
+ output.writeLong(Long.parseLong(pieces[col]));
+ } catch (NumberFormatException nfe) {
+ output.writeLong(missingLong);
+ }
+ break;
+ case FLOAT:
+ output.writeFloat(PApplet.parseFloat(pieces[col], missingFloat));
+ break;
+ case DOUBLE:
+ try {
+ output.writeDouble(Double.parseDouble(pieces[col]));
+ } catch (NumberFormatException nfe) {
+ output.writeDouble(missingDouble);
+ }
+ break;
+ case CATEGORY:
+ String peace = pieces[col];
+ if (peace.equals(missingString)) {
+ output.writeInt(missingCategory);
+ } else {
+ output.writeInt(columnCategories[col].index(peace));
+ }
+ break;
}
}
for (int col = pieces.length; col < getColumnCount(); col++) {
switch (columnTypes[col]) {
- case STRING:
- output.writeUTF("");
- break;
- case INT:
- output.writeInt(missingInt);
- break;
- case LONG:
- output.writeLong(missingLong);
- break;
- case FLOAT:
- output.writeFloat(missingFloat);
- break;
- case DOUBLE:
- output.writeDouble(missingDouble);
- break;
- case CATEGORY:
- output.writeInt(missingCategory);
- break;
+ case STRING:
+ output.writeUTF("");
+ break;
+ case INT:
+ output.writeInt(missingInt);
+ break;
+ case LONG:
+ output.writeLong(missingLong);
+ break;
+ case FLOAT:
+ output.writeFloat(missingFloat);
+ break;
+ case DOUBLE:
+ output.writeDouble(missingDouble);
+ break;
+ case CATEGORY:
+ output.writeInt(missingCategory);
+ break;
}
}
@@ -4917,4 +4932,4 @@ public void write(PrintWriter writer) {
public void print() {
writeTSV(new PrintWriter(System.out));
}
-}
\ No newline at end of file
+}
diff --git a/core/src/processing/data/TableRow.java b/libs/processing-core/src/main/java/processing/data/TableRow.java
similarity index 85%
rename from core/src/processing/data/TableRow.java
rename to libs/processing-core/src/main/java/processing/data/TableRow.java
index fe041fd78..3ac59fe4c 100644
--- a/core/src/processing/data/TableRow.java
+++ b/libs/processing-core/src/main/java/processing/data/TableRow.java
@@ -1,25 +1,3 @@
-/* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */
-
-/*
- Part of the Processing project - http://processing.org
-
- Copyright (c) 2013-16 The Processing Foundation
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License version 2.1 as published by the Free Software Foundation.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General
- Public License along with this library; if not, write to the
- Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- Boston, MA 02111-1307 USA
- */
-
package processing.data;
import java.io.PrintWriter;
@@ -90,7 +68,7 @@ public interface TableRow {
* @param columnName title of the column to reference
*/
public float getFloat(String columnName);
-
+
/**
* @brief Get a double value from the specified column
* @param column ID number of the column to reference
@@ -98,7 +76,7 @@ public interface TableRow {
* @see TableRow#getString(int)
*/
public double getDouble(int column);
-
+
/**
* @param columnName title of the column to reference
*/
@@ -132,7 +110,7 @@ public interface TableRow {
* @param columnName title of the target column
*/
public void setInt(String columnName, int value);
-
+
/**
* @brief Store a long value in the specified column
* @param column ID number of the target column
@@ -141,7 +119,7 @@ public interface TableRow {
* @see TableRow#setString(int, String)
*/
public void setLong(int column, long value);
-
+
/**
* @param columnName title of the target column
*/
@@ -156,7 +134,7 @@ public interface TableRow {
* @see TableRow#setString(int, String)
*/
public void setFloat(int column, float value);
-
+
/**
* @param columnName title of the target column
*/
@@ -170,7 +148,7 @@ public interface TableRow {
* @see TableRow#setString(int, String)
*/
public void setDouble(int column, double value);
-
+
/**
* @param columnName title of the target column
*/
@@ -182,19 +160,19 @@ public interface TableRow {
* @return count of all columns
*/
public int getColumnCount();
-
+
/**
* @brief Get the column type.
* @param columnName title of the target column
* @return type of the column
*/
public int getColumnType(String columnName);
-
+
/**
* @param column ID number of the target column
*/
public int getColumnType(int column);
-
+
/**
* @brief Get the all column types
* @return list of all column types
diff --git a/core/src/processing/data/XML.java b/libs/processing-core/src/main/java/processing/data/XML.java
similarity index 99%
rename from core/src/processing/data/XML.java
rename to libs/processing-core/src/main/java/processing/data/XML.java
index bfe81012e..f2c2e32cc 100644
--- a/core/src/processing/data/XML.java
+++ b/libs/processing-core/src/main/java/processing/data/XML.java
@@ -3,7 +3,7 @@
/*
Part of the Processing project - http://processing.org
- Copyright (c) 2012-16 The Processing Foundation
+ Copyright (c) 2012-21 The Processing Foundation
Copyright (c) 2009-12 Ben Fry and Casey Reas
This library is free software; you can redistribute it and/or
@@ -594,7 +594,14 @@ public void removeChild(XML kid) {
children = null; // TODO not efficient
}
-
+ /**
+ * Removes whitespace nodes.
+ * Those whitespace nodes are required to reconstruct the original XML's spacing and indentation.
+ * If you call this and use saveXML() your original spacing will be gone.
+ *
+ * @nowebref
+ * @brief Removes whitespace nodes
+ */
public void trim() {
try {
XPathFactory xpathFactory = XPathFactory.newInstance();
diff --git a/core/src/processing/event/Event.java b/libs/processing-core/src/main/java/processing/event/Event.java
similarity index 98%
rename from core/src/processing/event/Event.java
rename to libs/processing-core/src/main/java/processing/event/Event.java
index aa5b8544f..109dbbee7 100644
--- a/core/src/processing/event/Event.java
+++ b/libs/processing-core/src/main/java/processing/event/Event.java
@@ -3,7 +3,7 @@
/*
Part of the Processing project - http://processing.org
- Copyright (c) 2012-16 The Processing Foundation
+ Copyright (c) 2012-21 The Processing Foundation
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
diff --git a/core/src/processing/event/KeyEvent.java b/libs/processing-core/src/main/java/processing/event/KeyEvent.java
similarity index 97%
rename from core/src/processing/event/KeyEvent.java
rename to libs/processing-core/src/main/java/processing/event/KeyEvent.java
index 0778db483..4a9bdf44d 100644
--- a/core/src/processing/event/KeyEvent.java
+++ b/libs/processing-core/src/main/java/processing/event/KeyEvent.java
@@ -3,7 +3,7 @@
/*
Part of the Processing project - http://processing.org
- Copyright (c) 2012-16 The Processing Foundation
+ Copyright (c) 2012-21 The Processing Foundation
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
diff --git a/core/src/processing/event/MouseEvent.java b/libs/processing-core/src/main/java/processing/event/MouseEvent.java
similarity index 71%
rename from core/src/processing/event/MouseEvent.java
rename to libs/processing-core/src/main/java/processing/event/MouseEvent.java
index 64f422427..012f4e29e 100644
--- a/core/src/processing/event/MouseEvent.java
+++ b/libs/processing-core/src/main/java/processing/event/MouseEvent.java
@@ -3,7 +3,7 @@
/*
Part of the Processing project - http://processing.org
- Copyright (c) 2012-16 The Processing Foundation
+ Copyright (c) 2012-21 The Processing Foundation
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -36,7 +36,7 @@ public class MouseEvent extends Event {
protected int x, y;
protected int button;
- protected int clickCount;
+ protected int count;
// public MouseEvent(int x, int y) {
@@ -48,13 +48,13 @@ public class MouseEvent extends Event {
public MouseEvent(Object nativeObject,
long millis, int action, int modifiers,
- int x, int y, int button, int clickCount) {
+ int x, int y, int button, int count) {
super(nativeObject, millis, action, modifiers);
this.flavor = MOUSE;
this.x = x;
this.y = y;
this.button = button;
- this.clickCount = clickCount;
+ this.count = count;
}
@@ -79,8 +79,23 @@ public int getButton() {
// }
+ @Deprecated
public int getClickCount() {
- return clickCount;
+ return count;
+ }
+
+
+ /**
+ * Number of clicks for mouse button events, or the number of steps (positive
+ * or negative depending on direction) for a mouse wheel event.
+ * Wheel events follow Java (see here ), so
+ * getAmount() will return "negative values if the mouse wheel was rotated
+ * up or away from the user" and positive values in the other direction.
+ * On Mac OS X, this will be reversed when "natural" scrolling is enabled
+ * in System Preferences &rarr Mouse.
+ */
+ public int getCount() {
+ return count;
}
diff --git a/core/src/processing/event/TouchEvent.java b/libs/processing-core/src/main/java/processing/event/TouchEvent.java
similarity index 98%
rename from core/src/processing/event/TouchEvent.java
rename to libs/processing-core/src/main/java/processing/event/TouchEvent.java
index 2add7c140..440a7824e 100644
--- a/core/src/processing/event/TouchEvent.java
+++ b/libs/processing-core/src/main/java/processing/event/TouchEvent.java
@@ -3,7 +3,7 @@
/*
Part of the Processing project - http://processing.org
- Copyright (c) 2012-16 The Processing Foundation
+ Copyright (c) 2012-21 The Processing Foundation
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
diff --git a/core/src/processing/opengl/FontTexture.java b/libs/processing-core/src/main/java/processing/opengl/FontTexture.java
similarity index 99%
rename from core/src/processing/opengl/FontTexture.java
rename to libs/processing-core/src/main/java/processing/opengl/FontTexture.java
index 52ec62f2a..cc67259bb 100644
--- a/core/src/processing/opengl/FontTexture.java
+++ b/libs/processing-core/src/main/java/processing/opengl/FontTexture.java
@@ -3,7 +3,7 @@
/*
Part of the Processing project - http://processing.org
- Copyright (c) 2012-16 The Processing Foundation
+ Copyright (c) 2012-21 The Processing Foundation
Copyright (c) 2004-12 Ben Fry and Casey Reas
Copyright (c) 2001-04 Massachusetts Institute of Technology
diff --git a/core/src/processing/opengl/FrameBuffer.java b/libs/processing-core/src/main/java/processing/opengl/FrameBuffer.java
similarity index 99%
rename from core/src/processing/opengl/FrameBuffer.java
rename to libs/processing-core/src/main/java/processing/opengl/FrameBuffer.java
index 239054784..a5426c52d 100644
--- a/core/src/processing/opengl/FrameBuffer.java
+++ b/libs/processing-core/src/main/java/processing/opengl/FrameBuffer.java
@@ -3,7 +3,7 @@
/*
Part of the Processing project - http://processing.org
- Copyright (c) 2012-16 The Processing Foundation
+ Copyright (c) 2012-21 The Processing Foundation
Copyright (c) 2004-12 Ben Fry and Casey Reas
Copyright (c) 2001-04 Massachusetts Institute of Technology
diff --git a/core/src/processing/opengl/LinePath.java b/libs/processing-core/src/main/java/processing/opengl/LinePath.java
similarity index 100%
rename from core/src/processing/opengl/LinePath.java
rename to libs/processing-core/src/main/java/processing/opengl/LinePath.java
diff --git a/core/src/processing/opengl/LineStroker.java b/libs/processing-core/src/main/java/processing/opengl/LineStroker.java
similarity index 100%
rename from core/src/processing/opengl/LineStroker.java
rename to libs/processing-core/src/main/java/processing/opengl/LineStroker.java
diff --git a/core/src/processing/opengl/PGL.java b/libs/processing-core/src/main/java/processing/opengl/PGL.java
similarity index 99%
rename from core/src/processing/opengl/PGL.java
rename to libs/processing-core/src/main/java/processing/opengl/PGL.java
index 01b5f305e..18e4d8bb8 100644
--- a/core/src/processing/opengl/PGL.java
+++ b/libs/processing-core/src/main/java/processing/opengl/PGL.java
@@ -3,7 +3,7 @@
/*
Part of the Processing project - http://processing.org
- Copyright (c) 2012-17 The Processing Foundation
+ Copyright (c) 2012-21 The Processing Foundation
Copyright (c) 2004-12 Ben Fry and Casey Reas
Copyright (c) 2001-04 Massachusetts Institute of Technology
diff --git a/core/src/processing/opengl/PGLES.java b/libs/processing-core/src/main/java/processing/opengl/PGLES.java
similarity index 99%
rename from core/src/processing/opengl/PGLES.java
rename to libs/processing-core/src/main/java/processing/opengl/PGLES.java
index b86628048..e31799170 100644
--- a/core/src/processing/opengl/PGLES.java
+++ b/libs/processing-core/src/main/java/processing/opengl/PGLES.java
@@ -3,7 +3,7 @@
/*
Part of the Processing project - http://processing.org
- Copyright (c) 2012-16 The Processing Foundation
+ Copyright (c) 2012-21 The Processing Foundation
Copyright (c) 2004-12 Ben Fry and Casey Reas
Copyright (c) 2001-04 Massachusetts Institute of Technology
@@ -37,6 +37,7 @@
import android.opengl.GLSurfaceView;
import android.opengl.GLU;
import android.view.SurfaceView;
+
import processing.opengl.tess.PGLU;
import processing.opengl.tess.PGLUtessellator;
import processing.opengl.tess.PGLUtessellatorCallbackAdapter;
@@ -58,6 +59,10 @@ public class PGLES extends PGL {
/** The current surface view */
public GLSurfaceView glview;
+
+ /** Requested major version of the OpenGL ES context */
+ static public int version = 2;
+
// ........................................................
// Static initialization for some parameters that need to be different for
diff --git a/core/src/processing/opengl/PGraphics2D.java b/libs/processing-core/src/main/java/processing/opengl/PGraphics2D.java
similarity index 99%
rename from core/src/processing/opengl/PGraphics2D.java
rename to libs/processing-core/src/main/java/processing/opengl/PGraphics2D.java
index 9422d08d4..2fdd47543 100644
--- a/core/src/processing/opengl/PGraphics2D.java
+++ b/libs/processing-core/src/main/java/processing/opengl/PGraphics2D.java
@@ -3,7 +3,7 @@
/*
Part of the Processing project - http://processing.org
- Copyright (c) 2012-16 The Processing Foundation
+ Copyright (c) 2012-21 The Processing Foundation
Copyright (c) 2004-12 Ben Fry and Casey Reas
Copyright (c) 2001-04 Massachusetts Institute of Technology
diff --git a/core/src/processing/opengl/PGraphics2DX.java b/libs/processing-core/src/main/java/processing/opengl/PGraphics2DX.java
similarity index 77%
rename from core/src/processing/opengl/PGraphics2DX.java
rename to libs/processing-core/src/main/java/processing/opengl/PGraphics2DX.java
index a812a69a2..60fee8e16 100755
--- a/core/src/processing/opengl/PGraphics2DX.java
+++ b/libs/processing-core/src/main/java/processing/opengl/PGraphics2DX.java
@@ -1,3 +1,25 @@
+/* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */
+
+/*
+ Part of the Processing project - http://processing.org
+
+ Copyright (c) 2019-21 The Processing Foundation
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation, version 2.1.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General
+ Public License along with this library; if not, write to the
+ Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ Boston, MA 02111-1307 USA
+*/
+
package processing.opengl;
import static processing.core.PApplet.println;
@@ -8,23 +30,33 @@
import processing.core.PApplet;
import processing.core.PGraphics;
import processing.core.PImage;
-import processing.core.PMatrix2D;
import processing.core.PMatrix3D;
import processing.core.PShape;
import processing.core.PShapeSVG;
-// Super fast OpenGL 2D renderer by Miles Fogle:
-// https://github.com/hazmatsuitor
-
-//for testing purposes, I found it easier to create a separate class and avoid
-//touching existing code for now, rather than directly editing PGraphics2D/PGraphicsOpenGL
-//if this code becomes the new P2D implementation, then it will be properly migrated/integrated
-
-//NOTE: this implementation doesn't use some of Processing's OpenGL wrappers
-//(e.g. PShader, Texture) because I found it more convenient to handle them manually
-//it could probably be made to use those classes with a bit of elbow grease and a spot of guidance
-//but it may not be worth it - I doubt it would reduce complexity much, if at all
-//(if there are reasons we need to use those classes, let me know)
+/**
+ * Super fast OpenGL 2D renderer originally contributed by Miles Fogle:
+ * https://github.com/hazmatsuitor
+ *
+ * It speeds-up rendering of 2D geometry by essentially two key optimizations: packing all the
+ * vertex data in a single VBO, and using a custom stroke tessellator (see StrokeRenderer class
+ * at the end). There are a number of other, less critical optimizations, for example using a single
+ * shader for textured and non-textured geometry and a depth algorithm that allows stacking a large
+ * number of 2D shapes without z-fighting (so occlusion is based on drawing order).
+ *
+ * Some notes from Miles:
+ *
+ * for testing purposes, I found it easier to create a separate class and avoid
+ * touching existing code for now, rather than directly editing PGraphics2D/PGraphicsOpenGL
+ * if this code becomes the new P2D implementation, then it will be properly migrated/integrated
+
+ * NOTE: this implementation doesn't use some of Processing's OpenGL wrappers
+ * (e.g. PShader, Texture) because I found it more convenient to handle them manually
+ * it could probably be made to use those classes with a bit of elbow grease and a spot of guidance
+ * but it may not be worth it - I doubt it would reduce complexity much, if at all
+ * (if there are reasons we need to use those classes, let me know)
+ *
+ */
//TODO: track debug performance stats
public final class PGraphics2DX extends PGraphicsOpenGL {
@@ -36,13 +68,6 @@ public final class PGraphics2DX extends PGraphicsOpenGL {
static protected final int SHADER2D = 7;
- // Enables/disables matrix pre-multiplication
- // https://github.com/processing/processing/wiki/Advanced-OpenGL#vertex-coordinates-are-in-model-space
- // https://github.com/processing/processing/issues/2904
- // see above URLs for some discussion on premultiplying matrix vs. flushing buffer on matrix change.
- // rather than committing to one or the other, this implementation supports both
- public static boolean premultiplyMatrices = true;
-
// Uses the implementations in the parent PGraphicsOpenGL class, which is needed to to draw obj files
// and apply shader filters.
protected boolean useParentImpl = false;
@@ -361,8 +386,6 @@ public void texture(PImage image) {
return;
}
- init();
-
Texture t = currentPG.getTexture(image);
texWidth = t.width;
texHeight = t.height;
@@ -818,9 +841,6 @@ public void ellipseImpl(float a, float b, float c, float d) {
return;
}
- //TODO: optimize this function, it is still pretty slow
- //TODO: try using a lookup table and see if we can make it faster than real trig
-
beginShape(POLYGON);
//convert corner/diameter to center/radius
@@ -835,10 +855,15 @@ public void ellipseImpl(float a, float b, float c, float d) {
int segments = circleDetail(PApplet.max(rx, ry) + (stroke? strokeWeight : 0), TWO_PI);
float step = TWO_PI / segments;
- float angle = 0;
+ float cos = PApplet.cos(step);
+ float sin = PApplet.sin(step);
+ float dx = 0, dy = 1;
for (int i = 0; i < segments; ++i) {
- angle += step;
- shapeVertex(x + PApplet.sin(angle) * rx, y + PApplet.cos(angle) * ry, 0, 0, fillColor, 0);
+ shapeVertex(x + dx * rx, y + dy * ry, 0, 0, fillColor, 0);
+ //this is the equivalent of multiplying the vector by the 2x2 rotation matrix [[cos -sin] [sin cos]]
+ float tempx = dx * cos - dy * sin;
+ dy = dx * sin + dy * cos;
+ dx = tempx;
}
knownConvexPolygon = true;
@@ -903,17 +928,20 @@ protected void arcImpl(float x, float y, float w, float h, float start, float st
appendContour(vertCount);
}
+ float dx = PApplet.cos(start);
+ float dy = PApplet.sin(start);
+ float c = PApplet.cos(step);
+ float s = PApplet.sin(step);
for (int i = 0; i <= segments; ++i) {
- float s = PApplet.cos(start) * w;
- float c = PApplet.sin(start) * h;
-
- vertex(x + s, y + c);
-
- start += step;
+ shapeVertex(x + dx * w, y + dy * h, 0, 0, fillColor, 0);
+ //this is the equivalent of multiplying the vector by the 2x2 rotation matrix [[c -s] [s c]]
+ float tempx = dx * c - dy * s;
+ dy = dx * s + dy * c;
+ dx = tempx;
}
//for the case `(mode == PIE || mode == 0) && diff > HALF_PI`, the polygon
- //will not actually be convex, but we still want to tessellate as if it is
+ //will not actually be convex, but due to known vertex order, we can still safely tessellate as if it is
knownConvexPolygon = true;
if (mode == CHORD || mode == PIE) {
endShape(CLOSE);
@@ -1065,200 +1093,6 @@ protected void textCharModelImpl(FontTexture.TextureInfo info,
}
- //////////////////////////////////////////////////////////////
-
- // MATRIX OPS
-
-
- /*
- * Monkey-patch all methods that modify matrices to optionally flush the vertex buffer.
- * If you see a method that isn't here but should be, or is here but shouldn't,
- * feel free to add/remove it.
- */
-
-
- @Override
- public void applyMatrix(float n00, float n01, float n02, float n10, float n11, float n12) {
- preMatrixChanged();
- super.applyMatrix(n00, n01, n02, n10, n11, n12);
- postMatrixChanged();
- }
-
-
- @Override
- public void applyMatrix(PMatrix2D source) {
- preMatrixChanged();
- super.applyMatrix(source);
- postMatrixChanged();
- }
-
-
- @Override
- public void applyProjection(float n00, float n01, float n02, float n03,
- float n10, float n11, float n12, float n13,
- float n20, float n21, float n22, float n23,
- float n30, float n31, float n32, float n33) {
- preMatrixChanged();
- super.applyProjection(n00, n01, n02, n03,
- n10, n11, n12, n13,
- n20, n21, n22, n23,
- n30, n31, n32, n33);
- postMatrixChanged();
- }
-
-
- @Override
- public void applyProjection(PMatrix3D mat) {
- preMatrixChanged();
- super.applyProjection(mat);
- postMatrixChanged();
- }
-
-
- @Override
- public void popMatrix() {
- preMatrixChanged();
- super.popMatrix();
- postMatrixChanged();
- }
-
-
- @Override
- public void popProjection() {
- preMatrixChanged();
- super.popProjection();
- postMatrixChanged();
- }
-
-
- @Override
- public void pushMatrix() {
- preMatrixChanged();
- super.pushMatrix();
- postMatrixChanged();
- }
-
-
- @Override
- public void pushProjection() {
- preMatrixChanged();
- super.pushProjection();
- postMatrixChanged();
- }
-
-
- @Override
- public void resetMatrix() {
- preMatrixChanged();
- super.resetMatrix();
- postMatrixChanged();
- }
-
-
- @Override
- public void resetProjection() {
- preMatrixChanged();
- super.resetProjection();
- postMatrixChanged();
- }
-
-
- @Override
- public void rotate(float angle) {
- preMatrixChanged();
- super.rotate(angle);
- postMatrixChanged();
- }
-
-
- @Override
- public void scale(float s) {
- preMatrixChanged();
- super.scale(s);
- postMatrixChanged();
- }
-
-
- @Override
- public void scale(float sx, float sy) {
- preMatrixChanged();
- super.scale(sx, sy);
- postMatrixChanged();
- }
-
-
- @Override
- public void setMatrix(PMatrix2D source) {
- preMatrixChanged();
- super.setMatrix(source);
- postMatrixChanged();
- }
-
-
- @Override
- public void setProjection(PMatrix3D mat) {
- preMatrixChanged();
- super.setProjection(mat);
- postMatrixChanged();
- }
-
-
- @Override
- public void shearX(float angle) {
- preMatrixChanged();
- super.shearX(angle);
- postMatrixChanged();
- }
-
-
- @Override
- public void shearY(float angle) {
- preMatrixChanged();
- super.shearY(angle);
- postMatrixChanged();
- }
-
-
- @Override
- public void translate(float tx, float ty) {
- preMatrixChanged();
- super.translate(tx, ty);
- postMatrixChanged();
- }
-
-
- @Override
- public void updateProjmodelview() {
- preMatrixChanged();
- super.updateProjmodelview();
- postMatrixChanged();
- }
-
-
- @Override
- public void updateGLModelview() {
- preMatrixChanged();
- super.updateGLModelview();
- postMatrixChanged();
- }
-
-
- @Override
- public void updateGLProjection() {
- preMatrixChanged();
- super.updateGLProjection();
- postMatrixChanged();
- }
-
-
- @Override
- public void updateGLProjmodelview() {
- preMatrixChanged();
- super.updateGLProjmodelview();
- postMatrixChanged();
- }
-
-
//////////////////////////////////////////////////////////////
// MATRIX MORE!
@@ -1285,8 +1119,10 @@ protected void end2D() {
// SHADER FILTER
+
@Override
public void filter(PShader shader) {
+ // TODO: not working... the loadShader() method uses the P2 vertex stage
// The filter method needs to use the geometry-generation in the base class.
// We could re-implement it here, but this is easier.
if (!useParentImpl) {
@@ -1299,11 +1135,29 @@ public void filter(PShader shader) {
}
+
//////////////////////////////////////////////////////////////
// SHADER API
+ @Override
+ public PShader loadShader(String fragFilename) {
+ if (fragFilename == null || fragFilename.equals("")) {
+ PGraphics.showWarning(MISSING_FRAGMENT_SHADER);
+ return null;
+ }
+
+ PShader shader = new PShader(parent);
+
+ shader.setFragmentShader(fragFilename);
+ String[] vertSource = pgl.loadVertexShader(defP2DShaderVertURL);
+ shader.setVertexShader(vertSource);
+
+ return shader;
+ }
+
+
@Override
public void shader(PShader shader) {
if (useParentImpl) {
@@ -1498,24 +1352,6 @@ public void lightSpecular(float v1, float v2, float v3) {
// PRIVATE IMPLEMENTATION
- //superclass does lazy initialization, so we need to as well
- private void init() {
- if (initialized) return;
- initialized = true;
-
- String[] vertSource = pgl.loadVertexShader(defP2DShaderVertURL);
- String[] fragSource = pgl.loadFragmentShader(defP2DShaderFragURL);
- twoShader = new PShader(parent, vertSource, fragSource);
- loadShaderLocs(twoShader);
- defTwoShader = twoShader;
-
- //generate vbo
- IntBuffer vboBuff = IntBuffer.allocate(1);
- pgl.genBuffers(1, vboBuff);
- vbo = vboBuff.get(0);
- }
-
-
//maxVerts can be tweaked for memory/performance trade-off
//in my testing, performance seems to plateau after around 6000 (= 2000*3)
//memory usage should be around ~165kb for 6000 verts
@@ -1531,28 +1367,31 @@ private void init() {
private int vbo;
private int texWidth, texHeight;
+ // Determination of the smallest increments and largest-greater-than-minus-one
+ // https://en.wikipedia.org/wiki/Half-precision_floating-point_format
+
+ // Using the smallest positive normal number in half (16-bit) precision, which is how the depth
+ // buffer is initialized in mobile
+ private float smallestDepthIncrement = (float)Math.pow(2, -14);
+
+ // As the limit for the depth increase, we take the minus the largest number less than one in
+ // half (16-bit) precision
+ private float largestNumberLessThanOne = 1 - (float)Math.pow(2, -11);
private void incrementDepth() {
- //by resetting the depth buffer when needed, we are able to have arbitrarily many
- //layers, unlimited by depth buffer precision. in practice, the precision of this
- //algorithm seems to be very good (~1,000,000 layers), so it pretty much won't happen
- //unless you're drawing enough geometry per frame to set your computer on fire
- if (depth < -0.9999f) {
+ // By resetting the depth buffer when needed, we are able to have arbitrarily many
+ // layers, unlimited by depth buffer precision. In practice, the precision of this
+ // algorithm seems to be acceptable (exactly (1 + 1 - pow(2, -11))/pow(2, -14) = 32,760 layers)
+ // for mobile.
+ if (depth < -largestNumberLessThanOne) {
flushBuffer();
pgl.clear(PGL.DEPTH_BUFFER_BIT);
- //depth test will fail at depth = 1.0 after clearing the depth buffer,
- //but since we always increment before drawing anything, this should be okay
+ // Depth test will fail at depth = 1.0 after clearing the depth buffer,
+ // But since we always increment before drawing anything, this should be okay
depth = 1.0f;
}
- //found to be a small but reliable increment value for a 24-bit depth buffer
- //through trial and error. as numbers approach zero, absolute floating point
- //precision increases, while absolute fixed point precision stays the same,
- //so regardless of representation, this value should work for all depths in
- //range (-1, 1), as long as it works for depths at either end of the range
- depth -= 0.000001f;
-
- //TODO: use an increment value based on good math instead of lazy trial-and-error
+ depth -= smallestDepthIncrement;
}
@@ -1625,9 +1464,14 @@ private void flushBuffer() {
return;
}
- init();
+ if (vbo == 0) {
+ // Generate vbo
+ IntBuffer vboBuff = IntBuffer.allocate(1);
+ pgl.genBuffers(1, vboBuff);
+ vbo = vboBuff.get(0);
+ }
- //upload vertex data
+ // Upload vertex data
pgl.bindBuffer(PGL.ARRAY_BUFFER, vbo);
pgl.bufferData(PGL.ARRAY_BUFFER, usedVerts * vertSize,
FloatBuffer.wrap(vertexData), PGL.DYNAMIC_DRAW);
@@ -1652,16 +1496,24 @@ private boolean checkShaderLocs(PShader shader) {
if (positionLoc == -1) {
positionLoc = shader.getAttributeLoc("vertex");
}
- int colorLoc = shader.getAttributeLoc("color");
- int texCoordLoc = shader.getAttributeLoc("texCoord");
- int texFactorLoc = shader.getAttributeLoc("texFactor");
+// int colorLoc = shader.getAttributeLoc("color");
int transformLoc = shader.getUniformLoc("transform");
if (transformLoc == -1) {
transformLoc = shader.getUniformLoc("transformMatrix");
}
+
+ /*
+ // Became less demanding and 2D shaders do not need to have texture uniforms/attribs
int texScaleLoc = shader.getUniformLoc("texScale");
- return positionLoc != -1 && colorLoc != -1 && texCoordLoc != -1 &&
- texFactorLoc != -1 && transformLoc != -1 && texScaleLoc != -1;
+ if (texScaleLoc == -1) {
+ texScaleLoc = shader.getUniformLoc("texOffset");
+ }
+ int texCoordLoc = shader.getAttributeLoc("texCoord");
+ int texFactorLoc = shader.getAttributeLoc("texFactor");
+ */
+
+ return positionLoc != -1 && transformLoc != -1;
+// colorLoc != -1 && texCoordLoc != -1 && texFactorLoc != -1 && texScaleLoc != -1;
}
@@ -1678,51 +1530,67 @@ private void loadShaderLocs(PShader shader) {
transformLoc = shader.getUniformLoc("transformMatrix");
}
texScaleLoc = shader.getUniformLoc("texScale");
+ if (texScaleLoc == -1) {
+ texScaleLoc = shader.getUniformLoc("texOffset");
+ }
}
private PShader getShader() {
+ // TODO: Perhaps a better way to handle the new 2D rendering would be to define a PShader2D
+ // subclass of PShader...
PShader shader;
if (twoShader == null) {
+ if (defTwoShader == null) {
+ String[] vertSource = pgl.loadVertexShader(defP2DShaderVertURL);
+ String[] fragSource = pgl.loadFragmentShader(defP2DShaderFragURL);
+ defTwoShader = new PShader(parent, vertSource, fragSource);
+ }
shader = defTwoShader;
} else {
shader = twoShader;
}
- if (shader != defTwoShader) {
- loadShaderLocs(shader);
- }
+// if (shader != defTwoShader) {
+ loadShaderLocs(shader);
+// }
return shader;
}
+ @Override
+ protected PShader getPolyShader(boolean lit, boolean tex) {
+ return super.getPolyShader(lit, tex);
+ }
private void setAttribs() {
pgl.vertexAttribPointer(positionLoc, 3, PGL.FLOAT, false, vertSize, 0);
pgl.enableVertexAttribArray(positionLoc);
- pgl.vertexAttribPointer(texCoordLoc, 2, PGL.FLOAT, false, vertSize, 3*Float.BYTES);
- pgl.enableVertexAttribArray(texCoordLoc);
+ if (-1 < texCoordLoc) {
+ pgl.vertexAttribPointer(texCoordLoc, 2, PGL.FLOAT, false, vertSize, 3*Float.BYTES);
+ pgl.enableVertexAttribArray(texCoordLoc);
+ }
pgl.vertexAttribPointer(colorLoc, 4, PGL.UNSIGNED_BYTE, true, vertSize, 5*Float.BYTES);
pgl.enableVertexAttribArray(colorLoc);
- pgl.vertexAttribPointer(texFactorLoc, 1, PGL.FLOAT, false, vertSize, 6*Float.BYTES);
- pgl.enableVertexAttribArray(texFactorLoc);
+ if (-1 < texFactorLoc) {
+ pgl.vertexAttribPointer(texFactorLoc, 1, PGL.FLOAT, false, vertSize, 6*Float.BYTES);
+ pgl.enableVertexAttribArray(texFactorLoc);
+ }
}
private void loadUniforms() {
//set matrix uniform
- if (premultiplyMatrices) {
- pgl.uniformMatrix4fv(transformLoc, 1, true, FloatBuffer.wrap(new PMatrix3D().get(null)));
- } else {
- pgl.uniformMatrix4fv(transformLoc, 1, true, FloatBuffer.wrap(projmodelview.get(null)));
- }
+ pgl.uniformMatrix4fv(transformLoc, 1, true, FloatBuffer.wrap(new PMatrix3D().get(null)));
//set texture info
pgl.activeTexture(PGL.TEXTURE0);
pgl.bindTexture(PGL.TEXTURE_2D, tex);
- //enable uv scaling only for use-defined images, not for fonts
- if (tex == imageTex) {
- pgl.uniform2f(texScaleLoc, 1f/texWidth, 1f/texHeight);
- } else {
- pgl.uniform2f(texScaleLoc, 1, 1);
+ if (-1 < texScaleLoc) {
+ //enable uv scaling only for use-defined images, not for fonts
+ if (tex == imageTex) {
+ pgl.uniform2f(texScaleLoc, 1f/texWidth, 1f/texHeight);
+ } else {
+ pgl.uniform2f(texScaleLoc, 1, 1);
+ }
}
}
@@ -1746,14 +1614,9 @@ private void check(int newVerts) {
private void vertexImpl(float x, float y, float u, float v, int c, float f) {
int idx = usedVerts * 7;
- if (premultiplyMatrices) {
- //inline multiply only x and y to avoid an allocation and a few flops
- vertexData[idx + 0] = projmodelview.m00*x + projmodelview.m01*y + projmodelview.m03;
- vertexData[idx + 1] = projmodelview.m10*x + projmodelview.m11*y + projmodelview.m13;
- } else {
- vertexData[idx + 0] = x;
- vertexData[idx + 1] = y;
- }
+ //inline multiply only x and y to avoid an allocation and a few flops
+ vertexData[idx + 0] = projmodelview.m00*x + projmodelview.m01*y + projmodelview.m03;
+ vertexData[idx + 1] = projmodelview.m10*x + projmodelview.m11*y + projmodelview.m13;
vertexData[idx + 2] = depth;
vertexData[idx + 3] = u;
vertexData[idx + 4] = v;
@@ -1826,30 +1689,6 @@ private void shapeVertex(float x, float y, float u, float v, int c, float f) {
}
- float ellipseDetailMultiplier = 1;
-
-
- private void preMatrixChanged() {
- if (!premultiplyMatrices) {
- flushBuffer();
- }
- }
-
-
- private void postMatrixChanged() {
- //this serves as a rough approximation of how much the longest axis
- //of an ellipse will be scaled by a given matrix
- //(in other words, the amount by which its on-screen size changes)
- float sxi = projmodelview.m00 * width / 2;
- float syi = projmodelview.m10 * height / 2;
- float sxj = projmodelview.m01 * width / 2;
- float syj = projmodelview.m11 * height / 2;
- float Imag = PApplet.sqrt(sxi * sxi + syi * syi);
- float Jmag = PApplet.sqrt(sxj * sxj + syj * syj);
- ellipseDetailMultiplier = PApplet.max(Imag, Jmag);
- }
-
-
private void triangle(float x1, float y1, float x2, float y2, float x3, float y3, int color) {
check(3);
vertexImpl(x1, y1, 0, 0, color, 0);
@@ -1883,55 +1722,40 @@ private void singleLine(float x1, float y1, float x2, float y2, int color) {
triangle(x2 + tx, y2 - ty, x2 - tx, y2 + ty, x1 + tx, y1 - ty, color);
if (r >= LINE_DETAIL_LIMIT && strokeCap == ROUND) {
- float angle = PApplet.atan2(dx, dy);
-
int segments = circleDetail(r, HALF_PI);
float step = HALF_PI / segments;
+ float c = PApplet.cos(step);
+ float s = PApplet.sin(step);
+ for (int i = 0; i < segments; ++i) {
+ //this is the equivalent of multiplying the vector by the 2x2 rotation matrix [[c -s] [s c]]
+ float nx = c * tx - s * ty;
+ float ny = s * tx + c * ty;
- float psin = ty;
- float pcos = tx;
- for (int i = 1; i < segments; ++i) {
- angle += step;
- float nsin = PApplet.sin(angle) * r;
- float ncos = PApplet.cos(angle) * r;
-
- triangle(x2, y2, x2 + psin, y2 + pcos, x2 + nsin, y2 + ncos, color);
- triangle(x2, y2, x2 - pcos, y2 + psin, x2 - ncos, y2 + nsin, color);
- triangle(x1, y1, x1 - psin, y1 - pcos, x1 - nsin, y1 - ncos, color);
- triangle(x1, y1, x1 + pcos, y1 - psin, x1 + ncos, y1 - nsin, color);
+ triangle(x2, y2, x2 + ty, y2 + tx, x2 + ny, y2 + nx, color);
+ triangle(x2, y2, x2 - tx, y2 + ty, x2 - nx, y2 + ny, color);
+ triangle(x1, y1, x1 - ty, y1 - tx, x1 - ny, y1 - nx, color);
+ triangle(x1, y1, x1 + tx, y1 - ty, x1 + nx, y1 - ny, color);
- psin = nsin;
- pcos = ncos;
+ tx = nx;
+ ty = ny;
}
-
- triangle(x2, y2, x2 + psin, y2 + pcos, x2 + tx, y2 - ty, color);
- triangle(x2, y2, x2 - pcos, y2 + psin, x2 + ty, y2 + tx, color);
- triangle(x1, y1, x1 - psin, y1 - pcos, x1 - tx, y1 + ty, color);
- triangle(x1, y1, x1 + pcos, y1 - psin, x1 - ty, y1 - tx, color);
}
}
private void singlePoint(float x, float y, int color) {
float r = strokeWeight * 0.5f;
- if (strokeCap == ROUND) {
+ if (r >= LINE_DETAIL_LIMIT && strokeCap == ROUND) {
int segments = circleDetail(r);
float step = QUARTER_PI / segments;
- float x1 = 0;
- float y1 = r;
- float angle = 0;
+ float x1 = 0, y1 = r;
+ float c = PApplet.cos(step);
+ float s = PApplet.sin(step);
for (int i = 0; i < segments; ++i) {
- angle += step;
- float x2, y2;
- //this is not just for performance
- //it also ensures the circle is drawn with no diagonal gaps
- if (i < segments - 1) {
- x2 = PApplet.sin(angle) * r;
- y2 = PApplet.cos(angle) * r;
- } else {
- x2 = y2 = PApplet.sin(QUARTER_PI) * r;
- }
+ //this is the equivalent of multiplying the vector by the 2x2 rotation matrix [[c -s] [s c]]
+ float x2 = c * x1 - s * y1;
+ float y2 = s * x1 + c * y1;
triangle(x, y, x + x1, y + y1, x + x2, y + y2, strokeColor);
triangle(x, y, x + x1, y - y1, x + x2, y - y2, strokeColor);
@@ -1964,6 +1788,34 @@ private class StrokeRenderer {
float lx, ly;
float r;
+
+ void arcJoin(float x, float y, float dx1, float dy1, float dx2, float dy2) {
+ //we don't need to normalize before doing these products
+ //since the vectors are the same length and only used as arguments to atan2()
+ float cross = dx1 * dy2 - dy1 * dx2;
+ float dot = dx1 * dx2 + dy1 * dy2;
+ float theta = PApplet.atan2(cross, dot);
+ int segments = circleDetail(r, theta);
+ float px = x + dx1, py = y + dy1;
+ if (segments > 1) {
+ float c = PApplet.cos(theta / segments);
+ float s = PApplet.sin(theta / segments);
+ for (int i = 1; i < segments; ++i) {
+ //this is the equivalent of multiplying the vector by the 2x2 rotation matrix [[c -s] [s c]]
+ float tempx = c * dx1 - s * dy1;
+ dy1 = s * dx1 + c * dy1;
+ dx1 = tempx;
+
+ float nx = x + dx1;
+ float ny = y + dy1;
+ triangle(x, y, px, py, nx, ny, strokeColor);
+ px = nx;
+ py = ny;
+ }
+ }
+ triangle(x, y, px, py, x + dx2, y + dy2, strokeColor);
+ }
+
void beginLine() {
lineVertexCount = 0;
r = strokeWeight * 0.5f;
@@ -1985,23 +1837,23 @@ void lineVertex(float x, float y) {
sx = x;
sy = y;
} else {
- //find leg angles
- float angle1 = PApplet.atan2(lx - px, ly - py);
- float angle2 = PApplet.atan2(lx - x, ly - y);
-
- //find minimum absolute angle between the two legs
- //FROM: https://stackoverflow.com/a/7869457/3064745
- //NOTE: this only works for angles that are in range [-180, 180] !!!
- float diff = angle1 - angle2;
- diff += diff > PI? -TWO_PI : diff < -PI? TWO_PI : 0;
-
- if (strokeJoin == BEVEL || strokeJoin == ROUND ||
- PApplet.abs(diff) < PI/15 || PApplet.abs(diff) > PI - 0.001f) {
- float dx = lx - px;
- float dy = ly - py;
- float d = PApplet.sqrt(dx*dx + dy*dy);
- float tx = dy / d * r;
- float ty = -dx / d * r;
+ //calculate normalized direction vectors for each leg
+ float leg1x = lx - px;
+ float leg1y = ly - py;
+ float leg2x = x - lx;
+ float leg2y = y - ly;
+ float len1 = PApplet.sqrt(leg1x * leg1x + leg1y * leg1y);
+ float len2 = PApplet.sqrt(leg2x * leg2x + leg2y * leg2y);
+ leg1x /= len1;
+ leg1y /= len1;
+ leg2x /= len2;
+ leg2y /= len2;
+
+ float legDot = -leg1x * leg2x - leg1y * leg2y;
+ float cosPiOver15 = 0.97815f;
+ if (strokeJoin == BEVEL || strokeJoin == ROUND || legDot > cosPiOver15 || legDot < -0.999) {
+ float tx = leg1y * r;
+ float ty = -leg1x * r;
if (lineVertexCount == 2) {
sdx = tx;
@@ -2011,28 +1863,17 @@ void lineVertex(float x, float y) {
triangle(px + pdx, py + pdy, lx - tx, ly - ty, lx + tx, ly + ty, strokeColor);
}
- dx = x - lx;
- dy = y - ly;
- d = PApplet.sqrt(dx*dx + dy*dy);
- float nx = dy / d * r;
- float ny = -dx / d * r;
+ float nx = leg2y * r;
+ float ny = -leg2x * r;
+ float legCross = leg1x * leg2y - leg1y * leg2x;
if (strokeJoin == ROUND) {
- float theta1 = diff > 0? angle1 - HALF_PI : angle1 + HALF_PI;
- float theta2 = diff > 0? angle2 + HALF_PI : angle2 - HALF_PI;
-
- //find minimum absolute angle diff (again)
- float delta = theta2 - theta1;
- delta += delta > PI? -TWO_PI : delta < -PI? TWO_PI : 0;
-
- //start and end points of arc
- float ax1 = diff < 0? lx + tx : lx - tx;
- float ay1 = diff < 0? ly + ty : ly - ty;
- float ax2 = diff < 0? lx + nx : lx - nx;
- float ay2 = diff < 0? ly + ny : ly - ny;
-
- arcJoin(lx, ly, theta1, delta, ax1, ay1, ax2, ay2);
- } else if (diff < 0) {
+ if (legCross > 0) {
+ arcJoin(lx, ly, tx, ty, nx, ny);
+ } else {
+ arcJoin(lx, ly, -tx, -ty, -nx, -ny);
+ }
+ } else if (legCross > 0) {
triangle(lx, ly, lx + tx, ly + ty, lx + nx, ly + ny, strokeColor);
} else {
triangle(lx, ly, lx - tx, ly - ty, lx - nx, ly - ny, strokeColor);
@@ -2040,19 +1881,17 @@ void lineVertex(float x, float y) {
pdx = nx;
pdy = ny;
- } else {
- //find offset (hypotenuse) of miter joint
- float theta = HALF_PI - diff/2;
- float offset = r / PApplet.cos(theta);
-
- //find bisecting vector
- float angle = (angle1 + angle2)/2;
- float bx = PApplet.sin(angle) * offset;
- float by = PApplet.cos(angle) * offset;
- if (PApplet.abs(angle1 - angle2) < PI) {
- bx *= -1;
- by *= -1;
- }
+ } else { //miter joint
+ //find the bisecting vector
+ float x1 = leg2x - leg1x;
+ float y1 = leg2y - leg1y;
+ //find a (normalized) vector perpendicular to one of the legs
+ float x2 = leg1y;
+ float y2 = -leg1x;
+ //scale the bisecting vector to the correct length using magic (not sure how to explain this one)
+ float dot = x1 * x2 + y1 * y2;
+ float bx = x1 * (r / dot);
+ float by = y1 * (r / dot);
if (lineVertexCount == 2) {
sdx = bx;
@@ -2075,6 +1914,26 @@ void lineVertex(float x, float y) {
lineVertexCount += 1;
}
+ void lineCap(float x, float y, float dx, float dy) {
+ int segments = circleDetail(r, HALF_PI);
+ float px = dy, py = -dx;
+ if (segments > 1) {
+ float c = PApplet.cos(HALF_PI / segments);
+ float s = PApplet.sin(HALF_PI / segments);
+ for (int i = 1; i < segments; ++i) {
+ //this is the equivalent of multiplying the vector by the 2x2 rotation matrix [[c -s] [s c]]
+ float nx = c * px - s * py;
+ float ny = s * px + c * py;
+ triangle(x, y, x + px, y + py, x + nx, y + ny, strokeColor);
+ triangle(x, y, x - py, y + px, x - ny, y + nx, strokeColor);
+ px = nx;
+ py = ny;
+ }
+ }
+ triangle(x, y, x + px, y + py, x + dx, y + dy, strokeColor);
+ triangle(x, y, x - py, y + px, x - dy, y + dx, strokeColor);
+ }
+
void endLine(boolean closed) {
if (lineVertexCount < 2) {
return;
@@ -2117,7 +1976,7 @@ void endLine(boolean closed) {
triangle(px + pdx, py + pdy, lx - tx, ly - ty, lx + tx, ly + ty, strokeColor);
if (strokeCap == ROUND) {
- lineCap(lx, ly, PApplet.atan2(dx, dy));
+ lineCap(lx, ly, -ty, tx);
}
//draw first line (with cap)
@@ -2136,57 +1995,25 @@ void endLine(boolean closed) {
triangle(sx + sdx, sy + sdy, fx + tx, fy + ty, fx - tx, fy - ty, strokeColor);
if (strokeCap == ROUND) {
- lineCap(fx, fy, PApplet.atan2(dx, dy));
+ lineCap(fx, fy, -ty, tx);
}
}
}
-
- void arcJoin(float x, float y, float start, float delta, float x1, float y1, float x3, float y3) {
- int segments = circleDetail(r, delta);
- float step = delta / segments;
-
- for (int i = 0; i < segments - 1; ++i) {
- start += step;
- float x2 = x + PApplet.sin(start) * r;
- float y2 = y + PApplet.cos(start) * r;
-
- triangle(x, y, x1, y1, x2, y2, strokeColor);
-
- x1 = x2;
- y1 = y2;
- }
-
- triangle(x, y, x1, y1, x3, y3, strokeColor);
- }
-
- //XXX: wet code, will probably get removed when we optimize lineCap()
- void arcJoin(float x, float y, float start, float delta) {
- int segments = circleDetail(r, delta);
- float step = delta / segments;
-
- float x1 = x + PApplet.sin(start) * r;
- float y1 = y + PApplet.cos(start) * r;
- for (int i = 0; i < segments; ++i) {
- start += step;
- float x2 = x + PApplet.sin(start) * r;
- float y2 = y + PApplet.cos(start) * r;
-
- triangle(x, y, x1, y1, x2, y2, strokeColor);
-
- x1 = x2;
- y1 = y2;
- }
- }
-
- void lineCap(float x, float y, float angle) {
- //TODO: optimize this
- arcJoin(x, y, angle - HALF_PI, PI);
- }
}
//returns the total number of points needed to approximate an arc of a given radius and extent
int circleDetail(float radius, float delta) {
+ //this serves as a rough approximation of how much the longest axis
+ //of an ellipse will be scaled by a given matrix
+ //(in other words, the amount by which its on-screen size changes)
+ float sxi = projmodelview.m00 * width / 2;
+ float syi = projmodelview.m10 * height / 2;
+ float sxj = projmodelview.m01 * width / 2;
+ float syj = projmodelview.m11 * height / 2;
+ float Imag2 = sxi * sxi + syi * syi;
+ float Jmag2 = sxj * sxj + syj * syj;
+ float ellipseDetailMultiplier = PApplet.sqrt(PApplet.max(Imag2, Jmag2));
radius *= ellipseDetailMultiplier;
return (int)(PApplet.min(127, PApplet.sqrt(radius) / QUARTER_PI * PApplet.abs(delta) * 0.75f) + 1);
}
@@ -2225,4 +2052,4 @@ public String toString() {
return x + ", " + y;
}
}
-}
\ No newline at end of file
+}
diff --git a/core/src/processing/opengl/PGraphics3D.java b/libs/processing-core/src/main/java/processing/opengl/PGraphics3D.java
similarity index 99%
rename from core/src/processing/opengl/PGraphics3D.java
rename to libs/processing-core/src/main/java/processing/opengl/PGraphics3D.java
index 2e03f0a97..5a5e1c3b3 100644
--- a/core/src/processing/opengl/PGraphics3D.java
+++ b/libs/processing-core/src/main/java/processing/opengl/PGraphics3D.java
@@ -3,7 +3,7 @@
/*
Part of the Processing project - http://processing.org
- Copyright (c) 2012-16 The Processing Foundation
+ Copyright (c) 2012-21 The Processing Foundation
Copyright (c) 2004-12 Ben Fry and Casey Reas
Copyright (c) 2001-04 Massachusetts Institute of Technology
diff --git a/core/src/processing/opengl/PGraphicsOpenGL.java b/libs/processing-core/src/main/java/processing/opengl/PGraphicsOpenGL.java
similarity index 97%
rename from core/src/processing/opengl/PGraphicsOpenGL.java
rename to libs/processing-core/src/main/java/processing/opengl/PGraphicsOpenGL.java
index bc902677d..478a2f13b 100644
--- a/core/src/processing/opengl/PGraphicsOpenGL.java
+++ b/libs/processing-core/src/main/java/processing/opengl/PGraphicsOpenGL.java
@@ -3,7 +3,7 @@
/*
Part of the Processing project - http://processing.org
- Copyright (c) 2012-16 The Processing Foundation
+ Copyright (c) 2012-21 The Processing Foundation
Copyright (c) 2004-12 Ben Fry and Casey Reas
Copyright (c) 2001-04 Massachusetts Institute of Technology
@@ -341,6 +341,18 @@ public void dispose() {
/** Projection matrix stack **/
protected float[][] projectionStack = new float[MATRIX_STACK_DEPTH][16];
+
+ /** Matrix that transform coordinates to the eye coordinate system **/
+ protected PMatrix3D eyeMatrix;
+
+ /** Matrix that transform coordinates to the system that results from appling the modelview transformation **/
+ protected PMatrix3D objMatrix;
+
+ /** Vectors defining the eye axes **/
+ public float forwardX, forwardY, forwardZ;
+ public float rightX, rightY, rightZ;
+ public float upX, upY, upZ;
+
// ........................................................
// Lights:
@@ -520,6 +532,21 @@ public void dispose() {
// ........................................................
+ // Variables used in ray casting:
+
+ protected PVector[] ray;
+ protected PVector hit = new PVector();
+ protected PVector screen = new PVector();
+
+ protected PVector origInObjCoord = new PVector();
+ protected PVector hitInObjCoord = new PVector();
+ protected PVector dirInObjCoord = new PVector();
+
+ protected PVector origInWorldCoord = new PVector();
+ protected PVector dirInWorldCoord = new PVector();
+
+ // ........................................................
+
// Error strings:
static final String OPENGL_THREAD_ERROR =
@@ -830,6 +857,276 @@ public boolean saveImpl(String filename) {
}
+ //////////////////////////////////////////////////////////////
+
+ // EYE/OBJECT MATRICES
+
+
+ @Override
+ public PMatrix3D getEyeMatrix() {
+ return getEyeMatrix(null);
+ }
+
+
+ @Override
+ public PMatrix3D getEyeMatrix(PMatrix3D target) {
+ if (target == null) {
+ target = new PMatrix3D();
+ }
+ float sign = cameraUp ? +1 : -1;
+ target.set(rightX, sign * upX, forwardX, cameraX,
+ rightY, sign * upY, forwardY, cameraY,
+ rightZ, sign * upZ, forwardZ, cameraZ,
+ 0, 0, 0, 1);
+ return target;
+ }
+
+
+ @Override
+ public PMatrix3D getObjectMatrix() {
+ PMatrix3D mat = new PMatrix3D();
+ mat.set(modelviewInv);
+ mat.apply(camera);
+ return mat;
+ }
+
+
+ @Override
+ public PMatrix3D getObjectMatrix(PMatrix3D target) {
+ if (target == null) {
+ target = new PMatrix3D();
+ }
+ target.set(modelviewInv);
+ target.apply(camera);
+ return target;
+ }
+
+
+ @Override
+ public void eye() {
+ eyeMatrix = getEyeMatrix(eyeMatrix);
+
+ // Erasing any previous transformation in modelview
+ modelview.set(camera);
+ modelview.apply(eyeMatrix);
+
+ // The 3x3 block of eyeMatrix is orthogonal, so taking the transpose inverts it...
+ eyeMatrix.transpose();
+ // ...and then invert the translation separately:
+ eyeMatrix.m03 = -cameraX;
+ eyeMatrix.m13 = -cameraY;
+ eyeMatrix.m23 = -cameraZ;
+ eyeMatrix.m30 = 0;
+ eyeMatrix.m31 = 0;
+ eyeMatrix.m32 = 0;
+
+ // Applying the inverse of the previous transformations in the opposite order
+ // to compute the modelview inverse
+ modelviewInv.set(eyeMatrix);
+ modelviewInv.preApply(cameraInv);
+
+ updateProjmodelview();
+ }
+
+
+ //////////////////////////////////////////////////////////////
+
+ // RAY CASTING
+
+ @Override
+ public PVector[] getRayFromScreen(float screenX, float screenY, PVector[] ray) {
+ if (ray == null || ray.length < 2) {
+ ray = new PVector[2];
+ ray[0] = new PVector();
+ ray[1] = new PVector();
+ }
+ getRayFromScreen(screenX, screenY, ray[0], ray[1]);
+ return ray;
+ }
+
+
+ @Override
+ public void getRayFromScreen(float screenX, float screenY, PVector origin, PVector direction) {
+ eyeMatrix = getEyeMatrix(eyeMatrix);
+
+ // Transforming screen coordinates to world coordinates
+ screen.x = screenX;
+ screen.y = screenY;
+ screen.z = 0;
+ eyeMatrix.mult(screen, origin);
+
+ // The direction of the ray is simply extracted from the third column of the eye matrix (the
+ // forward vector).
+ direction.set(eyeMatrix.m02, eyeMatrix.m12, eyeMatrix.m22);
+ }
+
+
+ @Override
+ public boolean intersectsSphere(float r, float screenX, float screenY) {
+ ray = getRayFromScreen(screenX, screenY, ray);
+ return intersectsSphere(r, ray[0], ray[1]);
+ }
+
+
+ @Override
+ public boolean intersectsSphere(float r, PVector origin, PVector direction) {
+ objMatrix = getObjectMatrix(objMatrix);
+ objMatrix.mult(origin, origInObjCoord);
+ PVector.add(origin, direction, hit);
+ objMatrix.mult(hit, hitInObjCoord);
+ PVector.sub(hitInObjCoord, origInObjCoord, dirInObjCoord);
+
+ return rayIntersectsSphere(origInObjCoord, dirInObjCoord, r);
+ }
+
+
+ // Ray-sphere intersecton algorithm as described in:
+ // http://paulbourke.net/geometry/circlesphere/
+ private boolean rayIntersectsSphere(PVector orig, PVector dir, float r) {
+ float d = orig.mag();
+
+ // The eye is inside the sphere
+ if (d <= r) return true;
+
+ float p = PVector.dot(orig, dir);
+
+ // Check if sphere is in front of ray
+ if (p > 0) return false;
+
+ // Check intersection of ray with sphere
+ float b = 2 * p;
+ float c = d * d - r * r;
+ float det = b * b - 4 * c;
+ return det >= 0;
+ }
+
+
+ @Override
+ public boolean intersectsBox(float size, float screenX, float screenY) {
+ ray = getRayFromScreen(screenX, screenY, ray);
+ return intersectsBox(size, size, size, ray[0], ray[1]);
+ }
+
+
+ @Override
+ public boolean intersectsBox(float w, float h, float d, float screenX, float screenY) {
+ ray = getRayFromScreen(screenX, screenY, ray);
+ return intersectsBox(w, h, d, ray[0], ray[1]);
+ }
+
+
+ @Override
+ public boolean intersectsBox(float size, PVector origin, PVector direction) {
+ return intersectsBox(size, size, size, origin, direction);
+ }
+
+
+ @Override
+ public boolean intersectsBox(float w, float h, float d, PVector origin, PVector direction) {
+ objMatrix = getObjectMatrix(objMatrix);
+ objMatrix.mult(origin, origInObjCoord);
+ PVector.add(origin, direction, hit);
+ objMatrix.mult(hit, hitInObjCoord);
+ PVector.sub(hitInObjCoord, origInObjCoord, dirInObjCoord);
+
+ return lineIntersectsAABB(origInObjCoord, dirInObjCoord, w, h, d);
+ }
+
+
+ // Line intersection with an axis-aligned bounding box (AABB), calculated using the algorithm
+ // from Amy William et al: http:// dl.acm.org/citation.cfm?id=1198748
+ private boolean lineIntersectsAABB(PVector orig, PVector dir, float w, float h, float d) {
+ float minx = -w/2;
+ float miny = -h/2;
+ float minz = -d/2;
+
+ float maxx = +w/2;
+ float maxy = +h/2;
+ float maxz = +d/2;
+
+ float idx = 1/dir.x;
+ float idy = 1/dir.y;
+ float idz = 1/dir.z;
+
+ boolean sdx = idx < 0;
+ boolean sdy = idy < 0;
+ boolean sdz = idz < 0;
+
+ float bbx = sdx ? maxx : minx;
+ float txmin = (bbx - orig.x) * idx;
+ bbx = sdx ? minx : maxx;
+ float txmax = (bbx - orig.x) * idx;
+ float bby = sdy ? maxy : miny;
+ float tymin = (bby - orig.y) * idy;
+ bby = sdy ? miny : maxy;
+ float tymax = (bby - orig.y) * idy;
+
+ if ((txmin > tymax) || (tymin > txmax)) {
+ return false;
+ }
+ if (tymin > txmin) {
+ txmin = tymin;
+ }
+ if (tymax < txmax) {
+ txmax = tymax;
+ }
+
+ float bbz = sdz ? maxz : minz;
+ float tzmin = (bbz - orig.z) * idz;
+ bbz = sdz ? minz : maxz;
+ float tzmax = (bbz - orig.z) * idz;
+
+ if ((txmin > tzmax) || (tzmin > txmax)) {
+ return false;
+ }
+ if (tzmin > txmin) {
+ txmin = tzmin;
+ }
+ if (tzmax < txmax) {
+ txmax = tzmax;
+ }
+
+ if ((txmin < defCameraFar) && (txmax > 0)) {
+ // The intersection coordinates:
+ // x = orig.x + txmin * dir.x;
+ // y = orig.y + txmin * dir.y;
+ // z = orig.z + txmin * dir.z;
+ return true;
+ }
+
+ return false;
+ }
+
+
+ @Override
+ public PVector intersectsPlane(float screenX, float screenY) {
+ ray = getRayFromScreen(screenX, screenY, ray);
+ return intersectsPlane(ray[0], ray[1]);
+ }
+
+
+ @Override
+ public PVector intersectsPlane(PVector origin, PVector direction) {
+ modelview.mult(origin, origInWorldCoord);
+ modelview.mult(direction, dirInWorldCoord);
+ dirInWorldCoord.normalize();
+
+ // Plane representation
+ PVector point = new PVector(0, 0, 0);
+ PVector normal = new PVector(0, 0, 1);
+
+ // Ray-plane intersection algorithm
+ float d = PApplet.abs(PVector.dot(normal, dirInWorldCoord));
+ if (d == 0) return null;
+
+ PVector w = PVector.sub(point, origInWorldCoord);
+ float k = PApplet.abs(PVector.dot(normal, w)/d);
+ PVector p = PVector.add(origInWorldCoord, dirInWorldCoord).setMag(k);
+
+ return p;
+ }
+
+
//////////////////////////////////////////////////////////////
// IMAGE METADATA FOR THIS RENDERER
@@ -3958,9 +4255,16 @@ protected void translateImpl(float tx, float ty, float tz) {
static protected void invTranslate(PMatrix3D matrix,
float tx, float ty, float tz) {
matrix.preApply(1, 0, 0, -tx,
- 0, 1, 0, -ty,
- 0, 0, 1, -tz,
- 0, 0, 0, 1);
+ 0, 1, 0, -ty,
+ 0, 0, 1, -tz,
+ 0, 0, 0, 1);
+ }
+
+
+ static protected void invTranslate(PMatrix2D matrix,
+ float tx, float ty) {
+ matrix.preApply(1, 0, -tx,
+ 0, 1, -ty);
}
@@ -4049,16 +4353,21 @@ protected void rotateImpl(float angle, float v0, float v1, float v2) {
}
- static private void invRotate(PMatrix3D matrix, float angle,
- float v0, float v1, float v2) {
+ static protected void invRotate(PMatrix3D matrix, float angle,
+ float v0, float v1, float v2) {
float c = PApplet.cos(-angle);
float s = PApplet.sin(-angle);
float t = 1.0f - c;
matrix.preApply((t*v0*v0) + c, (t*v0*v1) - (s*v2), (t*v0*v2) + (s*v1), 0,
- (t*v0*v1) + (s*v2), (t*v1*v1) + c, (t*v1*v2) - (s*v0), 0,
- (t*v0*v2) - (s*v1), (t*v1*v2) + (s*v0), (t*v2*v2) + c, 0,
- 0, 0, 0, 1);
+ (t*v0*v1) + (s*v2), (t*v1*v1) + c, (t*v1*v2) - (s*v0), 0,
+ (t*v0*v2) - (s*v1), (t*v1*v2) + (s*v0), (t*v2*v2) + c, 0,
+ 0, 0, 0, 1);
+ }
+
+
+ static protected void invRotate(PMatrix2D matrix, float angle) {
+ matrix.rotate(-angle);
}
@@ -4103,6 +4412,11 @@ static protected void invScale(PMatrix3D matrix, float x, float y, float z) {
}
+ static protected void invScale(PMatrix2D matrix, float x, float y) {
+ matrix.preApply(1/x, 0, 0, 0, 1/y, 0);
+ }
+
+
@Override
public void shearX(float angle) {
float t = (float) Math.tan(angle);
@@ -4573,16 +4887,28 @@ public void camera(float eyeX, float eyeY, float eyeZ,
z2 /= eyeDist;
}
+ forwardX = z0;
+ forwardY = z1;
+ forwardZ = z2;
+
// Calculating Y vector
float y0 = upX;
float y1 = upY;
float y2 = upZ;
+ this.upX = upX;
+ this.upY = upY;
+ this.upZ = upZ;
+
// Computing X vector as Y cross Z
float x0 = y1 * z2 - y2 * z1;
float x1 = -y0 * z2 + y2 * z0;
float x2 = y0 * z1 - y1 * z0;
+ rightX = x0;
+ rightY = x1;
+ rightZ = x2;
+
// Recompute Y = Z cross X
y0 = z1 * x2 - z2 * x1;
y1 = -z0 * x2 + z2 * x0;
@@ -6448,25 +6774,25 @@ public void copy(PImage src,
int scrX0, scrX1;
int scrY0, scrY1;
if (invX) {
- scrX0 = dx + dw;
- scrX1 = dx;
+ scrX0 = (dx + dw) / src.pixelDensity;
+ scrX1 = dx / src.pixelDensity;
} else {
- scrX0 = dx;
- scrX1 = dx + dw;
+ scrX0 = dx / src.pixelDensity;
+ scrX1 = (dx + dw) / src.pixelDensity;
}
int texX0 = sx;
int texX1 = sx + sw;
int texY0, texY1;
if (invY) {
- scrY0 = height - (dy + dh);
- scrY1 = height - dy;
+ scrY0 = height - (dy + dh) / src.pixelDensity;
+ scrY1 = height - dy / src.pixelDensity;
texY0 = tex.height - (sy + sh);
texY1 = tex.height - sy;
} else {
// Because drawTexture uses bottom-to-top orientation of Y axis.
- scrY0 = height - dy;
- scrY1 = height - (dy + dh);
+ scrY0 = height - dy / src.pixelDensity;
+ scrY1 = height - (dy + dh) / src.pixelDensity;
texY0 = sy;
texY1 = sy + sh;
}
@@ -6690,7 +7016,7 @@ protected Object initCache(PImage img) {
if (tex == null || tex.contextIsOutdated()) {
tex = addTexture(img);
if (tex != null) {
- boolean dispose = !img.loaded;
+ boolean dispose = img.pixels == null;
img.loadPixels();
tex.set(img.pixels, img.format);
img.setModified();
@@ -7300,28 +7626,27 @@ protected PShader getPolyShader(boolean lit, boolean tex) {
PGraphicsOpenGL ppg = getPrimaryPG();
boolean useDefault = polyShader == null;
if (polyShader != null) {
- polyShader.setRenderer(this);
- polyShader.loadAttributes();
- polyShader.loadUniforms();
+ updateShader(polyShader);
+// polyShader.setRenderer(this);
+// polyShader.loadAttributes();
+// polyShader.loadUniforms();
}
if (lit) {
if (tex) {
- if (useDefault || !polyShader.checkPolyType(PShader.TEXLIGHT)) {
+ if (useDefault || !isPolyShaderTexLight(polyShader)) {
if (ppg.defTexlightShader == null) {
- String[] vertSource = pgl.loadVertexShader(defTexlightShaderVertURL);
- String[] fragSource = pgl.loadFragmentShader(defTexlightShaderFragURL);
- ppg.defTexlightShader = new PShader(parent, vertSource, fragSource);
+ ppg.defTexlightShader = loadShaderFromURL(defTexlightShaderFragURL,
+ defTexlightShaderVertURL);
}
shader = ppg.defTexlightShader;
} else {
shader = polyShader;
}
} else {
- if (useDefault || !polyShader.checkPolyType(PShader.LIGHT)) {
+ if (useDefault || !isPolyShaderLight(polyShader)) {
if (ppg.defLightShader == null) {
- String[] vertSource = pgl.loadVertexShader(defLightShaderVertURL);
- String[] fragSource = pgl.loadFragmentShader(defLightShaderFragURL);
- ppg.defLightShader = new PShader(parent, vertSource, fragSource);
+ ppg.defLightShader = loadShaderFromURL(defLightShaderFragURL,
+ defLightShaderVertURL);
}
shader = ppg.defLightShader;
} else {
@@ -7329,28 +7654,26 @@ protected PShader getPolyShader(boolean lit, boolean tex) {
}
}
} else {
- if (polyShader != null && polyShader.accessLightAttribs()) {
+ if (isPolyShaderUsingLights(polyShader)) {
PGraphics.showWarning(SHADER_NEED_LIGHT_ATTRIBS);
useDefault = true;
}
if (tex) {
- if (useDefault || !polyShader.checkPolyType(PShader.TEXTURE)) {
+ if (useDefault || !isPolyShaderTex(polyShader)) {
if (ppg.defTextureShader == null) {
- String[] vertSource = pgl.loadVertexShader(defTextureShaderVertURL);
- String[] fragSource = pgl.loadFragmentShader(defTextureShaderFragURL);
- ppg.defTextureShader = new PShader(parent, vertSource, fragSource);
+ ppg.defTextureShader = loadShaderFromURL(defTextureShaderFragURL,
+ defTextureShaderVertURL);
}
shader = ppg.defTextureShader;
} else {
shader = polyShader;
}
} else {
- if (useDefault || !polyShader.checkPolyType(PShader.COLOR)) {
+ if (useDefault || !isPolyShaderColor(polyShader)) {
if (ppg.defColorShader == null) {
- String[] vertSource = pgl.loadVertexShader(defColorShaderVertURL);
- String[] fragSource = pgl.loadFragmentShader(defColorShaderFragURL);
- ppg.defColorShader = new PShader(parent, vertSource, fragSource);
+ ppg.defColorShader = loadShaderFromURL(defColorShaderFragURL,
+ defColorShaderVertURL);
}
shader = ppg.defColorShader;
} else {
@@ -7359,14 +7682,52 @@ protected PShader getPolyShader(boolean lit, boolean tex) {
}
}
if (shader != polyShader) {
- shader.setRenderer(this);
- shader.loadAttributes();
- shader.loadUniforms();
+ updateShader(shader);
}
+ updateShader(shader);
return shader;
}
+ protected void updateShader(PShader shader) {
+ shader.setRenderer(this);
+ shader.loadAttributes();
+ shader.loadUniforms();
+ }
+
+
+ protected PShader loadShaderFromURL(URL fragURL, URL vertURL) {
+ String[] vertSource = pgl.loadVertexShader(vertURL);
+ String[] fragSource = pgl.loadFragmentShader(fragURL);
+ return new PShader(parent, vertSource, fragSource);
+ }
+
+
+ protected boolean isPolyShaderTexLight(PShader shader) {
+ return shader.checkPolyType(PShader.TEXLIGHT);
+ }
+
+
+ protected boolean isPolyShaderLight(PShader shader) {
+ return shader.checkPolyType(PShader.LIGHT);
+ }
+
+
+ protected boolean isPolyShaderTex(PShader shader) {
+ return shader.checkPolyType(PShader.TEXTURE);
+ }
+
+
+ protected boolean isPolyShaderColor(PShader shader) {
+ return shader.checkPolyType(PShader.COLOR);
+ }
+
+
+ protected boolean isPolyShaderUsingLights(PShader shader) {
+ return shader != null && shader.accessLightAttribs();
+ }
+
+
protected PShader getLineShader() {
PShader shader;
PGraphicsOpenGL ppg = getPrimaryPG();
diff --git a/core/src/processing/opengl/PShader.java b/libs/processing-core/src/main/java/processing/opengl/PShader.java
similarity index 99%
rename from core/src/processing/opengl/PShader.java
rename to libs/processing-core/src/main/java/processing/opengl/PShader.java
index 1b5a2a9b5..c3e47ead5 100644
--- a/core/src/processing/opengl/PShader.java
+++ b/libs/processing-core/src/main/java/processing/opengl/PShader.java
@@ -3,7 +3,7 @@
/*
Part of the Processing project - http://processing.org
- Copyright (c) 2012-16 The Processing Foundation
+ Copyright (c) 2012-21 The Processing Foundation
Copyright (c) 2004-12 Ben Fry and Casey Reas
Copyright (c) 2001-04 Massachusetts Institute of Technology
diff --git a/core/src/processing/opengl/PShapeOpenGL.java b/libs/processing-core/src/main/java/processing/opengl/PShapeOpenGL.java
similarity index 89%
rename from core/src/processing/opengl/PShapeOpenGL.java
rename to libs/processing-core/src/main/java/processing/opengl/PShapeOpenGL.java
index 31750aa4f..3f65727b4 100644
--- a/core/src/processing/opengl/PShapeOpenGL.java
+++ b/libs/processing-core/src/main/java/processing/opengl/PShapeOpenGL.java
@@ -3,7 +3,7 @@
/*
Part of the Processing project - http://processing.org
- Copyright (c) 2012-16 The Processing Foundation
+ Copyright (c) 2012-21 The Processing Foundation
Copyright (c) 2004-12 Ben Fry and Casey Reas
Copyright (c) 2001-04 Massachusetts Institute of Technology
@@ -43,7 +43,6 @@
import java.nio.Buffer;
import java.util.Arrays;
import java.util.HashSet;
-import java.util.Stack;
/**
* This class holds a 3D model composed of vertices, normals, colors
@@ -171,7 +170,8 @@ public class PShapeOpenGL extends PShape {
// Geometric transformations.
protected PMatrix transform;
- protected Stack transformStack;
+ protected PMatrix transformInv;
+ protected PMatrix matrixInv;
// ........................................................
@@ -349,7 +349,7 @@ public PShapeOpenGL(PGraphicsOpenGL pg, int family) {
textureMode = pg.textureMode;
colorMode(pg.colorMode,
- pg.colorModeX, pg.colorModeY, pg.colorModeZ, pg.colorModeA);
+ pg.colorModeX, pg.colorModeY, pg.colorModeZ, pg.colorModeA);
// Initial values for fill, stroke and tint colors are also imported from
// the renderer. This is particular relevant for primitive shapes, since is
@@ -608,9 +608,9 @@ static public void copyGroup2D(PGraphicsOpenGL pg, PShape src, PShape dest) {
@Override
public float getWidth() {
PVector min = new PVector(Float.POSITIVE_INFINITY, Float.POSITIVE_INFINITY,
- Float.POSITIVE_INFINITY);
+ Float.POSITIVE_INFINITY);
PVector max = new PVector(Float.NEGATIVE_INFINITY, Float.NEGATIVE_INFINITY,
- Float.NEGATIVE_INFINITY);
+ Float.NEGATIVE_INFINITY);
if (shapeCreated) {
getVertexMin(min);
getVertexMax(max);
@@ -623,9 +623,9 @@ public float getWidth() {
@Override
public float getHeight() {
PVector min = new PVector(Float.POSITIVE_INFINITY, Float.POSITIVE_INFINITY,
- Float.POSITIVE_INFINITY);
+ Float.POSITIVE_INFINITY);
PVector max = new PVector(Float.NEGATIVE_INFINITY, Float.NEGATIVE_INFINITY,
- Float.NEGATIVE_INFINITY);
+ Float.NEGATIVE_INFINITY);
if (shapeCreated) {
getVertexMin(min);
getVertexMax(max);
@@ -638,9 +638,9 @@ public float getHeight() {
@Override
public float getDepth() {
PVector min = new PVector(Float.POSITIVE_INFINITY, Float.POSITIVE_INFINITY,
- Float.POSITIVE_INFINITY);
+ Float.POSITIVE_INFINITY);
PVector max = new PVector(Float.NEGATIVE_INFINITY, Float.NEGATIVE_INFINITY,
- Float.NEGATIVE_INFINITY);
+ Float.NEGATIVE_INFINITY);
if (shapeCreated) {
getVertexMin(min);
getVertexMax(max);
@@ -713,11 +713,11 @@ protected int getVertexSum(PVector sum, int count) {
if (is3D()) {
if (hasLines) {
count += tessGeo.getLineVertexSum(sum, firstLineVertex,
- lastLineVertex);
+ lastLineVertex);
}
if (hasPoints) {
count += tessGeo.getPointVertexSum(sum, firstPointVertex,
- lastPointVertex);
+ lastPointVertex);
}
}
}
@@ -847,7 +847,7 @@ protected void scaleTextureUV(float uFactor, float vFactor) {
protected void addTexture(PImage tex) {
if (textures == null) {
- textures = new HashSet();
+ textures = new HashSet<>();
}
textures.add(tex);
if (parent != null) {
@@ -1063,12 +1063,12 @@ protected void vertexImpl(float x, float y, float z, float u, float v) {
}
inGeo.addVertex(x, y, z,
- fcolor,
- normalX, normalY, normalZ,
- u, v,
- scolor, sweight,
- ambientColor, specularColor, emissiveColor, shininess,
- VERTEX, vertexBreak());
+ fcolor,
+ normalX, normalY, normalZ,
+ u, v,
+ scolor, sweight,
+ ambientColor, specularColor, emissiveColor, shininess,
+ VERTEX, vertexBreak());
markForTessellation();
}
@@ -1114,7 +1114,7 @@ public void normal(float nx, float ny, float nz) {
@Override
public void attribPosition(String name, float x, float y, float z) {
VertexAttribute attrib = attribImpl(name, VertexAttribute.POSITION,
- PGL.FLOAT, 3);
+ PGL.FLOAT, 3);
if (attrib != null) attrib.set(x, y, z);
}
@@ -1122,7 +1122,7 @@ public void attribPosition(String name, float x, float y, float z) {
@Override
public void attribNormal(String name, float nx, float ny, float nz) {
VertexAttribute attrib = attribImpl(name, VertexAttribute.NORMAL,
- PGL.FLOAT, 3);
+ PGL.FLOAT, 3);
if (attrib != null) attrib.set(nx, ny, nz);
}
@@ -1137,7 +1137,7 @@ public void attribColor(String name, int color) {
@Override
public void attrib(String name, float... values) {
VertexAttribute attrib = attribImpl(name, VertexAttribute.OTHER, PGL.FLOAT,
- values.length);
+ values.length);
if (attrib != null) attrib.set(values);
}
@@ -1145,7 +1145,7 @@ public void attrib(String name, float... values) {
@Override
public void attrib(String name, int... values) {
VertexAttribute attrib = attribImpl(name, VertexAttribute.OTHER, PGL.INT,
- values.length);
+ values.length);
if (attrib != null) attrib.set(values);
}
@@ -1153,7 +1153,7 @@ public void attrib(String name, int... values) {
@Override
public void attrib(String name, boolean... values) {
VertexAttribute attrib = attribImpl(name, VertexAttribute.OTHER, PGL.BOOL,
- values.length);
+ values.length);
if (attrib != null) attrib.set(values);
}
@@ -1216,7 +1216,7 @@ public void setParams(float[] source) {
public void setPath(int vcount, float[][] verts, int ccount, int[] codes) {
if (family != PATH) {
PGraphics.showWarning("Vertex coordinates and codes can only be set to " +
- "PATH shapes");
+ "PATH shapes");
return;
}
@@ -1251,7 +1251,11 @@ public void translate(float tx, float ty, float tz) {
@Override
public void rotate(float angle) {
- transform(ROTATE, angle);
+ if (is3D) {
+ transform(ROTATE, angle, 0, 0, 1);
+ } else {
+ transform(ROTATE, angle);
+ }
}
@@ -1308,7 +1312,7 @@ public void scale(float x, float y, float z) {
@Override
public void applyMatrix(PMatrix2D source) {
transform(MATRIX, source.m00, source.m01, source.m02,
- source.m10, source.m11, source.m12);
+ source.m10, source.m11, source.m12);
}
@@ -1316,7 +1320,7 @@ public void applyMatrix(PMatrix2D source) {
public void applyMatrix(float n00, float n01, float n02,
float n10, float n11, float n12) {
transform(MATRIX, n00, n01, n02,
- n10, n11, n12);
+ n10, n11, n12);
}
@@ -1326,47 +1330,42 @@ public void applyMatrix(float n00, float n01, float n02, float n03,
float n20, float n21, float n22, float n23,
float n30, float n31, float n32, float n33) {
transform(MATRIX, n00, n01, n02, n03,
- n10, n11, n12, n13,
- n20, n21, n22, n23,
- n30, n31, n32, n33);
+ n10, n11, n12, n13,
+ n20, n21, n22, n23,
+ n30, n31, n32, n33);
}
@Override
public void resetMatrix() {
- if (shapeCreated && matrix != null && transformStack != null) {
+ if (shapeCreated && matrix != null && matrixInv != null) {
if (family == GROUP) {
updateTessellation();
}
if (tessellated) {
- PMatrix mat = popTransform();
- while (mat != null) {
- boolean res = mat.invert();
- if (res) {
- applyMatrixImpl(mat);
- } else {
- PGraphics.showWarning("Transformation applied on the shape cannot be inverted");
- }
- mat = popTransform();
- }
+ applyMatrixImpl(matrixInv);
}
matrix.reset();
- transformStack.clear();
+ matrixInv.reset();
}
}
protected void transform(int type, float... args) {
int dimensions = is3D ? 3 : 2;
+ boolean invertible = true;
checkMatrix(dimensions);
if (transform == null) {
if (dimensions == 2) {
transform = new PMatrix2D();
+ transformInv = new PMatrix2D();
} else {
transform = new PMatrix3D();
+ transformInv = new PMatrix3D();
}
} else {
transform.reset();
+ transformInv.reset();
}
int ncoords = args.length;
@@ -1377,67 +1376,61 @@ protected void transform(int type, float... args) {
}
switch (type) {
- case TRANSLATE:
- if (ncoords == 3) {
- transform.translate(args[0], args[1], args[2]);
- } else {
- transform.translate(args[0], args[1]);
- }
- break;
- case ROTATE:
- if (ncoords == 3) {
- transform.rotate(args[0], args[1], args[2], args[3]);
- } else {
- transform.rotate(args[0]);
- }
- break;
- case SCALE:
- if (ncoords == 3) {
- transform.scale(args[0], args[1], args[2]);
- } else {
- transform.scale(args[0], args[1]);
- }
- break;
- case MATRIX:
- if (ncoords == 3) {
- transform.set(args[ 0], args[ 1], args[ 2], args[ 3],
- args[ 4], args[ 5], args[ 6], args[ 7],
- args[ 8], args[ 9], args[10], args[11],
- args[12], args[13], args[14], args[15]);
- } else {
- transform.set(args[0], args[1], args[2],
- args[3], args[4], args[5]);
- }
- break;
+ case TRANSLATE:
+ if (ncoords == 3) {
+ transform.translate(args[0], args[1], args[2]);
+ PGraphicsOpenGL.invTranslate((PMatrix3D)transformInv, args[0], args[1], args[2]);
+ } else {
+ transform.translate(args[0], args[1]);
+ PGraphicsOpenGL.invTranslate((PMatrix2D)transformInv, args[0], args[1]);
+ }
+ break;
+ case ROTATE:
+ if (ncoords == 3) {
+ transform.rotate(args[0], args[1], args[2], args[3]);
+ PGraphicsOpenGL.invRotate((PMatrix3D)transformInv, args[0], args[1], args[2], args[3]);
+ } else {
+ transform.rotate(args[0]);
+ PGraphicsOpenGL.invRotate((PMatrix2D)transformInv, -args[0]);
+ }
+ break;
+ case SCALE:
+ if (ncoords == 3) {
+ transform.scale(args[0], args[1], args[2]);
+ PGraphicsOpenGL.invScale((PMatrix3D)transformInv, args[0], args[1], args[2]);
+ } else {
+ transform.scale(args[0], args[1]);
+ PGraphicsOpenGL.invScale((PMatrix2D)transformInv, args[0], args[1]);
+ }
+ break;
+ case MATRIX:
+ if (ncoords == 3) {
+ transform.set(args[ 0], args[ 1], args[ 2], args[ 3],
+ args[ 4], args[ 5], args[ 6], args[ 7],
+ args[ 8], args[ 9], args[10], args[11],
+ args[12], args[13], args[14], args[15]);
+ } else {
+ transform.set(args[0], args[1], args[2],
+ args[3], args[4], args[5]);
+ }
+ transformInv.set(transform);
+ invertible = transformInv.invert();
+ break;
}
matrix.preApply(transform);
- pushTransform();
- if (tessellated) applyMatrixImpl(transform);
- }
-
-
- protected void pushTransform() {
- if (transformStack == null) transformStack = new Stack();
- PMatrix mat;
- if (transform instanceof PMatrix2D) {
- mat = new PMatrix2D();
+ if (invertible) {
+ matrixInv.apply(transformInv);
} else {
- mat = new PMatrix3D();
+ PGraphics.showWarning("Transformation applied on the shape cannot be inverted");
}
- mat.set(transform);
- transformStack.push(mat);
+ if (tessellated) applyMatrixImpl(transform);
}
- protected PMatrix popTransform() {
- if (transformStack == null || transformStack.size() == 0) return null;
- return transformStack.pop();
- }
-
protected void applyMatrixImpl(PMatrix matrix) {
if (hasPolys) {
tessGeo.applyMatrixOnPolyGeometry(matrix,
- firstPolyVertex, lastPolyVertex);
+ firstPolyVertex, lastPolyVertex);
root.setModifiedPolyVertices(firstPolyVertex, lastPolyVertex);
root.setModifiedPolyNormals(firstPolyVertex, lastPolyVertex);
for (VertexAttribute attrib: polyAttribs.values()) {
@@ -1450,14 +1443,14 @@ protected void applyMatrixImpl(PMatrix matrix) {
if (is3D()) {
if (hasLines) {
tessGeo.applyMatrixOnLineGeometry(matrix,
- firstLineVertex, lastLineVertex);
+ firstLineVertex, lastLineVertex);
root.setModifiedLineVertices(firstLineVertex, lastLineVertex);
root.setModifiedLineAttributes(firstLineVertex, lastLineVertex);
}
if (hasPoints) {
tessGeo.applyMatrixOnPointGeometry(matrix,
- firstPointVertex, lastPointVertex);
+ firstPointVertex, lastPointVertex);
root.setModifiedPointVertices(firstPointVertex, lastPointVertex);
root.setModifiedPointAttributes(firstPointVertex, lastPointVertex);
}
@@ -1465,6 +1458,23 @@ protected void applyMatrixImpl(PMatrix matrix) {
}
+ @Override
+ protected void checkMatrix(int dimensions) {
+ if (matrix == null) {
+ if (dimensions == 2) {
+ matrix = new PMatrix2D();
+ matrixInv = new PMatrix2D();
+ } else {
+ matrix = new PMatrix3D();
+ matrixInv = new PMatrix3D();
+ }
+ } else if (dimensions == 3 && (matrix instanceof PMatrix2D)) {
+ matrix = new PMatrix3D(matrix);
+ matrixInv = new PMatrix3D(matrixInv);
+ }
+ }
+
+
///////////////////////////////////////////////////////////
//
@@ -1487,8 +1497,8 @@ public void bezierVertex(float x2, float y2,
float x3, float y3,
float x4, float y4) {
bezierVertexImpl(x2, y2, 0,
- x3, y3, 0,
- x4, y4, 0);
+ x3, y3, 0,
+ x4, y4, 0);
}
@@ -1497,8 +1507,8 @@ public void bezierVertex(float x2, float y2, float z2,
float x3, float y3, float z3,
float x4, float y4, float z4) {
bezierVertexImpl(x2, y2, z2,
- x3, y3, z3,
- x4, y4, z4);
+ x3, y3, z3,
+ x4, y4, z4);
}
@@ -1506,11 +1516,11 @@ protected void bezierVertexImpl(float x2, float y2, float z2,
float x3, float y3, float z3,
float x4, float y4, float z4) {
inGeo.setMaterial(fillColor, strokeColor, strokeWeight,
- ambientColor, specularColor, emissiveColor, shininess);
+ ambientColor, specularColor, emissiveColor, shininess);
inGeo.setNormal(normalX, normalY, normalZ);
inGeo.addBezierVertex(x2, y2, z2,
- x3, y3, z3,
- x4, y4, z4, vertexBreak());
+ x3, y3, z3,
+ x4, y4, z4, vertexBreak());
}
@@ -1518,7 +1528,7 @@ protected void bezierVertexImpl(float x2, float y2, float z2,
public void quadraticVertex(float cx, float cy,
float x3, float y3) {
quadraticVertexImpl(cx, cy, 0,
- x3, y3, 0);
+ x3, y3, 0);
}
@@ -1526,17 +1536,17 @@ public void quadraticVertex(float cx, float cy,
public void quadraticVertex(float cx, float cy, float cz,
float x3, float y3, float z3) {
quadraticVertexImpl(cx, cy, cz,
- x3, y3, z3);
+ x3, y3, z3);
}
protected void quadraticVertexImpl(float cx, float cy, float cz,
float x3, float y3, float z3) {
inGeo.setMaterial(fillColor, strokeColor, strokeWeight,
- ambientColor, specularColor, emissiveColor, shininess);
+ ambientColor, specularColor, emissiveColor, shininess);
inGeo.setNormal(normalX, normalY, normalZ);
inGeo.addQuadraticVertex(cx, cy, cz,
- x3, y3, z3, vertexBreak());
+ x3, y3, z3, vertexBreak());
}
@@ -1581,7 +1591,7 @@ public void curveVertex(float x, float y, float z) {
protected void curveVertexImpl(float x, float y, float z) {
inGeo.setMaterial(fillColor, strokeColor, strokeWeight,
- ambientColor, specularColor, emissiveColor, shininess);
+ ambientColor, specularColor, emissiveColor, shininess);
inGeo.setNormal(normalX, normalY, normalZ);
inGeo.addCurveVertex(x, y, z, vertexBreak());
}
@@ -1755,10 +1765,11 @@ public void setAttrib(String name, int index, float... values) {
return;
}
- VertexAttribute attrib = polyAttribs.get(name);
+ VertexAttribute attrib = attribImpl(name, VertexAttribute.OTHER, PGL.FLOAT,
+ values.length);
float[] array = inGeo.fattribs.get(name);
for (int i = 0; i < values.length; i++) {
- array[attrib.size * index + 0] = values[i];
+ array[attrib.size * index + i] = values[i];
}
markForTessellation();
}
@@ -1771,10 +1782,11 @@ public void setAttrib(String name, int index, int... values) {
return;
}
- VertexAttribute attrib = polyAttribs.get(name);
+ VertexAttribute attrib = attribImpl(name, VertexAttribute.OTHER, PGL.INT,
+ values.length);
int[] array = inGeo.iattribs.get(name);
for (int i = 0; i < values.length; i++) {
- array[attrib.size * index + 0] = values[i];
+ array[attrib.size * index + i] = values[i];
}
markForTessellation();
}
@@ -1787,10 +1799,11 @@ public void setAttrib(String name, int index, boolean... values) {
return;
}
- VertexAttribute attrib = polyAttribs.get(name);
+ VertexAttribute attrib = attribImpl(name, VertexAttribute.OTHER, PGL.BOOL,
+ values.length);
byte[] array = inGeo.battribs.get(name);
for (int i = 0; i < values.length; i++) {
- array[attrib.size * index + 0] = (byte)(values[i]?1:0);
+ array[attrib.size * index + i] = (byte)(values[i]?1:0);
}
markForTessellation();
}
@@ -1879,18 +1892,18 @@ protected void setFillImpl(int fill) {
if (image == null) {
Arrays.fill(inGeo.colors, 0, inGeo.vertexCount,
- PGL.javaToNativeARGB(fillColor));
+ PGL.javaToNativeARGB(fillColor));
if (shapeCreated && tessellated && hasPolys) {
if (is3D()) {
Arrays.fill(tessGeo.polyColors, firstPolyVertex, lastPolyVertex + 1,
- PGL.javaToNativeARGB(fillColor));
+ PGL.javaToNativeARGB(fillColor));
root.setModifiedPolyColors(firstPolyVertex, lastPolyVertex);
} else if (is2D()) {
int last1 = lastPolyVertex + 1;
if (-1 < firstLineVertex) last1 = firstLineVertex;
if (-1 < firstPointVertex) last1 = firstPointVertex;
Arrays.fill(tessGeo.polyColors, firstPolyVertex, last1,
- PGL.javaToNativeARGB(fillColor));
+ PGL.javaToNativeARGB(fillColor));
root.setModifiedPolyColors(firstPolyVertex, last1 - 1);
}
}
@@ -1974,18 +1987,18 @@ protected void setTintImpl(int tint) {
if (image != null) {
Arrays.fill(inGeo.colors, 0, inGeo.vertexCount,
- PGL.javaToNativeARGB(tintColor));
+ PGL.javaToNativeARGB(tintColor));
if (shapeCreated && tessellated && hasPolys) {
if (is3D()) {
Arrays.fill(tessGeo.polyColors, firstPolyVertex, lastPolyVertex + 1,
- PGL.javaToNativeARGB(tintColor));
+ PGL.javaToNativeARGB(tintColor));
root.setModifiedPolyColors(firstPolyVertex, lastPolyVertex);
} else if (is2D()) {
int last1 = lastPolyVertex + 1;
if (-1 < firstLineVertex) last1 = firstLineVertex;
if (-1 < firstPointVertex) last1 = firstPointVertex;
Arrays.fill(tessGeo.polyColors, firstPolyVertex, last1,
- PGL.javaToNativeARGB(tintColor));
+ PGL.javaToNativeARGB(tintColor));
root.setModifiedPolyColors(firstPolyVertex, last1 - 1);
}
}
@@ -2080,27 +2093,27 @@ protected void setStrokeImpl(int stroke) {
strokeColor = stroke;
Arrays.fill(inGeo.strokeColors, 0, inGeo.vertexCount,
- PGL.javaToNativeARGB(strokeColor));
+ PGL.javaToNativeARGB(strokeColor));
if (shapeCreated && tessellated && (hasLines || hasPoints)) {
if (hasLines) {
if (is3D()) {
Arrays.fill(tessGeo.lineColors, firstLineVertex, lastLineVertex + 1,
- PGL.javaToNativeARGB(strokeColor));
+ PGL.javaToNativeARGB(strokeColor));
root.setModifiedLineColors(firstLineVertex, lastLineVertex);
} else if (is2D()) {
Arrays.fill(tessGeo.polyColors, firstLineVertex, lastLineVertex + 1,
- PGL.javaToNativeARGB(strokeColor));
+ PGL.javaToNativeARGB(strokeColor));
root.setModifiedPolyColors(firstLineVertex, lastLineVertex);
}
}
if (hasPoints) {
if (is3D()) {
Arrays.fill(tessGeo.pointColors, firstPointVertex, lastPointVertex + 1,
- PGL.javaToNativeARGB(strokeColor));
+ PGL.javaToNativeARGB(strokeColor));
root.setModifiedPointColors(firstPointVertex, lastPointVertex);
} else if (is2D()) {
Arrays.fill(tessGeo.polyColors, firstPointVertex, lastPointVertex + 1,
- PGL.javaToNativeARGB(strokeColor));
+ PGL.javaToNativeARGB(strokeColor));
root.setModifiedPolyColors(firstPointVertex, lastPointVertex);
}
}
@@ -2280,18 +2293,18 @@ protected void setAmbientImpl(int ambient) {
ambientColor = ambient;
Arrays.fill(inGeo.ambient, 0, inGeo.vertexCount,
- PGL.javaToNativeARGB(ambientColor));
+ PGL.javaToNativeARGB(ambientColor));
if (shapeCreated && tessellated && hasPolys) {
if (is3D()) {
Arrays.fill(tessGeo.polyAmbient, firstPolyVertex, lastPolyVertex + 1,
- PGL.javaToNativeARGB(ambientColor));
+ PGL.javaToNativeARGB(ambientColor));
root.setModifiedPolyAmbient(firstPolyVertex, lastPolyVertex);
} else if (is2D()) {
int last1 = lastPolyVertex + 1;
if (-1 < firstLineVertex) last1 = firstLineVertex;
if (-1 < firstPointVertex) last1 = firstPointVertex;
Arrays.fill(tessGeo.polyAmbient, firstPolyVertex, last1,
- PGL.javaToNativeARGB(ambientColor));
+ PGL.javaToNativeARGB(ambientColor));
root.setModifiedPolyColors(firstPolyVertex, last1 - 1);
}
}
@@ -2345,18 +2358,18 @@ protected void setSpecularImpl(int specular) {
specularColor = specular;
Arrays.fill(inGeo.specular, 0, inGeo.vertexCount,
- PGL.javaToNativeARGB(specularColor));
+ PGL.javaToNativeARGB(specularColor));
if (shapeCreated && tessellated && hasPolys) {
if (is3D()) {
Arrays.fill(tessGeo.polySpecular, firstPolyVertex, lastPolyVertex + 1,
- PGL.javaToNativeARGB(specularColor));
+ PGL.javaToNativeARGB(specularColor));
root.setModifiedPolySpecular(firstPolyVertex, lastPolyVertex);
} else if (is2D()) {
int last1 = lastPolyVertex + 1;
if (-1 < firstLineVertex) last1 = firstLineVertex;
if (-1 < firstPointVertex) last1 = firstPointVertex;
Arrays.fill(tessGeo.polySpecular, firstPolyVertex, last1,
- PGL.javaToNativeARGB(specularColor));
+ PGL.javaToNativeARGB(specularColor));
root.setModifiedPolyColors(firstPolyVertex, last1 - 1);
}
}
@@ -2408,18 +2421,18 @@ protected void setEmissiveImpl(int emissive) {
emissiveColor = emissive;
Arrays.fill(inGeo.emissive, 0, inGeo.vertexCount,
- PGL.javaToNativeARGB(emissiveColor));
+ PGL.javaToNativeARGB(emissiveColor));
if (shapeCreated && tessellated && 0 < tessGeo.polyVertexCount) {
if (is3D()) {
Arrays.fill(tessGeo.polyEmissive, firstPolyVertex, lastPolyVertex + 1,
- PGL.javaToNativeARGB(emissiveColor));
+ PGL.javaToNativeARGB(emissiveColor));
root.setModifiedPolyEmissive(firstPolyVertex, lastPolyVertex);
} else if (is2D()) {
int last1 = lastPolyVertex + 1;
if (-1 < firstLineVertex) last1 = firstLineVertex;
if (-1 < firstPointVertex) last1 = firstPointVertex;
Arrays.fill(tessGeo.polyEmissive, firstPolyVertex, last1,
- PGL.javaToNativeARGB(emissiveColor));
+ PGL.javaToNativeARGB(emissiveColor));
root.setModifiedPolyColors(firstPolyVertex, last1 - 1);
}
}
@@ -2474,7 +2487,7 @@ protected void setShininessImpl(float shininess) {
if (shapeCreated && tessellated && hasPolys) {
if (is3D()) {
Arrays.fill(tessGeo.polyShininess, firstPolyVertex, lastPolyVertex + 1,
- shininess);
+ shininess);
root.setModifiedPolyShininess(firstPolyVertex, lastPolyVertex);
} else if (is2D()) {
int last1 = lastPolyVertex + 1;
@@ -2731,9 +2744,9 @@ public boolean contains(float x, float y) {
if (((inGeo.vertices[3 * i + 1] > y) != (inGeo.vertices[3 * j + 1] > y)) &&
(x <
(inGeo.vertices[3 * j]-inGeo.vertices[3 * i]) *
- (y-inGeo.vertices[3 * i + 1]) /
- (inGeo.vertices[3 * j + 1]-inGeo.vertices[3 * i + 1]) +
- inGeo.vertices[3 * i])) {
+ (y-inGeo.vertices[3 * i + 1]) /
+ (inGeo.vertices[3 * j + 1]-inGeo.vertices[3 * i + 1]) +
+ inGeo.vertices[3 * i])) {
c = !c;
}
}
@@ -2822,15 +2835,21 @@ protected void initModified() {
protected void tessellate() {
if (root == this && parent == null) { // Root shape
+ boolean initAttr = false;
if (polyAttribs == null) {
polyAttribs = PGraphicsOpenGL.newAttributeMap();
- collectPolyAttribs();
+ initAttr = true;
}
if (tessGeo == null) {
tessGeo = PGraphicsOpenGL.newTessGeometry(pg, polyAttribs, PGraphicsOpenGL.RETAINED);
}
tessGeo.clear();
+
+ if (initAttr) {
+ collectPolyAttribs();
+ }
+
for (int i = 0; i < polyAttribs.size(); i++) {
VertexAttribute attrib = polyAttribs.get(i);
tessGeo.initAttrib(attrib);
@@ -2848,6 +2867,7 @@ protected void tessellate() {
protected void collectPolyAttribs() {
AttributeMap rootAttribs = root.polyAttribs;
+ tessGeo = root.tessGeo;
if (family == GROUP) {
for (int i = 0; i < childCount; i++) {
@@ -2950,7 +2970,7 @@ protected void tessellateImpl() {
tessellator.resetCurveVertexCount();
}
tessellator.tessellatePolygon(solid, close,
- normalMode == NORMAL_MODE_AUTO);
+ normalMode == NORMAL_MODE_AUTO);
if (bez ||quad) restoreBezierVertexSettings();
if (curv) restoreCurveVertexSettings();
}
@@ -3018,7 +3038,7 @@ protected void tessellatePoint() {
}
inGeo.setMaterial(fillColor, strokeColor, strokeWeight,
- ambientColor, specularColor, emissiveColor, shininess);
+ ambientColor, specularColor, emissiveColor, shininess);
inGeo.setNormal(normalX, normalY, normalZ);
inGeo.addPoint(x, y, z, fill, stroke);
tessellator.tessellatePoints();
@@ -3043,11 +3063,11 @@ protected void tessellateLine() {
}
inGeo.setMaterial(fillColor, strokeColor, strokeWeight,
- ambientColor, specularColor, emissiveColor, shininess);
+ ambientColor, specularColor, emissiveColor, shininess);
inGeo.setNormal(normalX, normalY, normalZ);
inGeo.addLine(x1, y1, z1,
- x2, y2, z2,
- fill, stroke);
+ x2, y2, z2,
+ fill, stroke);
tessellator.tessellateLines();
}
@@ -3066,12 +3086,12 @@ protected void tessellateTriangle() {
}
inGeo.setMaterial(fillColor, strokeColor, strokeWeight,
- ambientColor, specularColor, emissiveColor, shininess);
+ ambientColor, specularColor, emissiveColor, shininess);
inGeo.setNormal(normalX, normalY, normalZ);
inGeo.addTriangle(x1, y1, 0,
- x2, y2, 0,
- x3, y3, 0,
- fill, stroke);
+ x2, y2, 0,
+ x3, y3, 0,
+ fill, stroke);
tessellator.tessellateTriangles();
}
@@ -3093,13 +3113,13 @@ protected void tessellateQuad() {
}
inGeo.setMaterial(fillColor, strokeColor, strokeWeight,
- ambientColor, specularColor, emissiveColor, shininess);
+ ambientColor, specularColor, emissiveColor, shininess);
inGeo.setNormal(normalX, normalY, normalZ);
inGeo.addQuad(x1, y1, 0,
- x2, y2, 0,
- x3, y3, 0,
- x4, y4, 0,
- stroke);
+ x2, y2, 0,
+ x3, y3, 0,
+ x4, y4, 0,
+ stroke);
tessellator.tessellateQuads();
}
@@ -3137,26 +3157,26 @@ protected void tessellateRect() {
float hradius, vradius;
switch (mode) {
- case CORNERS:
- break;
- case CORNER:
- c += a; d += b;
- break;
- case RADIUS:
- hradius = c;
- vradius = d;
- c = a + hradius;
- d = b + vradius;
- a -= hradius;
- b -= vradius;
- break;
- case CENTER:
- hradius = c / 2.0f;
- vradius = d / 2.0f;
- c = a + hradius;
- d = b + vradius;
- a -= hradius;
- b -= vradius;
+ case CORNERS:
+ break;
+ case CORNER:
+ c += a; d += b;
+ break;
+ case RADIUS:
+ hradius = c;
+ vradius = d;
+ c = a + hradius;
+ d = b + vradius;
+ a -= hradius;
+ b -= vradius;
+ break;
+ case CENTER:
+ hradius = c / 2.0f;
+ vradius = d / 2.0f;
+ c = a + hradius;
+ d = b + vradius;
+ a -= hradius;
+ b -= vradius;
}
if (a > c) {
@@ -3174,7 +3194,7 @@ protected void tessellateRect() {
if (bl > maxRounding) bl = maxRounding;
inGeo.setMaterial(fillColor, strokeColor, strokeWeight,
- ambientColor, specularColor, emissiveColor, shininess);
+ ambientColor, specularColor, emissiveColor, shininess);
inGeo.setNormal(normalX, normalY, normalZ);
if (rounded) {
saveBezierVertexSettings();
@@ -3230,7 +3250,7 @@ protected void tessellateEllipse() {
}
inGeo.setMaterial(fillColor, strokeColor, strokeWeight,
- ambientColor, specularColor, emissiveColor, shininess);
+ ambientColor, specularColor, emissiveColor, shininess);
inGeo.setNormal(normalX, normalY, normalZ);
inGeo.addEllipse(x, y, w, h, fill, stroke);
tessellator.tessellateTriangleFan();
@@ -3290,7 +3310,7 @@ protected void tessellateArc() {
stop = start + TWO_PI;
}
inGeo.setMaterial(fillColor, strokeColor, strokeWeight,
- ambientColor, specularColor, emissiveColor, shininess);
+ ambientColor, specularColor, emissiveColor, shininess);
inGeo.setNormal(normalX, normalY, normalZ);
inGeo.addArc(x, y, w, h, start, stop, fill, stroke, arcMode);
tessellator.tessellateTriangleFan();
@@ -3310,7 +3330,7 @@ protected void tessellateBox() {
}
inGeo.setMaterial(fillColor, strokeColor, strokeWeight,
- ambientColor, specularColor, emissiveColor, shininess);
+ ambientColor, specularColor, emissiveColor, shininess);
inGeo.addBox(w, h, d, fill, stroke);
tessellator.tessellateQuads();
}
@@ -3340,7 +3360,7 @@ protected void tessellateSphere() {
}
inGeo.setMaterial(fillColor, strokeColor, strokeWeight,
- ambientColor, specularColor, emissiveColor, shininess);
+ ambientColor, specularColor, emissiveColor, shininess);
int[] indices = inGeo.addSphere(r, nu, nv, fill, stroke);
tessellator.tessellateTriangles(indices);
@@ -3355,7 +3375,7 @@ protected void tessellatePath() {
if (vertices == null) return;
inGeo.setMaterial(fillColor, strokeColor, strokeWeight,
- ambientColor, specularColor, emissiveColor, shininess);
+ ambientColor, specularColor, emissiveColor, shininess);
if (vertexCodeCount == 0) { // each point is a simple vertex
if (vertices[0].length == 2) { // tessellating 2D vertices
@@ -3365,7 +3385,7 @@ protected void tessellatePath() {
} else { // drawing 3D vertices
for (int i = 0; i < vertexCount; i++) {
inGeo.addVertex(vertices[i][X], vertices[i][Y], vertices[i][Z],
- VERTEX, false);
+ VERTEX, false);
}
}
} else { // coded set of vertices
@@ -3377,88 +3397,88 @@ protected void tessellatePath() {
for (int j = 0; j < vertexCodeCount; j++) {
switch (vertexCodes[j]) {
- case VERTEX:
- inGeo.addVertex(vertices[idx][X], vertices[idx][Y], VERTEX, brk);
- brk = false;
- idx++;
- break;
-
- case QUADRATIC_VERTEX:
- inGeo.addQuadraticVertex(vertices[idx+0][X], vertices[idx+0][Y], 0,
- vertices[idx+1][X], vertices[idx+1][Y], 0,
- brk);
- brk = false;
- idx += 2;
- break;
-
- case BEZIER_VERTEX:
- inGeo.addBezierVertex(vertices[idx+0][X], vertices[idx+0][Y], 0,
- vertices[idx+1][X], vertices[idx+1][Y], 0,
- vertices[idx+2][X], vertices[idx+2][Y], 0,
- brk);
- brk = false;
- idx += 3;
- break;
-
- case CURVE_VERTEX:
- inGeo.addCurveVertex(vertices[idx][X], vertices[idx][Y], 0, brk);
- brk = false;
- idx++;
- break;
-
- case BREAK:
- brk = true;
+ case VERTEX:
+ inGeo.addVertex(vertices[idx][X], vertices[idx][Y], VERTEX, brk);
+ brk = false;
+ idx++;
+ break;
+
+ case QUADRATIC_VERTEX:
+ inGeo.addQuadraticVertex(vertices[idx+0][X], vertices[idx+0][Y], 0,
+ vertices[idx+1][X], vertices[idx+1][Y], 0,
+ brk);
+ brk = false;
+ idx += 2;
+ break;
+
+ case BEZIER_VERTEX:
+ inGeo.addBezierVertex(vertices[idx+0][X], vertices[idx+0][Y], 0,
+ vertices[idx+1][X], vertices[idx+1][Y], 0,
+ vertices[idx+2][X], vertices[idx+2][Y], 0,
+ brk);
+ brk = false;
+ idx += 3;
+ break;
+
+ case CURVE_VERTEX:
+ inGeo.addCurveVertex(vertices[idx][X], vertices[idx][Y], 0, brk);
+ brk = false;
+ idx++;
+ break;
+
+ case BREAK:
+ brk = true;
}
}
} else { // tessellating a 3D path
for (int j = 0; j < vertexCodeCount; j++) {
switch (vertexCodes[j]) {
- case VERTEX:
- inGeo.addVertex(vertices[idx][X], vertices[idx][Y],
- vertices[idx][Z], brk);
- brk = false;
- idx++;
- break;
-
- case QUADRATIC_VERTEX:
- inGeo.addQuadraticVertex(vertices[idx+0][X],
- vertices[idx+0][Y],
- vertices[idx+0][Z],
- vertices[idx+1][X],
- vertices[idx+1][Y],
- vertices[idx+0][Z],
- brk);
- brk = false;
- idx += 2;
- break;
-
- case BEZIER_VERTEX:
- inGeo.addBezierVertex(vertices[idx+0][X],
- vertices[idx+0][Y],
- vertices[idx+0][Z],
- vertices[idx+1][X],
- vertices[idx+1][Y],
- vertices[idx+1][Z],
- vertices[idx+2][X],
- vertices[idx+2][Y],
- vertices[idx+2][Z],
- brk);
- brk = false;
- idx += 3;
- break;
-
- case CURVE_VERTEX:
- inGeo.addCurveVertex(vertices[idx][X],
- vertices[idx][Y],
- vertices[idx][Z],
- brk);
- brk = false;
- idx++;
- break;
-
- case BREAK:
- brk = true;
+ case VERTEX:
+ inGeo.addVertex(vertices[idx][X], vertices[idx][Y],
+ vertices[idx][Z], brk);
+ brk = false;
+ idx++;
+ break;
+
+ case QUADRATIC_VERTEX:
+ inGeo.addQuadraticVertex(vertices[idx+0][X],
+ vertices[idx+0][Y],
+ vertices[idx+0][Z],
+ vertices[idx+1][X],
+ vertices[idx+1][Y],
+ vertices[idx+0][Z],
+ brk);
+ brk = false;
+ idx += 2;
+ break;
+
+ case BEZIER_VERTEX:
+ inGeo.addBezierVertex(vertices[idx+0][X],
+ vertices[idx+0][Y],
+ vertices[idx+0][Z],
+ vertices[idx+1][X],
+ vertices[idx+1][Y],
+ vertices[idx+1][Z],
+ vertices[idx+2][X],
+ vertices[idx+2][Y],
+ vertices[idx+2][Z],
+ brk);
+ brk = false;
+ idx += 3;
+ break;
+
+ case CURVE_VERTEX:
+ inGeo.addCurveVertex(vertices[idx][X],
+ vertices[idx][Y],
+ vertices[idx][Z],
+ brk);
+ brk = false;
+ idx++;
+ break;
+
+ case BREAK:
+ brk = true;
}
}
}
@@ -3601,16 +3621,16 @@ protected void aggregateImpl() {
// this shape before tessellation, so they are applied now.
if (hasPolys) {
tessGeo.applyMatrixOnPolyGeometry(matrix,
- firstPolyVertex, lastPolyVertex);
+ firstPolyVertex, lastPolyVertex);
}
if (is3D()) {
if (hasLines) {
tessGeo.applyMatrixOnLineGeometry(matrix,
- firstLineVertex, lastLineVertex);
+ firstLineVertex, lastLineVertex);
}
if (hasPoints) {
tessGeo.applyMatrixOnPointGeometry(matrix,
- firstPointVertex, lastPointVertex);
+ firstPointVertex, lastPointVertex);
}
}
}
@@ -3653,7 +3673,7 @@ protected void updatePolyIndexCache() {
// This is a result of how the indices are updated for the
// leaf shapes.
cache.incCounts(gindex,
- cache.indexCount[n], cache.vertexCount[n]);
+ cache.indexCount[n], cache.vertexCount[n]);
} else {
gindex = cache.addNew(n);
}
@@ -3686,7 +3706,7 @@ protected void updatePolyIndexCache() {
// to be restarted as well to reflect the new index offset.
firstPolyVertex = lastPolyVertex =
- cache.vertexOffset[firstPolyIndexCache];
+ cache.vertexOffset[firstPolyIndexCache];
for (int n = firstPolyIndexCache; n <= lastPolyIndexCache; n++) {
int ioffset = cache.indexOffset[n];
int icount = cache.indexCount[n];
@@ -3699,7 +3719,7 @@ protected void updatePolyIndexCache() {
cache.indexOffset[n] = root.polyIndexOffset;
} else {
tessGeo.incPolyIndices(ioffset, ioffset + icount - 1,
- root.polyVertexRel);
+ root.polyVertexRel);
}
cache.vertexOffset[n] = root.polyVertexOffset;
if (is2D()) {
@@ -3721,7 +3741,7 @@ protected void updatePolyIndexCache() {
protected boolean startStrokedTex(int n) {
return image != null && (n == firstLineIndexCache ||
- n == firstPointIndexCache);
+ n == firstPointIndexCache);
}
@@ -3761,7 +3781,7 @@ protected void updateLineIndexCache() {
} else {
if (cache.vertexOffset[gindex] == cache.vertexOffset[n]) {
cache.incCounts(gindex, cache.indexCount[n],
- cache.vertexCount[n]);
+ cache.vertexCount[n]);
} else {
gindex = cache.addNew(n);
}
@@ -3780,7 +3800,7 @@ protected void updateLineIndexCache() {
lastLineIndexCache = gindex;
} else {
firstLineVertex = lastLineVertex =
- cache.vertexOffset[firstLineIndexCache];
+ cache.vertexOffset[firstLineIndexCache];
for (int n = firstLineIndexCache; n <= lastLineIndexCache; n++) {
int ioffset = cache.indexOffset[n];
int icount = cache.indexCount[n];
@@ -3792,7 +3812,7 @@ protected void updateLineIndexCache() {
cache.indexOffset[n] = root.lineIndexOffset;
} else {
tessGeo.incLineIndices(ioffset, ioffset + icount - 1,
- root.lineVertexRel);
+ root.lineVertexRel);
}
cache.vertexOffset[n] = root.lineVertexOffset;
@@ -3829,7 +3849,7 @@ protected void updatePointIndexCache() {
// This is a result of how the indices are updated for the
// leaf shapes in aggregateImpl().
cache.incCounts(gindex, cache.indexCount[n],
- cache.vertexCount[n]);
+ cache.vertexCount[n]);
} else {
gindex = cache.addNew(n);
}
@@ -3840,7 +3860,7 @@ protected void updatePointIndexCache() {
if (-1 < child.firstPointVertex) {
if (firstPointVertex == -1) firstPointVertex = Integer.MAX_VALUE;
firstPointVertex = PApplet.min(firstPointVertex,
- child.firstPointVertex);
+ child.firstPointVertex);
}
if (-1 < child.lastPointVertex) {
lastPointVertex = PApplet.max(lastPointVertex, child.lastPointVertex);
@@ -3849,7 +3869,7 @@ protected void updatePointIndexCache() {
lastPointIndexCache = gindex;
} else {
firstPointVertex = lastPointVertex =
- cache.vertexOffset[firstPointIndexCache];
+ cache.vertexOffset[firstPointIndexCache];
for (int n = firstPointIndexCache; n <= lastPointIndexCache; n++) {
int ioffset = cache.indexOffset[n];
int icount = cache.indexCount[n];
@@ -3861,7 +3881,7 @@ protected void updatePointIndexCache() {
cache.indexOffset[n] = root.pointIndexOffset;
} else {
tessGeo.incPointIndices(ioffset, ioffset + icount - 1,
- root.pointVertexRel);
+ root.pointVertexRel);
}
cache.vertexOffset[n] = root.pointVertexOffset;
@@ -3912,56 +3932,56 @@ protected void initPolyBuffers() {
bufPolyVertex = new VertexBuffer(pg, PGL.ARRAY_BUFFER, 4, PGL.SIZEOF_FLOAT);
pgl.bindBuffer(PGL.ARRAY_BUFFER, bufPolyVertex.glId);
pgl.bufferData(PGL.ARRAY_BUFFER, 4 * sizef,
- tessGeo.polyVerticesBuffer, glUsage);
+ tessGeo.polyVerticesBuffer, glUsage);
tessGeo.updatePolyColorsBuffer();
if (bufPolyColor == null)
bufPolyColor = new VertexBuffer(pg, PGL.ARRAY_BUFFER, 1, PGL.SIZEOF_INT);
pgl.bindBuffer(PGL.ARRAY_BUFFER, bufPolyColor.glId);
pgl.bufferData(PGL.ARRAY_BUFFER, sizei,
- tessGeo.polyColorsBuffer, glUsage);
+ tessGeo.polyColorsBuffer, glUsage);
tessGeo.updatePolyNormalsBuffer();
if (bufPolyNormal == null)
bufPolyNormal = new VertexBuffer(pg, PGL.ARRAY_BUFFER, 3, PGL.SIZEOF_FLOAT);
pgl.bindBuffer(PGL.ARRAY_BUFFER, bufPolyNormal.glId);
pgl.bufferData(PGL.ARRAY_BUFFER, 3 * sizef,
- tessGeo.polyNormalsBuffer, glUsage);
+ tessGeo.polyNormalsBuffer, glUsage);
tessGeo.updatePolyTexCoordsBuffer();
if (bufPolyTexcoord == null)
bufPolyTexcoord = new VertexBuffer(pg, PGL.ARRAY_BUFFER, 2, PGL.SIZEOF_FLOAT);
pgl.bindBuffer(PGL.ARRAY_BUFFER, bufPolyTexcoord.glId);
pgl.bufferData(PGL.ARRAY_BUFFER, 2 * sizef,
- tessGeo.polyTexCoordsBuffer, glUsage);
+ tessGeo.polyTexCoordsBuffer, glUsage);
tessGeo.updatePolyAmbientBuffer();
if (bufPolyAmbient == null)
bufPolyAmbient = new VertexBuffer(pg, PGL.ARRAY_BUFFER, 1, PGL.SIZEOF_INT);
pgl.bindBuffer(PGL.ARRAY_BUFFER, bufPolyAmbient.glId);
pgl.bufferData(PGL.ARRAY_BUFFER, sizei,
- tessGeo.polyAmbientBuffer, glUsage);
+ tessGeo.polyAmbientBuffer, glUsage);
tessGeo.updatePolySpecularBuffer();
if (bufPolySpecular == null)
bufPolySpecular = new VertexBuffer(pg, PGL.ARRAY_BUFFER, 1, PGL.SIZEOF_INT);
pgl.bindBuffer(PGL.ARRAY_BUFFER, bufPolySpecular.glId);
pgl.bufferData(PGL.ARRAY_BUFFER, sizei,
- tessGeo.polySpecularBuffer, glUsage);
+ tessGeo.polySpecularBuffer, glUsage);
tessGeo.updatePolyEmissiveBuffer();
if (bufPolyEmissive == null)
bufPolyEmissive = new VertexBuffer(pg, PGL.ARRAY_BUFFER, 1, PGL.SIZEOF_INT);
pgl.bindBuffer(PGL.ARRAY_BUFFER, bufPolyEmissive.glId);
pgl.bufferData(PGL.ARRAY_BUFFER, sizei,
- tessGeo.polyEmissiveBuffer, glUsage);
+ tessGeo.polyEmissiveBuffer, glUsage);
tessGeo.updatePolyShininessBuffer();
if (bufPolyShininess == null)
bufPolyShininess = new VertexBuffer(pg, PGL.ARRAY_BUFFER, 1, PGL.SIZEOF_FLOAT);
pgl.bindBuffer(PGL.ARRAY_BUFFER, bufPolyShininess.glId);
pgl.bufferData(PGL.ARRAY_BUFFER, sizef,
- tessGeo.polyShininessBuffer, glUsage);
+ tessGeo.polyShininessBuffer, glUsage);
for (String name: polyAttribs.keySet()) {
VertexAttribute attrib = polyAttribs.get(name);
@@ -3969,7 +3989,7 @@ protected void initPolyBuffers() {
if (!attrib.bufferCreated()) attrib.createBuffer(pgl);
pgl.bindBuffer(PGL.ARRAY_BUFFER, attrib.buf.glId);
pgl.bufferData(PGL.ARRAY_BUFFER, attrib.sizeInBytes(size),
- tessGeo.polyAttribBuffers.get(name), glUsage);
+ tessGeo.polyAttribBuffers.get(name), glUsage);
}
pgl.bindBuffer(PGL.ARRAY_BUFFER, 0);
@@ -3979,8 +3999,8 @@ protected void initPolyBuffers() {
bufPolyIndex = new VertexBuffer(pg, PGL.ELEMENT_ARRAY_BUFFER, 1, PGL.SIZEOF_INDEX, true);
pgl.bindBuffer(PGL.ELEMENT_ARRAY_BUFFER, bufPolyIndex.glId);
pgl.bufferData(PGL.ELEMENT_ARRAY_BUFFER,
- tessGeo.polyIndexCount * PGL.SIZEOF_INDEX,
- tessGeo.polyIndicesBuffer, glUsage);
+ tessGeo.polyIndexCount * PGL.SIZEOF_INDEX,
+ tessGeo.polyIndicesBuffer, glUsage);
pgl.bindBuffer(PGL.ELEMENT_ARRAY_BUFFER, 0);
}
@@ -3996,21 +4016,21 @@ protected void initLineBuffers() {
bufLineVertex = new VertexBuffer(pg, PGL.ARRAY_BUFFER, 4, PGL.SIZEOF_FLOAT);
pgl.bindBuffer(PGL.ARRAY_BUFFER, bufLineVertex.glId);
pgl.bufferData(PGL.ARRAY_BUFFER, 4 * sizef,
- tessGeo.lineVerticesBuffer, glUsage);
+ tessGeo.lineVerticesBuffer, glUsage);
tessGeo.updateLineColorsBuffer();
if (bufLineColor == null)
bufLineColor = new VertexBuffer(pg, PGL.ARRAY_BUFFER, 1, PGL.SIZEOF_INT);
pgl.bindBuffer(PGL.ARRAY_BUFFER, bufLineColor.glId);
pgl.bufferData(PGL.ARRAY_BUFFER, sizei,
- tessGeo.lineColorsBuffer, glUsage);
+ tessGeo.lineColorsBuffer, glUsage);
tessGeo.updateLineDirectionsBuffer();
if (bufLineAttrib == null)
bufLineAttrib = new VertexBuffer(pg, PGL.ARRAY_BUFFER, 4, PGL.SIZEOF_FLOAT);
pgl.bindBuffer(PGL.ARRAY_BUFFER, bufLineAttrib.glId);
pgl.bufferData(PGL.ARRAY_BUFFER, 4 * sizef,
- tessGeo.lineDirectionsBuffer, glUsage);
+ tessGeo.lineDirectionsBuffer, glUsage);
pgl.bindBuffer(PGL.ARRAY_BUFFER, 0);
@@ -4019,8 +4039,8 @@ protected void initLineBuffers() {
bufLineIndex = new VertexBuffer(pg, PGL.ELEMENT_ARRAY_BUFFER, 1, PGL.SIZEOF_INDEX, true);
pgl.bindBuffer(PGL.ELEMENT_ARRAY_BUFFER, bufLineIndex.glId);
pgl.bufferData(PGL.ELEMENT_ARRAY_BUFFER,
- tessGeo.lineIndexCount * PGL.SIZEOF_INDEX,
- tessGeo.lineIndicesBuffer, glUsage);
+ tessGeo.lineIndexCount * PGL.SIZEOF_INDEX,
+ tessGeo.lineIndicesBuffer, glUsage);
pgl.bindBuffer(PGL.ELEMENT_ARRAY_BUFFER, 0);
}
@@ -4036,21 +4056,21 @@ protected void initPointBuffers() {
bufPointVertex = new VertexBuffer(pg, PGL.ARRAY_BUFFER, 4, PGL.SIZEOF_FLOAT);
pgl.bindBuffer(PGL.ARRAY_BUFFER, bufPointVertex.glId);
pgl.bufferData(PGL.ARRAY_BUFFER, 4 * sizef,
- tessGeo.pointVerticesBuffer, glUsage);
+ tessGeo.pointVerticesBuffer, glUsage);
tessGeo.updatePointColorsBuffer();
if (bufPointColor == null)
bufPointColor = new VertexBuffer(pg, PGL.ARRAY_BUFFER, 1, PGL.SIZEOF_INT);
pgl.bindBuffer(PGL.ARRAY_BUFFER, bufPointColor.glId);
pgl.bufferData(PGL.ARRAY_BUFFER, sizei,
- tessGeo.pointColorsBuffer, glUsage);
+ tessGeo.pointColorsBuffer, glUsage);
tessGeo.updatePointOffsetsBuffer();
if (bufPointAttrib == null)
bufPointAttrib = new VertexBuffer(pg, PGL.ARRAY_BUFFER, 2, PGL.SIZEOF_FLOAT);
pgl.bindBuffer(PGL.ARRAY_BUFFER, bufPointAttrib.glId);
pgl.bufferData(PGL.ARRAY_BUFFER, 2 * sizef,
- tessGeo.pointOffsetsBuffer, glUsage);
+ tessGeo.pointOffsetsBuffer, glUsage);
pgl.bindBuffer(PGL.ARRAY_BUFFER, 0);
@@ -4059,8 +4079,8 @@ protected void initPointBuffers() {
bufPointIndex = new VertexBuffer(pg, PGL.ELEMENT_ARRAY_BUFFER, 1, PGL.SIZEOF_INDEX, true);
pgl.bindBuffer(PGL.ELEMENT_ARRAY_BUFFER, bufPointIndex.glId);
pgl.bufferData(PGL.ELEMENT_ARRAY_BUFFER,
- tessGeo.pointIndexCount * PGL.SIZEOF_INDEX,
- tessGeo.pointIndicesBuffer, glUsage);
+ tessGeo.pointIndexCount * PGL.SIZEOF_INDEX,
+ tessGeo.pointIndicesBuffer, glUsage);
pgl.bindBuffer(PGL.ELEMENT_ARRAY_BUFFER, 0);
}
@@ -4247,7 +4267,7 @@ protected void copyPolyVertices(int offset, int size) {
pgl.bindBuffer(PGL.ARRAY_BUFFER, bufPolyVertex.glId);
tessGeo.polyVerticesBuffer.position(4 * offset);
pgl.bufferSubData(PGL.ARRAY_BUFFER, 4 * offset * PGL.SIZEOF_FLOAT,
- 4 * size * PGL.SIZEOF_FLOAT, tessGeo.polyVerticesBuffer);
+ 4 * size * PGL.SIZEOF_FLOAT, tessGeo.polyVerticesBuffer);
tessGeo.polyVerticesBuffer.rewind();
pgl.bindBuffer(PGL.ARRAY_BUFFER, 0);
}
@@ -4258,7 +4278,7 @@ protected void copyPolyColors(int offset, int size) {
pgl.bindBuffer(PGL.ARRAY_BUFFER, bufPolyColor.glId);
tessGeo.polyColorsBuffer.position(offset);
pgl.bufferSubData(PGL.ARRAY_BUFFER, offset * PGL.SIZEOF_INT,
- size * PGL.SIZEOF_INT, tessGeo.polyColorsBuffer);
+ size * PGL.SIZEOF_INT, tessGeo.polyColorsBuffer);
tessGeo.polyColorsBuffer.rewind();
pgl.bindBuffer(PGL.ARRAY_BUFFER, 0);
}
@@ -4269,7 +4289,7 @@ protected void copyPolyNormals(int offset, int size) {
pgl.bindBuffer(PGL.ARRAY_BUFFER, bufPolyNormal.glId);
tessGeo.polyNormalsBuffer.position(3 * offset);
pgl.bufferSubData(PGL.ARRAY_BUFFER, 3 * offset * PGL.SIZEOF_FLOAT,
- 3 * size * PGL.SIZEOF_FLOAT, tessGeo.polyNormalsBuffer);
+ 3 * size * PGL.SIZEOF_FLOAT, tessGeo.polyNormalsBuffer);
tessGeo.polyNormalsBuffer.rewind();
pgl.bindBuffer(PGL.ARRAY_BUFFER, 0);
}
@@ -4280,7 +4300,7 @@ protected void copyPolyTexCoords(int offset, int size) {
pgl.bindBuffer(PGL.ARRAY_BUFFER, bufPolyTexcoord.glId);
tessGeo.polyTexCoordsBuffer.position(2 * offset);
pgl.bufferSubData(PGL.ARRAY_BUFFER, 2 * offset * PGL.SIZEOF_FLOAT,
- 2 * size * PGL.SIZEOF_FLOAT, tessGeo.polyTexCoordsBuffer);
+ 2 * size * PGL.SIZEOF_FLOAT, tessGeo.polyTexCoordsBuffer);
tessGeo.polyTexCoordsBuffer.rewind();
pgl.bindBuffer(PGL.ARRAY_BUFFER, 0);
}
@@ -4291,7 +4311,7 @@ protected void copyPolyAmbient(int offset, int size) {
pgl.bindBuffer(PGL.ARRAY_BUFFER, bufPolyAmbient.glId);
tessGeo.polyAmbientBuffer.position(offset);
pgl.bufferSubData(PGL.ARRAY_BUFFER, offset * PGL.SIZEOF_INT,
- size * PGL.SIZEOF_INT, tessGeo.polyAmbientBuffer);
+ size * PGL.SIZEOF_INT, tessGeo.polyAmbientBuffer);
tessGeo.polyAmbientBuffer.rewind();
pgl.bindBuffer(PGL.ARRAY_BUFFER, 0);
}
@@ -4302,7 +4322,7 @@ protected void copyPolySpecular(int offset, int size) {
pgl.bindBuffer(PGL.ARRAY_BUFFER, bufPolySpecular.glId);
tessGeo.polySpecularBuffer.position(offset);
pgl.bufferSubData(PGL.ARRAY_BUFFER, offset * PGL.SIZEOF_INT,
- size * PGL.SIZEOF_INT, tessGeo.polySpecularBuffer);
+ size * PGL.SIZEOF_INT, tessGeo.polySpecularBuffer);
tessGeo.polySpecularBuffer.rewind();
pgl.bindBuffer(PGL.ARRAY_BUFFER, 0);
}
@@ -4313,7 +4333,7 @@ protected void copyPolyEmissive(int offset, int size) {
pgl.bindBuffer(PGL.ARRAY_BUFFER, bufPolyEmissive.glId);
tessGeo.polyEmissiveBuffer.position(offset);
pgl.bufferSubData(PGL.ARRAY_BUFFER, offset * PGL.SIZEOF_INT,
- size * PGL.SIZEOF_INT, tessGeo.polyEmissiveBuffer);
+ size * PGL.SIZEOF_INT, tessGeo.polyEmissiveBuffer);
tessGeo.polyEmissiveBuffer.rewind();
pgl.bindBuffer(PGL.ARRAY_BUFFER, 0);
}
@@ -4324,7 +4344,7 @@ protected void copyPolyShininess(int offset, int size) {
pgl.bindBuffer(PGL.ARRAY_BUFFER, bufPolyShininess.glId);
tessGeo.polyShininessBuffer.position(offset);
pgl.bufferSubData(PGL.ARRAY_BUFFER, offset * PGL.SIZEOF_FLOAT,
- size * PGL.SIZEOF_FLOAT, tessGeo.polyShininessBuffer);
+ size * PGL.SIZEOF_FLOAT, tessGeo.polyShininessBuffer);
tessGeo.polyShininessBuffer.rewind();
pgl.bindBuffer(PGL.ARRAY_BUFFER, 0);
}
@@ -4336,7 +4356,7 @@ protected void copyPolyAttrib(VertexAttribute attrib, int offset, int size) {
Buffer buf = tessGeo.polyAttribBuffers.get(attrib.name);
buf.position(attrib.size * offset);
pgl.bufferSubData(PGL.ARRAY_BUFFER, attrib.sizeInBytes(offset),
- attrib.sizeInBytes(size), buf);
+ attrib.sizeInBytes(size), buf);
buf.rewind();
pgl.bindBuffer(PGL.ARRAY_BUFFER, 0);
}
@@ -4347,7 +4367,7 @@ protected void copyLineVertices(int offset, int size) {
pgl.bindBuffer(PGL.ARRAY_BUFFER, bufLineVertex.glId);
tessGeo.lineVerticesBuffer.position(4 * offset);
pgl.bufferSubData(PGL.ARRAY_BUFFER, 4 * offset * PGL.SIZEOF_FLOAT,
- 4 * size * PGL.SIZEOF_FLOAT, tessGeo.lineVerticesBuffer);
+ 4 * size * PGL.SIZEOF_FLOAT, tessGeo.lineVerticesBuffer);
tessGeo.lineVerticesBuffer.rewind();
pgl.bindBuffer(PGL.ARRAY_BUFFER, 0);
}
@@ -4358,7 +4378,7 @@ protected void copyLineColors(int offset, int size) {
pgl.bindBuffer(PGL.ARRAY_BUFFER, bufLineColor.glId);
tessGeo.lineColorsBuffer.position(offset);
pgl.bufferSubData(PGL.ARRAY_BUFFER, offset * PGL.SIZEOF_INT,
- size * PGL.SIZEOF_INT, tessGeo.lineColorsBuffer);
+ size * PGL.SIZEOF_INT, tessGeo.lineColorsBuffer);
tessGeo.lineColorsBuffer.rewind();
pgl.bindBuffer(PGL.ARRAY_BUFFER, 0);
}
@@ -4369,7 +4389,7 @@ protected void copyLineAttributes(int offset, int size) {
pgl.bindBuffer(PGL.ARRAY_BUFFER, bufLineAttrib.glId);
tessGeo.lineDirectionsBuffer.position(4 * offset);
pgl.bufferSubData(PGL.ARRAY_BUFFER, 4 * offset * PGL.SIZEOF_FLOAT,
- 4 * size * PGL.SIZEOF_FLOAT, tessGeo.lineDirectionsBuffer);
+ 4 * size * PGL.SIZEOF_FLOAT, tessGeo.lineDirectionsBuffer);
tessGeo.lineDirectionsBuffer.rewind();
pgl.bindBuffer(PGL.ARRAY_BUFFER, 0);
}
@@ -4380,7 +4400,7 @@ protected void copyPointVertices(int offset, int size) {
pgl.bindBuffer(PGL.ARRAY_BUFFER, bufPointVertex.glId);
tessGeo.pointVerticesBuffer.position(4 * offset);
pgl.bufferSubData(PGL.ARRAY_BUFFER, 4 * offset * PGL.SIZEOF_FLOAT,
- 4 * size * PGL.SIZEOF_FLOAT, tessGeo.pointVerticesBuffer);
+ 4 * size * PGL.SIZEOF_FLOAT, tessGeo.pointVerticesBuffer);
tessGeo.pointVerticesBuffer.rewind();
pgl.bindBuffer(PGL.ARRAY_BUFFER, 0);
}
@@ -4391,7 +4411,7 @@ protected void copyPointColors(int offset, int size) {
pgl.bindBuffer(PGL.ARRAY_BUFFER, bufPointColor.glId);
tessGeo.pointColorsBuffer.position(offset);
pgl.bufferSubData(PGL.ARRAY_BUFFER, offset * PGL.SIZEOF_INT,
- size * PGL.SIZEOF_INT,tessGeo.pointColorsBuffer);
+ size * PGL.SIZEOF_INT,tessGeo.pointColorsBuffer);
tessGeo.pointColorsBuffer.rewind();
pgl.bindBuffer(PGL.ARRAY_BUFFER, 0);
}
@@ -4402,7 +4422,7 @@ protected void copyPointAttributes(int offset, int size) {
pgl.bindBuffer(PGL.ARRAY_BUFFER, bufPointAttrib.glId);
tessGeo.pointOffsetsBuffer.position(2 * offset);
pgl.bufferSubData(PGL.ARRAY_BUFFER, 2 * offset * PGL.SIZEOF_FLOAT,
- 2 * size * PGL.SIZEOF_FLOAT, tessGeo.pointOffsetsBuffer);
+ 2 * size * PGL.SIZEOF_FLOAT, tessGeo.pointOffsetsBuffer);
tessGeo.pointOffsetsBuffer.rewind();
pgl.bindBuffer(PGL.ARRAY_BUFFER, 0);
}
@@ -4711,63 +4731,63 @@ private void inGeoToVertices() {
for (int j = 0; j < inGeo.codeCount; j++) {
switch (inGeo.codes[j]) {
- case VERTEX:
- v = 3 * idx;
- x = inGeo.vertices[v++];
- y = inGeo.vertices[v ];
- super.vertex(x, y);
+ case VERTEX:
+ v = 3 * idx;
+ x = inGeo.vertices[v++];
+ y = inGeo.vertices[v ];
+ super.vertex(x, y);
- idx++;
- break;
+ idx++;
+ break;
- case QUADRATIC_VERTEX:
- v = 3 * idx;
- cx = inGeo.vertices[v++];
- cy = inGeo.vertices[v];
+ case QUADRATIC_VERTEX:
+ v = 3 * idx;
+ cx = inGeo.vertices[v++];
+ cy = inGeo.vertices[v];
- v = 3 * (idx + 1);
- x3 = inGeo.vertices[v++];
- y3 = inGeo.vertices[v];
+ v = 3 * (idx + 1);
+ x3 = inGeo.vertices[v++];
+ y3 = inGeo.vertices[v];
- super.quadraticVertex(cx, cy, x3, y3);
+ super.quadraticVertex(cx, cy, x3, y3);
- idx += 2;
- break;
+ idx += 2;
+ break;
- case BEZIER_VERTEX:
- v = 3 * idx;
- x2 = inGeo.vertices[v++];
- y2 = inGeo.vertices[v ];
+ case BEZIER_VERTEX:
+ v = 3 * idx;
+ x2 = inGeo.vertices[v++];
+ y2 = inGeo.vertices[v ];
- v = 3 * (idx + 1);
- x3 = inGeo.vertices[v++];
- y3 = inGeo.vertices[v ];
+ v = 3 * (idx + 1);
+ x3 = inGeo.vertices[v++];
+ y3 = inGeo.vertices[v ];
- v = 3 * (idx + 2);
- x4 = inGeo.vertices[v++];
- y4 = inGeo.vertices[v ];
+ v = 3 * (idx + 2);
+ x4 = inGeo.vertices[v++];
+ y4 = inGeo.vertices[v ];
- super.bezierVertex(x2, y2, x3, y3, x4, y4);
+ super.bezierVertex(x2, y2, x3, y3, x4, y4);
- idx += 3;
- break;
+ idx += 3;
+ break;
- case CURVE_VERTEX:
- v = 3 * idx;
- x = inGeo.vertices[v++];
- y = inGeo.vertices[v ];
+ case CURVE_VERTEX:
+ v = 3 * idx;
+ x = inGeo.vertices[v++];
+ y = inGeo.vertices[v ];
- super.curveVertex(x, y);
+ super.curveVertex(x, y);
- idx++;
- break;
+ idx++;
+ break;
- case BREAK:
- if (insideContour) {
- super.endContourImpl();
- }
- super.beginContourImpl();
- insideContour = true;
+ case BREAK:
+ if (insideContour) {
+ super.endContourImpl();
+ }
+ super.beginContourImpl();
+ insideContour = true;
}
}
if (insideContour) {
@@ -4785,8 +4805,8 @@ private void inGeoToVertices() {
// shape to be rendered separately.
protected boolean fragmentedGroup(PGraphicsOpenGL g) {
return g.getHint(DISABLE_OPTIMIZED_STROKE) ||
- (textures != null && (1 < textures.size() || untexChild)) ||
- strokedTexture;
+ (textures != null && (1 < textures.size() || untexChild)) ||
+ strokedTexture;
}
@@ -4829,7 +4849,7 @@ protected void render(PGraphicsOpenGL g, PImage texture) {
if (root == null) {
// Some error. Root should never be null. At least it should be 'this'.
throw new RuntimeException("Error rendering PShapeOpenGL, root shape is " +
- "null");
+ "null");
}
if (hasPolys) {
@@ -4871,9 +4891,9 @@ protected void renderPolys(PGraphicsOpenGL g, PImage textureImage) {
IndexCache cache = tessGeo.polyIndexCache;
for (int n = firstPolyIndexCache; n <= lastPolyIndexCache; n++) {
if (is3D() || (tex != null && (firstLineIndexCache == -1 ||
- n < firstLineIndexCache) &&
- (firstPointIndexCache == -1 ||
- n < firstPointIndexCache))) {
+ n < firstLineIndexCache) &&
+ (firstPointIndexCache == -1 ||
+ n < firstPointIndexCache))) {
// Rendering fill triangles, which can be lit and textured.
if (!renderingFill) {
shader = g.getPolyShader(g.lights, tex != null);
@@ -4907,30 +4927,30 @@ protected void renderPolys(PGraphicsOpenGL g, PImage textureImage) {
int voffset = cache.vertexOffset[n];
shader.setVertexAttribute(root.bufPolyVertex.glId, 4, PGL.FLOAT,
- 0, 4 * voffset * PGL.SIZEOF_FLOAT);
+ 0, 4 * voffset * PGL.SIZEOF_FLOAT);
shader.setColorAttribute(root.bufPolyColor.glId, 4, PGL.UNSIGNED_BYTE,
- 0, 4 * voffset * PGL.SIZEOF_BYTE);
+ 0, 4 * voffset * PGL.SIZEOF_BYTE);
if (g.lights) {
shader.setNormalAttribute(root.bufPolyNormal.glId, 3, PGL.FLOAT,
- 0, 3 * voffset * PGL.SIZEOF_FLOAT);
+ 0, 3 * voffset * PGL.SIZEOF_FLOAT);
shader.setAmbientAttribute(root.bufPolyAmbient.glId, 4, PGL.UNSIGNED_BYTE,
- 0, 4 * voffset * PGL.SIZEOF_BYTE);
+ 0, 4 * voffset * PGL.SIZEOF_BYTE);
shader.setSpecularAttribute(root.bufPolySpecular.glId, 4, PGL.UNSIGNED_BYTE,
- 0, 4 * voffset * PGL.SIZEOF_BYTE);
+ 0, 4 * voffset * PGL.SIZEOF_BYTE);
shader.setEmissiveAttribute(root.bufPolyEmissive.glId, 4, PGL.UNSIGNED_BYTE,
- 0, 4 * voffset * PGL.SIZEOF_BYTE);
+ 0, 4 * voffset * PGL.SIZEOF_BYTE);
shader.setShininessAttribute(root.bufPolyShininess.glId, 1, PGL.FLOAT,
- 0, voffset * PGL.SIZEOF_FLOAT);
+ 0, voffset * PGL.SIZEOF_FLOAT);
}
if (g.lights || needNormals) {
shader.setNormalAttribute(root.bufPolyNormal.glId, 3, PGL.FLOAT,
- 0, 3 * voffset * PGL.SIZEOF_FLOAT);
+ 0, 3 * voffset * PGL.SIZEOF_FLOAT);
}
if (tex != null || needTexCoords) {
shader.setTexcoordAttribute(root.bufPolyTexcoord.glId, 2, PGL.FLOAT,
- 0, 2 * voffset * PGL.SIZEOF_FLOAT);
+ 0, 2 * voffset * PGL.SIZEOF_FLOAT);
shader.setTexture(tex);
}
@@ -4938,8 +4958,8 @@ protected void renderPolys(PGraphicsOpenGL g, PImage textureImage) {
if (!attrib.active(shader)) continue;
attrib.bind(pgl);
shader.setAttributeVBO(attrib.glLoc, attrib.buf.glId,
- attrib.tessSize, attrib.type,
- attrib.isColor(), 0, attrib.sizeInBytes(voffset));
+ attrib.tessSize, attrib.type,
+ attrib.isColor(), 0, attrib.sizeInBytes(voffset));
}
shader.draw(root.bufPolyIndex.glId, icount, ioffset);
@@ -5060,11 +5080,11 @@ protected void renderLines(PGraphicsOpenGL g) {
int voffset = cache.vertexOffset[n];
shader.setVertexAttribute(root.bufLineVertex.glId, 4, PGL.FLOAT,
- 0, 4 * voffset * PGL.SIZEOF_FLOAT);
+ 0, 4 * voffset * PGL.SIZEOF_FLOAT);
shader.setColorAttribute(root.bufLineColor.glId, 4, PGL.UNSIGNED_BYTE,
- 0, 4 * voffset * PGL.SIZEOF_BYTE);
+ 0, 4 * voffset * PGL.SIZEOF_BYTE);
shader.setLineAttribute(root.bufLineAttrib.glId, 4, PGL.FLOAT,
- 0, 4 * voffset * PGL.SIZEOF_FLOAT);
+ 0, 4 * voffset * PGL.SIZEOF_FLOAT);
shader.draw(root.bufLineIndex.glId, icount, ioffset);
}
@@ -5157,11 +5177,11 @@ protected void renderPoints(PGraphicsOpenGL g) {
int voffset = cache.vertexOffset[n];
shader.setVertexAttribute(root.bufPointVertex.glId, 4, PGL.FLOAT,
- 0, 4 * voffset * PGL.SIZEOF_FLOAT);
+ 0, 4 * voffset * PGL.SIZEOF_FLOAT);
shader.setColorAttribute(root.bufPointColor.glId, 4, PGL.UNSIGNED_BYTE,
- 0, 4 * voffset * PGL.SIZEOF_BYTE);
+ 0, 4 * voffset * PGL.SIZEOF_BYTE);
shader.setPointAttribute(root.bufPointAttrib.glId, 2, PGL.FLOAT,
- 0, 2 * voffset * PGL.SIZEOF_FLOAT);
+ 0, 2 * voffset * PGL.SIZEOF_FLOAT);
shader.draw(root.bufPointIndex.glId, icount, ioffset);
}
@@ -5197,9 +5217,9 @@ protected void rawPoints(PGraphicsOpenGL g) {
if (0 < size) { // round point
weight = +size / 0.5f;
perim = PApplet.min(PGraphicsOpenGL.MAX_POINT_ACCURACY,
- PApplet.max(PGraphicsOpenGL.MIN_POINT_ACCURACY,
- (int) (TWO_PI * weight /
- PGraphicsOpenGL.POINT_ACCURACY_FACTOR))) + 1;
+ PApplet.max(PGraphicsOpenGL.MIN_POINT_ACCURACY,
+ (int) (TWO_PI * weight /
+ PGraphicsOpenGL.POINT_ACCURACY_FACTOR))) + 1;
} else { // Square point
weight = -size / 0.5f;
perim = 5;
diff --git a/core/src/processing/opengl/PSurfaceGLES.java b/libs/processing-core/src/main/java/processing/opengl/PSurfaceGLES.java
similarity index 99%
rename from core/src/processing/opengl/PSurfaceGLES.java
rename to libs/processing-core/src/main/java/processing/opengl/PSurfaceGLES.java
index 5a1289f32..b9a86ae87 100644
--- a/core/src/processing/opengl/PSurfaceGLES.java
+++ b/libs/processing-core/src/main/java/processing/opengl/PSurfaceGLES.java
@@ -3,7 +3,7 @@
/*
Part of the Processing project - http://processing.org
- Copyright (c) 2016 The Processing Foundation
+ Copyright (c) 2016-21 The Processing Foundation
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -28,7 +28,6 @@
import javax.microedition.khronos.egl.EGLDisplay;
import javax.microedition.khronos.opengles.GL10;
-
import android.app.ActivityManager;
import android.content.Context;
import android.content.pm.ConfigurationInfo;
@@ -40,6 +39,7 @@
import android.view.MotionEvent;
import android.view.SurfaceHolder;
import android.view.View;
+
import processing.android.AppComponent;
import processing.android.PFragment;
import processing.core.PApplet;
@@ -118,7 +118,7 @@ public SurfaceViewGLES(Context context, SurfaceHolder holder) {
h.addCallback(this);
// Tells the default EGLContextFactory and EGLConfigChooser to create an GLES2 context.
- setEGLContextClientVersion(2);
+ setEGLContextClientVersion(PGLES.version);
setPreserveEGLContextOnPause(true);
int samples = sketch.sketchSmooth();
@@ -295,7 +295,7 @@ protected class ContextFactoryGLES implements
GLSurfaceView.EGLContextFactory {
public EGLContext createContext(EGL10 egl, EGLDisplay display,
EGLConfig eglConfig) {
- int[] attrib_list = { PGLES.EGL_CONTEXT_CLIENT_VERSION, 2,
+ int[] attrib_list = { PGLES.EGL_CONTEXT_CLIENT_VERSION, PGLES.version,
EGL10.EGL_NONE };
EGLContext context = egl.eglCreateContext(display, eglConfig,
EGL10.EGL_NO_CONTEXT,
diff --git a/core/src/processing/opengl/Texture.java b/libs/processing-core/src/main/java/processing/opengl/Texture.java
similarity index 99%
rename from core/src/processing/opengl/Texture.java
rename to libs/processing-core/src/main/java/processing/opengl/Texture.java
index e6e84c6ba..29d8ba4c5 100644
--- a/core/src/processing/opengl/Texture.java
+++ b/libs/processing-core/src/main/java/processing/opengl/Texture.java
@@ -3,7 +3,7 @@
/*
Part of the Processing project - http://processing.org
- Copyright (c) 2012-16 The Processing Foundation
+ Copyright (c) 2012-21 The Processing Foundation
Copyright (c) 2004-12 Ben Fry and Casey Reas
Copyright (c) 2001-04 Massachusetts Institute of Technology
diff --git a/core/src/processing/opengl/VertexBuffer.java b/libs/processing-core/src/main/java/processing/opengl/VertexBuffer.java
similarity index 98%
rename from core/src/processing/opengl/VertexBuffer.java
rename to libs/processing-core/src/main/java/processing/opengl/VertexBuffer.java
index e4ef85b9c..114428b03 100644
--- a/core/src/processing/opengl/VertexBuffer.java
+++ b/libs/processing-core/src/main/java/processing/opengl/VertexBuffer.java
@@ -3,7 +3,7 @@
/*
Part of the Processing project - http://processing.org
- Copyright (c) 2012-16 The Processing Foundation
+ Copyright (c) 2012-21 The Processing Foundation
Copyright (c) 2004-12 Ben Fry and Casey Reas
Copyright (c) 2001-04 Massachusetts Institute of Technology
diff --git a/core/src/processing/opengl/tess/ActiveRegion.java b/libs/processing-core/src/main/java/processing/opengl/tess/ActiveRegion.java
similarity index 100%
rename from core/src/processing/opengl/tess/ActiveRegion.java
rename to libs/processing-core/src/main/java/processing/opengl/tess/ActiveRegion.java
diff --git a/core/src/processing/opengl/tess/CachedVertex.java b/libs/processing-core/src/main/java/processing/opengl/tess/CachedVertex.java
similarity index 100%
rename from core/src/processing/opengl/tess/CachedVertex.java
rename to libs/processing-core/src/main/java/processing/opengl/tess/CachedVertex.java
diff --git a/core/src/processing/opengl/tess/Dict.java b/libs/processing-core/src/main/java/processing/opengl/tess/Dict.java
similarity index 100%
rename from core/src/processing/opengl/tess/Dict.java
rename to libs/processing-core/src/main/java/processing/opengl/tess/Dict.java
diff --git a/core/src/processing/opengl/tess/DictNode.java b/libs/processing-core/src/main/java/processing/opengl/tess/DictNode.java
similarity index 100%
rename from core/src/processing/opengl/tess/DictNode.java
rename to libs/processing-core/src/main/java/processing/opengl/tess/DictNode.java
diff --git a/core/src/processing/opengl/tess/GLUface.java b/libs/processing-core/src/main/java/processing/opengl/tess/GLUface.java
similarity index 100%
rename from core/src/processing/opengl/tess/GLUface.java
rename to libs/processing-core/src/main/java/processing/opengl/tess/GLUface.java
diff --git a/core/src/processing/opengl/tess/GLUhalfEdge.java b/libs/processing-core/src/main/java/processing/opengl/tess/GLUhalfEdge.java
similarity index 100%
rename from core/src/processing/opengl/tess/GLUhalfEdge.java
rename to libs/processing-core/src/main/java/processing/opengl/tess/GLUhalfEdge.java
diff --git a/core/src/processing/opengl/tess/GLUmesh.java b/libs/processing-core/src/main/java/processing/opengl/tess/GLUmesh.java
similarity index 100%
rename from core/src/processing/opengl/tess/GLUmesh.java
rename to libs/processing-core/src/main/java/processing/opengl/tess/GLUmesh.java
diff --git a/core/src/processing/opengl/tess/GLUtessellatorImpl.java b/libs/processing-core/src/main/java/processing/opengl/tess/GLUtessellatorImpl.java
similarity index 100%
rename from core/src/processing/opengl/tess/GLUtessellatorImpl.java
rename to libs/processing-core/src/main/java/processing/opengl/tess/GLUtessellatorImpl.java
diff --git a/core/src/processing/opengl/tess/GLUvertex.java b/libs/processing-core/src/main/java/processing/opengl/tess/GLUvertex.java
similarity index 100%
rename from core/src/processing/opengl/tess/GLUvertex.java
rename to libs/processing-core/src/main/java/processing/opengl/tess/GLUvertex.java
diff --git a/core/src/processing/opengl/tess/Geom.java b/libs/processing-core/src/main/java/processing/opengl/tess/Geom.java
similarity index 100%
rename from core/src/processing/opengl/tess/Geom.java
rename to libs/processing-core/src/main/java/processing/opengl/tess/Geom.java
diff --git a/core/src/processing/opengl/tess/Mesh.java b/libs/processing-core/src/main/java/processing/opengl/tess/Mesh.java
similarity index 100%
rename from core/src/processing/opengl/tess/Mesh.java
rename to libs/processing-core/src/main/java/processing/opengl/tess/Mesh.java
diff --git a/core/src/processing/opengl/tess/Normal.java b/libs/processing-core/src/main/java/processing/opengl/tess/Normal.java
similarity index 100%
rename from core/src/processing/opengl/tess/Normal.java
rename to libs/processing-core/src/main/java/processing/opengl/tess/Normal.java
diff --git a/core/src/processing/opengl/tess/PGLU.java b/libs/processing-core/src/main/java/processing/opengl/tess/PGLU.java
similarity index 100%
rename from core/src/processing/opengl/tess/PGLU.java
rename to libs/processing-core/src/main/java/processing/opengl/tess/PGLU.java
diff --git a/core/src/processing/opengl/tess/PGLUtessellator.java b/libs/processing-core/src/main/java/processing/opengl/tess/PGLUtessellator.java
similarity index 100%
rename from core/src/processing/opengl/tess/PGLUtessellator.java
rename to libs/processing-core/src/main/java/processing/opengl/tess/PGLUtessellator.java
diff --git a/core/src/processing/opengl/tess/PGLUtessellatorCallback.java b/libs/processing-core/src/main/java/processing/opengl/tess/PGLUtessellatorCallback.java
similarity index 100%
rename from core/src/processing/opengl/tess/PGLUtessellatorCallback.java
rename to libs/processing-core/src/main/java/processing/opengl/tess/PGLUtessellatorCallback.java
diff --git a/core/src/processing/opengl/tess/PGLUtessellatorCallbackAdapter.java b/libs/processing-core/src/main/java/processing/opengl/tess/PGLUtessellatorCallbackAdapter.java
similarity index 100%
rename from core/src/processing/opengl/tess/PGLUtessellatorCallbackAdapter.java
rename to libs/processing-core/src/main/java/processing/opengl/tess/PGLUtessellatorCallbackAdapter.java
diff --git a/core/src/processing/opengl/tess/PriorityQ.java b/libs/processing-core/src/main/java/processing/opengl/tess/PriorityQ.java
similarity index 100%
rename from core/src/processing/opengl/tess/PriorityQ.java
rename to libs/processing-core/src/main/java/processing/opengl/tess/PriorityQ.java
diff --git a/core/src/processing/opengl/tess/PriorityQHeap.java b/libs/processing-core/src/main/java/processing/opengl/tess/PriorityQHeap.java
similarity index 100%
rename from core/src/processing/opengl/tess/PriorityQHeap.java
rename to libs/processing-core/src/main/java/processing/opengl/tess/PriorityQHeap.java
diff --git a/core/src/processing/opengl/tess/PriorityQSort.java b/libs/processing-core/src/main/java/processing/opengl/tess/PriorityQSort.java
similarity index 100%
rename from core/src/processing/opengl/tess/PriorityQSort.java
rename to libs/processing-core/src/main/java/processing/opengl/tess/PriorityQSort.java
diff --git a/core/src/processing/opengl/tess/Render.java b/libs/processing-core/src/main/java/processing/opengl/tess/Render.java
similarity index 100%
rename from core/src/processing/opengl/tess/Render.java
rename to libs/processing-core/src/main/java/processing/opengl/tess/Render.java
diff --git a/core/src/processing/opengl/tess/Sweep.java b/libs/processing-core/src/main/java/processing/opengl/tess/Sweep.java
similarity index 100%
rename from core/src/processing/opengl/tess/Sweep.java
rename to libs/processing-core/src/main/java/processing/opengl/tess/Sweep.java
diff --git a/core/src/processing/opengl/tess/TessMono.java b/libs/processing-core/src/main/java/processing/opengl/tess/TessMono.java
similarity index 100%
rename from core/src/processing/opengl/tess/TessMono.java
rename to libs/processing-core/src/main/java/processing/opengl/tess/TessMono.java
diff --git a/core/src/processing/opengl/tess/TessState.java b/libs/processing-core/src/main/java/processing/opengl/tess/TessState.java
similarity index 100%
rename from core/src/processing/opengl/tess/TessState.java
rename to libs/processing-core/src/main/java/processing/opengl/tess/TessState.java
diff --git a/libs/processing-vr/build.gradle b/libs/processing-vr/build.gradle
new file mode 100644
index 000000000..06328948e
--- /dev/null
+++ b/libs/processing-vr/build.gradle
@@ -0,0 +1,24 @@
+plugins {
+ id 'com.android.library'
+}
+
+android {
+ namespace "processing.vr"
+
+ defaultConfig {
+ minSdkVersion 19
+ targetSdkVersion 33
+ }
+
+ compileOptions {
+ sourceCompatibility JavaVersion.VERSION_1_8
+ targetCompatibility JavaVersion.VERSION_1_8
+ }
+ productFlavors {
+ }
+}
+
+dependencies {
+ implementation project(':libs:processing-core')
+ implementation project(':libs:google-vr')
+}
\ No newline at end of file
diff --git a/libs/processing-vr/proguard-rules.pro b/libs/processing-vr/proguard-rules.pro
new file mode 100644
index 000000000..f1b424510
--- /dev/null
+++ b/libs/processing-vr/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+# http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+# public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
diff --git a/libs/processing-vr/src/main/AndroidManifest.xml b/libs/processing-vr/src/main/AndroidManifest.xml
new file mode 100755
index 000000000..97330b776
--- /dev/null
+++ b/libs/processing-vr/src/main/AndroidManifest.xml
@@ -0,0 +1 @@
+
-
diff --git a/mode/.project b/mode/.project
deleted file mode 100644
index 9b2d77470..000000000
--- a/mode/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
- android-mode
-
-
-
-
- org.eclipse.jdt.core.javabuilder
-
-
-
-
-
- org.eclipse.jdt.core.javanature
-
-
diff --git a/mode/build.gradle b/mode/build.gradle
deleted file mode 100644
index 224c87f6c..000000000
--- a/mode/build.gradle
+++ /dev/null
@@ -1,66 +0,0 @@
-import java.nio.file.Files
-import org.zeroturnaround.zip.ZipUtil
-import static java.nio.file.StandardCopyOption.REPLACE_EXISTING;
-
-
-// Extend compile to copy the jars from gradle-tooling and slf4j:
-// https://stackoverflow.com/a/43602463
-configurations {
- compile.extendsFrom compileAndCopy
-}
-
-dependencies {
- compile group: "org.processing", name: "core", version: "${processingVersion}"
- compile group: "org.processing", name: "pde", version: "${processingVersion}"
- compile group: "org.processing", name: "java-mode", version: "${processingVersion}"
-
- compileAndCopy "org.gradle:gradle-tooling-api:${toolingVersion}"
- compileAndCopy "org.slf4j:slf4j-api:${slf4jVersion}"
- compileAndCopy "org.slf4j:slf4j-simple:${slf4jVersion}"
-}
-
-// This task copies the gradle tooling jar into the mode folder
-task copyToLib(type: Copy) {
- from configurations.compileAndCopy.files
- into "mode"
-}
-build.dependsOn(copyToLib)
-
-sourceSets {
- main {
- java {
- srcDirs = ["src/"]
- }
- }
-}
-
-task permissions(type:Exec) {
- // This task retrieves the latest list of Android permissions and adds them
- // to the Permissions.java file. The python scripts requries BeautifulSoup
- workingDir "scripts"
- commandLine "python", "permissions.py"
-}
-
-task wrapper(type: Wrapper) {
- gradleVersion = "${gradlewVersion}" //version required for gradle wrapper
-}
-wrapper.doLast {
- File wrapperFolder = file("mode/gradlew");
- wrapperFolder.mkdirs();
- file("gradle").renameTo(file("mode/gradlew/gradle"))
- file("gradlew").renameTo(file("mode/gradlew/gradlew"))
- file("gradlew.bat").renameTo(file("mode/gradlew/gradlew.bat"))
- ZipUtil.pack(file("mode/gradlew"), new File("mode/gradlew.zip"));
- delete "mode/gradlew"
-}
-
-clean.doFirst {
- delete fileTree("mode") {
- include "**/*.jar"
- }
-}
-
-build.doLast {
- Files.copy(file("$buildDir/libs/mode.jar").toPath(),
- file("mode/AndroidMode.jar").toPath(), REPLACE_EXISTING);
-}
diff --git a/mode/icons/icon-144.png b/mode/icons/icon-144.png
deleted file mode 100644
index ebc41bc8d..000000000
Binary files a/mode/icons/icon-144.png and /dev/null differ
diff --git a/mode/icons/icon-192.png b/mode/icons/icon-192.png
deleted file mode 100644
index 40932779b..000000000
Binary files a/mode/icons/icon-192.png and /dev/null differ
diff --git a/mode/icons/icon-36.png b/mode/icons/icon-36.png
deleted file mode 100644
index 4412d4f69..000000000
Binary files a/mode/icons/icon-36.png and /dev/null differ
diff --git a/mode/icons/icon-48.png b/mode/icons/icon-48.png
deleted file mode 100644
index 0359b7c88..000000000
Binary files a/mode/icons/icon-48.png and /dev/null differ
diff --git a/mode/icons/icon-72.png b/mode/icons/icon-72.png
deleted file mode 100644
index 8f19510ff..000000000
Binary files a/mode/icons/icon-72.png and /dev/null differ
diff --git a/mode/icons/icon-96.png b/mode/icons/icon-96.png
deleted file mode 100644
index c9016cf0c..000000000
Binary files a/mode/icons/icon-96.png and /dev/null differ
diff --git a/mode/icons/preview_circular.png b/mode/icons/preview_circular.png
deleted file mode 100644
index 940afd811..000000000
Binary files a/mode/icons/preview_circular.png and /dev/null differ
diff --git a/mode/icons/preview_rectangular.png b/mode/icons/preview_rectangular.png
deleted file mode 100644
index 277a466e4..000000000
Binary files a/mode/icons/preview_rectangular.png and /dev/null differ
diff --git a/mode/libraries/vr/build.gradle b/mode/libraries/vr/build.gradle
deleted file mode 100644
index b364cadcb..000000000
--- a/mode/libraries/vr/build.gradle
+++ /dev/null
@@ -1,174 +0,0 @@
-import com.android.build.gradle.internal.dependency.ExtractAarTransform
-import com.android.build.gradle.internal.dependency.AarTransform
-import com.android.build.gradle.internal.publishing.AndroidArtifacts
-import com.android.build.gradle.internal.publishing.AndroidArtifacts.ArtifactType
-import com.google.common.collect.ImmutableList
-import org.gradle.api.artifacts.transform.ArtifactTransform
-import org.gradle.api.artifacts.type.ArtifactTypeDefinition
-import java.util.regex.Pattern
-
-import static org.gradle.api.internal.artifacts.ArtifactAttributes.ARTIFACT_FORMAT
-
-import java.nio.file.Files
-import static java.nio.file.StandardCopyOption.REPLACE_EXISTING;
-
-apply plugin: 'maven'
-
-/**
- * Custom aar configuration needed to use aar files as dependencies in a pure java
- * library project, lifted from the following repo:
- * https://github.com/nekocode/Gradle-Import-Aar
- */
-configurations {
- aar {
- attributes {
- attribute(ARTIFACT_FORMAT, ArtifactTypeDefinition.JAR_TYPE)
- }
-
- // Add the aar inner jars to the compileClasspath
- sourceSets.main.compileClasspath += it
-
- // Put our custom dependencies onto IDEA's PROVIDED scope
- apply plugin: "idea"
- idea.module.scopes.PROVIDED.plus += [it]
- }
-}
-
-dependencies {
- // Transforamtions to extract the classes.jar in the aar package
- def explodedAarType = ArtifactType.EXPLODED_AAR.getType()
- registerTransform {
- from.attribute(ARTIFACT_FORMAT, AndroidArtifacts.TYPE_AAR)
- to.attribute(ARTIFACT_FORMAT, explodedAarType)
- artifactTransform(ExtractAarTransform)
- }
-
- registerTransform {
- from.attribute(ARTIFACT_FORMAT, explodedAarType)
- to.attribute(ARTIFACT_FORMAT, "classes.jar")
- artifactTransform(AarTransform) { params(ArtifactType.JAR) }
- }
-
- registerTransform {
- from.attribute(ARTIFACT_FORMAT, "classes.jar")
- to.attribute(ARTIFACT_FORMAT, ArtifactTypeDefinition.JAR_TYPE)
- artifactTransform(ClassesJarArtifactTransform)
- }
-
- compileOnly name: "android"
-
- compileOnly "org.p5android:processing-core:${modeVersion}"
-
- aar "com.google.vr:sdk-audio:${gvrVersion}"
- aar "com.google.vr:sdk-base:${gvrVersion}"
-}
-
-/**
- * An ArtifactTransform for renaming the classes.jar
- */
-class ClassesJarArtifactTransform extends ArtifactTransform {
- @Override
- List transform(File file) {
- final String[] names = file.getPath().split(Pattern.quote(File.separator))
- final String aarName = names[names.length - 4].replace(".aar", "")
- final File renamedJar = new File(getOutputDirectory(), aarName + ".jar")
- renamedJar << file.bytes
- File libraryFolder = new File(System.getProperty("user.dir"), "mode/libraries/vr/library")
- libraryFolder.mkdirs();
- final File libraryJar = new File(libraryFolder, aarName + ".jar")
- Files.copy(renamedJar.toPath(), libraryJar.toPath(), REPLACE_EXISTING);
- return ImmutableList.of(renamedJar)
- }
-}
-
-task createPom {
- // The compile configuration should be replaced by implementation eventually:
- // https://developer.android.com/studio/build/gradle-plugin-3-0-0-migration#new_configurations
- pom {
- project {
- groupId "org.p5android"
- artifactId "processing-vr"
- version "${vrLibVersion}"
- packaging "jar"
- licenses {
- license {
- name "GNU Lesser General Public License, version 2.1"
- url "https://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt"
- distribution "repo"
- }
- }
- dependencies {
- dependency {
- groupId "org.p5android"
- artifactId "processing-core"
- version "${modeVersion}"
- scope "compile"
- }
-
- dependency {
- groupId "com.google.vr"
- artifactId "sdk-base"
- version "${gvrVersion}"
- scope "compile"
- }
- dependency {
- groupId "com.google.vr"
- artifactId "sdk-audio"
- version "${gvrVersion}"
- scope "compile"
- }
- }
- }
- }.writeTo("dist/processing-vr-${vrLibVersion}.pom")
-}
-
-sourceSets {
- main {
- java {
- srcDirs = ["src/"]
- }
- }
-}
-
-task sourcesJar(type: Jar, dependsOn: classes) {
- classifier = "sources"
- from sourceSets.main.allSource
-}
-
-// Does not work because of Processing-specific tags in source code, such as @webref
-task javadocJar(type: Jar, dependsOn: javadoc) {
- classifier = "javadoc"
- from javadoc.destinationDir
-}
-
-artifacts {
-// archives javadocJar
- archives sourcesJar
-}
-
-jar.doLast { task ->
- ant.checksum file: task.archivePath
-}
-
-clean.doFirst {
- delete "dist"
- delete "library/vr.jar"
-}
-
-build.doLast {
- // // Copying vr jar to library folder
- File vrJar = file("library/vr.jar")
- vrJar.mkdirs();
- Files.copy(file("$buildDir/libs/vr.jar").toPath(),
- vrJar.toPath(), REPLACE_EXISTING);
-
- // // Copying the files for release on JCentral
- File distFolder = file("dist");
- distFolder.mkdirs();
- Files.copy(file("$buildDir/libs/vr.jar").toPath(),
- file("dist/processing-vr-${vrLibVersion}.jar").toPath(), REPLACE_EXISTING);
- Files.copy(file("$buildDir/libs/vr-sources.jar").toPath(),
- file("dist/processing-vr-${vrLibVersion}-sources.jar").toPath(), REPLACE_EXISTING);
- Files.copy(file("$buildDir/libs/vr.jar.MD5").toPath(),
- file("dist/processing-vr-${vrLibVersion}.jar.md5").toPath(), REPLACE_EXISTING);
-}
\ No newline at end of file
diff --git a/mode/libraries/vr/examples/Cube/AndroidManifest.xml b/mode/libraries/vr/examples/Cube/AndroidManifest.xml
deleted file mode 100644
index 9e67d8615..000000000
--- a/mode/libraries/vr/examples/Cube/AndroidManifest.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/mode/libraries/vr/examples/Cube/code/sketch.properties b/mode/libraries/vr/examples/Cube/code/sketch.properties
deleted file mode 100644
index ab2c3cf6c..000000000
--- a/mode/libraries/vr/examples/Cube/code/sketch.properties
+++ /dev/null
@@ -1 +0,0 @@
-component=vr
diff --git a/mode/libraries/vr/examples/Mono/code/sketch.properties b/mode/libraries/vr/examples/Mono/code/sketch.properties
deleted file mode 100644
index ab2c3cf6c..000000000
--- a/mode/libraries/vr/examples/Mono/code/sketch.properties
+++ /dev/null
@@ -1 +0,0 @@
-component=vr
diff --git a/mode/libraries/vr/examples/drawAim/AndroidManifest.xml b/mode/libraries/vr/examples/drawAim/AndroidManifest.xml
deleted file mode 100644
index 9e67d8615..000000000
--- a/mode/libraries/vr/examples/drawAim/AndroidManifest.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/mode/mode.properties b/mode/mode.properties
deleted file mode 100644
index c98c49e25..000000000
--- a/mode/mode.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-name = Android Mode
-authorList = [The Processing Foundation](https://processingfoundation.org/)
-url = http://android.processing.org
-sentence = Create projects with Processing for Android devices
-paragraph = This version of the Android Mode is for Processing 3.1+
-imports=processing.mode.java.JavaMode
-version = 271
-prettyVersion = 4.0.4
-minRevision = 249
-maxRevision = 0
diff --git a/mode/mode/gradlew.zip b/mode/mode/gradlew.zip
deleted file mode 100644
index 4ea799d16..000000000
Binary files a/mode/mode/gradlew.zip and /dev/null differ
diff --git a/mode/scripts/permissions.py b/mode/scripts/permissions.py
deleted file mode 100644
index fc9eed5a2..000000000
--- a/mode/scripts/permissions.py
+++ /dev/null
@@ -1,76 +0,0 @@
-import sys, re
-
-from urllib2 import urlopen
-from BeautifulSoup import BeautifulSoup
-
-def getSoup(url):
- print 'Opening', url, '...'
- page = urlopen(url)
- soup = BeautifulSoup(page)
- return soup
-
-def parseAll():
- soup = getSoup("https://developer.android.com/reference/android/Manifest.permission.html")
- print ' parsing...'
- table = soup.find('table', { 'id': 'constants', 'class' : 'responsive constants' })
- entries = table.findAll('tr')
- strList = ''
- for entry in entries:
- if not entry or not entry.attrs: continue
- if 'absent' in entry.attrs[0][1]: continue
- info = entry.find('td', {'width':'100%'})
- if info:
- name = info.find('code').find('a').contents[0]
- pieces = []
- for piece in info.find('p').contents:
- piece_str = re.sub('\s+', ' ', str(piece)).strip()
- if '' in piece_str:
- piece_str = piece.find('a').contents[0].strip();
- pieces += [piece_str]
- if name and pieces:
- desc = ' '.join(pieces).strip().replace('"', '\\"')
- strList += (',' if strList else '') + '\n "' + name + '", "' + desc + '"'
- strList = 'static final String[] listing = {' + strList + '\n };\n'
- return strList
-
-def replaceAll(source, strList):
- print ' replacing...'
- idx0 = source.find('static final String[] listing = {')
- idx1 = source[idx0:].find(' };')
- return source[:idx0] + strList + source[idx0+idx1+5:]
-
-def parseDanger():
- soup = getSoup("https://developer.android.com/guide/topics/security/permissions.html")
- print ' parsing...'
- table = soup.find('table')
- entries = table.findAll('tr')
- strList = ''
- for entry in entries:
- items = entry.findAll('li')
- for item in items:
- name = item.find('code').find('a').contents[0]
- strList += (',' if strList else '') + '\n "' + name + '"'
- strList = 'static final String[] dangerous = {' + strList + '\n };\n'
- return strList
-
-def replaceDanger(source, strList):
- print ' replacing...'
- idx0 = source.find('static final String[] dangerous = {')
- idx1 = source[idx0:].find(' };')
- return source[:idx0] + strList + source[idx0+idx1+5:]
-
-javaFile = '../src/processing/mode/android/Permissions.java'
-print 'Reading Permissions.java...'
-with open(javaFile, 'r') as f:
- source = f.read()
-
-allList = parseAll()
-source = replaceAll(source, allList)
-
-dangerList = parseDanger()
-source = replaceDanger(source, dangerList)
-
-print 'Writing Permissions.java...'
-with open(javaFile, 'w') as f:
- f.write(source)
-print 'Done.'
\ No newline at end of file
diff --git a/mode/src/processing/mode/android/AndroidPreprocessor.java b/mode/src/processing/mode/android/AndroidPreprocessor.java
deleted file mode 100644
index af4a73ce2..000000000
--- a/mode/src/processing/mode/android/AndroidPreprocessor.java
+++ /dev/null
@@ -1,321 +0,0 @@
-/* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */
-
-/*
- Part of the Processing project - http://processing.org
-
- Copyright (c) 2012-17 The Processing Foundation
- Copyright (c) 2009-12 Ben Fry and Casey Reas
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2
- as published by the Free Software Foundation.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-package processing.mode.android;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-//import java.io.Writer;
-import java.util.List;
-import processing.app.*;
-import processing.core.PApplet;
-import processing.mode.java.preproc.PdePreprocessor;
-import processing.mode.java.preproc.SurfaceInfo;
-
-
-/**
- * Processing preprocessor, supporting the Android specifics.
- */
-public class AndroidPreprocessor extends PdePreprocessor {
- protected Sketch sketch;
- protected String packageName;
-
- protected String smoothStatement;
- protected String sketchQuality;
-
- protected String kindStatement;
- protected String sketchKind;
-
-
- public static final String SMOOTH_REGEX =
- "(?:^|\\s|;)smooth\\s*\\(\\s*([^\\s,]+)\\s*\\)\\s*\\;";
-
- public AndroidPreprocessor(final String sketchName) {
- super(sketchName);
- }
-
- public AndroidPreprocessor(final Sketch sketch,
- final String packageName) throws IOException {
- super(sketch.getName());
- this.sketch = sketch;
- this.packageName = packageName;
- }
-
-
- public SurfaceInfo initSketchSize(String code) throws SketchException {
- SurfaceInfo surfaceInfo = parseSketchSize(code, true);
- if (surfaceInfo == null) {
- System.err.println("More about the size() command on Android can be");
- System.err.println("found here: http://wiki.processing.org/w/Android");
- throw new SketchException("Could not parse the size() command.");
- }
- return surfaceInfo;
- }
-
-
- public String[] initSketchSmooth(String code) throws SketchException {
- String[] info = parseSketchSmooth(code, true);
- if (info == null) {
- System.err.println("More about the smooth() command on Android can be");
- System.err.println("found here: http://wiki.processing.org/w/Android");
- throw new SketchException("Could not parse the smooth() command.");
- }
- smoothStatement = info[0];
- sketchQuality = info[1];
- return info;
- }
-
-
- static public String[] parseSketchSmooth(String code, boolean fussy) {
- String[] matches = PApplet.match(scrubComments(code), SMOOTH_REGEX);
-
- if (matches != null) {
- boolean badSmooth = false;
-
- if (PApplet.parseInt(matches[1], -1) == -1) {
- badSmooth = true;
- }
-
- if (badSmooth && fussy) {
- // found a reference to smooth, but it didn't seem to contain numbers
- final String message =
- "The smooth level of this applet could not automatically\n" +
- "be determined from your code. Use only a numeric\n" +
- "value (not variables) for the smooth() command.\n" +
- "See the smooth() reference for an explanation.";
- Messages.showWarning("Could not find smooth level", message, null);
- return null;
- }
-
- return matches;
- }
- return new String[] { null, null }; // not an error, just empty
- }
-
-
- @Override
- protected int writeImports(final PrintWriter out,
- final List programImports,
- final List codeFolderImports) {
- out.println("package " + packageName + ";");
- out.println();
- int count = 2;
- count += super.writeImports(out, programImports, codeFolderImports);
-// count += writeImportList(out, getAndroidImports());
- return count;
- }
-
-
- @Override
- protected void writeFooter(PrintWriter out, String className) {
- SurfaceInfo info = null;
- try {
- info = initSketchSize(sketch.getMainProgram());
- } catch (SketchException e) {
- e.printStackTrace();
- }
-
- if (info == null) {
- // Cannot get size info, just use parent's implementation.
- super.writeFooter(out, className);
- } else {
- // Same as in the parent, but without writing the main() method, which is
- // not needed in Android.
-
- if (mode == Mode.STATIC) {
- // close off setup() definition
- out.println(indent + indent + "noLoop();");
- out.println(indent + "}");
- out.println();
- }
-
- if ((mode == Mode.STATIC) || (mode == Mode.ACTIVE)) {
- // doesn't remove the original size() method, but calling size()
- // again in setup() is harmless.
- if (!hasMethod("settings") && info.hasSettings()) {
- out.println(indent + "public void settings() { " + info.getSettings() + " }");
- }
-
- // close off the class definition
- out.println("}");
- }
- }
- }
-
-
-////////////////////////////////////////////////////////////////////////////////
-// Assorted commented out code
-//
-
- // As of revision 0215 (2.0b7-ish), the default imports are now identical
- // between desktop and Android (to avoid unintended incompatibilities).
- /*
- @Override
- public String[] getCoreImports() {
- return new String[] {
- "processing.core.*",
- "processing.data.*",
- "processing.event.*",
- "processing.opengl.*"
- };
- }
-
-
- @Override
- public String[] getDefaultImports() {
- final String prefsLine = Preferences.get("android.preproc.imports");
- if (prefsLine != null) {
- return PApplet.splitTokens(prefsLine, ", ");
- }
-
- // The initial values are stored in here for the day when Android
- // is broken out as a separate mode.
-
- // In the future, this may include standard classes for phone or
- // accelerometer access within the Android APIs. This is currently living
- // in code rather than preferences.txt because Android mode needs to
- // maintain its independence from the rest of processing.app.
- final String[] androidImports = new String[] {
-// "android.view.MotionEvent", "android.view.KeyEvent",
-// "android.graphics.Bitmap", //"java.awt.Image",
- "java.io.*", // for BufferedReader, InputStream, etc
- //"java.net.*", "java.text.*", // leaving otu for now
- "java.util.*" // for ArrayList and friends
- //"java.util.zip.*", "java.util.regex.*" // not necessary w/ newer i/o
- };
-
- Preferences.set("android.preproc.imports",
- PApplet.join(androidImports, ","));
-
- return androidImports;
- }
- */
-
- // No need for it now
- /*
- public String[] getDefaultImports() {
-// String[] defs = super.getDefaultImports();
-// return defs;
- return new String[] {
- "java.util.HashMap",
- "java.util.ArrayList",
- "java.io.File",
- "java.io.BufferedReader",
- "java.io.PrintWriter",
- "java.io.InputStream",
- "java.io.OutputStream",
- "java.io.IOException",
- "android.app.Activity",
- "android.app.Fragment"
- };
- }
-
-
- public String[] getAndroidImports() {
- return new String[] {
- "processing.android.ServiceEngine"
- };
- }
- */
-
- /*
- protected boolean parseSketchSize() {
- // This matches against any uses of the size() function, whether numbers
- // or variables or whatever. This way, no warning is shown if size() isn't
- // actually used in the applet, which is the case especially for anyone
- // who is cutting/pasting from the reference.
-
- String scrubbed = processing.mode.java.JavaBuild.scrubComments(sketch.getCode(0).getProgram());
- String[] matches = PApplet.match(scrubbed, processing.mode.java.JavaBuild.SIZE_REGEX);
-// PApplet.println("matches: " + Sketch.SIZE_REGEX);
-// PApplet.println(matches);
-
- if (matches != null) {
- boolean badSize = false;
-
- if (matches[1].equals("screenWidth") ||
- matches[1].equals("screenHeight") ||
- matches[2].equals("screenWidth") ||
- matches[2].equals("screenHeight")) {
- final String message =
- "The screenWidth and screenHeight variables are named\n" +
- "displayWidth and displayHeight in this release of Processing.";
- Base.showWarning("Time for a quick update", message, null);
- return false;
- }
-
- if (!matches[1].equals("displayWidth") &&
- !matches[1].equals("displayHeight") &&
- PApplet.parseInt(matches[1], -1) == -1) {
- badSize = true;
- }
- if (!matches[2].equals("displayWidth") &&
- !matches[2].equals("displayHeight") &&
- PApplet.parseInt(matches[2], -1) == -1) {
- badSize = true;
- }
-
- if (badSize) {
- // found a reference to size, but it didn't seem to contain numbers
- final String message =
- "The size of this applet could not automatically be determined\n" +
- "from your code. Use only numeric values (not variables) for the\n" +
- "size() command. See the size() reference for more information.";
- Base.showWarning("Could not find sketch size", message, null);
- System.out.println("More about the size() command on Android can be");
- System.out.println("found here: http://wiki.processing.org/w/Android");
- return false;
- }
-
-// PApplet.println(matches);
- sizeStatement = matches[0]; // the full method to be removed from the source
- sketchWidth = matches[1];
- sketchHeight = matches[2];
- sketchRenderer = matches[3].trim();
- if (sketchRenderer.length() == 0) {
- sketchRenderer = null;
- }
- } else {
- sizeStatement = null;
- sketchWidth = null;
- sketchHeight = null;
- sketchRenderer = null;
- }
- return true;
- }
- */
-
-
- /*
- public PreprocessorResult write(Writer out, String program, String[] codeFolderPackages)
- throws SketchException, RecognitionException, TokenStreamException {
- if (sizeStatement != null) {
- int start = program.indexOf(sizeStatement);
- program = program.substring(0, start) +
- program.substring(start + sizeStatement.length());
- }
- // the OpenGL package is back in 2.0a5
- //program = program.replaceAll("import\\s+processing\\.opengl\\.\\S+;", "");
- return super.write(out, program, codeFolderPackages);
- }
- */
-}
\ No newline at end of file
diff --git a/mode/src/processing/mode/android/AndroidToolbar.java b/mode/src/processing/mode/android/AndroidToolbar.java
deleted file mode 100644
index b2c772b60..000000000
--- a/mode/src/processing/mode/android/AndroidToolbar.java
+++ /dev/null
@@ -1,177 +0,0 @@
-/* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */
-
-/*
- Part of the Processing project - http://processing.org
-
- Copyright (c) 2012-16 The Processing Foundation
- Copyright (c) 2011-12 Ben Fry and Casey Reas
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2
- as published by the Free Software Foundation.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-
-package processing.mode.android;
-
-import java.awt.event.ActionEvent;
-import java.awt.event.InputEvent;
-import java.util.ArrayList;
-import java.util.List;
-
-import processing.app.Base;
-import processing.app.ui.Editor;
-import processing.app.ui.EditorButton;
-import processing.app.ui.EditorToolbar;
-import processing.app.Language;
-
-
-@SuppressWarnings("serial")
-public class AndroidToolbar extends EditorToolbar {
- static protected final int RUN = 0;
- static protected final int STOP = 1;
-
- static protected final int NEW = 2;
- static protected final int OPEN = 3;
- static protected final int SAVE = 4;
- static protected final int EXPORT = 5;
-
-
- public AndroidToolbar(Editor editor, Base base) {
- super(editor);
- }
-
-
- // TODO:
- // Buttons are initialized in createButtons, see code of EditorToolbar.rebuild()
-// public void init() {
-// Image[][] images = loadImages();
-// for (int i = 0; i < 6; i++) {
-// addButton(getTitle(i, false), getTitle(i, true), images[i], i == NEW);
-// }
-// }
-
-
- static public String getTitle(int index, boolean shift) {
- switch (index) {
- case RUN: return !shift ? "Run on Device" : "Run in Emulator";
- case STOP: return "Stop";
- case NEW: return "New";
- case OPEN: return "Open";
- case SAVE: return "Save";
- case EXPORT: return !shift ? "Export Signed Package" : "Export Android Project";
- }
- return null;
- }
-
-/*
- public void handlePressed(MouseEvent e, int sel) {
- boolean shift = e.isShiftDown();
- AndroidEditor aeditor = (AndroidEditor) editor;
-
- switch (sel) {
- case RUN:
- if (!shift) {
- aeditor.handleRunDevice();
- } else {
- aeditor.handleRunEmulator();
- }
- break;
-
- case STOP:
- aeditor.handleStop();
- break;
-
- case OPEN:
- // TODO I think we need a longer chain of accessors here.
- JPopupMenu popup = editor.getMode().getToolbarMenu().getPopupMenu();
- popup.show(this, e.getX(), e.getY());
- break;
-
- case NEW:
-// if (shift) {
- base.handleNew();
-// } else {
-// base.handleNewReplace();
-// }
- break;
-
- case SAVE:
- aeditor.handleSave(false);
- break;
-
- case EXPORT:
- if (!shift) {
- aeditor.handleExportPackage();
- } else {
- aeditor.handleExportProject();
- }
- break;
- }
- }
-*/
-
- @Override
- public List createButtons() {
- ArrayList toReturn = new ArrayList();
- runButton = new EditorButton(this,
- "/lib/toolbar/run",
- "Run on device",
- "Run on emulator") {
- @Override
- public void actionPerformed(ActionEvent e) {
- handleRun(e.getModifiers());
- }
- };
- toReturn.add(runButton);
-
- stopButton = new EditorButton(this,
- "/lib/toolbar/stop",
- Language.text("toolbar.stop")) {
- @Override
- public void actionPerformed(ActionEvent e) {
- handleStop();
- }
- };
- toReturn.add(stopButton);
- return toReturn;
- }
-
- @Override
- public void handleRun(int modifiers) {
- AndroidEditor aEditor = (AndroidEditor) editor;
- boolean shift = (modifiers & InputEvent.SHIFT_MASK) != 0;
- if (!shift) {
- aEditor.handleRunDevice();
- } else {
- aEditor.handleRunEmulator();
- }
- }
-
-
- @Override
- public void handleStop() {
- // TODO Auto-generated method stub
- AndroidEditor aEditor = (AndroidEditor) editor;
- aEditor.handleStop();
- }
-
-
- public void activateExport() {
- // TODO added to match the new API in EditorToolbar (activateRun, etc).
- }
-
-
- public void deactivateExport() {
- // TODO added to match the new API in EditorToolbar (activateRun, etc).
- }
-}
\ No newline at end of file
diff --git a/mode/src/processing/mode/android/JarSigner.java b/mode/src/processing/mode/android/JarSigner.java
deleted file mode 100644
index c50022b69..000000000
--- a/mode/src/processing/mode/android/JarSigner.java
+++ /dev/null
@@ -1,290 +0,0 @@
-/* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */
-
-/*
- Part of the Processing project - http://processing.org
-
- Copyright (c) 2014-16 The Processing Foundation
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2
- as published by the Free Software Foundation.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
-
-package processing.mode.android;
-
-import java.io.*;
-
-import java.security.*;
-import java.security.cert.X509Certificate;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.jar.Attributes;
-import java.util.jar.JarEntry;
-import java.util.jar.JarFile;
-import java.util.jar.JarOutputStream;
-import java.util.jar.Manifest;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipInputStream;
-import java.util.Base64;
-import sun.security.pkcs.SignerInfo;
-import sun.security.x509.AlgorithmId;
-import sun.security.x509.X500Name;
-import sun.security.pkcs.PKCS7;
-import sun.security.pkcs.ContentInfo;
-
-/**
- * Created by ibziy_000 on 17.08.2014.
- */
-public class JarSigner {
- private static final String DIGEST_ALGORITHM = "SHA1";
- private static final String DIGEST_ATTR = "SHA1-Digest";
- private static final String DIGEST_MANIFEST_ATTR = "SHA1-Digest-Manifest";
- private static SignatureOutputStream certFileContents = null;
- private static byte[] buffer;
-
- public static void signJar(File jarToSign, File outputJar, String alias,
- String keypass, String keystore, String storepass)
- throws GeneralSecurityException, IOException, NoSuchAlgorithmException {
-
- PrivateKey privateKey = null;
- X509Certificate x509Cert = null;
- Manifest manifest = null;
-
- KeyStore keyStore = KeyStore.getInstance(KeyStore.getDefaultType());
- FileInputStream fis = new FileInputStream(keystore);
- keyStore.load(fis, storepass.toCharArray());
- fis.close();
-
- KeyStore.PrivateKeyEntry entry = (KeyStore.PrivateKeyEntry)keyStore.getEntry(
- alias, new KeyStore.PasswordProtection(keypass.toCharArray()));
- if (entry != null) {
- privateKey = entry.getPrivateKey();
- x509Cert = (X509Certificate) entry.getCertificate();
- } else {
- throw new KeyStoreException("Couldn't get key");
- }
-
- JarOutputStream signedJar = new JarOutputStream(new FileOutputStream(outputJar, false));
- signedJar.setLevel(9);
- if (privateKey != null && x509Cert != null) {
- manifest = new Manifest();
- Attributes main = manifest.getMainAttributes();
- main.putValue("Manifest-Version", "1.0");
- main.putValue("Created-By", "1.0 (Android)");
- }
-
- writeZip(new FileInputStream(jarToSign), signedJar, manifest);
-
- closeJar(signedJar, manifest, privateKey, x509Cert);
- }
-
- private static void writeZip(InputStream input, JarOutputStream output, Manifest manifest)
- throws IOException, NoSuchAlgorithmException {
- Base64.Encoder base64Encoder = Base64.getEncoder();
- MessageDigest messageDigest = MessageDigest.getInstance(DIGEST_ALGORITHM);
- buffer = new byte[4096];
-
- ZipInputStream zis = new ZipInputStream(input);
-
- try {
- // loop on the entries of the intermediary package and put them in the final package.
- ZipEntry entry;
- while ((entry = zis.getNextEntry()) != null) {
- String name = entry.getName();
-
- // do not take directories or anything inside a potential META-INF folder.
- if (entry.isDirectory() || name.startsWith("META-INF/")) {
- continue;
- }
-
- JarEntry newEntry;
-
- // Preserve the STORED method of the input entry.
- if (entry.getMethod() == JarEntry.STORED) {
- newEntry = new JarEntry(entry);
- } else {
- // Create a new entry so that the compressed len is recomputed.
- newEntry = new JarEntry(name);
- }
-
- writeEntry(output, zis, newEntry, messageDigest, manifest, base64Encoder);
-
- zis.closeEntry();
- }
- } finally {
- zis.close();
- }
- }
-
- private static void writeEntry(JarOutputStream output, InputStream input, JarEntry entry,
- MessageDigest digest, Manifest manifest, Base64.Encoder encoder) throws IOException {
- output.putNextEntry(entry);
-
- // Write input stream to the jar output.
- int count;
- while ((count = input.read(buffer)) != -1) {
- output.write(buffer, 0, count);
-
- if (digest != null) digest.update(buffer, 0, count);
- }
-
- output.closeEntry();
-
- if (manifest != null) {
- Attributes attr = manifest.getAttributes(entry.getName());
- if (attr == null) {
- attr = new Attributes();
- manifest.getEntries().put(entry.getName(), attr);
- }
- attr.putValue(DIGEST_ATTR, encoder.encodeToString(digest.digest()));
- }
- }
-
- private static void closeJar(JarOutputStream jar, Manifest manifest,
- PrivateKey key, X509Certificate cert)
- throws IOException, GeneralSecurityException {
- if (manifest != null) {
- // write the manifest to the jar file
- jar.putNextEntry(new JarEntry(JarFile.MANIFEST_NAME));
- manifest.write(jar);
-
- // CERT.SF
- Signature signature = Signature.getInstance("SHA1with" + key.getAlgorithm());
- signature.initSign(key);
- jar.putNextEntry(new JarEntry("META-INF/CERT.SF"));
- //Caching the SignatureOutputStream object for future use by the signature provider extensions.
- certFileContents = new SignatureOutputStream(jar, signature);
- writeSignatureFile(certFileContents, manifest);
-
- // CERT.*
- jar.putNextEntry(new JarEntry("META-INF/CERT." + key.getAlgorithm()));
- writeSignature(jar, signature, cert, key);
- }
-
- jar.close();
- }
-
- // Writes a .SF file with a digest to the manifest.
- private static void writeSignatureFile(SignatureOutputStream out, Manifest manifest)
- throws IOException, GeneralSecurityException {
- Manifest sf = new Manifest();
- Attributes main = sf.getMainAttributes();
- main.putValue("Signature-Version", "1.0");
- main.putValue("Created-By", "1.0 (Android)");
-
- Base64.Encoder base64 = Base64.getEncoder();
- MessageDigest md = MessageDigest.getInstance(DIGEST_ALGORITHM);
- PrintStream print = new PrintStream(
- new DigestOutputStream(new ByteArrayOutputStream(), md),
- true, "UTF-8");
-
- // Digest of the entire manifest
- manifest.write(print);
- print.flush();
- main.putValue(DIGEST_MANIFEST_ATTR, base64.encodeToString(md.digest()));
-
- Map entries = manifest.getEntries();
- for (Map.Entry entry : entries.entrySet()) {
- // Digest of the manifest stanza for this entry.
- print.print("Name: " + entry.getKey() + "\r\n");
- for (Map.Entry att : entry.getValue().entrySet()) {
- print.print(att.getKey() + ": " + att.getValue() + "\r\n");
- }
- print.print("\r\n");
- print.flush();
-
- Attributes sfAttr = new Attributes();
- sfAttr.putValue(DIGEST_ATTR, base64.encodeToString(md.digest()));
- sf.getEntries().put(entry.getKey(), sfAttr);
- }
-
- sf.write(out);
-
- // A bug in the java.util.jar implementation of Android platforms
- // up to version 1.6 will cause a spurious IOException to be thrown
- // if the length of the signature file is a multiple of 1024 bytes.
- // As a workaround, add an extra CRLF in this case.
- if ((out.size() % 1024) == 0) {
- out.write('\r');
- out.write('\n');
- }
- }
-
- private static void writeSignature(JarOutputStream outputJar,
- Signature signature, X509Certificate publicKey, PrivateKey privateKey)
- throws IOException, GeneralSecurityException{
- writeSignatureBlock(outputJar, signature, publicKey, privateKey);
- }
-
- // Write the certificate file with a digital signature.
- private static void writeSignatureBlock(JarOutputStream outputJar,
- Signature signature, X509Certificate publicKey, PrivateKey privateKey)
- throws IOException, GeneralSecurityException {
-
- SignerInfo signerInfo = new SignerInfo(
- new X500Name(publicKey.getIssuerX500Principal().getName()),
- publicKey.getSerialNumber(),
- AlgorithmId.get(DIGEST_ALGORITHM),
- AlgorithmId.get(privateKey.getAlgorithm()),
- signature.sign());
-
- PKCS7 pkcs7 = new PKCS7(
- new AlgorithmId[] { AlgorithmId.get(DIGEST_ALGORITHM) },
- new ContentInfo(ContentInfo.DATA_OID, null),
- new X509Certificate[] { publicKey },
- new SignerInfo[] { signerInfo });
-
- pkcs7.encodeSignedData(outputJar);
- }
-
- private static class SignatureOutputStream extends FilterOutputStream {
- private Signature signature;
- private int count = 0;
- private List contents = new ArrayList();
-
- public SignatureOutputStream(OutputStream out, Signature sig) {
- super(out);
- signature = sig;
- }
-
- @Override
- public void write(int b) throws IOException {
- try {
- signature.update((byte) b);
- contents.add((byte)b);
- } catch (SignatureException e) {
- throw new IOException("SignatureException: " + e);
- }
- super.write(b);
- count++;
- }
-
- @Override
- public void write(byte[] b, int off, int len) throws IOException {
- try {
- signature.update(b, off, len);
- for (byte myByte: b) {
- contents.add(myByte);
- }
- } catch (SignatureException e) {
- throw new IOException("SignatureException: " + e);
- }
- super.write(b, off, len);
- count += len;
- }
-
- public int size() {
- return count;
- }
- }
-}
\ No newline at end of file
diff --git a/mode/src/processing/mode/android/Permissions.java b/mode/src/processing/mode/android/Permissions.java
deleted file mode 100644
index 68c2501de..000000000
--- a/mode/src/processing/mode/android/Permissions.java
+++ /dev/null
@@ -1,514 +0,0 @@
-/* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */
-
-/*
- Part of the Processing project - http://processing.org
-
- Copyright (c) 2012-16 The Processing Foundation
- Copyright (c) 2010-12 Ben Fry and Casey Reas
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2
- as published by the Free Software Foundation.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
-
-package processing.mode.android;
-
-import java.awt.Component;
-import java.awt.Container;
-import java.awt.Dimension;
-import java.awt.event.*;
-import java.io.File;
-import java.util.ArrayList;
-import java.util.HashMap;
-
-import javax.swing.*;
-import javax.swing.border.*;
-import javax.swing.event.*;
-
-import processing.app.Platform;
-import processing.app.Sketch;
-import processing.app.ui.Toolkit;
-
-
-@SuppressWarnings("serial")
-public class Permissions extends JFrame {
- static final String GUIDE_URL =
- "https://developer.android.com/training/articles/security-tips.html#Permissions";
-
- static final int BORDER_HORIZ = Toolkit.zoom(5);
- static final int BORDER_VERT = Toolkit.zoom(3);
- static final int CELL_HEIGHT = Toolkit.zoom(20);
- static final int BORDER = Toolkit.zoom(13);
- static final int TEXT_WIDTH = Toolkit.zoom(400);
- static final int TEXT_HEIGHT = Toolkit.zoom(80);
- static final int URL_WIDTH = Toolkit.zoom(400);
- static final int URL_HEIGHT = Toolkit.zoom(30);
- static final int DESC_WIDTH = Toolkit.zoom(400);
- static final int DESC_HEIGHT = Toolkit.zoom(50);
- static final int GAP = Toolkit.zoom(8);
-
- JScrollPane permissionScroller;
- JList permissionList;
- JLabel descriptionLabel;
- Sketch sketch;
-
- int appComp;
-
- File modeFolder;
-
-
- public Permissions(Sketch sketch, int appComp, File modeFolder) {
- super("Android Permissions Selector");
- this.appComp = appComp;
- this.sketch = sketch;
- this.modeFolder = modeFolder;
-
- permissionList = new CheckBoxList();
- permissionList.addListSelectionListener(new ListSelectionListener() {
- public void valueChanged(ListSelectionEvent e) {
- if (e.getValueIsAdjusting() == false) {
- int index = permissionList.getSelectedIndex();
- if (index == -1) {
- descriptionLabel.setText("");
- } else {
- descriptionLabel.setText("" + description[index] + "");
- }
- }
- }
- });
- permissionList.setFixedCellHeight(CELL_HEIGHT);
- permissionList.setBorder(new EmptyBorder(BORDER_VERT, BORDER_HORIZ,
- BORDER_VERT, BORDER_HORIZ));
-
- DefaultListModel model = new DefaultListModel();
- permissionList.setModel(model);
- for (String item : title) {
- model.addElement(new JCheckBox(item));
- }
-
- permissionScroller =
- new JScrollPane(permissionList,
- ScrollPaneConstants.VERTICAL_SCROLLBAR_ALWAYS,
- ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
- permissionList.setVisibleRowCount(12);
- permissionList.addKeyListener(new KeyAdapter() {
- public void keyTyped(KeyEvent e) {
- if (e.getKeyChar() == ' ') {
- int index = permissionList.getSelectedIndex();
- JCheckBox checkbox =
- permissionList.getModel().getElementAt(index);
- checkbox.setSelected(!checkbox.isSelected());
- permissionList.repaint();
- }
- }
- });
-
- Container outer = getContentPane();
- Box vbox = Box.createVerticalBox();
- vbox.setBorder(new EmptyBorder(BORDER, BORDER, BORDER, BORDER));
- outer.add(vbox);
-
- String labelText =
- "" +
- "Android applications must specifically ask for permission\n" +
- "to do things like connect to the internet, write a file,\n" +
- "or make phone calls. When installing your application,\n" +
- "users will be asked whether they want to allow such access.";
- String urlText = "More about permissions can be found " +
- "here .";
- JLabel textarea = new JLabel(labelText);
- JLabel urlarea = new JLabel(urlText);
- textarea.setPreferredSize(new Dimension(TEXT_WIDTH, TEXT_HEIGHT));
- urlarea.setPreferredSize(new Dimension(URL_WIDTH, URL_HEIGHT));
- urlarea.addMouseListener(new MouseAdapter() {
- public void mouseClicked(MouseEvent e) {
- Platform.openURL(GUIDE_URL);
- }
- });
- urlarea.setCursor(new java.awt.Cursor(java.awt.Cursor.HAND_CURSOR));
- textarea.setAlignmentX(LEFT_ALIGNMENT);
- urlarea.setAlignmentX(LEFT_ALIGNMENT);
- vbox.add(textarea);
- vbox.add(urlarea);
-
- permissionScroller.setAlignmentX(LEFT_ALIGNMENT);
- vbox.add(permissionScroller);
- vbox.add(Box.createVerticalStrut(GAP));
-
- descriptionLabel = new JLabel();
- descriptionLabel.setPreferredSize(new Dimension(DESC_WIDTH, DESC_HEIGHT));
- descriptionLabel.setVerticalAlignment(SwingConstants.TOP);
- descriptionLabel.setAlignmentX(LEFT_ALIGNMENT);
- vbox.add(descriptionLabel);
- vbox.add(Box.createVerticalStrut(GAP));
-
- JPanel buttons = new JPanel();
- buttons.setAlignmentX(LEFT_ALIGNMENT);
- JButton okButton = new JButton("OK");
- Dimension dim = new Dimension(Toolkit.getButtonWidth(),
- okButton.getPreferredSize().height);
- okButton.setPreferredSize(dim);
- okButton.addActionListener(new ActionListener() {
- public void actionPerformed(ActionEvent e) {
- saveSelections();
- setVisible(false);
- }
- });
- okButton.setEnabled(true);
-
- JButton cancelButton = new JButton("Cancel");
- cancelButton.setPreferredSize(dim);
- cancelButton.addActionListener(new ActionListener() {
- public void actionPerformed(ActionEvent e) {
- setVisible(false);
- }
- });
- cancelButton.setEnabled(true);
-
- // think different, biznatchios!
- if (Platform.isMacOS()) {
- buttons.add(cancelButton);
- buttons.add(okButton);
- } else {
- buttons.add(okButton);
- buttons.add(cancelButton);
- }
- vbox.add(buttons);
-
- JRootPane root = getRootPane();
- root.setDefaultButton(okButton);
- ActionListener disposer = new ActionListener() {
- public void actionPerformed(ActionEvent actionEvent) {
- setVisible(false);
- }
- };
- Toolkit.registerWindowCloseKeys(root, disposer);
- Toolkit.setIcon(this);
-
- pack();
-
- Dimension screen = Toolkit.getScreenSize();
- Dimension windowSize = getSize();
-
- setLocation((screen.width - windowSize.width) / 2,
- (screen.height - windowSize.height) / 2);
-
- Manifest mf = new Manifest(sketch, appComp, modeFolder, false);
- setSelections(mf.getPermissions());
-
- // show the window and get to work
- setVisible(true);
- }
-
-
- @SuppressWarnings("rawtypes")
- protected void setSelections(String[] sel) {
-// processing.core.PApplet.println("permissions are:");
-// processing.core.PApplet.println(sel);
- HashMap map = new HashMap();
- for (String s : sel) {
- map.put(s, new Object());
- }
- DefaultListModel model = (DefaultListModel) permissionList.getModel();
- for (int i = 0; i < count; i++) {
- JCheckBox box = (JCheckBox) model.get(i);
-// System.out.println(map.containsKey(box.getText()) + " " + box.getText());
- box.setSelected(map.containsKey(box.getText()));
- }
- }
-
-
- @SuppressWarnings("rawtypes")
- protected String[] getSelections() {
- ArrayList sel = new ArrayList();
- DefaultListModel model = (DefaultListModel) permissionList.getModel();
- for (int i = 0; i < count; i++) {
- if (((JCheckBox) model.get(i)).isSelected()) {
- sel.add(title[i]);
- }
- }
- return sel.toArray(new String[0]);
- }
-
-
- protected void saveSelections() {
- String[] sel = getSelections();
- Manifest mf = new Manifest(sketch, appComp, modeFolder, false);
- mf.setPermissions(sel);
- }
-
-
- public String getMenuTitle() {
- return "Android Permissions";
- }
-
-
- // List of constants for each permission and a brief description:
- // https://developer.android.com/reference/android/Manifest.permission
- static final String[] listing = {
- "ACCEPT_HANDOVER", "Allows a calling app to continue a call which was started in another app.",
- "ACCESS_CHECKIN_PROPERTIES", "Allows read/write access to the \"properties\" table in the checkin database, to change values that get uploaded.",
- "ACCESS_COARSE_LOCATION", "Allows an app to access approximate location.",
- "ACCESS_FINE_LOCATION", "Allows an app to access precise location.",
- "ACCESS_LOCATION_EXTRA_COMMANDS", "Allows an application to access extra location provider commands.",
- "ACCESS_NETWORK_STATE", "Allows applications to access information about networks.",
- "ACCESS_NOTIFICATION_POLICY", "Marker permission for applications that wish to access notification policy.",
- "ACCESS_WIFI_STATE", "Allows applications to access information about Wi-Fi networks.",
- "ACCOUNT_MANAGER", "Allows applications to call into AccountAuthenticators.",
- "ADD_VOICEMAIL", "Allows an application to add voicemails into the system.",
- "ANSWER_PHONE_CALLS", "Allows the app to answer an incoming phone call.",
- "BATTERY_STATS", "Allows an application to collect battery statistics",
- "BIND_ACCESSIBILITY_SERVICE", "Must be required by an AccessibilityService , to ensure that only the system can bind to it.",
- "BIND_APPWIDGET", "Allows an application to tell the AppWidget service which application can access AppWidget's data.",
- "BIND_AUTOFILL_SERVICE", "Must be required by a AutofillService , to ensure that only the system can bind to it.",
- "BIND_CARRIER_MESSAGING_SERVICE", "BIND_CARRIER_SERVICES",
- "BIND_CARRIER_SERVICES", "The system process that is allowed to bind to services in carrier apps will have this permission.",
- "BIND_CHOOSER_TARGET_SERVICE", "Must be required by a ChooserTargetService , to ensure that only the system can bind to it.",
- "BIND_CONDITION_PROVIDER_SERVICE", "Must be required by a ConditionProviderService , to ensure that only the system can bind to it.",
- "BIND_DEVICE_ADMIN", "Must be required by device administration receiver, to ensure that only the system can interact with it.",
- "BIND_DREAM_SERVICE", "Must be required by an DreamService , to ensure that only the system can bind to it.",
- "BIND_INCALL_SERVICE", "Must be required by a InCallService , to ensure that only the system can bind to it.",
- "BIND_INPUT_METHOD", "Must be required by an InputMethodService , to ensure that only the system can bind to it.",
- "BIND_MIDI_DEVICE_SERVICE", "Must be required by an MidiDeviceService , to ensure that only the system can bind to it.",
- "BIND_NFC_SERVICE", "Must be required by a HostApduService or OffHostApduService to ensure that only the system can bind to it.",
- "BIND_NOTIFICATION_LISTENER_SERVICE", "Must be required by an NotificationListenerService , to ensure that only the system can bind to it.",
- "BIND_PRINT_SERVICE", "Must be required by a PrintService , to ensure that only the system can bind to it.",
- "BIND_QUICK_SETTINGS_TILE", "Allows an application to bind to third party quick settings tiles.",
- "BIND_REMOTEVIEWS", "Must be required by a RemoteViewsService , to ensure that only the system can bind to it.",
- "BIND_SCREENING_SERVICE", "Must be required by a CallScreeningService , to ensure that only the system can bind to it.",
- "BIND_TELECOM_CONNECTION_SERVICE", "Must be required by a ConnectionService , to ensure that only the system can bind to it.",
- "BIND_TEXT_SERVICE", "Must be required by a TextService (e.g.",
- "BIND_TV_INPUT", "Must be required by a TvInputService to ensure that only the system can bind to it.",
- "BIND_VISUAL_VOICEMAIL_SERVICE", "Must be required by a link VisualVoicemailService to ensure that only the system can bind to it.",
- "BIND_VOICE_INTERACTION", "Must be required by a VoiceInteractionService , to ensure that only the system can bind to it.",
- "BIND_VPN_SERVICE", "Must be required by a VpnService , to ensure that only the system can bind to it.",
- "BIND_VR_LISTENER_SERVICE", "Must be required by an VrListenerService , to ensure that only the system can bind to it.",
- "BIND_WALLPAPER", "Must be required by a WallpaperService , to ensure that only the system can bind to it.",
- "BLUETOOTH", "Allows applications to connect to paired bluetooth devices.",
- "BLUETOOTH_ADMIN", "Allows applications to discover and pair bluetooth devices.",
- "BLUETOOTH_PRIVILEGED", "Allows applications to pair bluetooth devices without user interaction, and to allow or disallow phonebook access or message access.",
- "BODY_SENSORS", "Allows an application to access data from sensors that the user uses to measure what is happening inside his/her body, such as heart rate.",
- "BROADCAST_PACKAGE_REMOVED", "Allows an application to broadcast a notification that an application package has been removed.",
- "BROADCAST_SMS", "Allows an application to broadcast an SMS receipt notification.",
- "BROADCAST_STICKY", "Allows an application to broadcast sticky intents.",
- "BROADCAST_WAP_PUSH", "Allows an application to broadcast a WAP PUSH receipt notification.",
- "CALL_PHONE", "Allows an application to initiate a phone call without going through the Dialer user interface for the user to confirm the call.",
- "CALL_PRIVILEGED", "Allows an application to call any phone number, including emergency numbers, without going through the Dialer user interface for the user to confirm the call being placed.",
- "CAMERA", "Required to be able to access the camera device.",
- "CAPTURE_AUDIO_OUTPUT", "Allows an application to capture audio output.",
- "CAPTURE_SECURE_VIDEO_OUTPUT", "Allows an application to capture secure video output.",
- "CAPTURE_VIDEO_OUTPUT", "Allows an application to capture video output.",
- "CHANGE_COMPONENT_ENABLED_STATE", "Allows an application to change whether an application component (other than its own) is enabled or not.",
- "CHANGE_CONFIGURATION", "Allows an application to modify the current configuration, such as locale.",
- "CHANGE_NETWORK_STATE", "Allows applications to change network connectivity state.",
- "CHANGE_WIFI_MULTICAST_STATE", "Allows applications to enter Wi-Fi Multicast mode.",
- "CHANGE_WIFI_STATE", "Allows applications to change Wi-Fi connectivity state.",
- "CLEAR_APP_CACHE", "Allows an application to clear the caches of all installed applications on the device.",
- "CONTROL_LOCATION_UPDATES", "Allows enabling/disabling location update notifications from the radio.",
- "DELETE_CACHE_FILES", "Old permission for deleting an app's cache files, no longer used, but signals for us to quietly ignore calls instead of throwing an exception.",
- "DELETE_PACKAGES", "Allows an application to delete packages.",
- "DIAGNOSTIC", "Allows applications to RW to diagnostic resources.",
- "DISABLE_KEYGUARD", "Allows applications to disable the keyguard if it is not secure.",
- "DUMP", "Allows an application to retrieve state dump information from system services.",
- "EXPAND_STATUS_BAR", "Allows an application to expand or collapse the status bar.",
- "FACTORY_TEST", "Run as a manufacturer test application, running as the root user.",
- "FOREGROUND_SERVICE", "Allows a regular application to use Service.startForeground .",
- "GET_ACCOUNTS", "Allows access to the list of accounts in the Accounts Service.",
- "GET_ACCOUNTS_PRIVILEGED", "Allows access to the list of accounts in the Accounts Service.",
- "GET_PACKAGE_SIZE", "Allows an application to find out the space used by any package.",
- "GET_TASKS", " This constant was deprecated in API level 21. No longer enforced. ",
- "GLOBAL_SEARCH", "This permission can be used on content providers to allow the global search system to access their data.",
- "INSTALL_LOCATION_PROVIDER", "Allows an application to install a location provider into the Location Manager.",
- "INSTALL_PACKAGES", "Allows an application to install packages.",
- "INSTALL_SHORTCUT", "Allows an application to install a shortcut in Launcher.",
- "INSTANT_APP_FOREGROUND_SERVICE", "Allows an instant app to create foreground services.",
- "INTERNET", "Allows applications to open network sockets.",
- "KILL_BACKGROUND_PROCESSES", "Allows an application to call killBackgroundProcesses(String) .",
- "LOCATION_HARDWARE", "Allows an application to use location features in hardware, such as the geofencing api.",
- "MANAGE_DOCUMENTS", "Allows an application to manage access to documents, usually as part of a document picker.",
- "MANAGE_OWN_CALLS", "Allows a calling application which manages it own calls through the self-managed ConnectionService APIs.",
- "MASTER_CLEAR", "Not for use by third-party applications.",
- "MEDIA_CONTENT_CONTROL", "Allows an application to know what content is playing and control its playback.",
- "MODIFY_AUDIO_SETTINGS", "Allows an application to modify global audio settings.",
- "MODIFY_PHONE_STATE", "Allows modification of the telephony state - power on, mmi, etc.",
- "MOUNT_FORMAT_FILESYSTEMS", "Allows formatting file systems for removable storage.",
- "MOUNT_UNMOUNT_FILESYSTEMS", "Allows mounting and unmounting file systems for removable storage.",
- "NFC", "Allows applications to perform I/O operations over NFC.",
- "NFC_TRANSACTION_EVENT", "Allows applications to receive NFC transaction events.",
- "PACKAGE_USAGE_STATS", "Allows an application to collect component usage statistics",
- "PERSISTENT_ACTIVITY", " This constant was deprecated in API level 9. This functionality will be removed in the future; please do not use. Allow an application to make its activities persistent. ",
- "PROCESS_OUTGOING_CALLS", "Allows an application to see the number being dialed during an outgoing call with the option to redirect the call to a different number or abort the call altogether.",
- "READ_CALENDAR", "Allows an application to read the user's calendar data.",
- "READ_CALL_LOG", "Allows an application to read the user's call log.",
- "READ_CONTACTS", "Allows an application to read the user's contacts data.",
- "READ_EXTERNAL_STORAGE", "Allows an application to read from external storage.",
- "READ_FRAME_BUFFER", "Allows an application to take screen shots and more generally get access to the frame buffer data.",
- "READ_INPUT_STATE", " This constant was deprecated in API level 16. The API that used this permission has been removed. ",
- "READ_LOGS", "Allows an application to read the low-level system log files.",
- "READ_PHONE_NUMBERS", "Allows read access to the device's phone number(s).",
- "READ_PHONE_STATE", "Allows read only access to phone state, including the phone number of the device, current cellular network information, the status of any ongoing calls, and a list of any PhoneAccount s registered on the device.",
- "READ_SMS", "Allows an application to read SMS messages.",
- "READ_SYNC_SETTINGS", "Allows applications to read the sync settings.",
- "READ_SYNC_STATS", "Allows applications to read the sync stats.",
- "READ_VOICEMAIL", "Allows an application to read voicemails in the system.",
- "REBOOT", "Required to be able to reboot the device.",
- "RECEIVE_BOOT_COMPLETED", "Allows an application to receive the ACTION_BOOT_COMPLETED that is broadcast after the system finishes booting.",
- "RECEIVE_MMS", "Allows an application to monitor incoming MMS messages.",
- "RECEIVE_SMS", "Allows an application to receive SMS messages.",
- "RECEIVE_WAP_PUSH", "Allows an application to receive WAP push messages.",
- "RECORD_AUDIO", "Allows an application to record audio.",
- "REORDER_TASKS", "Allows an application to change the Z-order of tasks.",
- "REQUEST_COMPANION_RUN_IN_BACKGROUND", "Allows a companion app to run in the background.",
- "REQUEST_COMPANION_USE_DATA_IN_BACKGROUND", "Allows a companion app to use data in the background.",
- "REQUEST_DELETE_PACKAGES", "Allows an application to request deleting packages.",
- "REQUEST_IGNORE_BATTERY_OPTIMIZATIONS", "Permission an application must hold in order to use ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS .",
- "REQUEST_INSTALL_PACKAGES", "Allows an application to request installing packages.",
- "RESTART_PACKAGES", "restartPackage(String)",
- "SEND_RESPOND_VIA_MESSAGE", "Allows an application (Phone) to send a request to other applications to handle the respond-via-message action during incoming calls.",
- "SEND_SMS", "Allows an application to send SMS messages.",
- "SET_ALARM", "Allows an application to broadcast an Intent to set an alarm for the user.",
- "SET_ALWAYS_FINISH", "Allows an application to control whether activities are immediately finished when put in the background.",
- "SET_ANIMATION_SCALE", "Modify the global animation scaling factor.",
- "SET_DEBUG_APP", "Configure an application for debugging.",
- "SET_PREFERRED_APPLICATIONS", "addPackageToPreferred(String)",
- "SET_PROCESS_LIMIT", "Allows an application to set the maximum number of (not needed) application processes that can be running.",
- "SET_TIME", "Allows applications to set the system time.",
- "SET_TIME_ZONE", "Allows applications to set the system time zone.",
- "SET_WALLPAPER", "Allows applications to set the wallpaper.",
- "SET_WALLPAPER_HINTS", "Allows applications to set the wallpaper hints.",
- "SIGNAL_PERSISTENT_PROCESSES", "Allow an application to request that a signal be sent to all persistent processes.",
- "STATUS_BAR", "Allows an application to open, close, or disable the status bar and its icons.",
- "SYSTEM_ALERT_WINDOW", "Allows an app to create windows using the type TYPE_APPLICATION_OVERLAY , shown on top of all other apps.",
- "TRANSMIT_IR", "Allows using the device's IR transmitter, if available.",
- "UNINSTALL_SHORTCUT", "This permission is no longer supported.",
- "UPDATE_DEVICE_STATS", "Allows an application to update device statistics.",
- "USE_BIOMETRIC", "Allows an app to use device supported biometric modalities.",
- "USE_FINGERPRINT", "USE_BIOMETRIC",
- "USE_SIP", "Allows an application to use SIP service.",
- "VIBRATE", "Allows access to the vibrator.",
- "WAKE_LOCK", "Allows using PowerManager WakeLocks to keep processor from sleeping or screen from dimming.",
- "WRITE_APN_SETTINGS", "Allows applications to write the apn settings.",
- "WRITE_CALENDAR", "Allows an application to write the user's calendar data.",
- "WRITE_CALL_LOG", "Allows an application to write (but not read) the user's call log data.",
- "WRITE_CONTACTS", "Allows an application to write the user's contacts data.",
- "WRITE_EXTERNAL_STORAGE", "Allows an application to write to external storage.",
- "WRITE_GSERVICES", "Allows an application to modify the Google service map.",
- "WRITE_SECURE_SETTINGS", "Allows an application to read or write the secure system settings.",
- "WRITE_SETTINGS", "Allows an application to read or write the system settings.",
- "WRITE_SYNC_SETTINGS", "Allows applications to write the sync settings.",
- "WRITE_VOICEMAIL", "Allows an application to modify and remove existing voicemails in the system."
- };
-
- // Dangerous permissions that need runtime approval:
- // https://developer.android.com/guide/topics/security/permissions.html#normal-dangerous
- public static final String[] dangerous = {
- "READ_CALENDAR",
- "WRITE_CALENDAR",
- "CAMERA",
- "READ_CONTACTS",
- "WRITE_CONTACTS",
- "GET_ACCOUNTS",
- "ACCESS_FINE_LOCATION",
- "ACCESS_COARSE_LOCATION",
- "RECORD_AUDIO",
- "READ_PHONE_STATE",
- "READ_PHONE_NUMBERS",
- "CALL_PHONE",
- "ANSWER_PHONE_CALLS",
- "READ_CALL_LOG",
- "WRITE_CALL_LOG",
- "ADD_VOICEMAIL",
- "USE_SIP",
- "PROCESS_OUTGOING_CALLS",
- "BODY_SENSORS",
- "SEND_SMS",
- "RECEIVE_SMS",
- "READ_SMS",
- "RECEIVE_WAP_PUSH",
- "RECEIVE_MMS",
- "READ_EXTERNAL_STORAGE",
- "WRITE_EXTERNAL_STORAGE"
- };
-
- static String[] title;
- static String[] description;
- static int count;
- static {
- count = listing.length / 2;
- title = new String[count];
- description = new String[count];
- for (int i = 0; i < count; i++) {
- title[i] = listing[i*2];
- description[i] = listing[i*2+1];
- }
- }
-}
-
-
-// Code for this CheckBoxList class found on the net, though I've lost the
-// link. If you run across the original version, please let me know so that
-// the original author can be credited properly. It was from a snippet
-// collection, but it seems to have been picked up so many places with others
-// placing their copyright on it that I haven't been able to determine the
-// original author. [fry 20100216]
-@SuppressWarnings("serial")
-class CheckBoxList extends JList {
- protected static Border noFocusBorder = new EmptyBorder(1, 1, 1, 1);
- int checkboxWidth;
-
- public CheckBoxList() {
- setCellRenderer(new CellRenderer());
-
- // get the width of a checkbox so we can figure out if the mouse is inside
- checkboxWidth = new JCheckBox().getPreferredSize().width;
- // add the amount for the inset
- checkboxWidth += Permissions.BORDER_HORIZ;
-
- addMouseListener(new MouseAdapter() {
- public void mousePressed(MouseEvent e) {
- if (isEnabled()) {
-// System.out.println("cbw = " + checkboxWidth);
- int index = locationToIndex(e.getPoint());
-// descriptionLabel.setText(description[index]);
- if (index != -1) {
- JCheckBox checkbox = getModel().getElementAt(index);
- //System.out.println("mouse event in list: " + e);
-// System.out.println(checkbox.getSize() + " ... " + checkbox);
-// if (e.getX() < checkbox.getSize().height) {
- if (e.getX() < checkboxWidth) {
- checkbox.setSelected(!checkbox.isSelected());
- repaint();
- }
- }
- }
- }
- });
- setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
- }
-
-
- protected class CellRenderer implements ListCellRenderer {
- public Component getListCellRendererComponent(JList list,
- JCheckBox checkbox,
- int index, boolean isSelected,
- boolean cellHasFocus) {
- checkbox.setBackground(isSelected ? getSelectionBackground() : getBackground());
- checkbox.setForeground(isSelected ? getSelectionForeground() : getForeground());
- checkbox.setEnabled(list.isEnabled());
- checkbox.setFont(getFont());
- checkbox.setFocusPainted(false);
- checkbox.setBorderPainted(true);
- checkbox.setBorder(isSelected ? UIManager.getBorder("List.focusCellHighlightBorder") : noFocusBorder);
- return checkbox;
- }
- }
-}
diff --git a/mode/templates/VRActivity.java.tmpl b/mode/templates/VRActivity.java.tmpl
deleted file mode 100644
index ce92c4e08..000000000
--- a/mode/templates/VRActivity.java.tmpl
+++ /dev/null
@@ -1,16 +0,0 @@
-package @@package_name@@;
-
-import android.os.Bundle;
-
-import processing.vr.PVR;
-import processing.core.PApplet;
-
-public class MainActivity extends PVR {
- @Override
- public void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- PApplet sketch = new @@sketch_class_name@@();
- @@external@@
- setSketch(sketch);
- }
-}
\ No newline at end of file
diff --git a/mode/templates/VRBuild.gradle.tmpl b/mode/templates/VRBuild.gradle.tmpl
deleted file mode 100644
index 3f58f6606..000000000
--- a/mode/templates/VRBuild.gradle.tmpl
+++ /dev/null
@@ -1,43 +0,0 @@
-apply plugin: 'com.android.application'
-
-android {
- compileSdkVersion @@target_sdk@@
- defaultConfig {
- applicationId "@@package_name@@"
- minSdkVersion @@min_sdk@@
- targetSdkVersion @@target_sdk@@
- versionCode @@version_code@@
- versionName "@@version_name@@"
- }
- compileOptions {
- sourceCompatibility JavaVersion.VERSION_1_8
- targetCompatibility JavaVersion.VERSION_1_8
- }
- buildTypes {
- debug {
- debuggable true
- }
- release {
- minifyEnabled false
- proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
- }
- }
- lintOptions {
- abortOnError false
- }
-}
-
-dependencies {
- implementation fileTree(include: ['*.jar'], dir: 'libs')
- implementation 'com.android.support:appcompat-v7:@@support_version@@'
- implementation 'com.android.support:design:@@support_version@@'
- implementation 'com.google.android.support:wearable:@@wear_version@@'
- compileOnly 'com.google.android.wearable:wearable:@@wear_version@@'
- implementation 'com.google.vr:sdk-audio:@@gvr_version@@'
- implementation 'com.google.vr:sdk-base:@@gvr_version@@'
- implementation files('libs/processing-core.jar')
- implementation files('libs/vr.jar')
- testImplementation 'junit:junit:4.12'
- androidTestImplementation 'com.android.support.test:runner:1.0.1'
- androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
-}
diff --git a/mode/tools/SDKUpdater/.classpath b/mode/tools/SDKUpdater/.classpath
deleted file mode 100644
index baec41f58..000000000
--- a/mode/tools/SDKUpdater/.classpath
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
diff --git a/mode/tools/SDKUpdater/.project b/mode/tools/SDKUpdater/.project
deleted file mode 100644
index 82aae162e..000000000
--- a/mode/tools/SDKUpdater/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
- android-mode-sdkupdater
-
-
-
-
- org.eclipse.jdt.core.javabuilder
-
-
-
-
-
- org.eclipse.jdt.core.javanature
-
-
diff --git a/mode/tools/SDKUpdater/build.gradle b/mode/tools/SDKUpdater/build.gradle
deleted file mode 100644
index f9b26d43f..000000000
--- a/mode/tools/SDKUpdater/build.gradle
+++ /dev/null
@@ -1,29 +0,0 @@
-import java.nio.file.Files
-import static java.nio.file.StandardCopyOption.REPLACE_EXISTING;
-
-dependencies {
- compile group: "org.processing", name: "pde", version: "${processingVersion}"
-
- compile name: "sdklib-${toolsLibVersion}"
- compile name: "repository-${toolsLibVersion}"
-}
-
-sourceSets {
- main {
- java {
- srcDirs = ["src/"]
- }
- }
-}
-
-clean.doFirst {
- delete "tool"
-}
-
-build.doLast {
- // Copy jar file to tool folder
- File toolJar = file("tool/SDKUpdater.jar");
- toolJar.mkdirs();
- Files.copy(file("$buildDir/libs/SDKUpdater.jar").toPath(),
- toolJar.toPath(), REPLACE_EXISTING);
-}
diff --git a/processing/.gitignore b/processing/.gitignore
new file mode 100644
index 000000000..9c6eb9d40
--- /dev/null
+++ b/processing/.gitignore
@@ -0,0 +1,14 @@
+mode/processing-core.zip
+mode/mode/AndroidMode.jar
+mode/mode/gradle-tooling-api*
+mode/mode/slf4j*
+
+mode/mode/percent.jar
+mode/mode/recyclerview-v7.jar
+mode/mode/support-*
+mode/mode/wearable.jar
+
+mode/libraries/vr/library
+mode/libraries/ar/library
+mode/tools/SDKUpdater/tool
+mode/tools/SDKUpdater/lib
diff --git a/processing/README.md b/processing/README.md
new file mode 100644
index 000000000..743c8422c
--- /dev/null
+++ b/processing/README.md
@@ -0,0 +1,6 @@
+Processing for Android
+======================
+
+This is the main repository for Processing for Android. It includes the core library inside the core folder, and the mode itself in the root. See the [wiki](https://github.com/processing/processing-android/wiki) for build instructions.
+
+
diff --git a/processing/build.gradle b/processing/build.gradle
new file mode 100644
index 000000000..9823664a5
--- /dev/null
+++ b/processing/build.gradle
@@ -0,0 +1,175 @@
+import java.nio.file.Files
+import org.zeroturnaround.zip.ZipUtil
+import org.apache.commons.io.FileUtils
+import java.util.regex.Pattern
+import static java.nio.file.StandardCopyOption.REPLACE_EXISTING;
+
+buildscript {
+ repositories {
+ google()
+ mavenCentral()
+ }
+ dependencies {
+ classpath 'com.android.tools.build:gradle:7.3.1'
+ classpath group: 'commons-io', name: 'commons-io', version: '2.12.0'
+ classpath group: 'org.zeroturnaround', name: 'zt-zip', version: '1.15'
+ }
+}
+
+plugins {
+ id 'java'
+ id('io.github.gradle-nexus.publish-plugin') version '1.1.0'
+}
+
+apply from: "${rootDir}/scripts/publish-root.gradle"
+
+allprojects {
+ apply plugin: 'java'
+ apply plugin: 'java-library'
+
+ Properties versions = new Properties()
+ versions.load(project.rootProject.file("mode/version.properties").newDataInputStream())
+ ext.targetSdkVersion = versions.getProperty("android-platform")
+ ext.appcompatVersion = versions.getProperty("androidx.appcompat%appcompat")
+ ext.v4legacyVersion = versions.getProperty("androidx.legacy%legacy-support-v4")
+ ext.wearVersion = versions.getProperty("com.google.android.support%wearable")
+ ext.gvrVersion = versions.getProperty("com.google.vr")
+ ext.garVersion = versions.getProperty("com.google.ar")
+ ext.processingVersion = versions.getProperty("org.processing")
+ ext.toolingVersion = versions.getProperty("org.gradle%gradle-tooling-api")
+ ext.slf4jVersion = versions.getProperty("org.slf4j")
+ ext.gradlewVersion = versions.getProperty("gradle-wrapper")
+ ext.toolsLibVersion = versions.getProperty("android-toolslib")
+ ext.jdtVersion = versions.getProperty("org.eclipse.jdt")
+
+ Properties modeProperties = new Properties()
+ modeProperties.load(project.rootProject.file("mode/mode.properties").newDataInputStream())
+ ext.modeVersion = modeProperties.getProperty("prettyVersion")
+
+ Properties vrProperties = new Properties()
+ vrProperties.load(project.rootProject.file("mode/libraries/vr/library.properties").newDataInputStream())
+ ext.vrLibVersion = vrProperties.getProperty("prettyVersion")
+
+ Properties arProperties = new Properties()
+ arProperties.load(project.rootProject.file("mode/libraries/ar/library.properties").newDataInputStream())
+ ext.arLibVersion = arProperties.getProperty("prettyVersion")
+
+
+ def fn = project.rootProject.file("local.properties")
+ if (!fn.exists()) {
+ if (System.env["ANDROID_SDK"] != null) {
+ def syspath = System.env["ANDROID_SDK"]
+ def parts = syspath.split(Pattern.quote(File.separator))
+ def path = String.join("/", parts)
+ fn.withWriterAppend { w ->
+ w << "sdk.dir=${path}\n"
+ }
+ } else {
+ throw new GradleException(
+ "The file local.properties does not exist, and there is no ANDROID_SDK environmental variable defined in the system.\n" +
+ "Define ANDROID_SDK so it points to the location of the Android SDK, or create the local.properties file manually\n" +
+ "and add the following line to it:\n" +
+ "sdk.dir=")
+ }
+ }
+
+
+ Properties localProperties = new Properties()
+ localProperties.load(project.rootProject.file("local.properties").newDataInputStream())
+ def sdkDir = localProperties.getProperty("sdk.dir")
+ ext.androidPlatformPath = "${sdkDir}/platforms/android-${targetSdkVersion}"
+ ext.coreZipPath = "${rootDir}/mode/processing-core.zip"
+
+ repositories {
+ google()
+ mavenCentral()
+ maven { url "https://maven.google.com" }
+ maven { url "https://jitpack.io" }
+ maven { url 'https://repo.gradle.org/gradle/libs-releases' }
+ flatDir dirs: androidPlatformPath
+ flatDir dirs: "${rootDir}/core/build/libs"
+ }
+
+ compileJava {
+ sourceCompatibility = JavaVersion.VERSION_1_8
+ targetCompatibility = JavaVersion.VERSION_1_8
+
+ // Uncomment this option when building with Java 11+
+ // https://github.com/processing/processing-android/issues/625
+ // options.release = 8
+ }
+}
+
+clean.doFirst {
+ delete "dist"
+}
+
+task dist {
+ dependsOn subprojects.build
+ doLast {
+ def root = "${buildDir}/zip/AndroidMode"
+
+ // Copy assets to build dir
+ FileUtils.copyDirectory(file("mode/templates"), file("${root}/templates"))
+ FileUtils.copyDirectory(file("mode/examples"), file("${root}/examples"))
+ FileUtils.copyDirectory(file("mode/icons"), file("${root}/icons"))
+ FileUtils.copyDirectory(file("mode/theme"), file("${root}/theme"))
+ FileUtils.copyDirectory(file("mode/mode"), file("${root}/mode"))
+ delete "${root}/mode/core.jar"
+ delete "${root}/mode/pde.jar"
+ delete "${root}/mode/JavaMode.jar"
+ // delete "${root}/mode/jdi.jar"
+ // delete "${root}/mode/jdimodel.jar"
+
+ Files.copy(file("mode/processing-core.zip").toPath(),
+ file("${root}/processing-core.zip").toPath(), REPLACE_EXISTING)
+
+ Files.copy(file("mode/keywords.txt").toPath(),
+ file("${root}/keywords.txt").toPath(), REPLACE_EXISTING)
+
+ Files.copy(file("mode/version.properties").toPath(),
+ file("${root}/version.properties").toPath(), REPLACE_EXISTING)
+
+ Files.copy(file("mode/mode.properties").toPath(),
+ file("${root}/mode.properties").toPath(), REPLACE_EXISTING)
+
+ FileUtils.copyDirectory(file("mode/languages"),
+ file("${root}/languages"))
+
+ FileUtils.copyDirectory(file("mode/resources"),
+ file("${root}/resources"))
+
+ FileUtils.copyDirectory(file("mode/tools/SDKUpdater/tool"),
+ file("${root}/tools/SDKUpdater/tool"))
+ FileUtils.copyDirectory(file("mode/tools/SDKUpdater/lib"),
+ file("${root}/tools/SDKUpdater/lib"))
+ FileUtils.copyDirectory(file("mode/tools/SDKUpdater/src"),
+ file("${root}/tools/SDKUpdater/src"))
+
+ FileUtils.copyDirectory(file("mode/libraries/vr/examples"),
+ file("${root}/libraries/vr/examples"))
+ FileUtils.copyDirectory(file("mode/libraries/vr/library"),
+ file("${root}/libraries/vr/library"))
+ FileUtils.copyDirectory(file("mode/libraries/vr/libs"),
+ file("${root}/libraries/vr/libs"))
+ FileUtils.copyDirectory(file("../libs/processing-vr/src/main/java/"),
+ file("${root}/libraries/vr/src"))
+ Files.copy(file("mode/libraries/vr/library.properties").toPath(),
+ file("${root}/libraries/vr/library.properties").toPath(), REPLACE_EXISTING)
+
+ FileUtils.copyDirectory(file("mode/libraries/ar/examples"),
+ file("${root}/libraries/ar/examples"))
+ FileUtils.copyDirectory(file("mode/libraries/ar/library"),
+ file("${root}/libraries/ar/library"))
+ FileUtils.copyDirectory(file("../libs/processing-ar/src/main/java/"),
+ file("${root}/libraries/ar/src"))
+ Files.copy(file("mode/libraries/ar/library.properties").toPath(),
+ file("${root}/libraries/ar/library.properties").toPath(), REPLACE_EXISTING)
+
+ File distFolder = file("dist")
+ distFolder.mkdirs()
+ ZipUtil.pack(file("${buildDir}/zip"), new File("dist/AndroidMode.zip"))
+ Files.copy(file("mode/mode.properties").toPath(),
+ file("dist/AndroidMode.txt").toPath(), REPLACE_EXISTING)
+ }
+}
diff --git a/processing/buildSrc/build.gradle b/processing/buildSrc/build.gradle
new file mode 100644
index 000000000..e6ffdbeb9
--- /dev/null
+++ b/processing/buildSrc/build.gradle
@@ -0,0 +1,17 @@
+// apply plugin: 'groovy'
+plugins {
+ id 'groovy'
+}
+
+repositories {
+ google()
+ mavenCentral()
+}
+
+dependencies {
+ implementation gradleApi()
+ implementation localGroovy()
+ implementation 'com.android.tools.build:gradle:7.3.1'
+ implementation 'com.google.guava:guava:32.0.0-jre'
+ implementation 'com.android.tools:common:25.3.0'
+}
\ No newline at end of file
diff --git a/processing/buildSrc/src/main/groovy/ImportAar.groovy b/processing/buildSrc/src/main/groovy/ImportAar.groovy
new file mode 100644
index 000000000..fc20588f1
--- /dev/null
+++ b/processing/buildSrc/src/main/groovy/ImportAar.groovy
@@ -0,0 +1,237 @@
+// import org.gradle.api.Plugin
+// import org.gradle.api.Project
+// import org.gradle.api.artifacts.Configuration
+// import org.gradle.api.artifacts.transform.TransformAction
+// import org.gradle.api.artifacts.transform.TransformParameters
+// import org.gradle.api.artifacts.transform.InputArtifact
+// import org.gradle.api.artifacts.transform.TransformOutputs
+// import org.gradle.api.file.FileSystemLocation
+// import org.gradle.api.provider.Provider
+// import org.gradle.api.tasks.PathSensitive
+// import org.gradle.api.tasks.PathSensitivity
+
+// import org.gradle.api.attributes.LibraryElements
+// import org.gradle.api.attributes.Usage
+// import org.gradle.api.attributes.Category
+
+// import com.android.build.gradle.internal.dependency.AarTransform
+// import com.android.build.gradle.internal.dependency.ExtractAarTransform
+// import com.android.build.gradle.internal.publishing.AndroidArtifacts
+// import com.android.builder.aar.AarExtractor
+// import com.google.common.collect.ImmutableList
+
+// import java.nio.file.Files
+// import static java.nio.file.StandardCopyOption.REPLACE_EXISTING
+
+
+// import org.gradle.api.Plugin
+// import org.gradle.api.Project
+// import org.gradle.api.artifacts.Configuration
+// import org.gradle.api.artifacts.ResolvedArtifact
+// import java.util.zip.ZipFile
+
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.gradle.api.artifacts.Configuration
+import org.gradle.api.tasks.TaskAction
+import java.util.zip.ZipFile
+
+/**
+ * Build Gradle plgin needed to use aar files as dependencies in a pure java library project.
+ * Adapted from the following plugin by nekocode
+ * https://github.com/nekocode/Gradle-Import-Aar
+ * Ported to Groovy, and made specific to the needs of the Android mode build process (i.e.: this plugin
+ * is not meant to be used with other projects).
+ * Ported to Gradle 8 replacing the deprecated ArtifactTransform with the new TransformAction API.
+ */
+class ImportAar implements Plugin {
+ final String CONFIG_NAME_POSTFIX = "Aar"
+
+ @Override
+ void apply(Project project) {
+ // def aar = AndroidArtifacts.TYPE_AAR
+ // def jar = AndroidArtifacts.TYPE_JAR
+
+ println ">>> Calling ImportAar"
+
+ // Create a custom resolvable configuration
+ project.configurations.create('aarExtractorResolvable') {
+ canBeResolved = true
+ canBeConsumed = false
+ extendsFrom project.configurations.implementation
+ }
+
+ project.tasks.register('extractAarJars', ExtractAarJarsTask) {
+ group = 'build'
+ description = 'Extracts JAR files from AAR dependencies and places them in build/libs.'
+ }
+
+
+ // project.task('extractAarJars') {
+ // doLast {
+ // println "=======> Calling extractAarJars task"
+
+ // project.configurations.each { Configuration config ->
+ // config.resolvedConfiguration.resolvedArtifacts.each { ResolvedArtifact artifact ->
+ // println "Resolved artifact: ${artifact}"
+ // if (artifact.type == 'aar') {
+ // extractJarFromAar(artifact, project)
+ // }
+ // }
+ // }
+ // }
+ // }
+
+
+
+/*
+ // Create AAR configurations
+ Collection allConfigs = project.getConfigurations().toList()
+ for (Configuration config: allConfigs) {
+ println config
+ Configuration aarConfig = project.configurations.maybeCreate(config.name + CONFIG_NAME_POSTFIX)
+ println aarConfig
+
+ // Add extracted jars to original configuration after project evaluating
+ aarConfig.attributes {
+ attribute(LibraryElements.LIBRARY_ELEMENTS_ATTRIBUTE, project.objects.named(LibraryElements, LibraryElements.JAR))
+ attribute(Usage.USAGE_ATTRIBUTE, project.objects.named(Usage, Usage.JAVA_RUNTIME))
+ attribute(Category.CATEGORY_ATTRIBUTE, project.objects.named(Category, Category.LIBRARY))
+ }
+
+ project.afterEvaluate {
+ println "-> In afterEvaluate"
+ aarConfig.resolvedConfiguration.resolvedArtifacts.each { artifact ->
+ File jarFile = artifact.file
+ print "================================================> FILE "
+ println jarFile
+ println jarFile.getName()
+
+ // Add jar file to classpath
+ project.sourceSets.main.compileClasspath += project.files(jarFile)
+
+ File libraryFolder = new File(project.buildDir, "libs")
+ libraryFolder.mkdirs()
+
+ // Strip version number when copying
+ String name = jarFile.name
+ int p = name.lastIndexOf("-")
+ String libName = name.substring(0, p) + ".jar"
+ File libraryJar = new File(libraryFolder, libName)
+ Files.copy(jarFile.toPath(), libraryJar.toPath(), REPLACE_EXISTING)
+ }
+ }
+ }
+
+ // Register aar transform
+ project.dependencies {
+ registerTransform(AarToJarTransform) {
+ from.attribute(LibraryElements.LIBRARY_ELEMENTS_ATTRIBUTE, project.objects.named(LibraryElements, aar))
+ to.attribute(LibraryElements.LIBRARY_ELEMENTS_ATTRIBUTE, project.objects.named(LibraryElements, jar))
+ }
+ }
+ */
+ }
+
+ // void extractJarFromAar(ResolvedArtifact artifact, Project project) {
+ // println "Input AAR: ${aarFile}"
+ // def aarFile = artifact.file
+ // def zipFile = new ZipFile(aarFile)
+ // def entry = zipFile.getEntry('classes.jar')
+ // if (entry) {
+ // project.copy {
+ // from project.zipTree(aarFile)
+ // include 'classes.jar'
+ // into "${project.buildDir}/libs"
+ // rename { "${artifact.name}-${artifact.moduleVersion.id.version}.jar" }
+ // }
+ // }
+ // zipFile.close()
+ // }
+
+
+ // abstract static class AarToJarTransform implements TransformAction {
+ // AarToJarTransform() {
+ // println "AarToJarTransform instantiated"
+ // }
+
+ // @InputArtifact
+ // @PathSensitive(PathSensitivity.NAME_ONLY)
+ // abstract Provider getInputArtifact()
+
+ // @Override
+ // void transform(TransformOutputs outputs) {
+ // File inputFile = inputArtifact.get().asFile
+ // println "Input AAR: ${inputFile}"
+ // File explodedDir = new File(outputs.getOutputDirectory(), "exploded")
+ // println "Exploded Directory: ${explodedDir}"
+
+ // AarExtractor aarExtractor = new AarExtractor()
+ // aarExtractor.extract(inputFile, explodedDir)
+ // File classesJar = new File(new File(explodedDir, "jars"), "classes.jar")
+ // if (classesJar.exists()) {
+ // println "Classes JAR found: ${classesJar}"
+ // String aarName = inputFile.name.replace(".aar", "")
+ // File renamedJar = outputs.file("${aarName}.jar")
+ // Files.copy(classesJar.toPath(), renamedJar.toPath(), REPLACE_EXISTING)
+ // println "Transformed JAR: ${renamedJar}"
+ // } else {
+ // println "Error: classes.jar not found in ${explodedDir}"
+ // }
+ // }
+ // }
+}
+
+
+class ExtractAarJarsTask extends org.gradle.api.DefaultTask {
+ @TaskAction
+ void extractJars() {
+ //File outputDir = new File(project.buildDir, 'libs')
+ File outputDir = new File(System.getProperty("user.dir"), "build/libs")
+ outputDir.mkdirs()
+
+ // Configuration compileClasspath = project.configurations.getByName('implementation')
+ Configuration aarExtractorResolvable = project.configurations.getByName('aarExtractorResolvable')
+
+ // compileClasspath.resolvedConfiguration.resolvedArtifacts.each { artifact ->
+ aarExtractorResolvable.resolvedConfiguration.resolvedArtifacts.each { artifact ->
+ if (artifact.type == 'aar') {
+ File aarFile = artifact.file
+ println "Processing AAR: ${aarFile.name}"
+
+ // Extract the AAR file
+ ZipFile zipFile = new ZipFile(aarFile)
+ zipFile.entries().each { entry ->
+ if (entry.name.endsWith('.jar')) {
+ println "Classes JAR found: ${entry}"
+ String aarName = aarFile.name.replace(".aar", "")
+ String jarName = "${aarName}.jar".replaceFirst(/-\d+(\.\d+)*(?=\.jar$)/, '')
+
+ File jarOutput = new File(outputDir, jarName)
+ jarOutput.parentFile.mkdirs()
+
+ // Write the JAR file to the output directory
+ zipFile.getInputStream(entry).withCloseable { inputStream ->
+ jarOutput.withOutputStream { outputStream ->
+ copyStream(inputStream, outputStream)
+ }
+ }
+ println "Extracted JAR: ${jarOutput.absolutePath}"
+ }
+ }
+ }
+ }
+ }
+
+ /**
+ * Copies data from an InputStream to an OutputStream.
+ */
+ void copyStream(InputStream input, OutputStream output) {
+ byte[] buffer = new byte[1024]
+ int bytesRead
+ while ((bytesRead = input.read(buffer)) != -1) {
+ output.write(buffer, 0, bytesRead)
+ }
+ }
+}
+
diff --git a/processing/buildSrc/src/main/resources/META-INF/gradle-plugins/ImportAar.properties b/processing/buildSrc/src/main/resources/META-INF/gradle-plugins/ImportAar.properties
new file mode 100644
index 000000000..f41e15936
--- /dev/null
+++ b/processing/buildSrc/src/main/resources/META-INF/gradle-plugins/ImportAar.properties
@@ -0,0 +1 @@
+implementation-class=ImportAar
\ No newline at end of file
diff --git a/processing/core/build.gradle b/processing/core/build.gradle
new file mode 100644
index 000000000..07a8b8b73
--- /dev/null
+++ b/processing/core/build.gradle
@@ -0,0 +1,110 @@
+import org.apache.tools.ant.Project
+import java.nio.file.Files
+import static java.nio.file.StandardCopyOption.REPLACE_EXISTING;
+
+plugins {
+ id 'ImportAar'
+ id 'java-library'
+ id 'maven-publish'
+}
+
+dependencies {
+ implementation name: "android"
+ implementation "androidx.legacy:legacy-support-v4:${v4legacyVersion}"
+ implementation "com.google.android.support:wearable:${wearVersion}"
+}
+
+sourceSets.main {
+ java.srcDir("../../libs/processing-core/src/main/java/")
+ resources.srcDir("../../libs/processing-core/src/main/")
+ resources.exclude("AndroidManifest.xml", "**/java/**")
+}
+
+tasks.register('sourceJar', Jar) {
+ dependsOn classes
+ duplicatesStrategy = DuplicatesStrategy.INCLUDE
+ archiveClassifier.set("sources")
+ from sourceSets.main.allSource
+}
+
+// Does not work because of Processing-specific tags in source code, such as @webref
+tasks.register('javadocJar', Jar) {
+ dependsOn javadoc
+ archiveClassifier.set("javadoc")
+ from javadoc.destinationDir
+}
+
+// project.afterEvaluate {
+// tasks.named('extractAarJars').configure {
+// dependsOn configurations.runtimeClasspath
+// }
+// }
+
+// project.tasks.named('build').configure {
+// finalizedBy('extractAarJars')
+// }
+
+artifacts {
+// archives javadocJar
+ archives sourceJar
+}
+
+jar.doLast { task ->
+ ant.checksum file: task.archiveFile.get().asFile
+}
+
+tasks.named('clean').configure {
+ doFirst {
+ delete "dist"
+ delete "${coreZipPath}"
+ }
+}
+
+tasks.named('compileJava').configure {
+ doFirst {
+ String[] deps = ["wearable.jar"]
+ deps.each { fn ->
+ Files.copy(file("${rootDir}/build/libs/${fn}").toPath(),
+ file("${rootDir}/mode/mode/${fn}").toPath(), REPLACE_EXISTING)
+ }
+ }
+}
+
+tasks.named('build').configure {
+ doLast {
+ // Need to check the existance of the files before using as the files
+ // will get generated only if Task :core:jar is not being skipped
+ // Task :core:jar will be skipped if source files are unchanged or jar task is UP-TO-DATE
+ if (file("${buildDir}/libs/core.jar").exists()) {
+ // Copying core jar as zip inside the mode folder
+ Files.copy(file("${buildDir}/libs/core.jar").toPath(),
+ file("${coreZipPath}").toPath(), REPLACE_EXISTING)
+ }
+ // Renaming artifacts for maven publishing
+ if (file("${buildDir}/libs/core.jar").exists()) {
+ Files.move(file("${buildDir}/libs/core.jar").toPath(),
+ file("$buildDir/libs/processing-core-${modeVersion}.jar").toPath(), REPLACE_EXISTING)
+ }
+ if (file("${buildDir}/libs/core-sources.jar").exists()) {
+ Files.move(file("${buildDir}/libs/core-sources.jar").toPath(),
+ file("$buildDir/libs/processing-core-${modeVersion}-sources.jar").toPath(), REPLACE_EXISTING)
+ }
+ if (file("${buildDir}/libs/core.jar.MD5").exists()) {
+ Files.move(file("${buildDir}/libs/core.jar.MD5").toPath(),
+ file("$buildDir/libs/processing-core-${modeVersion}.jar.md5").toPath(), REPLACE_EXISTING)
+ }
+ }
+}
+
+ext {
+ libName = 'processing-core'
+ libVersion = modeVersion
+ libJar = "${buildDir}/libs/${libName}-${libVersion}.jar"
+ libSrc = "${buildDir}/libs/${libName}-${libVersion}-sources.jar"
+ libMd5 = "${buildDir}/libs/${libName}-${libVersion}-sources.jar.md5"
+ libDependencies = [[name: 'legacy-support-v4', group: 'androidx.legacy', version: v4legacyVersion],
+ [name: 'wearable', group: 'com.google.android.support', version: wearVersion],
+ [name: 'android']]
+}
+
+apply from: "${rootProject.projectDir}/scripts/publish-module.gradle"
diff --git a/processing/gradle.properties b/processing/gradle.properties
new file mode 100644
index 000000000..5465fec0e
--- /dev/null
+++ b/processing/gradle.properties
@@ -0,0 +1,2 @@
+android.enableJetifier=true
+android.useAndroidX=true
\ No newline at end of file
diff --git a/processing/gradle/wrapper/gradle-wrapper.jar b/processing/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 000000000..41d9927a4
Binary files /dev/null and b/processing/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/processing/gradle/wrapper/gradle-wrapper.properties b/processing/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 000000000..d6e308a63
--- /dev/null
+++ b/processing/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/processing/gradlew b/processing/gradlew
new file mode 100755
index 000000000..1b6c78733
--- /dev/null
+++ b/processing/gradlew
@@ -0,0 +1,234 @@
+#!/bin/sh
+
+#
+# Copyright © 2015-2021 the original authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+##############################################################################
+#
+# Gradle start up script for POSIX generated by Gradle.
+#
+# Important for running:
+#
+# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+# noncompliant, but you have some other compliant shell such as ksh or
+# bash, then to run this script, type that shell name before the whole
+# command line, like:
+#
+# ksh Gradle
+#
+# Busybox and similar reduced shells will NOT work, because this script
+# requires all of these POSIX shell features:
+# * functions;
+# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+# * compound commands having a testable exit status, especially «case»;
+# * various built-in commands including «command», «set», and «ulimit».
+#
+# Important for patching:
+#
+# (2) This script targets any POSIX shell, so it avoids extensions provided
+# by Bash, Ksh, etc; in particular arrays are avoided.
+#
+# The "traditional" practice of packing multiple parameters into a
+# space-separated string is a well documented source of bugs and security
+# problems, so this is (mostly) avoided, by progressively accumulating
+# options in "$@", and eventually passing that to Java.
+#
+# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+# see the in-line comments for details.
+#
+# There are tweaks for specific operating systems such as AIX, CygWin,
+# Darwin, MinGW, and NonStop.
+#
+# (3) This script is generated from the Groovy template
+# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+# within the Gradle project.
+#
+# You can find Gradle at https://github.com/gradle/gradle/.
+#
+##############################################################################
+
+# Attempt to set APP_HOME
+
+# Resolve links: $0 may be a link
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+ APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path
+ [ -h "$app_path" ]
+do
+ ls=$( ls -ld "$app_path" )
+ link=${ls#*' -> '}
+ case $link in #(
+ /*) app_path=$link ;; #(
+ *) app_path=$APP_HOME$link ;;
+ esac
+done
+
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+
+APP_NAME="Gradle"
+APP_BASE_NAME=${0##*/}
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD=maximum
+
+warn () {
+ echo "$*"
+} >&2
+
+die () {
+ echo
+ echo "$*"
+ echo
+ exit 1
+} >&2
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "$( uname )" in #(
+ CYGWIN* ) cygwin=true ;; #(
+ Darwin* ) darwin=true ;; #(
+ MSYS* | MINGW* ) msys=true ;; #(
+ NONSTOP* ) nonstop=true ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+ if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+ # IBM's JDK on AIX uses strange locations for the executables
+ JAVACMD=$JAVA_HOME/jre/sh/java
+ else
+ JAVACMD=$JAVA_HOME/bin/java
+ fi
+ if [ ! -x "$JAVACMD" ] ; then
+ die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+ fi
+else
+ JAVACMD=java
+ which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+ case $MAX_FD in #(
+ max*)
+ MAX_FD=$( ulimit -H -n ) ||
+ warn "Could not query maximum file descriptor limit"
+ esac
+ case $MAX_FD in #(
+ '' | soft) :;; #(
+ *)
+ ulimit -n "$MAX_FD" ||
+ warn "Could not set maximum file descriptor limit to $MAX_FD"
+ esac
+fi
+
+# Collect all arguments for the java command, stacking in reverse order:
+# * args from the command line
+# * the main class name
+# * -classpath
+# * -D...appname settings
+# * --module-path (only if needed)
+# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+ APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+ CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+ JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+ # Now convert the arguments - kludge to limit ourselves to /bin/sh
+ for arg do
+ if
+ case $arg in #(
+ -*) false ;; # don't mess with options #(
+ /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath
+ [ -e "$t" ] ;; #(
+ *) false ;;
+ esac
+ then
+ arg=$( cygpath --path --ignore --mixed "$arg" )
+ fi
+ # Roll the args list around exactly as many times as the number of
+ # args, so each arg winds up back in the position where it started, but
+ # possibly modified.
+ #
+ # NB: a `for` loop captures its iteration list before it begins, so
+ # changing the positional parameters here affects neither the number of
+ # iterations, nor the values presented in `arg`.
+ shift # remove old arg
+ set -- "$@" "$arg" # push replacement arg
+ done
+fi
+
+# Collect all arguments for the java command;
+# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+# shell script including quotes and variable substitutions, so put them in
+# double quotes to make sure that they get re-expanded; and
+# * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+ "-Dorg.gradle.appname=$APP_BASE_NAME" \
+ -classpath "$CLASSPATH" \
+ org.gradle.wrapper.GradleWrapperMain \
+ "$@"
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+# readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+# set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+ printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+ xargs -n1 |
+ sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+ tr '\n' ' '
+ )" '"$@"'
+
+exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/processing/gradlew.bat
similarity index 64%
rename from gradlew.bat
rename to processing/gradlew.bat
index e95643d6a..ac1b06f93 100644
--- a/gradlew.bat
+++ b/processing/gradlew.bat
@@ -1,3 +1,19 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
@if "%DEBUG%" == "" @echo off
@rem ##########################################################################
@rem
@@ -13,15 +29,18 @@ if "%DIRNAME%" == "" set DIRNAME=.
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome
set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -35,7 +54,7 @@ goto fail
set JAVA_HOME=%JAVA_HOME:"=%
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -45,28 +64,14 @@ echo location of your Java installation.
goto fail
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
:execute
@rem Setup the command line
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
:end
@rem End local scope for the variables with windows NT shell
diff --git a/processing/mode/.classpath b/processing/mode/.classpath
new file mode 100644
index 000000000..3242dff64
--- /dev/null
+++ b/processing/mode/.classpath
@@ -0,0 +1,24 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/processing/mode/.project b/processing/mode/.project
new file mode 100644
index 000000000..e89bdfe07
--- /dev/null
+++ b/processing/mode/.project
@@ -0,0 +1,34 @@
+
+
+ android-mode
+
+
+
+
+ org.eclipse.jdt.core.javabuilder
+
+
+
+
+ org.eclipse.buildship.core.gradleprojectbuilder
+
+
+
+
+
+ org.eclipse.jdt.core.javanature
+ org.eclipse.buildship.core.gradleprojectnature
+
+
+
+ 1675640664215
+ 30
+
+ org.eclipse.core.resources.regexFilterMatcher
+ node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__
+
+
+
+
diff --git a/processing/mode/.settings/org.eclipse.buildship.core.prefs b/processing/mode/.settings/org.eclipse.buildship.core.prefs
new file mode 100644
index 000000000..e8895216f
--- /dev/null
+++ b/processing/mode/.settings/org.eclipse.buildship.core.prefs
@@ -0,0 +1,2 @@
+connection.project.dir=
+eclipse.preferences.version=1
diff --git a/mode/tools/SDKUpdater/.settings/org.eclipse.jdt.core.prefs b/processing/mode/.settings/org.eclipse.jdt.core.prefs
similarity index 61%
rename from mode/tools/SDKUpdater/.settings/org.eclipse.jdt.core.prefs
rename to processing/mode/.settings/org.eclipse.jdt.core.prefs
index d17b6724d..0fee6a9c4 100644
--- a/mode/tools/SDKUpdater/.settings/org.eclipse.jdt.core.prefs
+++ b/processing/mode/.settings/org.eclipse.jdt.core.prefs
@@ -1,12 +1,15 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=disabled
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/processing/mode/build.gradle b/processing/mode/build.gradle
new file mode 100644
index 000000000..0f34a95d9
--- /dev/null
+++ b/processing/mode/build.gradle
@@ -0,0 +1,102 @@
+import java.nio.file.Files
+import org.zeroturnaround.zip.ZipUtil
+import org.apache.commons.io.FileUtils
+import static java.nio.file.StandardCopyOption.REPLACE_EXISTING;
+
+plugins {
+ id 'java'
+}
+
+// Extend compile to copy the jars from gradle-tooling and slf4j:
+// https://stackoverflow.com/a/43602463
+configurations {
+ implementationCopy
+ implementationExtract
+}
+
+dependencies {
+ // implementation group: "org.processing", name: "core", version: "${processingVersion}"
+ // implementation group: "org.processing", name: "pde", version: "${processingVersion}"
+ // implementation group: "org.processing", name: "java-mode", version: "${processingVersion}"
+
+ implementationExtract "org.eclipse.jdt:org.eclipse.jdt.debug:${jdtVersion}"
+
+ implementationCopy "org.gradle:gradle-tooling-api:${toolingVersion}"
+ implementationCopy "org.slf4j:slf4j-api:${slf4jVersion}"
+ implementationCopy "org.slf4j:slf4j-simple:${slf4jVersion}"
+
+ implementation fileTree(include: ["jdi.jar", "jdimodel.jar", "core.jar", "pde.jar", "JavaMode.jar"], dir: 'mode')
+}
+
+// This task copies the gradle tooling jar into the mode folder
+tasks.register("copyToLib", Copy) {
+ from(configurations.implementationCopy)
+ into("mode")
+}
+
+tasks.named('build') {
+ dependsOn 'copyToLib'
+}
+
+tasks.named('compileJava') {
+ dependsOn 'copyToLib'
+}
+
+sourceSets.main.java.srcDir("src/")
+
+tasks.register('getjdi', Copy) {
+ // This task extracts the jar files inside org.eclipse.jdt.debug, which are
+ // jdi.jar and jdimodel.jar and needed to build the debugger.
+ from(zipTree(configurations.implementationExtract.singleFile)) {
+ include '**/*.jar'
+ exclude 'META-INF'
+ }
+ into "mode"
+}
+
+tasks.register('permissions', Exec) {
+ // This task retrieves the latest list of Android permissions and adds them
+ // to the Permissions.java file. The python scripts requries BeautifulSoup
+ workingDir "scripts"
+ commandLine "python", "permissions.py"
+}
+
+
+tasks.register("wrapper", Wrapper) {
+ gradleVersion = "${gradlewVersion}" // version required for gradle wrapper
+}
+
+tasks.named("wrapper").configure {
+ doLast {
+ def wrapperFolder = file("mode/gradlew")
+ wrapperFolder.mkdirs()
+ file("gradle").renameTo(file("mode/gradlew/gradle"))
+ file("gradlew").renameTo(file("mode/gradlew/gradlew"))
+ file("gradlew.bat").renameTo(file("mode/gradlew/gradlew.bat"))
+ FileUtils.copyDirectory(file("gradle"), file("../debug/gradle"))
+ delete("gradle")
+ ZipUtil.pack(file("mode/gradlew"), new File("mode/mode/gradlew.zip"))
+ delete("mode/gradlew")
+ }
+}
+
+tasks.named('clean') {
+ doFirst {
+ delete fileTree("mode") {
+ include "**/*.jar"
+ exclude "jdi.jar", "jdimodel.jar", "istack-commons-runtime.jar", "javax.activation-api.jar",
+ "jaxb-api.jar", "jaxb-jxc.jar", "jaxb-runtime.jar", "jaxb-xjc.jar", "core.jar",
+ "pde.jar", "JavaMode.jar", "org.eclipse.core.contenttype.jar", "org.eclipse.core.jobs.jar",
+ "org.eclipse.core.resources.jar", "org.eclipse.core.runtime.jar", "org.eclipse.equinox.common.jar",
+ "org.eclipse.equinox.preferences.jar", "org.eclipse.jdt.core.jar", "org.eclipse.osgi.jar",
+ "org.eclipse.text.jar"
+ }
+ }
+}
+
+tasks.named('build') {
+ doLast {
+ Files.copy(file("$buildDir/libs/mode.jar").toPath(),
+ file("mode/AndroidMode.jar").toPath(), REPLACE_EXISTING)
+ }
+}
\ No newline at end of file
diff --git a/mode/examples/Basics/Arrays/Array/Array.pde b/processing/mode/examples/Basics/Arrays/Array/Array.pde
similarity index 100%
rename from mode/examples/Basics/Arrays/Array/Array.pde
rename to processing/mode/examples/Basics/Arrays/Array/Array.pde
diff --git a/mode/examples/Basics/Arrays/Array2D/Array2D.pde b/processing/mode/examples/Basics/Arrays/Array2D/Array2D.pde
similarity index 100%
rename from mode/examples/Basics/Arrays/Array2D/Array2D.pde
rename to processing/mode/examples/Basics/Arrays/Array2D/Array2D.pde
diff --git a/mode/examples/Basics/Arrays/ArrayObjects/ArrayObjects.pde b/processing/mode/examples/Basics/Arrays/ArrayObjects/ArrayObjects.pde
similarity index 100%
rename from mode/examples/Basics/Arrays/ArrayObjects/ArrayObjects.pde
rename to processing/mode/examples/Basics/Arrays/ArrayObjects/ArrayObjects.pde
diff --git a/mode/examples/Basics/Arrays/ArrayObjects/Module.pde b/processing/mode/examples/Basics/Arrays/ArrayObjects/Module.pde
similarity index 100%
rename from mode/examples/Basics/Arrays/ArrayObjects/Module.pde
rename to processing/mode/examples/Basics/Arrays/ArrayObjects/Module.pde
diff --git a/mode/examples/Basics/Camera/MoveEye/MoveEye.pde b/processing/mode/examples/Basics/Camera/MoveEye/MoveEye.pde
similarity index 100%
rename from mode/examples/Basics/Camera/MoveEye/MoveEye.pde
rename to processing/mode/examples/Basics/Camera/MoveEye/MoveEye.pde
diff --git a/mode/examples/Basics/Camera/Perspective/Perspective.pde b/processing/mode/examples/Basics/Camera/Perspective/Perspective.pde
similarity index 100%
rename from mode/examples/Basics/Camera/Perspective/Perspective.pde
rename to processing/mode/examples/Basics/Camera/Perspective/Perspective.pde
diff --git a/mode/examples/Basics/Color/Brightness/Brightness.pde b/processing/mode/examples/Basics/Color/Brightness/Brightness.pde
similarity index 100%
rename from mode/examples/Basics/Color/Brightness/Brightness.pde
rename to processing/mode/examples/Basics/Color/Brightness/Brightness.pde
diff --git a/mode/examples/Basics/Color/ColorWheel/ColorWheel.pde b/processing/mode/examples/Basics/Color/ColorWheel/ColorWheel.pde
similarity index 100%
rename from mode/examples/Basics/Color/ColorWheel/ColorWheel.pde
rename to processing/mode/examples/Basics/Color/ColorWheel/ColorWheel.pde
diff --git a/mode/examples/Basics/Color/Creating/Creating.pde b/processing/mode/examples/Basics/Color/Creating/Creating.pde
similarity index 100%
rename from mode/examples/Basics/Color/Creating/Creating.pde
rename to processing/mode/examples/Basics/Color/Creating/Creating.pde
diff --git a/mode/examples/Basics/Color/Hue/Hue.pde b/processing/mode/examples/Basics/Color/Hue/Hue.pde
similarity index 100%
rename from mode/examples/Basics/Color/Hue/Hue.pde
rename to processing/mode/examples/Basics/Color/Hue/Hue.pde
diff --git a/mode/examples/Basics/Color/LinearGradient/LinearGradient.pde b/processing/mode/examples/Basics/Color/LinearGradient/LinearGradient.pde
similarity index 100%
rename from mode/examples/Basics/Color/LinearGradient/LinearGradient.pde
rename to processing/mode/examples/Basics/Color/LinearGradient/LinearGradient.pde
diff --git a/mode/examples/Basics/Color/RadialGradient/RadialGradient.pde b/processing/mode/examples/Basics/Color/RadialGradient/RadialGradient.pde
similarity index 100%
rename from mode/examples/Basics/Color/RadialGradient/RadialGradient.pde
rename to processing/mode/examples/Basics/Color/RadialGradient/RadialGradient.pde
diff --git a/mode/examples/Basics/Color/RadialGradient2/RadialGradient2.pde b/processing/mode/examples/Basics/Color/RadialGradient2/RadialGradient2.pde
similarity index 100%
rename from mode/examples/Basics/Color/RadialGradient2/RadialGradient2.pde
rename to processing/mode/examples/Basics/Color/RadialGradient2/RadialGradient2.pde
diff --git a/mode/examples/Basics/Color/Reading/Reading.pde b/processing/mode/examples/Basics/Color/Reading/Reading.pde
similarity index 100%
rename from mode/examples/Basics/Color/Reading/Reading.pde
rename to processing/mode/examples/Basics/Color/Reading/Reading.pde
diff --git a/mode/examples/Basics/Color/Reading/data/cait.jpg b/processing/mode/examples/Basics/Color/Reading/data/cait.jpg
similarity index 100%
rename from mode/examples/Basics/Color/Reading/data/cait.jpg
rename to processing/mode/examples/Basics/Color/Reading/data/cait.jpg
diff --git a/mode/examples/Basics/Color/Relativity/Relativity.pde b/processing/mode/examples/Basics/Color/Relativity/Relativity.pde
similarity index 100%
rename from mode/examples/Basics/Color/Relativity/Relativity.pde
rename to processing/mode/examples/Basics/Color/Relativity/Relativity.pde
diff --git a/mode/examples/Basics/Color/Saturation/Saturation.pde b/processing/mode/examples/Basics/Color/Saturation/Saturation.pde
similarity index 100%
rename from mode/examples/Basics/Color/Saturation/Saturation.pde
rename to processing/mode/examples/Basics/Color/Saturation/Saturation.pde
diff --git a/mode/examples/Basics/Color/WaveGradient/WaveGradient.pde b/processing/mode/examples/Basics/Color/WaveGradient/WaveGradient.pde
similarity index 100%
rename from mode/examples/Basics/Color/WaveGradient/WaveGradient.pde
rename to processing/mode/examples/Basics/Color/WaveGradient/WaveGradient.pde
diff --git a/mode/examples/Basics/Control/Conditionals1/Conditionals1.pde b/processing/mode/examples/Basics/Control/Conditionals1/Conditionals1.pde
similarity index 100%
rename from mode/examples/Basics/Control/Conditionals1/Conditionals1.pde
rename to processing/mode/examples/Basics/Control/Conditionals1/Conditionals1.pde
diff --git a/mode/examples/Basics/Control/Conditionals2/Conditionals2.pde b/processing/mode/examples/Basics/Control/Conditionals2/Conditionals2.pde
similarity index 100%
rename from mode/examples/Basics/Control/Conditionals2/Conditionals2.pde
rename to processing/mode/examples/Basics/Control/Conditionals2/Conditionals2.pde
diff --git a/mode/examples/Basics/Control/EmbeddedIteration/EmbeddedIteration.pde b/processing/mode/examples/Basics/Control/EmbeddedIteration/EmbeddedIteration.pde
similarity index 100%
rename from mode/examples/Basics/Control/EmbeddedIteration/EmbeddedIteration.pde
rename to processing/mode/examples/Basics/Control/EmbeddedIteration/EmbeddedIteration.pde
diff --git a/mode/examples/Basics/Control/Iteration/Iteration.pde b/processing/mode/examples/Basics/Control/Iteration/Iteration.pde
similarity index 100%
rename from mode/examples/Basics/Control/Iteration/Iteration.pde
rename to processing/mode/examples/Basics/Control/Iteration/Iteration.pde
diff --git a/mode/examples/Basics/Control/LogicalOperators/LogicalOperators.pde b/processing/mode/examples/Basics/Control/LogicalOperators/LogicalOperators.pde
similarity index 100%
rename from mode/examples/Basics/Control/LogicalOperators/LogicalOperators.pde
rename to processing/mode/examples/Basics/Control/LogicalOperators/LogicalOperators.pde
diff --git a/mode/examples/Basics/Data/CharactersStrings/CharactersStrings.pde b/processing/mode/examples/Basics/Data/CharactersStrings/CharactersStrings.pde
similarity index 100%
rename from mode/examples/Basics/Data/CharactersStrings/CharactersStrings.pde
rename to processing/mode/examples/Basics/Data/CharactersStrings/CharactersStrings.pde
diff --git a/mode/examples/Basics/Data/CharactersStrings/data/Eureka-90.vlw b/processing/mode/examples/Basics/Data/CharactersStrings/data/Eureka-90.vlw
similarity index 100%
rename from mode/examples/Basics/Data/CharactersStrings/data/Eureka-90.vlw
rename to processing/mode/examples/Basics/Data/CharactersStrings/data/Eureka-90.vlw
diff --git a/mode/examples/Basics/Data/CharactersStrings/data/rathausFrog.jpg b/processing/mode/examples/Basics/Data/CharactersStrings/data/rathausFrog.jpg
similarity index 100%
rename from mode/examples/Basics/Data/CharactersStrings/data/rathausFrog.jpg
rename to processing/mode/examples/Basics/Data/CharactersStrings/data/rathausFrog.jpg
diff --git a/mode/examples/Basics/Data/DatatypeConversion/DatatypeConversion.pde b/processing/mode/examples/Basics/Data/DatatypeConversion/DatatypeConversion.pde
similarity index 100%
rename from mode/examples/Basics/Data/DatatypeConversion/DatatypeConversion.pde
rename to processing/mode/examples/Basics/Data/DatatypeConversion/DatatypeConversion.pde
diff --git a/mode/examples/Basics/Data/IntegersFloats/IntegersFloats.pde b/processing/mode/examples/Basics/Data/IntegersFloats/IntegersFloats.pde
similarity index 100%
rename from mode/examples/Basics/Data/IntegersFloats/IntegersFloats.pde
rename to processing/mode/examples/Basics/Data/IntegersFloats/IntegersFloats.pde
diff --git a/mode/examples/Basics/Data/TrueFalse/TrueFalse.pde b/processing/mode/examples/Basics/Data/TrueFalse/TrueFalse.pde
similarity index 100%
rename from mode/examples/Basics/Data/TrueFalse/TrueFalse.pde
rename to processing/mode/examples/Basics/Data/TrueFalse/TrueFalse.pde
diff --git a/mode/examples/Basics/Data/VariableScope/VariableScope.pde b/processing/mode/examples/Basics/Data/VariableScope/VariableScope.pde
similarity index 100%
rename from mode/examples/Basics/Data/VariableScope/VariableScope.pde
rename to processing/mode/examples/Basics/Data/VariableScope/VariableScope.pde
diff --git a/mode/examples/Basics/Data/Variables/Variables.pde b/processing/mode/examples/Basics/Data/Variables/Variables.pde
similarity index 100%
rename from mode/examples/Basics/Data/Variables/Variables.pde
rename to processing/mode/examples/Basics/Data/Variables/Variables.pde
diff --git a/mode/examples/Basics/Form/Bezier/Bezier.pde b/processing/mode/examples/Basics/Form/Bezier/Bezier.pde
similarity index 100%
rename from mode/examples/Basics/Form/Bezier/Bezier.pde
rename to processing/mode/examples/Basics/Form/Bezier/Bezier.pde
diff --git a/mode/examples/Basics/Form/BezierEllipse/BezierEllipse.pde b/processing/mode/examples/Basics/Form/BezierEllipse/BezierEllipse.pde
similarity index 100%
rename from mode/examples/Basics/Form/BezierEllipse/BezierEllipse.pde
rename to processing/mode/examples/Basics/Form/BezierEllipse/BezierEllipse.pde
diff --git a/mode/examples/Basics/Form/PieChart/PieChart.pde b/processing/mode/examples/Basics/Form/PieChart/PieChart.pde
similarity index 100%
rename from mode/examples/Basics/Form/PieChart/PieChart.pde
rename to processing/mode/examples/Basics/Form/PieChart/PieChart.pde
diff --git a/mode/examples/Basics/Form/PointsLines/PointsLines.pde b/processing/mode/examples/Basics/Form/PointsLines/PointsLines.pde
similarity index 100%
rename from mode/examples/Basics/Form/PointsLines/PointsLines.pde
rename to processing/mode/examples/Basics/Form/PointsLines/PointsLines.pde
diff --git a/mode/examples/Basics/Form/Primitives3D/Primitives3D.pde b/processing/mode/examples/Basics/Form/Primitives3D/Primitives3D.pde
similarity index 100%
rename from mode/examples/Basics/Form/Primitives3D/Primitives3D.pde
rename to processing/mode/examples/Basics/Form/Primitives3D/Primitives3D.pde
diff --git a/mode/examples/Basics/Form/ShapePrimitives/ShapePrimitives.pde b/processing/mode/examples/Basics/Form/ShapePrimitives/ShapePrimitives.pde
similarity index 100%
rename from mode/examples/Basics/Form/ShapePrimitives/ShapePrimitives.pde
rename to processing/mode/examples/Basics/Form/ShapePrimitives/ShapePrimitives.pde
diff --git a/mode/examples/Basics/Form/SimpleCurves/SimpleCurves.pde b/processing/mode/examples/Basics/Form/SimpleCurves/SimpleCurves.pde
similarity index 100%
rename from mode/examples/Basics/Form/SimpleCurves/SimpleCurves.pde
rename to processing/mode/examples/Basics/Form/SimpleCurves/SimpleCurves.pde
diff --git a/mode/examples/Basics/Form/TriangleStrip/TriangleStrip.pde b/processing/mode/examples/Basics/Form/TriangleStrip/TriangleStrip.pde
similarity index 100%
rename from mode/examples/Basics/Form/TriangleStrip/TriangleStrip.pde
rename to processing/mode/examples/Basics/Form/TriangleStrip/TriangleStrip.pde
diff --git a/mode/examples/Basics/Form/Vertices/Vertices.pde b/processing/mode/examples/Basics/Form/Vertices/Vertices.pde
similarity index 100%
rename from mode/examples/Basics/Form/Vertices/Vertices.pde
rename to processing/mode/examples/Basics/Form/Vertices/Vertices.pde
diff --git a/mode/examples/Basics/Image/Alphamask/Alphamask.pde b/processing/mode/examples/Basics/Image/Alphamask/Alphamask.pde
similarity index 100%
rename from mode/examples/Basics/Image/Alphamask/Alphamask.pde
rename to processing/mode/examples/Basics/Image/Alphamask/Alphamask.pde
diff --git a/mode/examples/Basics/Image/Alphamask/data/mask.jpg b/processing/mode/examples/Basics/Image/Alphamask/data/mask.jpg
similarity index 100%
rename from mode/examples/Basics/Image/Alphamask/data/mask.jpg
rename to processing/mode/examples/Basics/Image/Alphamask/data/mask.jpg
diff --git a/mode/examples/Basics/Image/Alphamask/data/test.jpg b/processing/mode/examples/Basics/Image/Alphamask/data/test.jpg
similarity index 100%
rename from mode/examples/Basics/Image/Alphamask/data/test.jpg
rename to processing/mode/examples/Basics/Image/Alphamask/data/test.jpg
diff --git a/mode/examples/Basics/Image/BackgroundImage/BackgroundImage.pde b/processing/mode/examples/Basics/Image/BackgroundImage/BackgroundImage.pde
similarity index 100%
rename from mode/examples/Basics/Image/BackgroundImage/BackgroundImage.pde
rename to processing/mode/examples/Basics/Image/BackgroundImage/BackgroundImage.pde
diff --git a/mode/examples/Basics/Image/BackgroundImage/data/milan_rubbish.jpg b/processing/mode/examples/Basics/Image/BackgroundImage/data/milan_rubbish.jpg
similarity index 100%
rename from mode/examples/Basics/Image/BackgroundImage/data/milan_rubbish.jpg
rename to processing/mode/examples/Basics/Image/BackgroundImage/data/milan_rubbish.jpg
diff --git a/mode/examples/Basics/Image/CreateImage/CreateImage.pde b/processing/mode/examples/Basics/Image/CreateImage/CreateImage.pde
similarity index 100%
rename from mode/examples/Basics/Image/CreateImage/CreateImage.pde
rename to processing/mode/examples/Basics/Image/CreateImage/CreateImage.pde
diff --git a/mode/examples/Basics/Image/CreateImage/data/mask.jpg b/processing/mode/examples/Basics/Image/CreateImage/data/mask.jpg
similarity index 100%
rename from mode/examples/Basics/Image/CreateImage/data/mask.jpg
rename to processing/mode/examples/Basics/Image/CreateImage/data/mask.jpg
diff --git a/mode/examples/Basics/Image/CreateImage/data/test.jpg b/processing/mode/examples/Basics/Image/CreateImage/data/test.jpg
similarity index 100%
rename from mode/examples/Basics/Image/CreateImage/data/test.jpg
rename to processing/mode/examples/Basics/Image/CreateImage/data/test.jpg
diff --git a/mode/examples/Basics/Image/LoadDisplayImage/LoadDisplayImage.pde b/processing/mode/examples/Basics/Image/LoadDisplayImage/LoadDisplayImage.pde
similarity index 93%
rename from mode/examples/Basics/Image/LoadDisplayImage/LoadDisplayImage.pde
rename to processing/mode/examples/Basics/Image/LoadDisplayImage/LoadDisplayImage.pde
index 8252c5cbc..495d1f124 100644
--- a/mode/examples/Basics/Image/LoadDisplayImage/LoadDisplayImage.pde
+++ b/processing/mode/examples/Basics/Image/LoadDisplayImage/LoadDisplayImage.pde
@@ -12,7 +12,6 @@ void setup() {
// The file "jelly.jpg" must be in the data folder
// of the current sketch to load successfully
a = loadImage("jelly.jpg"); // Load the image into the program
- noLoop(); // Makes draw() only run once
}
void draw() {
diff --git a/mode/examples/Basics/Image/LoadDisplayImage/data/jelly.jpg b/processing/mode/examples/Basics/Image/LoadDisplayImage/data/jelly.jpg
similarity index 100%
rename from mode/examples/Basics/Image/LoadDisplayImage/data/jelly.jpg
rename to processing/mode/examples/Basics/Image/LoadDisplayImage/data/jelly.jpg
diff --git a/mode/examples/Basics/Image/Pointillism/Pointillism.pde b/processing/mode/examples/Basics/Image/Pointillism/Pointillism.pde
similarity index 100%
rename from mode/examples/Basics/Image/Pointillism/Pointillism.pde
rename to processing/mode/examples/Basics/Image/Pointillism/Pointillism.pde
diff --git a/mode/examples/Basics/Image/Pointillism/data/eames.jpg b/processing/mode/examples/Basics/Image/Pointillism/data/eames.jpg
similarity index 100%
rename from mode/examples/Basics/Image/Pointillism/data/eames.jpg
rename to processing/mode/examples/Basics/Image/Pointillism/data/eames.jpg
diff --git a/mode/examples/Basics/Image/Pointillism/data/sunflower.jpg b/processing/mode/examples/Basics/Image/Pointillism/data/sunflower.jpg
similarity index 100%
rename from mode/examples/Basics/Image/Pointillism/data/sunflower.jpg
rename to processing/mode/examples/Basics/Image/Pointillism/data/sunflower.jpg
diff --git a/mode/examples/Basics/Image/RequestImage/RequestImage.pde b/processing/mode/examples/Basics/Image/RequestImage/RequestImage.pde
similarity index 100%
rename from mode/examples/Basics/Image/RequestImage/RequestImage.pde
rename to processing/mode/examples/Basics/Image/RequestImage/RequestImage.pde
diff --git a/mode/examples/Basics/Image/Sprite/Sprite.pde b/processing/mode/examples/Basics/Image/Sprite/Sprite.pde
similarity index 100%
rename from mode/examples/Basics/Image/Sprite/Sprite.pde
rename to processing/mode/examples/Basics/Image/Sprite/Sprite.pde
diff --git a/mode/examples/Basics/Image/Sprite/data/teddy.gif b/processing/mode/examples/Basics/Image/Sprite/data/teddy.gif
similarity index 100%
rename from mode/examples/Basics/Image/Sprite/data/teddy.gif
rename to processing/mode/examples/Basics/Image/Sprite/data/teddy.gif
diff --git a/mode/examples/Basics/Image/Sprite2/Sprite2.pde b/processing/mode/examples/Basics/Image/Sprite2/Sprite2.pde
similarity index 100%
rename from mode/examples/Basics/Image/Sprite2/Sprite2.pde
rename to processing/mode/examples/Basics/Image/Sprite2/Sprite2.pde
diff --git a/mode/examples/Basics/Image/Sprite2/data/sky.jpg b/processing/mode/examples/Basics/Image/Sprite2/data/sky.jpg
similarity index 100%
rename from mode/examples/Basics/Image/Sprite2/data/sky.jpg
rename to processing/mode/examples/Basics/Image/Sprite2/data/sky.jpg
diff --git a/mode/examples/Basics/Image/Sprite2/data/teddy.gif b/processing/mode/examples/Basics/Image/Sprite2/data/teddy.gif
similarity index 100%
rename from mode/examples/Basics/Image/Sprite2/data/teddy.gif
rename to processing/mode/examples/Basics/Image/Sprite2/data/teddy.gif
diff --git a/mode/examples/Basics/Image/Transparency/Transparency.pde b/processing/mode/examples/Basics/Image/Transparency/Transparency.pde
similarity index 100%
rename from mode/examples/Basics/Image/Transparency/Transparency.pde
rename to processing/mode/examples/Basics/Image/Transparency/Transparency.pde
diff --git a/mode/examples/Basics/Image/Transparency/data/construct.jpg b/processing/mode/examples/Basics/Image/Transparency/data/construct.jpg
similarity index 100%
rename from mode/examples/Basics/Image/Transparency/data/construct.jpg
rename to processing/mode/examples/Basics/Image/Transparency/data/construct.jpg
diff --git a/mode/examples/Basics/Image/Transparency/data/wash.jpg b/processing/mode/examples/Basics/Image/Transparency/data/wash.jpg
similarity index 100%
rename from mode/examples/Basics/Image/Transparency/data/wash.jpg
rename to processing/mode/examples/Basics/Image/Transparency/data/wash.jpg
diff --git a/mode/examples/Basics/Input/Clock/Clock.pde b/processing/mode/examples/Basics/Input/Clock/Clock.pde
similarity index 100%
rename from mode/examples/Basics/Input/Clock/Clock.pde
rename to processing/mode/examples/Basics/Input/Clock/Clock.pde
diff --git a/mode/examples/Basics/Input/Constrain/Constrain.pde b/processing/mode/examples/Basics/Input/Constrain/Constrain.pde
similarity index 100%
rename from mode/examples/Basics/Input/Constrain/Constrain.pde
rename to processing/mode/examples/Basics/Input/Constrain/Constrain.pde
diff --git a/mode/examples/Basics/Input/Easing/Easing.pde b/processing/mode/examples/Basics/Input/Easing/Easing.pde
similarity index 100%
rename from mode/examples/Basics/Input/Easing/Easing.pde
rename to processing/mode/examples/Basics/Input/Easing/Easing.pde
diff --git a/mode/examples/Basics/Input/Keyboard/Keyboard.pde b/processing/mode/examples/Basics/Input/Keyboard/Keyboard.pde
similarity index 100%
rename from mode/examples/Basics/Input/Keyboard/Keyboard.pde
rename to processing/mode/examples/Basics/Input/Keyboard/Keyboard.pde
diff --git a/mode/examples/Basics/Input/KeyboardFunctions/KeyboardFunctions.pde b/processing/mode/examples/Basics/Input/KeyboardFunctions/KeyboardFunctions.pde
similarity index 100%
rename from mode/examples/Basics/Input/KeyboardFunctions/KeyboardFunctions.pde
rename to processing/mode/examples/Basics/Input/KeyboardFunctions/KeyboardFunctions.pde
diff --git a/mode/examples/Basics/Input/KeyboardFunctions/data/brugges.jpg b/processing/mode/examples/Basics/Input/KeyboardFunctions/data/brugges.jpg
similarity index 100%
rename from mode/examples/Basics/Input/KeyboardFunctions/data/brugges.jpg
rename to processing/mode/examples/Basics/Input/KeyboardFunctions/data/brugges.jpg
diff --git a/mode/examples/Basics/Input/Milliseconds/Milliseconds.pde b/processing/mode/examples/Basics/Input/Milliseconds/Milliseconds.pde
similarity index 100%
rename from mode/examples/Basics/Input/Milliseconds/Milliseconds.pde
rename to processing/mode/examples/Basics/Input/Milliseconds/Milliseconds.pde
diff --git a/mode/examples/Basics/Input/Mouse1D/Mouse1D.pde b/processing/mode/examples/Basics/Input/Mouse1D/Mouse1D.pde
similarity index 100%
rename from mode/examples/Basics/Input/Mouse1D/Mouse1D.pde
rename to processing/mode/examples/Basics/Input/Mouse1D/Mouse1D.pde
diff --git a/mode/examples/Basics/Input/Mouse2D/Mouse2D.pde b/processing/mode/examples/Basics/Input/Mouse2D/Mouse2D.pde
similarity index 100%
rename from mode/examples/Basics/Input/Mouse2D/Mouse2D.pde
rename to processing/mode/examples/Basics/Input/Mouse2D/Mouse2D.pde
diff --git a/mode/examples/Basics/Input/MouseFunctions/MouseFunctions.pde b/processing/mode/examples/Basics/Input/MouseFunctions/MouseFunctions.pde
similarity index 100%
rename from mode/examples/Basics/Input/MouseFunctions/MouseFunctions.pde
rename to processing/mode/examples/Basics/Input/MouseFunctions/MouseFunctions.pde
diff --git a/mode/examples/Basics/Input/MousePress/MousePress.pde b/processing/mode/examples/Basics/Input/MousePress/MousePress.pde
similarity index 100%
rename from mode/examples/Basics/Input/MousePress/MousePress.pde
rename to processing/mode/examples/Basics/Input/MousePress/MousePress.pde
diff --git a/mode/examples/Basics/Input/MouseSignals/MouseSignals.pde b/processing/mode/examples/Basics/Input/MouseSignals/MouseSignals.pde
similarity index 100%
rename from mode/examples/Basics/Input/MouseSignals/MouseSignals.pde
rename to processing/mode/examples/Basics/Input/MouseSignals/MouseSignals.pde
diff --git a/mode/examples/Basics/Input/StoringInput/StoringInput.pde b/processing/mode/examples/Basics/Input/StoringInput/StoringInput.pde
similarity index 100%
rename from mode/examples/Basics/Input/StoringInput/StoringInput.pde
rename to processing/mode/examples/Basics/Input/StoringInput/StoringInput.pde
diff --git a/mode/examples/Basics/Lights/Directional/Directional.pde b/processing/mode/examples/Basics/Lights/Directional/Directional.pde
similarity index 100%
rename from mode/examples/Basics/Lights/Directional/Directional.pde
rename to processing/mode/examples/Basics/Lights/Directional/Directional.pde
diff --git a/mode/examples/Basics/Lights/Mixture/Mixture.pde b/processing/mode/examples/Basics/Lights/Mixture/Mixture.pde
similarity index 100%
rename from mode/examples/Basics/Lights/Mixture/Mixture.pde
rename to processing/mode/examples/Basics/Lights/Mixture/Mixture.pde
diff --git a/mode/examples/Basics/Lights/MixtureGrid/MixtureGrid.pde b/processing/mode/examples/Basics/Lights/MixtureGrid/MixtureGrid.pde
similarity index 100%
rename from mode/examples/Basics/Lights/MixtureGrid/MixtureGrid.pde
rename to processing/mode/examples/Basics/Lights/MixtureGrid/MixtureGrid.pde
diff --git a/mode/examples/Basics/Lights/OnOff/OnOff.pde b/processing/mode/examples/Basics/Lights/OnOff/OnOff.pde
similarity index 100%
rename from mode/examples/Basics/Lights/OnOff/OnOff.pde
rename to processing/mode/examples/Basics/Lights/OnOff/OnOff.pde
diff --git a/mode/examples/Basics/Lights/Reflection/Reflection.pde b/processing/mode/examples/Basics/Lights/Reflection/Reflection.pde
similarity index 100%
rename from mode/examples/Basics/Lights/Reflection/Reflection.pde
rename to processing/mode/examples/Basics/Lights/Reflection/Reflection.pde
diff --git a/mode/examples/Basics/Lights/Spot/Spot.pde b/processing/mode/examples/Basics/Lights/Spot/Spot.pde
similarity index 100%
rename from mode/examples/Basics/Lights/Spot/Spot.pde
rename to processing/mode/examples/Basics/Lights/Spot/Spot.pde
diff --git a/mode/examples/Basics/Math/AdditiveWave/AdditiveWave.pde b/processing/mode/examples/Basics/Math/AdditiveWave/AdditiveWave.pde
similarity index 100%
rename from mode/examples/Basics/Math/AdditiveWave/AdditiveWave.pde
rename to processing/mode/examples/Basics/Math/AdditiveWave/AdditiveWave.pde
diff --git a/mode/examples/Basics/Math/Arctangent/Arctangent.pde b/processing/mode/examples/Basics/Math/Arctangent/Arctangent.pde
similarity index 100%
rename from mode/examples/Basics/Math/Arctangent/Arctangent.pde
rename to processing/mode/examples/Basics/Math/Arctangent/Arctangent.pde
diff --git a/mode/examples/Basics/Math/Distance1D/Distance1D.pde b/processing/mode/examples/Basics/Math/Distance1D/Distance1D.pde
similarity index 100%
rename from mode/examples/Basics/Math/Distance1D/Distance1D.pde
rename to processing/mode/examples/Basics/Math/Distance1D/Distance1D.pde
diff --git a/mode/examples/Basics/Math/Distance2D/Distance2D.pde b/processing/mode/examples/Basics/Math/Distance2D/Distance2D.pde
similarity index 100%
rename from mode/examples/Basics/Math/Distance2D/Distance2D.pde
rename to processing/mode/examples/Basics/Math/Distance2D/Distance2D.pde
diff --git a/mode/examples/Basics/Math/DoubleRandom/DoubleRandom.pde b/processing/mode/examples/Basics/Math/DoubleRandom/DoubleRandom.pde
similarity index 100%
rename from mode/examples/Basics/Math/DoubleRandom/DoubleRandom.pde
rename to processing/mode/examples/Basics/Math/DoubleRandom/DoubleRandom.pde
diff --git a/mode/examples/Basics/Math/Graphing2DEquation/Graphing2DEquation.pde b/processing/mode/examples/Basics/Math/Graphing2DEquation/Graphing2DEquation.pde
similarity index 100%
rename from mode/examples/Basics/Math/Graphing2DEquation/Graphing2DEquation.pde
rename to processing/mode/examples/Basics/Math/Graphing2DEquation/Graphing2DEquation.pde
diff --git a/mode/examples/Basics/Math/IncrementDecrement/IncrementDecrement.pde b/processing/mode/examples/Basics/Math/IncrementDecrement/IncrementDecrement.pde
similarity index 100%
rename from mode/examples/Basics/Math/IncrementDecrement/IncrementDecrement.pde
rename to processing/mode/examples/Basics/Math/IncrementDecrement/IncrementDecrement.pde
diff --git a/mode/examples/Basics/Math/Modulo/Modulo.pde b/processing/mode/examples/Basics/Math/Modulo/Modulo.pde
similarity index 100%
rename from mode/examples/Basics/Math/Modulo/Modulo.pde
rename to processing/mode/examples/Basics/Math/Modulo/Modulo.pde
diff --git a/mode/examples/Basics/Math/Noise1D/Noise1D.pde b/processing/mode/examples/Basics/Math/Noise1D/Noise1D.pde
similarity index 100%
rename from mode/examples/Basics/Math/Noise1D/Noise1D.pde
rename to processing/mode/examples/Basics/Math/Noise1D/Noise1D.pde
diff --git a/mode/examples/Basics/Math/Noise2D/Noise2D.pde b/processing/mode/examples/Basics/Math/Noise2D/Noise2D.pde
similarity index 100%
rename from mode/examples/Basics/Math/Noise2D/Noise2D.pde
rename to processing/mode/examples/Basics/Math/Noise2D/Noise2D.pde
diff --git a/mode/examples/Basics/Math/Noise3D/Noise3D.pde b/processing/mode/examples/Basics/Math/Noise3D/Noise3D.pde
similarity index 100%
rename from mode/examples/Basics/Math/Noise3D/Noise3D.pde
rename to processing/mode/examples/Basics/Math/Noise3D/Noise3D.pde
diff --git a/mode/examples/Basics/Math/NoiseWave/NoiseWave.pde b/processing/mode/examples/Basics/Math/NoiseWave/NoiseWave.pde
similarity index 100%
rename from mode/examples/Basics/Math/NoiseWave/NoiseWave.pde
rename to processing/mode/examples/Basics/Math/NoiseWave/NoiseWave.pde
diff --git a/mode/examples/Basics/Math/OperatorPrecedence/OperatorPrecedence.pde b/processing/mode/examples/Basics/Math/OperatorPrecedence/OperatorPrecedence.pde
similarity index 100%
rename from mode/examples/Basics/Math/OperatorPrecedence/OperatorPrecedence.pde
rename to processing/mode/examples/Basics/Math/OperatorPrecedence/OperatorPrecedence.pde
diff --git a/mode/examples/Basics/Math/PolarToCartesian/PolarToCartesian.pde b/processing/mode/examples/Basics/Math/PolarToCartesian/PolarToCartesian.pde
similarity index 100%
rename from mode/examples/Basics/Math/PolarToCartesian/PolarToCartesian.pde
rename to processing/mode/examples/Basics/Math/PolarToCartesian/PolarToCartesian.pde
diff --git a/mode/examples/Basics/Math/Random/Random.pde b/processing/mode/examples/Basics/Math/Random/Random.pde
similarity index 100%
rename from mode/examples/Basics/Math/Random/Random.pde
rename to processing/mode/examples/Basics/Math/Random/Random.pde
diff --git a/mode/examples/Basics/Math/Sine/Sine.pde b/processing/mode/examples/Basics/Math/Sine/Sine.pde
similarity index 100%
rename from mode/examples/Basics/Math/Sine/Sine.pde
rename to processing/mode/examples/Basics/Math/Sine/Sine.pde
diff --git a/mode/examples/Basics/Math/SineCosine/SineCosine.pde b/processing/mode/examples/Basics/Math/SineCosine/SineCosine.pde
similarity index 100%
rename from mode/examples/Basics/Math/SineCosine/SineCosine.pde
rename to processing/mode/examples/Basics/Math/SineCosine/SineCosine.pde
diff --git a/mode/examples/Basics/Math/SineWave/SineWave.pde b/processing/mode/examples/Basics/Math/SineWave/SineWave.pde
similarity index 100%
rename from mode/examples/Basics/Math/SineWave/SineWave.pde
rename to processing/mode/examples/Basics/Math/SineWave/SineWave.pde
diff --git a/mode/examples/Basics/Objects/CompositeObjects/CompositeObjects.pde b/processing/mode/examples/Basics/Objects/CompositeObjects/CompositeObjects.pde
similarity index 100%
rename from mode/examples/Basics/Objects/CompositeObjects/CompositeObjects.pde
rename to processing/mode/examples/Basics/Objects/CompositeObjects/CompositeObjects.pde
diff --git a/mode/examples/Basics/Objects/CompositeObjects/Egg.pde b/processing/mode/examples/Basics/Objects/CompositeObjects/Egg.pde
similarity index 100%
rename from mode/examples/Basics/Objects/CompositeObjects/Egg.pde
rename to processing/mode/examples/Basics/Objects/CompositeObjects/Egg.pde
diff --git a/mode/examples/Basics/Objects/CompositeObjects/EggRing.pde b/processing/mode/examples/Basics/Objects/CompositeObjects/EggRing.pde
similarity index 100%
rename from mode/examples/Basics/Objects/CompositeObjects/EggRing.pde
rename to processing/mode/examples/Basics/Objects/CompositeObjects/EggRing.pde
diff --git a/mode/examples/Basics/Objects/CompositeObjects/Ring.pde b/processing/mode/examples/Basics/Objects/CompositeObjects/Ring.pde
similarity index 100%
rename from mode/examples/Basics/Objects/CompositeObjects/Ring.pde
rename to processing/mode/examples/Basics/Objects/CompositeObjects/Ring.pde
diff --git a/mode/examples/Basics/Objects/Inheritance/Inheritance.pde b/processing/mode/examples/Basics/Objects/Inheritance/Inheritance.pde
similarity index 100%
rename from mode/examples/Basics/Objects/Inheritance/Inheritance.pde
rename to processing/mode/examples/Basics/Objects/Inheritance/Inheritance.pde
diff --git a/mode/examples/Basics/Objects/MultipleConstructors/MultipleConstructors.pde b/processing/mode/examples/Basics/Objects/MultipleConstructors/MultipleConstructors.pde
similarity index 100%
rename from mode/examples/Basics/Objects/MultipleConstructors/MultipleConstructors.pde
rename to processing/mode/examples/Basics/Objects/MultipleConstructors/MultipleConstructors.pde
diff --git a/mode/examples/Basics/Objects/Neighborhood/Neighborhood.pde b/processing/mode/examples/Basics/Objects/Neighborhood/Neighborhood.pde
similarity index 100%
rename from mode/examples/Basics/Objects/Neighborhood/Neighborhood.pde
rename to processing/mode/examples/Basics/Objects/Neighborhood/Neighborhood.pde
diff --git a/mode/examples/Basics/Objects/Objects/Objects.pde b/processing/mode/examples/Basics/Objects/Objects/Objects.pde
similarity index 100%
rename from mode/examples/Basics/Objects/Objects/Objects.pde
rename to processing/mode/examples/Basics/Objects/Objects/Objects.pde
diff --git a/mode/examples/Basics/Shape/DisableStyle/DisableStyle.pde b/processing/mode/examples/Basics/Shape/DisableStyle/DisableStyle.pde
similarity index 100%
rename from mode/examples/Basics/Shape/DisableStyle/DisableStyle.pde
rename to processing/mode/examples/Basics/Shape/DisableStyle/DisableStyle.pde
diff --git a/mode/examples/Basics/Shape/LoadDisplaySVG/data/bot1.svg b/processing/mode/examples/Basics/Shape/DisableStyle/data/bot1.svg
similarity index 100%
rename from mode/examples/Basics/Shape/LoadDisplaySVG/data/bot1.svg
rename to processing/mode/examples/Basics/Shape/DisableStyle/data/bot1.svg
diff --git a/mode/examples/Basics/Shape/GetChild/GetChild.pde b/processing/mode/examples/Basics/Shape/GetChild/GetChild.pde
similarity index 100%
rename from mode/examples/Basics/Shape/GetChild/GetChild.pde
rename to processing/mode/examples/Basics/Shape/GetChild/GetChild.pde
diff --git a/mode/examples/Basics/Shape/GetChild/data/usa-wikipedia.svg b/processing/mode/examples/Basics/Shape/GetChild/data/usa-wikipedia.svg
similarity index 100%
rename from mode/examples/Basics/Shape/GetChild/data/usa-wikipedia.svg
rename to processing/mode/examples/Basics/Shape/GetChild/data/usa-wikipedia.svg
diff --git a/mode/examples/Basics/Shape/LoadDisplayOBJ/LoadDisplayOBJ.pde b/processing/mode/examples/Basics/Shape/LoadDisplayOBJ/LoadDisplayOBJ.pde
similarity index 100%
rename from mode/examples/Basics/Shape/LoadDisplayOBJ/LoadDisplayOBJ.pde
rename to processing/mode/examples/Basics/Shape/LoadDisplayOBJ/LoadDisplayOBJ.pde
diff --git a/mode/examples/Basics/Shape/LoadDisplayOBJ/data/rocket.mtl b/processing/mode/examples/Basics/Shape/LoadDisplayOBJ/data/rocket.mtl
similarity index 100%
rename from mode/examples/Basics/Shape/LoadDisplayOBJ/data/rocket.mtl
rename to processing/mode/examples/Basics/Shape/LoadDisplayOBJ/data/rocket.mtl
diff --git a/mode/examples/Basics/Shape/LoadDisplayOBJ/data/rocket.obj b/processing/mode/examples/Basics/Shape/LoadDisplayOBJ/data/rocket.obj
similarity index 100%
rename from mode/examples/Basics/Shape/LoadDisplayOBJ/data/rocket.obj
rename to processing/mode/examples/Basics/Shape/LoadDisplayOBJ/data/rocket.obj
diff --git a/mode/examples/Basics/Shape/LoadDisplayOBJ/data/rocket.png b/processing/mode/examples/Basics/Shape/LoadDisplayOBJ/data/rocket.png
similarity index 100%
rename from mode/examples/Basics/Shape/LoadDisplayOBJ/data/rocket.png
rename to processing/mode/examples/Basics/Shape/LoadDisplayOBJ/data/rocket.png
diff --git a/mode/examples/Basics/Shape/LoadDisplaySVG/LoadDisplaySVG.pde b/processing/mode/examples/Basics/Shape/LoadDisplaySVG/LoadDisplaySVG.pde
similarity index 100%
rename from mode/examples/Basics/Shape/LoadDisplaySVG/LoadDisplaySVG.pde
rename to processing/mode/examples/Basics/Shape/LoadDisplaySVG/LoadDisplaySVG.pde
diff --git a/mode/examples/Basics/Shape/ScaleShape/data/bot1.svg b/processing/mode/examples/Basics/Shape/LoadDisplaySVG/data/bot1.svg
similarity index 100%
rename from mode/examples/Basics/Shape/ScaleShape/data/bot1.svg
rename to processing/mode/examples/Basics/Shape/LoadDisplaySVG/data/bot1.svg
diff --git a/mode/examples/Basics/Shape/ScaleShape/ScaleShape.pde b/processing/mode/examples/Basics/Shape/ScaleShape/ScaleShape.pde
similarity index 100%
rename from mode/examples/Basics/Shape/ScaleShape/ScaleShape.pde
rename to processing/mode/examples/Basics/Shape/ScaleShape/ScaleShape.pde
diff --git a/studio/apps/fast2d/src/main/assets/bot1.svg b/processing/mode/examples/Basics/Shape/ScaleShape/data/bot1.svg
similarity index 100%
rename from studio/apps/fast2d/src/main/assets/bot1.svg
rename to processing/mode/examples/Basics/Shape/ScaleShape/data/bot1.svg
diff --git a/mode/examples/Basics/Structure/Coordinates/Coordinates.pde b/processing/mode/examples/Basics/Structure/Coordinates/Coordinates.pde
similarity index 100%
rename from mode/examples/Basics/Structure/Coordinates/Coordinates.pde
rename to processing/mode/examples/Basics/Structure/Coordinates/Coordinates.pde
diff --git a/mode/examples/Basics/Structure/CreateGraphics/CreateGraphics.pde b/processing/mode/examples/Basics/Structure/CreateGraphics/CreateGraphics.pde
similarity index 100%
rename from mode/examples/Basics/Structure/CreateGraphics/CreateGraphics.pde
rename to processing/mode/examples/Basics/Structure/CreateGraphics/CreateGraphics.pde
diff --git a/mode/examples/Basics/Structure/CreateGraphics/data/mask.jpg b/processing/mode/examples/Basics/Structure/CreateGraphics/data/mask.jpg
similarity index 100%
rename from mode/examples/Basics/Structure/CreateGraphics/data/mask.jpg
rename to processing/mode/examples/Basics/Structure/CreateGraphics/data/mask.jpg
diff --git a/mode/examples/Basics/Structure/CreateGraphics/data/test.jpg b/processing/mode/examples/Basics/Structure/CreateGraphics/data/test.jpg
similarity index 100%
rename from mode/examples/Basics/Structure/CreateGraphics/data/test.jpg
rename to processing/mode/examples/Basics/Structure/CreateGraphics/data/test.jpg
diff --git a/mode/examples/Basics/Structure/Functions/Functions.pde b/processing/mode/examples/Basics/Structure/Functions/Functions.pde
similarity index 100%
rename from mode/examples/Basics/Structure/Functions/Functions.pde
rename to processing/mode/examples/Basics/Structure/Functions/Functions.pde
diff --git a/mode/examples/Basics/Structure/Loop/Loop.pde b/processing/mode/examples/Basics/Structure/Loop/Loop.pde
similarity index 100%
rename from mode/examples/Basics/Structure/Loop/Loop.pde
rename to processing/mode/examples/Basics/Structure/Loop/Loop.pde
diff --git a/mode/examples/Basics/Structure/NoLoop/NoLoop.pde b/processing/mode/examples/Basics/Structure/NoLoop/NoLoop.pde
similarity index 100%
rename from mode/examples/Basics/Structure/NoLoop/NoLoop.pde
rename to processing/mode/examples/Basics/Structure/NoLoop/NoLoop.pde
diff --git a/mode/examples/Basics/Structure/Recursion/Recursion.pde b/processing/mode/examples/Basics/Structure/Recursion/Recursion.pde
similarity index 100%
rename from mode/examples/Basics/Structure/Recursion/Recursion.pde
rename to processing/mode/examples/Basics/Structure/Recursion/Recursion.pde
diff --git a/mode/examples/Basics/Structure/Recursion2/Recursion2.pde b/processing/mode/examples/Basics/Structure/Recursion2/Recursion2.pde
similarity index 100%
rename from mode/examples/Basics/Structure/Recursion2/Recursion2.pde
rename to processing/mode/examples/Basics/Structure/Recursion2/Recursion2.pde
diff --git a/mode/examples/Basics/Structure/Redraw/Redraw.pde b/processing/mode/examples/Basics/Structure/Redraw/Redraw.pde
similarity index 100%
rename from mode/examples/Basics/Structure/Redraw/Redraw.pde
rename to processing/mode/examples/Basics/Structure/Redraw/Redraw.pde
diff --git a/mode/examples/Basics/Structure/SetupDraw/SetupDraw.pde b/processing/mode/examples/Basics/Structure/SetupDraw/SetupDraw.pde
similarity index 100%
rename from mode/examples/Basics/Structure/SetupDraw/SetupDraw.pde
rename to processing/mode/examples/Basics/Structure/SetupDraw/SetupDraw.pde
diff --git a/mode/examples/Basics/Structure/StatementsComments/StatementsComments.pde b/processing/mode/examples/Basics/Structure/StatementsComments/StatementsComments.pde
similarity index 100%
rename from mode/examples/Basics/Structure/StatementsComments/StatementsComments.pde
rename to processing/mode/examples/Basics/Structure/StatementsComments/StatementsComments.pde
diff --git a/mode/examples/Basics/Structure/WidthHeight/WidthHeight.pde b/processing/mode/examples/Basics/Structure/WidthHeight/WidthHeight.pde
similarity index 100%
rename from mode/examples/Basics/Structure/WidthHeight/WidthHeight.pde
rename to processing/mode/examples/Basics/Structure/WidthHeight/WidthHeight.pde
diff --git a/mode/examples/Basics/Transform/Arm/Arm.pde b/processing/mode/examples/Basics/Transform/Arm/Arm.pde
similarity index 100%
rename from mode/examples/Basics/Transform/Arm/Arm.pde
rename to processing/mode/examples/Basics/Transform/Arm/Arm.pde
diff --git a/mode/examples/Basics/Transform/Rotate/Rotate.pde b/processing/mode/examples/Basics/Transform/Rotate/Rotate.pde
similarity index 100%
rename from mode/examples/Basics/Transform/Rotate/Rotate.pde
rename to processing/mode/examples/Basics/Transform/Rotate/Rotate.pde
diff --git a/mode/examples/Basics/Transform/RotatePushPop/RotatePushPop.pde b/processing/mode/examples/Basics/Transform/RotatePushPop/RotatePushPop.pde
similarity index 100%
rename from mode/examples/Basics/Transform/RotatePushPop/RotatePushPop.pde
rename to processing/mode/examples/Basics/Transform/RotatePushPop/RotatePushPop.pde
diff --git a/mode/examples/Basics/Transform/RotateXY/RotateXY.pde b/processing/mode/examples/Basics/Transform/RotateXY/RotateXY.pde
similarity index 100%
rename from mode/examples/Basics/Transform/RotateXY/RotateXY.pde
rename to processing/mode/examples/Basics/Transform/RotateXY/RotateXY.pde
diff --git a/mode/examples/Basics/Transform/Scale/Scale.pde b/processing/mode/examples/Basics/Transform/Scale/Scale.pde
similarity index 100%
rename from mode/examples/Basics/Transform/Scale/Scale.pde
rename to processing/mode/examples/Basics/Transform/Scale/Scale.pde
diff --git a/mode/examples/Basics/Transform/Translate/Translate.pde b/processing/mode/examples/Basics/Transform/Translate/Translate.pde
similarity index 100%
rename from mode/examples/Basics/Transform/Translate/Translate.pde
rename to processing/mode/examples/Basics/Transform/Translate/Translate.pde
diff --git a/mode/examples/Basics/Transform/TriangleFlower/TriangleFlower.pde b/processing/mode/examples/Basics/Transform/TriangleFlower/TriangleFlower.pde
similarity index 100%
rename from mode/examples/Basics/Transform/TriangleFlower/TriangleFlower.pde
rename to processing/mode/examples/Basics/Transform/TriangleFlower/TriangleFlower.pde
diff --git a/mode/examples/Basics/Typography/Letters/Letters.pde b/processing/mode/examples/Basics/Typography/Letters/Letters.pde
similarity index 100%
rename from mode/examples/Basics/Typography/Letters/Letters.pde
rename to processing/mode/examples/Basics/Typography/Letters/Letters.pde
diff --git a/mode/examples/Basics/Typography/Letters/data/CourierNew36.vlw b/processing/mode/examples/Basics/Typography/Letters/data/CourierNew36.vlw
similarity index 100%
rename from mode/examples/Basics/Typography/Letters/data/CourierNew36.vlw
rename to processing/mode/examples/Basics/Typography/Letters/data/CourierNew36.vlw
diff --git a/mode/examples/Basics/Typography/Words/Words.pde b/processing/mode/examples/Basics/Typography/Words/Words.pde
similarity index 100%
rename from mode/examples/Basics/Typography/Words/Words.pde
rename to processing/mode/examples/Basics/Typography/Words/Words.pde
diff --git a/mode/examples/Basics/Typography/Words/data/Ziggurat-HTF-Black-32.vlw b/processing/mode/examples/Basics/Typography/Words/data/Ziggurat-HTF-Black-32.vlw
similarity index 100%
rename from mode/examples/Basics/Typography/Words/data/Ziggurat-HTF-Black-32.vlw
rename to processing/mode/examples/Basics/Typography/Words/data/Ziggurat-HTF-Black-32.vlw
diff --git a/mode/examples/Basics/Web/EmbeddedLinks/EmbeddedLinks.pde b/processing/mode/examples/Basics/Web/EmbeddedLinks/EmbeddedLinks.pde
similarity index 100%
rename from mode/examples/Basics/Web/EmbeddedLinks/EmbeddedLinks.pde
rename to processing/mode/examples/Basics/Web/EmbeddedLinks/EmbeddedLinks.pde
diff --git a/mode/examples/Basics/Web/LoadingImages/LoadingImages.pde b/processing/mode/examples/Basics/Web/LoadingImages/LoadingImages.pde
similarity index 100%
rename from mode/examples/Basics/Web/LoadingImages/LoadingImages.pde
rename to processing/mode/examples/Basics/Web/LoadingImages/LoadingImages.pde
diff --git a/mode/examples/Demos/Graphics/Particles/Particle.pde b/processing/mode/examples/Demos/Graphics/Particles/Particle.pde
similarity index 100%
rename from mode/examples/Demos/Graphics/Particles/Particle.pde
rename to processing/mode/examples/Demos/Graphics/Particles/Particle.pde
diff --git a/mode/examples/Demos/Graphics/Particles/ParticleSystem.pde b/processing/mode/examples/Demos/Graphics/Particles/ParticleSystem.pde
similarity index 100%
rename from mode/examples/Demos/Graphics/Particles/ParticleSystem.pde
rename to processing/mode/examples/Demos/Graphics/Particles/ParticleSystem.pde
diff --git a/mode/examples/Demos/Graphics/Particles/Particles.pde b/processing/mode/examples/Demos/Graphics/Particles/Particles.pde
similarity index 100%
rename from mode/examples/Demos/Graphics/Particles/Particles.pde
rename to processing/mode/examples/Demos/Graphics/Particles/Particles.pde
diff --git a/mode/examples/Demos/Graphics/Particles/data/sprite.png b/processing/mode/examples/Demos/Graphics/Particles/data/sprite.png
similarity index 100%
rename from mode/examples/Demos/Graphics/Particles/data/sprite.png
rename to processing/mode/examples/Demos/Graphics/Particles/data/sprite.png
diff --git a/mode/examples/Demos/Graphics/Patch/Patch.pde b/processing/mode/examples/Demos/Graphics/Patch/Patch.pde
similarity index 100%
rename from mode/examples/Demos/Graphics/Patch/Patch.pde
rename to processing/mode/examples/Demos/Graphics/Patch/Patch.pde
diff --git a/mode/examples/Demos/Graphics/Planets/Perlin.pde b/processing/mode/examples/Demos/Graphics/Planets/Perlin.pde
similarity index 100%
rename from mode/examples/Demos/Graphics/Planets/Perlin.pde
rename to processing/mode/examples/Demos/Graphics/Planets/Perlin.pde
diff --git a/mode/examples/Demos/Graphics/Planets/Planets.pde b/processing/mode/examples/Demos/Graphics/Planets/Planets.pde
similarity index 100%
rename from mode/examples/Demos/Graphics/Planets/Planets.pde
rename to processing/mode/examples/Demos/Graphics/Planets/Planets.pde
diff --git a/mode/examples/Demos/Graphics/Planets/data/mercury.jpg b/processing/mode/examples/Demos/Graphics/Planets/data/mercury.jpg
similarity index 100%
rename from mode/examples/Demos/Graphics/Planets/data/mercury.jpg
rename to processing/mode/examples/Demos/Graphics/Planets/data/mercury.jpg
diff --git a/mode/examples/Demos/Graphics/Planets/data/planet.jpg b/processing/mode/examples/Demos/Graphics/Planets/data/planet.jpg
similarity index 100%
rename from mode/examples/Demos/Graphics/Planets/data/planet.jpg
rename to processing/mode/examples/Demos/Graphics/Planets/data/planet.jpg
diff --git a/mode/examples/Demos/Graphics/Planets/data/starfield.jpg b/processing/mode/examples/Demos/Graphics/Planets/data/starfield.jpg
similarity index 100%
rename from mode/examples/Demos/Graphics/Planets/data/starfield.jpg
rename to processing/mode/examples/Demos/Graphics/Planets/data/starfield.jpg
diff --git a/mode/examples/Demos/Graphics/Planets/data/sun.jpg b/processing/mode/examples/Demos/Graphics/Planets/data/sun.jpg
similarity index 100%
rename from mode/examples/Demos/Graphics/Planets/data/sun.jpg
rename to processing/mode/examples/Demos/Graphics/Planets/data/sun.jpg
diff --git a/mode/examples/Demos/Graphics/Ribbons/ArcBall.pde b/processing/mode/examples/Demos/Graphics/Ribbons/ArcBall.pde
similarity index 100%
rename from mode/examples/Demos/Graphics/Ribbons/ArcBall.pde
rename to processing/mode/examples/Demos/Graphics/Ribbons/ArcBall.pde
diff --git a/mode/examples/Demos/Graphics/Ribbons/BSpline.pde b/processing/mode/examples/Demos/Graphics/Ribbons/BSpline.pde
similarity index 100%
rename from mode/examples/Demos/Graphics/Ribbons/BSpline.pde
rename to processing/mode/examples/Demos/Graphics/Ribbons/BSpline.pde
diff --git a/mode/examples/Demos/Graphics/Ribbons/Geometry.pde b/processing/mode/examples/Demos/Graphics/Ribbons/Geometry.pde
similarity index 100%
rename from mode/examples/Demos/Graphics/Ribbons/Geometry.pde
rename to processing/mode/examples/Demos/Graphics/Ribbons/Geometry.pde
diff --git a/mode/examples/Demos/Graphics/Ribbons/PDB.pde b/processing/mode/examples/Demos/Graphics/Ribbons/PDB.pde
similarity index 100%
rename from mode/examples/Demos/Graphics/Ribbons/PDB.pde
rename to processing/mode/examples/Demos/Graphics/Ribbons/PDB.pde
diff --git a/mode/examples/Demos/Graphics/Ribbons/Ribbons.pde b/processing/mode/examples/Demos/Graphics/Ribbons/Ribbons.pde
similarity index 100%
rename from mode/examples/Demos/Graphics/Ribbons/Ribbons.pde
rename to processing/mode/examples/Demos/Graphics/Ribbons/Ribbons.pde
diff --git a/mode/examples/Demos/Graphics/Ribbons/data/1CBS.pdb b/processing/mode/examples/Demos/Graphics/Ribbons/data/1CBS.pdb
similarity index 100%
rename from mode/examples/Demos/Graphics/Ribbons/data/1CBS.pdb
rename to processing/mode/examples/Demos/Graphics/Ribbons/data/1CBS.pdb
diff --git a/mode/examples/Demos/Graphics/Ribbons/data/2POR.pdb b/processing/mode/examples/Demos/Graphics/Ribbons/data/2POR.pdb
similarity index 100%
rename from mode/examples/Demos/Graphics/Ribbons/data/2POR.pdb
rename to processing/mode/examples/Demos/Graphics/Ribbons/data/2POR.pdb
diff --git a/mode/examples/Demos/Graphics/Ribbons/data/4HHB.pdb b/processing/mode/examples/Demos/Graphics/Ribbons/data/4HHB.pdb
similarity index 100%
rename from mode/examples/Demos/Graphics/Ribbons/data/4HHB.pdb
rename to processing/mode/examples/Demos/Graphics/Ribbons/data/4HHB.pdb
diff --git a/mode/examples/Demos/Graphics/RotatingArcs/RotatingArcs.pde b/processing/mode/examples/Demos/Graphics/RotatingArcs/RotatingArcs.pde
similarity index 100%
rename from mode/examples/Demos/Graphics/RotatingArcs/RotatingArcs.pde
rename to processing/mode/examples/Demos/Graphics/RotatingArcs/RotatingArcs.pde
diff --git a/mode/examples/Demos/Graphics/Trefoil/Surface.pde b/processing/mode/examples/Demos/Graphics/Trefoil/Surface.pde
similarity index 100%
rename from mode/examples/Demos/Graphics/Trefoil/Surface.pde
rename to processing/mode/examples/Demos/Graphics/Trefoil/Surface.pde
diff --git a/mode/examples/Demos/Graphics/Trefoil/Trefoil.pde b/processing/mode/examples/Demos/Graphics/Trefoil/Trefoil.pde
similarity index 100%
rename from mode/examples/Demos/Graphics/Trefoil/Trefoil.pde
rename to processing/mode/examples/Demos/Graphics/Trefoil/Trefoil.pde
diff --git a/mode/examples/Demos/Graphics/Trefoil/data/particle.png b/processing/mode/examples/Demos/Graphics/Trefoil/data/particle.png
similarity index 100%
rename from mode/examples/Demos/Graphics/Trefoil/data/particle.png
rename to processing/mode/examples/Demos/Graphics/Trefoil/data/particle.png
diff --git a/mode/examples/Demos/Graphics/Wiggling/Wiggling.pde b/processing/mode/examples/Demos/Graphics/Wiggling/Wiggling.pde
similarity index 100%
rename from mode/examples/Demos/Graphics/Wiggling/Wiggling.pde
rename to processing/mode/examples/Demos/Graphics/Wiggling/Wiggling.pde
diff --git a/mode/examples/Demos/Graphics/Yellowtail/Gesture.pde b/processing/mode/examples/Demos/Graphics/Yellowtail/Gesture.pde
similarity index 100%
rename from mode/examples/Demos/Graphics/Yellowtail/Gesture.pde
rename to processing/mode/examples/Demos/Graphics/Yellowtail/Gesture.pde
diff --git a/mode/examples/Demos/Graphics/Yellowtail/Polygon.pde b/processing/mode/examples/Demos/Graphics/Yellowtail/Polygon.pde
similarity index 100%
rename from mode/examples/Demos/Graphics/Yellowtail/Polygon.pde
rename to processing/mode/examples/Demos/Graphics/Yellowtail/Polygon.pde
diff --git a/mode/examples/Demos/Graphics/Yellowtail/Vec3f.pde b/processing/mode/examples/Demos/Graphics/Yellowtail/Vec3f.pde
similarity index 100%
rename from mode/examples/Demos/Graphics/Yellowtail/Vec3f.pde
rename to processing/mode/examples/Demos/Graphics/Yellowtail/Vec3f.pde
diff --git a/mode/examples/Demos/Graphics/Yellowtail/Yellowtail.pde b/processing/mode/examples/Demos/Graphics/Yellowtail/Yellowtail.pde
similarity index 100%
rename from mode/examples/Demos/Graphics/Yellowtail/Yellowtail.pde
rename to processing/mode/examples/Demos/Graphics/Yellowtail/Yellowtail.pde
diff --git a/mode/examples/Demos/Performance/CubicGridImmediate/CubicGridImmediate.pde b/processing/mode/examples/Demos/Performance/CubicGridImmediate/CubicGridImmediate.pde
similarity index 100%
rename from mode/examples/Demos/Performance/CubicGridImmediate/CubicGridImmediate.pde
rename to processing/mode/examples/Demos/Performance/CubicGridImmediate/CubicGridImmediate.pde
diff --git a/mode/examples/Demos/Performance/CubicGridRetained/CubicGridRetained.pde b/processing/mode/examples/Demos/Performance/CubicGridRetained/CubicGridRetained.pde
similarity index 100%
rename from mode/examples/Demos/Performance/CubicGridRetained/CubicGridRetained.pde
rename to processing/mode/examples/Demos/Performance/CubicGridRetained/CubicGridRetained.pde
diff --git a/mode/examples/Demos/Performance/DynamicParticlesImmediate/DynamicParticlesImmediate.pde b/processing/mode/examples/Demos/Performance/DynamicParticlesImmediate/DynamicParticlesImmediate.pde
similarity index 100%
rename from mode/examples/Demos/Performance/DynamicParticlesImmediate/DynamicParticlesImmediate.pde
rename to processing/mode/examples/Demos/Performance/DynamicParticlesImmediate/DynamicParticlesImmediate.pde
diff --git a/mode/examples/Demos/Performance/DynamicParticlesImmediate/data/sprite.png b/processing/mode/examples/Demos/Performance/DynamicParticlesImmediate/data/sprite.png
similarity index 100%
rename from mode/examples/Demos/Performance/DynamicParticlesImmediate/data/sprite.png
rename to processing/mode/examples/Demos/Performance/DynamicParticlesImmediate/data/sprite.png
diff --git a/mode/examples/Demos/Performance/DynamicParticlesRetained/DynamicParticlesRetained.pde b/processing/mode/examples/Demos/Performance/DynamicParticlesRetained/DynamicParticlesRetained.pde
similarity index 100%
rename from mode/examples/Demos/Performance/DynamicParticlesRetained/DynamicParticlesRetained.pde
rename to processing/mode/examples/Demos/Performance/DynamicParticlesRetained/DynamicParticlesRetained.pde
diff --git a/mode/examples/Demos/Performance/DynamicParticlesRetained/data/sprite.png b/processing/mode/examples/Demos/Performance/DynamicParticlesRetained/data/sprite.png
similarity index 100%
rename from mode/examples/Demos/Performance/DynamicParticlesRetained/data/sprite.png
rename to processing/mode/examples/Demos/Performance/DynamicParticlesRetained/data/sprite.png
diff --git a/mode/examples/Demos/Performance/Esfera/Esfera.pde b/processing/mode/examples/Demos/Performance/Esfera/Esfera.pde
similarity index 100%
rename from mode/examples/Demos/Performance/Esfera/Esfera.pde
rename to processing/mode/examples/Demos/Performance/Esfera/Esfera.pde
diff --git a/mode/examples/Demos/Performance/LineRendering/LineRendering.pde b/processing/mode/examples/Demos/Performance/LineRendering/LineRendering.pde
similarity index 100%
rename from mode/examples/Demos/Performance/LineRendering/LineRendering.pde
rename to processing/mode/examples/Demos/Performance/LineRendering/LineRendering.pde
diff --git a/processing/mode/examples/Demos/Performance/P2DXDemo/P2DXDemo.pde b/processing/mode/examples/Demos/Performance/P2DXDemo/P2DXDemo.pde
new file mode 100644
index 000000000..c929f5a35
--- /dev/null
+++ b/processing/mode/examples/Demos/Performance/P2DXDemo/P2DXDemo.pde
@@ -0,0 +1,60 @@
+int join = MITER;
+int cap = SQUARE;
+
+boolean premultiply = true;
+
+float dev = 10; //deviation
+
+//change these parameters to benchmark various things
+int unit = 10;
+//line, triangle, rect, ellipse, point
+int[] amount = { 20, 15, 10, 5, 40 };
+
+void setup() {
+ fullScreen(P2DX);
+ strokeCap(cap);
+ strokeJoin(join);
+ PGraphics2DX.premultiplyMatrices = premultiply;
+
+ textFont(createFont("SansSerif", 15 * displayDensity));
+}
+
+public void draw() {
+ background(255);
+
+ strokeWeight(2 * displayDensity);
+ stroke(0);
+ fill(200);
+
+ for (int i = 0; i < amount[0]*unit; ++i) {
+ float x = random(width);
+ float y = random(height);
+ line(x, y, x + random(-dev, dev), y + random(-dev, dev));
+ }
+
+ for (int i = 0; i < amount[1]*unit; ++i) {
+ float x = random(width);
+ float y = random(height);
+ triangle(x, y,
+ x + random(-dev*2, dev*2), y + random(-dev*2, dev*2),
+ x + random(-dev*2, dev*2), y + random(-dev*2, dev*2));
+ }
+
+ for (int i = 0; i < amount[2]*unit; ++i) {
+ rect(random(width), random(height), random(dev), random(dev));
+ }
+
+ for (int i = 0; i < amount[3]*unit; ++i) {
+ ellipse(random(width), random(height), random(dev*2), random(dev*2));
+ }
+
+ for (int i = 0; i < amount[4]*unit; ++i) {
+ point(random(width), random(height));
+ }
+
+ //large ellipse to test smoothness of outline
+ ellipse(width/2, height/2, width/2, height/4);
+
+ fill(255, 0, 0);
+ text((int) frameRate + " fps", 30, 30);
+}
\ No newline at end of file
diff --git a/mode/examples/Demos/Performance/QuadRendering/QuadRendering.pde b/processing/mode/examples/Demos/Performance/QuadRendering/QuadRendering.pde
similarity index 100%
rename from mode/examples/Demos/Performance/QuadRendering/QuadRendering.pde
rename to processing/mode/examples/Demos/Performance/QuadRendering/QuadRendering.pde
diff --git a/mode/examples/Demos/Performance/StaticParticlesImmediate/StaticParticlesImmediate.pde b/processing/mode/examples/Demos/Performance/StaticParticlesImmediate/StaticParticlesImmediate.pde
similarity index 100%
rename from mode/examples/Demos/Performance/StaticParticlesImmediate/StaticParticlesImmediate.pde
rename to processing/mode/examples/Demos/Performance/StaticParticlesImmediate/StaticParticlesImmediate.pde
diff --git a/mode/examples/Demos/Performance/StaticParticlesImmediate/data/sprite.png b/processing/mode/examples/Demos/Performance/StaticParticlesImmediate/data/sprite.png
similarity index 100%
rename from mode/examples/Demos/Performance/StaticParticlesImmediate/data/sprite.png
rename to processing/mode/examples/Demos/Performance/StaticParticlesImmediate/data/sprite.png
diff --git a/mode/examples/Demos/Performance/StaticParticlesRetained/StaticParticlesRetained.pde b/processing/mode/examples/Demos/Performance/StaticParticlesRetained/StaticParticlesRetained.pde
similarity index 100%
rename from mode/examples/Demos/Performance/StaticParticlesRetained/StaticParticlesRetained.pde
rename to processing/mode/examples/Demos/Performance/StaticParticlesRetained/StaticParticlesRetained.pde
diff --git a/mode/examples/Demos/Performance/StaticParticlesRetained/data/sprite.png b/processing/mode/examples/Demos/Performance/StaticParticlesRetained/data/sprite.png
similarity index 100%
rename from mode/examples/Demos/Performance/StaticParticlesRetained/data/sprite.png
rename to processing/mode/examples/Demos/Performance/StaticParticlesRetained/data/sprite.png
diff --git a/mode/examples/Demos/Performance/TextRendering/TextRendering.pde b/processing/mode/examples/Demos/Performance/TextRendering/TextRendering.pde
similarity index 100%
rename from mode/examples/Demos/Performance/TextRendering/TextRendering.pde
rename to processing/mode/examples/Demos/Performance/TextRendering/TextRendering.pde
diff --git a/mode/examples/Demos/Tests/NoBackgroundTest/NoBackgroundTest.pde b/processing/mode/examples/Demos/Tests/NoBackgroundTest/NoBackgroundTest.pde
similarity index 100%
rename from mode/examples/Demos/Tests/NoBackgroundTest/NoBackgroundTest.pde
rename to processing/mode/examples/Demos/Tests/NoBackgroundTest/NoBackgroundTest.pde
diff --git a/mode/examples/Demos/Tests/OffscreenTest/OffscreenTest.pde b/processing/mode/examples/Demos/Tests/OffscreenTest/OffscreenTest.pde
similarity index 100%
rename from mode/examples/Demos/Tests/OffscreenTest/OffscreenTest.pde
rename to processing/mode/examples/Demos/Tests/OffscreenTest/OffscreenTest.pde
diff --git a/mode/examples/Demos/Tests/RedrawTest/RedrawTest.pde b/processing/mode/examples/Demos/Tests/RedrawTest/RedrawTest.pde
similarity index 100%
rename from mode/examples/Demos/Tests/RedrawTest/RedrawTest.pde
rename to processing/mode/examples/Demos/Tests/RedrawTest/RedrawTest.pde
diff --git a/mode/examples/Sensors/Accelerometer/Accelerometer.pde b/processing/mode/examples/Sensors/Accelerometer/Accelerometer.pde
similarity index 100%
rename from mode/examples/Sensors/Accelerometer/Accelerometer.pde
rename to processing/mode/examples/Sensors/Accelerometer/Accelerometer.pde
diff --git a/mode/examples/Sensors/Accelerometer/AccelerometerManager.java b/processing/mode/examples/Sensors/Accelerometer/AccelerometerManager.java
similarity index 100%
rename from mode/examples/Sensors/Accelerometer/AccelerometerManager.java
rename to processing/mode/examples/Sensors/Accelerometer/AccelerometerManager.java
diff --git a/mode/examples/Sensors/Compass/Compass.pde b/processing/mode/examples/Sensors/Compass/Compass.pde
similarity index 100%
rename from mode/examples/Sensors/Compass/Compass.pde
rename to processing/mode/examples/Sensors/Compass/Compass.pde
diff --git a/mode/examples/Sensors/Compass/CompassManager.java b/processing/mode/examples/Sensors/Compass/CompassManager.java
similarity index 100%
rename from mode/examples/Sensors/Compass/CompassManager.java
rename to processing/mode/examples/Sensors/Compass/CompassManager.java
diff --git a/mode/examples/Topics/Advanced Data/ArrayListClass/ArrayListClass.pde b/processing/mode/examples/Topics/Advanced Data/ArrayListClass/ArrayListClass.pde
similarity index 100%
rename from mode/examples/Topics/Advanced Data/ArrayListClass/ArrayListClass.pde
rename to processing/mode/examples/Topics/Advanced Data/ArrayListClass/ArrayListClass.pde
diff --git a/mode/examples/Topics/Advanced Data/ArrayListClass/Ball.pde b/processing/mode/examples/Topics/Advanced Data/ArrayListClass/Ball.pde
similarity index 100%
rename from mode/examples/Topics/Advanced Data/ArrayListClass/Ball.pde
rename to processing/mode/examples/Topics/Advanced Data/ArrayListClass/Ball.pde
diff --git a/mode/examples/Topics/Advanced Data/DirectoryList/DirectoryList.pde b/processing/mode/examples/Topics/Advanced Data/DirectoryList/DirectoryList.pde
similarity index 100%
rename from mode/examples/Topics/Advanced Data/DirectoryList/DirectoryList.pde
rename to processing/mode/examples/Topics/Advanced Data/DirectoryList/DirectoryList.pde
diff --git a/mode/examples/Topics/Advanced Data/HashMapClass/HashMapClass.pde b/processing/mode/examples/Topics/Advanced Data/HashMapClass/HashMapClass.pde
similarity index 100%
rename from mode/examples/Topics/Advanced Data/HashMapClass/HashMapClass.pde
rename to processing/mode/examples/Topics/Advanced Data/HashMapClass/HashMapClass.pde
diff --git a/mode/examples/Topics/Advanced Data/HashMapClass/Word.pde b/processing/mode/examples/Topics/Advanced Data/HashMapClass/Word.pde
similarity index 100%
rename from mode/examples/Topics/Advanced Data/HashMapClass/Word.pde
rename to processing/mode/examples/Topics/Advanced Data/HashMapClass/Word.pde
diff --git a/mode/examples/Topics/Advanced Data/HashMapClass/data/dracula.txt b/processing/mode/examples/Topics/Advanced Data/HashMapClass/data/dracula.txt
similarity index 100%
rename from mode/examples/Topics/Advanced Data/HashMapClass/data/dracula.txt
rename to processing/mode/examples/Topics/Advanced Data/HashMapClass/data/dracula.txt
diff --git a/mode/examples/Topics/Advanced Data/HashMapClass/data/hamlet.txt b/processing/mode/examples/Topics/Advanced Data/HashMapClass/data/hamlet.txt
similarity index 100%
rename from mode/examples/Topics/Advanced Data/HashMapClass/data/hamlet.txt
rename to processing/mode/examples/Topics/Advanced Data/HashMapClass/data/hamlet.txt
diff --git a/mode/examples/Topics/Animation/AnimatedSprite/AnimatedSprite.pde b/processing/mode/examples/Topics/Animation/AnimatedSprite/AnimatedSprite.pde
similarity index 100%
rename from mode/examples/Topics/Animation/AnimatedSprite/AnimatedSprite.pde
rename to processing/mode/examples/Topics/Animation/AnimatedSprite/AnimatedSprite.pde
diff --git a/mode/examples/Topics/Animation/AnimatedSprite/Animation.pde b/processing/mode/examples/Topics/Animation/AnimatedSprite/Animation.pde
similarity index 100%
rename from mode/examples/Topics/Animation/AnimatedSprite/Animation.pde
rename to processing/mode/examples/Topics/Animation/AnimatedSprite/Animation.pde
diff --git a/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0000.gif b/processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0000.gif
similarity index 100%
rename from mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0000.gif
rename to processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0000.gif
diff --git a/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0001.gif b/processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0001.gif
similarity index 100%
rename from mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0001.gif
rename to processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0001.gif
diff --git a/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0002.gif b/processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0002.gif
similarity index 100%
rename from mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0002.gif
rename to processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0002.gif
diff --git a/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0003.gif b/processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0003.gif
similarity index 100%
rename from mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0003.gif
rename to processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0003.gif
diff --git a/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0004.gif b/processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0004.gif
similarity index 100%
rename from mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0004.gif
rename to processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0004.gif
diff --git a/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0005.gif b/processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0005.gif
similarity index 100%
rename from mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0005.gif
rename to processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0005.gif
diff --git a/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0006.gif b/processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0006.gif
similarity index 100%
rename from mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0006.gif
rename to processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0006.gif
diff --git a/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0007.gif b/processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0007.gif
similarity index 100%
rename from mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0007.gif
rename to processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0007.gif
diff --git a/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0008.gif b/processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0008.gif
similarity index 100%
rename from mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0008.gif
rename to processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0008.gif
diff --git a/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0009.gif b/processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0009.gif
similarity index 100%
rename from mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0009.gif
rename to processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0009.gif
diff --git a/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0010.gif b/processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0010.gif
similarity index 100%
rename from mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0010.gif
rename to processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0010.gif
diff --git a/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0011.gif b/processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0011.gif
similarity index 100%
rename from mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0011.gif
rename to processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0011.gif
diff --git a/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0012.gif b/processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0012.gif
similarity index 100%
rename from mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0012.gif
rename to processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0012.gif
diff --git a/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0013.gif b/processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0013.gif
similarity index 100%
rename from mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0013.gif
rename to processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0013.gif
diff --git a/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0014.gif b/processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0014.gif
similarity index 100%
rename from mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0014.gif
rename to processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0014.gif
diff --git a/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0015.gif b/processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0015.gif
similarity index 100%
rename from mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0015.gif
rename to processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0015.gif
diff --git a/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0016.gif b/processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0016.gif
similarity index 100%
rename from mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0016.gif
rename to processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0016.gif
diff --git a/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0017.gif b/processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0017.gif
similarity index 100%
rename from mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0017.gif
rename to processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0017.gif
diff --git a/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0018.gif b/processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0018.gif
similarity index 100%
rename from mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0018.gif
rename to processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0018.gif
diff --git a/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0019.gif b/processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0019.gif
similarity index 100%
rename from mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0019.gif
rename to processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0019.gif
diff --git a/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0020.gif b/processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0020.gif
similarity index 100%
rename from mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0020.gif
rename to processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0020.gif
diff --git a/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0021.gif b/processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0021.gif
similarity index 100%
rename from mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0021.gif
rename to processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0021.gif
diff --git a/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0022.gif b/processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0022.gif
similarity index 100%
rename from mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0022.gif
rename to processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0022.gif
diff --git a/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0023.gif b/processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0023.gif
similarity index 100%
rename from mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0023.gif
rename to processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0023.gif
diff --git a/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0024.gif b/processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0024.gif
similarity index 100%
rename from mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0024.gif
rename to processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0024.gif
diff --git a/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0025.gif b/processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0025.gif
similarity index 100%
rename from mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0025.gif
rename to processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0025.gif
diff --git a/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0026.gif b/processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0026.gif
similarity index 100%
rename from mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0026.gif
rename to processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0026.gif
diff --git a/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0027.gif b/processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0027.gif
similarity index 100%
rename from mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0027.gif
rename to processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0027.gif
diff --git a/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0028.gif b/processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0028.gif
similarity index 100%
rename from mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0028.gif
rename to processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0028.gif
diff --git a/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0029.gif b/processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0029.gif
similarity index 100%
rename from mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0029.gif
rename to processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0029.gif
diff --git a/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0030.gif b/processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0030.gif
similarity index 100%
rename from mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0030.gif
rename to processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0030.gif
diff --git a/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0031.gif b/processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0031.gif
similarity index 100%
rename from mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0031.gif
rename to processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0031.gif
diff --git a/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0032.gif b/processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0032.gif
similarity index 100%
rename from mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0032.gif
rename to processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0032.gif
diff --git a/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0033.gif b/processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0033.gif
similarity index 100%
rename from mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0033.gif
rename to processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0033.gif
diff --git a/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0034.gif b/processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0034.gif
similarity index 100%
rename from mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0034.gif
rename to processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0034.gif
diff --git a/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0035.gif b/processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0035.gif
similarity index 100%
rename from mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0035.gif
rename to processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0035.gif
diff --git a/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0036.gif b/processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0036.gif
similarity index 100%
rename from mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0036.gif
rename to processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0036.gif
diff --git a/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0037.gif b/processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0037.gif
similarity index 100%
rename from mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0037.gif
rename to processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Shifty_0037.gif
diff --git a/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0000.gif b/processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0000.gif
similarity index 100%
rename from mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0000.gif
rename to processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0000.gif
diff --git a/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0001.gif b/processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0001.gif
similarity index 100%
rename from mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0001.gif
rename to processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0001.gif
diff --git a/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0002.gif b/processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0002.gif
similarity index 100%
rename from mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0002.gif
rename to processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0002.gif
diff --git a/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0003.gif b/processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0003.gif
similarity index 100%
rename from mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0003.gif
rename to processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0003.gif
diff --git a/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0004.gif b/processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0004.gif
similarity index 100%
rename from mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0004.gif
rename to processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0004.gif
diff --git a/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0005.gif b/processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0005.gif
similarity index 100%
rename from mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0005.gif
rename to processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0005.gif
diff --git a/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0006.gif b/processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0006.gif
similarity index 100%
rename from mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0006.gif
rename to processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0006.gif
diff --git a/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0007.gif b/processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0007.gif
similarity index 100%
rename from mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0007.gif
rename to processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0007.gif
diff --git a/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0008.gif b/processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0008.gif
similarity index 100%
rename from mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0008.gif
rename to processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0008.gif
diff --git a/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0009.gif b/processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0009.gif
similarity index 100%
rename from mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0009.gif
rename to processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0009.gif
diff --git a/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0010.gif b/processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0010.gif
similarity index 100%
rename from mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0010.gif
rename to processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0010.gif
diff --git a/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0011.gif b/processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0011.gif
similarity index 100%
rename from mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0011.gif
rename to processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0011.gif
diff --git a/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0012.gif b/processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0012.gif
similarity index 100%
rename from mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0012.gif
rename to processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0012.gif
diff --git a/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0013.gif b/processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0013.gif
similarity index 100%
rename from mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0013.gif
rename to processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0013.gif
diff --git a/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0014.gif b/processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0014.gif
similarity index 100%
rename from mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0014.gif
rename to processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0014.gif
diff --git a/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0015.gif b/processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0015.gif
similarity index 100%
rename from mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0015.gif
rename to processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0015.gif
diff --git a/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0016.gif b/processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0016.gif
similarity index 100%
rename from mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0016.gif
rename to processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0016.gif
diff --git a/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0017.gif b/processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0017.gif
similarity index 100%
rename from mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0017.gif
rename to processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0017.gif
diff --git a/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0018.gif b/processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0018.gif
similarity index 100%
rename from mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0018.gif
rename to processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0018.gif
diff --git a/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0019.gif b/processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0019.gif
similarity index 100%
rename from mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0019.gif
rename to processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0019.gif
diff --git a/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0020.gif b/processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0020.gif
similarity index 100%
rename from mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0020.gif
rename to processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0020.gif
diff --git a/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0021.gif b/processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0021.gif
similarity index 100%
rename from mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0021.gif
rename to processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0021.gif
diff --git a/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0022.gif b/processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0022.gif
similarity index 100%
rename from mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0022.gif
rename to processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0022.gif
diff --git a/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0023.gif b/processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0023.gif
similarity index 100%
rename from mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0023.gif
rename to processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0023.gif
diff --git a/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0024.gif b/processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0024.gif
similarity index 100%
rename from mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0024.gif
rename to processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0024.gif
diff --git a/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0025.gif b/processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0025.gif
similarity index 100%
rename from mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0025.gif
rename to processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0025.gif
diff --git a/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0026.gif b/processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0026.gif
similarity index 100%
rename from mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0026.gif
rename to processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0026.gif
diff --git a/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0027.gif b/processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0027.gif
similarity index 100%
rename from mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0027.gif
rename to processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0027.gif
diff --git a/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0028.gif b/processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0028.gif
similarity index 100%
rename from mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0028.gif
rename to processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0028.gif
diff --git a/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0029.gif b/processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0029.gif
similarity index 100%
rename from mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0029.gif
rename to processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0029.gif
diff --git a/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0030.gif b/processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0030.gif
similarity index 100%
rename from mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0030.gif
rename to processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0030.gif
diff --git a/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0031.gif b/processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0031.gif
similarity index 100%
rename from mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0031.gif
rename to processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0031.gif
diff --git a/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0032.gif b/processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0032.gif
similarity index 100%
rename from mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0032.gif
rename to processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0032.gif
diff --git a/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0033.gif b/processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0033.gif
similarity index 100%
rename from mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0033.gif
rename to processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0033.gif
diff --git a/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0034.gif b/processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0034.gif
similarity index 100%
rename from mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0034.gif
rename to processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0034.gif
diff --git a/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0035.gif b/processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0035.gif
similarity index 100%
rename from mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0035.gif
rename to processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0035.gif
diff --git a/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0036.gif b/processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0036.gif
similarity index 100%
rename from mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0036.gif
rename to processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0036.gif
diff --git a/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0037.gif b/processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0037.gif
similarity index 100%
rename from mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0037.gif
rename to processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0037.gif
diff --git a/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0038.gif b/processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0038.gif
similarity index 100%
rename from mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0038.gif
rename to processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0038.gif
diff --git a/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0039.gif b/processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0039.gif
similarity index 100%
rename from mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0039.gif
rename to processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0039.gif
diff --git a/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0040.gif b/processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0040.gif
similarity index 100%
rename from mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0040.gif
rename to processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0040.gif
diff --git a/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0041.gif b/processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0041.gif
similarity index 100%
rename from mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0041.gif
rename to processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0041.gif
diff --git a/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0042.gif b/processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0042.gif
similarity index 100%
rename from mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0042.gif
rename to processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0042.gif
diff --git a/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0043.gif b/processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0043.gif
similarity index 100%
rename from mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0043.gif
rename to processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0043.gif
diff --git a/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0044.gif b/processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0044.gif
similarity index 100%
rename from mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0044.gif
rename to processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0044.gif
diff --git a/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0045.gif b/processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0045.gif
similarity index 100%
rename from mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0045.gif
rename to processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0045.gif
diff --git a/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0046.gif b/processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0046.gif
similarity index 100%
rename from mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0046.gif
rename to processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0046.gif
diff --git a/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0047.gif b/processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0047.gif
similarity index 100%
rename from mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0047.gif
rename to processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0047.gif
diff --git a/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0048.gif b/processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0048.gif
similarity index 100%
rename from mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0048.gif
rename to processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0048.gif
diff --git a/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0049.gif b/processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0049.gif
similarity index 100%
rename from mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0049.gif
rename to processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0049.gif
diff --git a/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0050.gif b/processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0050.gif
similarity index 100%
rename from mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0050.gif
rename to processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0050.gif
diff --git a/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0051.gif b/processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0051.gif
similarity index 100%
rename from mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0051.gif
rename to processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0051.gif
diff --git a/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0052.gif b/processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0052.gif
similarity index 100%
rename from mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0052.gif
rename to processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0052.gif
diff --git a/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0053.gif b/processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0053.gif
similarity index 100%
rename from mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0053.gif
rename to processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0053.gif
diff --git a/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0054.gif b/processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0054.gif
similarity index 100%
rename from mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0054.gif
rename to processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0054.gif
diff --git a/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0055.gif b/processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0055.gif
similarity index 100%
rename from mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0055.gif
rename to processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0055.gif
diff --git a/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0056.gif b/processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0056.gif
similarity index 100%
rename from mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0056.gif
rename to processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0056.gif
diff --git a/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0057.gif b/processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0057.gif
similarity index 100%
rename from mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0057.gif
rename to processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0057.gif
diff --git a/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0058.gif b/processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0058.gif
similarity index 100%
rename from mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0058.gif
rename to processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0058.gif
diff --git a/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0059.gif b/processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0059.gif
similarity index 100%
rename from mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0059.gif
rename to processing/mode/examples/Topics/Animation/AnimatedSprite/data/PT_Teddy_0059.gif
diff --git a/mode/examples/Topics/Animation/Sequential/Sequential.pde b/processing/mode/examples/Topics/Animation/Sequential/Sequential.pde
similarity index 100%
rename from mode/examples/Topics/Animation/Sequential/Sequential.pde
rename to processing/mode/examples/Topics/Animation/Sequential/Sequential.pde
diff --git a/mode/examples/Topics/Animation/Sequential/data/PT_anim0000.gif b/processing/mode/examples/Topics/Animation/Sequential/data/PT_anim0000.gif
similarity index 100%
rename from mode/examples/Topics/Animation/Sequential/data/PT_anim0000.gif
rename to processing/mode/examples/Topics/Animation/Sequential/data/PT_anim0000.gif
diff --git a/mode/examples/Topics/Animation/Sequential/data/PT_anim0001.gif b/processing/mode/examples/Topics/Animation/Sequential/data/PT_anim0001.gif
similarity index 100%
rename from mode/examples/Topics/Animation/Sequential/data/PT_anim0001.gif
rename to processing/mode/examples/Topics/Animation/Sequential/data/PT_anim0001.gif
diff --git a/mode/examples/Topics/Animation/Sequential/data/PT_anim0002.gif b/processing/mode/examples/Topics/Animation/Sequential/data/PT_anim0002.gif
similarity index 100%
rename from mode/examples/Topics/Animation/Sequential/data/PT_anim0002.gif
rename to processing/mode/examples/Topics/Animation/Sequential/data/PT_anim0002.gif
diff --git a/mode/examples/Topics/Animation/Sequential/data/PT_anim0003.gif b/processing/mode/examples/Topics/Animation/Sequential/data/PT_anim0003.gif
similarity index 100%
rename from mode/examples/Topics/Animation/Sequential/data/PT_anim0003.gif
rename to processing/mode/examples/Topics/Animation/Sequential/data/PT_anim0003.gif
diff --git a/mode/examples/Topics/Animation/Sequential/data/PT_anim0004.gif b/processing/mode/examples/Topics/Animation/Sequential/data/PT_anim0004.gif
similarity index 100%
rename from mode/examples/Topics/Animation/Sequential/data/PT_anim0004.gif
rename to processing/mode/examples/Topics/Animation/Sequential/data/PT_anim0004.gif
diff --git a/mode/examples/Topics/Animation/Sequential/data/PT_anim0005.gif b/processing/mode/examples/Topics/Animation/Sequential/data/PT_anim0005.gif
similarity index 100%
rename from mode/examples/Topics/Animation/Sequential/data/PT_anim0005.gif
rename to processing/mode/examples/Topics/Animation/Sequential/data/PT_anim0005.gif
diff --git a/mode/examples/Topics/Animation/Sequential/data/PT_anim0006.gif b/processing/mode/examples/Topics/Animation/Sequential/data/PT_anim0006.gif
similarity index 100%
rename from mode/examples/Topics/Animation/Sequential/data/PT_anim0006.gif
rename to processing/mode/examples/Topics/Animation/Sequential/data/PT_anim0006.gif
diff --git a/mode/examples/Topics/Animation/Sequential/data/PT_anim0007.gif b/processing/mode/examples/Topics/Animation/Sequential/data/PT_anim0007.gif
similarity index 100%
rename from mode/examples/Topics/Animation/Sequential/data/PT_anim0007.gif
rename to processing/mode/examples/Topics/Animation/Sequential/data/PT_anim0007.gif
diff --git a/mode/examples/Topics/Animation/Sequential/data/PT_anim0008.gif b/processing/mode/examples/Topics/Animation/Sequential/data/PT_anim0008.gif
similarity index 100%
rename from mode/examples/Topics/Animation/Sequential/data/PT_anim0008.gif
rename to processing/mode/examples/Topics/Animation/Sequential/data/PT_anim0008.gif
diff --git a/mode/examples/Topics/Animation/Sequential/data/PT_anim0009.gif b/processing/mode/examples/Topics/Animation/Sequential/data/PT_anim0009.gif
similarity index 100%
rename from mode/examples/Topics/Animation/Sequential/data/PT_anim0009.gif
rename to processing/mode/examples/Topics/Animation/Sequential/data/PT_anim0009.gif
diff --git a/mode/examples/Topics/Animation/Sequential/data/PT_anim0010.gif b/processing/mode/examples/Topics/Animation/Sequential/data/PT_anim0010.gif
similarity index 100%
rename from mode/examples/Topics/Animation/Sequential/data/PT_anim0010.gif
rename to processing/mode/examples/Topics/Animation/Sequential/data/PT_anim0010.gif
diff --git a/mode/examples/Topics/Animation/Sequential/data/PT_anim0011.gif b/processing/mode/examples/Topics/Animation/Sequential/data/PT_anim0011.gif
similarity index 100%
rename from mode/examples/Topics/Animation/Sequential/data/PT_anim0011.gif
rename to processing/mode/examples/Topics/Animation/Sequential/data/PT_anim0011.gif
diff --git a/mode/examples/Topics/Cellular Automata/Conway/Conway.pde b/processing/mode/examples/Topics/Cellular Automata/Conway/Conway.pde
similarity index 100%
rename from mode/examples/Topics/Cellular Automata/Conway/Conway.pde
rename to processing/mode/examples/Topics/Cellular Automata/Conway/Conway.pde
diff --git a/mode/examples/Topics/Cellular Automata/Spore1/Spore1.pde b/processing/mode/examples/Topics/Cellular Automata/Spore1/Spore1.pde
similarity index 100%
rename from mode/examples/Topics/Cellular Automata/Spore1/Spore1.pde
rename to processing/mode/examples/Topics/Cellular Automata/Spore1/Spore1.pde
diff --git a/mode/examples/Topics/Cellular Automata/Spore2/Spore2.pde b/processing/mode/examples/Topics/Cellular Automata/Spore2/Spore2.pde
similarity index 100%
rename from mode/examples/Topics/Cellular Automata/Spore2/Spore2.pde
rename to processing/mode/examples/Topics/Cellular Automata/Spore2/Spore2.pde
diff --git a/mode/examples/Topics/Cellular Automata/Wolfram/CA.pde b/processing/mode/examples/Topics/Cellular Automata/Wolfram/CA.pde
similarity index 100%
rename from mode/examples/Topics/Cellular Automata/Wolfram/CA.pde
rename to processing/mode/examples/Topics/Cellular Automata/Wolfram/CA.pde
diff --git a/mode/examples/Topics/Cellular Automata/Wolfram/Wolfram.pde b/processing/mode/examples/Topics/Cellular Automata/Wolfram/Wolfram.pde
similarity index 100%
rename from mode/examples/Topics/Cellular Automata/Wolfram/Wolfram.pde
rename to processing/mode/examples/Topics/Cellular Automata/Wolfram/Wolfram.pde
diff --git a/mode/examples/Topics/Create Shapes/BeginEndContour/BeginEndContour.pde b/processing/mode/examples/Topics/Create Shapes/BeginEndContour/BeginEndContour.pde
similarity index 100%
rename from mode/examples/Topics/Create Shapes/BeginEndContour/BeginEndContour.pde
rename to processing/mode/examples/Topics/Create Shapes/BeginEndContour/BeginEndContour.pde
diff --git a/mode/examples/Topics/Create Shapes/GroupPShape/GroupPShape.pde b/processing/mode/examples/Topics/Create Shapes/GroupPShape/GroupPShape.pde
similarity index 100%
rename from mode/examples/Topics/Create Shapes/GroupPShape/GroupPShape.pde
rename to processing/mode/examples/Topics/Create Shapes/GroupPShape/GroupPShape.pde
diff --git a/mode/examples/Topics/Create Shapes/ParticleSystemPShape/Particle.pde b/processing/mode/examples/Topics/Create Shapes/ParticleSystemPShape/Particle.pde
similarity index 100%
rename from mode/examples/Topics/Create Shapes/ParticleSystemPShape/Particle.pde
rename to processing/mode/examples/Topics/Create Shapes/ParticleSystemPShape/Particle.pde
diff --git a/mode/examples/Topics/Create Shapes/ParticleSystemPShape/ParticleSystem.pde b/processing/mode/examples/Topics/Create Shapes/ParticleSystemPShape/ParticleSystem.pde
similarity index 100%
rename from mode/examples/Topics/Create Shapes/ParticleSystemPShape/ParticleSystem.pde
rename to processing/mode/examples/Topics/Create Shapes/ParticleSystemPShape/ParticleSystem.pde
diff --git a/mode/examples/Topics/Create Shapes/ParticleSystemPShape/ParticleSystemPShape.pde b/processing/mode/examples/Topics/Create Shapes/ParticleSystemPShape/ParticleSystemPShape.pde
similarity index 100%
rename from mode/examples/Topics/Create Shapes/ParticleSystemPShape/ParticleSystemPShape.pde
rename to processing/mode/examples/Topics/Create Shapes/ParticleSystemPShape/ParticleSystemPShape.pde
diff --git a/mode/examples/Topics/Create Shapes/ParticleSystemPShape/data/sprite.png b/processing/mode/examples/Topics/Create Shapes/ParticleSystemPShape/data/sprite.png
similarity index 100%
rename from mode/examples/Topics/Create Shapes/ParticleSystemPShape/data/sprite.png
rename to processing/mode/examples/Topics/Create Shapes/ParticleSystemPShape/data/sprite.png
diff --git a/mode/examples/Topics/Create Shapes/PathPShape/PathPShape.pde b/processing/mode/examples/Topics/Create Shapes/PathPShape/PathPShape.pde
similarity index 100%
rename from mode/examples/Topics/Create Shapes/PathPShape/PathPShape.pde
rename to processing/mode/examples/Topics/Create Shapes/PathPShape/PathPShape.pde
diff --git a/mode/examples/Topics/Create Shapes/PolygonPShape/PolygonPShape.pde b/processing/mode/examples/Topics/Create Shapes/PolygonPShape/PolygonPShape.pde
similarity index 100%
rename from mode/examples/Topics/Create Shapes/PolygonPShape/PolygonPShape.pde
rename to processing/mode/examples/Topics/Create Shapes/PolygonPShape/PolygonPShape.pde
diff --git a/mode/examples/Topics/Create Shapes/PolygonPShapeOOP/PolygonPShapeOOP.pde b/processing/mode/examples/Topics/Create Shapes/PolygonPShapeOOP/PolygonPShapeOOP.pde
similarity index 100%
rename from mode/examples/Topics/Create Shapes/PolygonPShapeOOP/PolygonPShapeOOP.pde
rename to processing/mode/examples/Topics/Create Shapes/PolygonPShapeOOP/PolygonPShapeOOP.pde
diff --git a/mode/examples/Topics/Create Shapes/PolygonPShapeOOP/Star.pde b/processing/mode/examples/Topics/Create Shapes/PolygonPShapeOOP/Star.pde
similarity index 100%
rename from mode/examples/Topics/Create Shapes/PolygonPShapeOOP/Star.pde
rename to processing/mode/examples/Topics/Create Shapes/PolygonPShapeOOP/Star.pde
diff --git a/mode/examples/Topics/Create Shapes/PolygonPShapeOOP2/Polygon.pde b/processing/mode/examples/Topics/Create Shapes/PolygonPShapeOOP2/Polygon.pde
similarity index 100%
rename from mode/examples/Topics/Create Shapes/PolygonPShapeOOP2/Polygon.pde
rename to processing/mode/examples/Topics/Create Shapes/PolygonPShapeOOP2/Polygon.pde
diff --git a/mode/examples/Topics/Create Shapes/PolygonPShapeOOP2/PolygonPShapeOOP2.pde b/processing/mode/examples/Topics/Create Shapes/PolygonPShapeOOP2/PolygonPShapeOOP2.pde
similarity index 100%
rename from mode/examples/Topics/Create Shapes/PolygonPShapeOOP2/PolygonPShapeOOP2.pde
rename to processing/mode/examples/Topics/Create Shapes/PolygonPShapeOOP2/PolygonPShapeOOP2.pde
diff --git a/mode/examples/Topics/Create Shapes/PolygonPShapeOOP3/Polygon.pde b/processing/mode/examples/Topics/Create Shapes/PolygonPShapeOOP3/Polygon.pde
similarity index 100%
rename from mode/examples/Topics/Create Shapes/PolygonPShapeOOP3/Polygon.pde
rename to processing/mode/examples/Topics/Create Shapes/PolygonPShapeOOP3/Polygon.pde
diff --git a/mode/examples/Topics/Create Shapes/PolygonPShapeOOP3/PolygonPShapeOOP3.pde b/processing/mode/examples/Topics/Create Shapes/PolygonPShapeOOP3/PolygonPShapeOOP3.pde
similarity index 100%
rename from mode/examples/Topics/Create Shapes/PolygonPShapeOOP3/PolygonPShapeOOP3.pde
rename to processing/mode/examples/Topics/Create Shapes/PolygonPShapeOOP3/PolygonPShapeOOP3.pde
diff --git a/mode/examples/Topics/Create Shapes/PrimitivePShape/PrimitivePShape.pde b/processing/mode/examples/Topics/Create Shapes/PrimitivePShape/PrimitivePShape.pde
similarity index 100%
rename from mode/examples/Topics/Create Shapes/PrimitivePShape/PrimitivePShape.pde
rename to processing/mode/examples/Topics/Create Shapes/PrimitivePShape/PrimitivePShape.pde
diff --git a/mode/examples/Topics/Create Shapes/WigglePShape/WigglePShape.pde b/processing/mode/examples/Topics/Create Shapes/WigglePShape/WigglePShape.pde
similarity index 100%
rename from mode/examples/Topics/Create Shapes/WigglePShape/WigglePShape.pde
rename to processing/mode/examples/Topics/Create Shapes/WigglePShape/WigglePShape.pde
diff --git a/mode/examples/Topics/Create Shapes/WigglePShape/Wiggler.pde b/processing/mode/examples/Topics/Create Shapes/WigglePShape/Wiggler.pde
similarity index 100%
rename from mode/examples/Topics/Create Shapes/WigglePShape/Wiggler.pde
rename to processing/mode/examples/Topics/Create Shapes/WigglePShape/Wiggler.pde
diff --git a/mode/examples/Topics/Drawing/Animator/Animator.pde b/processing/mode/examples/Topics/Drawing/Animator/Animator.pde
similarity index 100%
rename from mode/examples/Topics/Drawing/Animator/Animator.pde
rename to processing/mode/examples/Topics/Drawing/Animator/Animator.pde
diff --git a/mode/examples/Topics/Drawing/ContinuousLines/ContinuousLines.pde b/processing/mode/examples/Topics/Drawing/ContinuousLines/ContinuousLines.pde
similarity index 100%
rename from mode/examples/Topics/Drawing/ContinuousLines/ContinuousLines.pde
rename to processing/mode/examples/Topics/Drawing/ContinuousLines/ContinuousLines.pde
diff --git a/mode/examples/Topics/Drawing/CustomTool/CustomTool.pde b/processing/mode/examples/Topics/Drawing/CustomTool/CustomTool.pde
similarity index 100%
rename from mode/examples/Topics/Drawing/CustomTool/CustomTool.pde
rename to processing/mode/examples/Topics/Drawing/CustomTool/CustomTool.pde
diff --git a/mode/examples/Topics/Drawing/CustomTool/data/milan.jpg b/processing/mode/examples/Topics/Drawing/CustomTool/data/milan.jpg
similarity index 100%
rename from mode/examples/Topics/Drawing/CustomTool/data/milan.jpg
rename to processing/mode/examples/Topics/Drawing/CustomTool/data/milan.jpg
diff --git a/mode/examples/Topics/Drawing/CustomTool/data/paris.jpg b/processing/mode/examples/Topics/Drawing/CustomTool/data/paris.jpg
similarity index 100%
rename from mode/examples/Topics/Drawing/CustomTool/data/paris.jpg
rename to processing/mode/examples/Topics/Drawing/CustomTool/data/paris.jpg
diff --git a/mode/examples/Topics/Drawing/Pattern/Pattern.pde b/processing/mode/examples/Topics/Drawing/Pattern/Pattern.pde
similarity index 100%
rename from mode/examples/Topics/Drawing/Pattern/Pattern.pde
rename to processing/mode/examples/Topics/Drawing/Pattern/Pattern.pde
diff --git a/mode/examples/Topics/Drawing/Pulses/Pulses.pde b/processing/mode/examples/Topics/Drawing/Pulses/Pulses.pde
similarity index 100%
rename from mode/examples/Topics/Drawing/Pulses/Pulses.pde
rename to processing/mode/examples/Topics/Drawing/Pulses/Pulses.pde
diff --git a/mode/examples/Topics/Drawing/ScribblePlotter/ScribblePlotter.pde b/processing/mode/examples/Topics/Drawing/ScribblePlotter/ScribblePlotter.pde
similarity index 100%
rename from mode/examples/Topics/Drawing/ScribblePlotter/ScribblePlotter.pde
rename to processing/mode/examples/Topics/Drawing/ScribblePlotter/ScribblePlotter.pde
diff --git a/mode/examples/Topics/Effects/FireCube/FireCube.pde b/processing/mode/examples/Topics/Effects/FireCube/FireCube.pde
similarity index 100%
rename from mode/examples/Topics/Effects/FireCube/FireCube.pde
rename to processing/mode/examples/Topics/Effects/FireCube/FireCube.pde
diff --git a/mode/examples/Topics/Effects/Lens/Lens.pde b/processing/mode/examples/Topics/Effects/Lens/Lens.pde
similarity index 100%
rename from mode/examples/Topics/Effects/Lens/Lens.pde
rename to processing/mode/examples/Topics/Effects/Lens/Lens.pde
diff --git a/mode/examples/Topics/Effects/Lens/data/red_smoke.jpg b/processing/mode/examples/Topics/Effects/Lens/data/red_smoke.jpg
similarity index 100%
rename from mode/examples/Topics/Effects/Lens/data/red_smoke.jpg
rename to processing/mode/examples/Topics/Effects/Lens/data/red_smoke.jpg
diff --git a/mode/examples/Topics/Effects/Metaball/Metaball.pde b/processing/mode/examples/Topics/Effects/Metaball/Metaball.pde
similarity index 100%
rename from mode/examples/Topics/Effects/Metaball/Metaball.pde
rename to processing/mode/examples/Topics/Effects/Metaball/Metaball.pde
diff --git a/mode/examples/Topics/Effects/Plasma/Plasma.pde b/processing/mode/examples/Topics/Effects/Plasma/Plasma.pde
similarity index 100%
rename from mode/examples/Topics/Effects/Plasma/Plasma.pde
rename to processing/mode/examples/Topics/Effects/Plasma/Plasma.pde
diff --git a/mode/examples/Topics/Effects/Tunnel/Tunnel.pde b/processing/mode/examples/Topics/Effects/Tunnel/Tunnel.pde
similarity index 100%
rename from mode/examples/Topics/Effects/Tunnel/Tunnel.pde
rename to processing/mode/examples/Topics/Effects/Tunnel/Tunnel.pde
diff --git a/mode/examples/Topics/Effects/Tunnel/data/red_smoke.jpg b/processing/mode/examples/Topics/Effects/Tunnel/data/red_smoke.jpg
similarity index 100%
rename from mode/examples/Topics/Effects/Tunnel/data/red_smoke.jpg
rename to processing/mode/examples/Topics/Effects/Tunnel/data/red_smoke.jpg
diff --git a/mode/examples/Topics/Effects/UnlimitedSprites/UnlimitedSprites.pde b/processing/mode/examples/Topics/Effects/UnlimitedSprites/UnlimitedSprites.pde
similarity index 100%
rename from mode/examples/Topics/Effects/UnlimitedSprites/UnlimitedSprites.pde
rename to processing/mode/examples/Topics/Effects/UnlimitedSprites/UnlimitedSprites.pde
diff --git a/mode/examples/Topics/Effects/UnlimitedSprites/data/Aqua-Ball-48x48.png b/processing/mode/examples/Topics/Effects/UnlimitedSprites/data/Aqua-Ball-48x48.png
similarity index 100%
rename from mode/examples/Topics/Effects/UnlimitedSprites/data/Aqua-Ball-48x48.png
rename to processing/mode/examples/Topics/Effects/UnlimitedSprites/data/Aqua-Ball-48x48.png
diff --git a/mode/examples/Topics/Effects/Wormhole/Wormhole.pde b/processing/mode/examples/Topics/Effects/Wormhole/Wormhole.pde
similarity index 100%
rename from mode/examples/Topics/Effects/Wormhole/Wormhole.pde
rename to processing/mode/examples/Topics/Effects/Wormhole/Wormhole.pde
diff --git a/mode/examples/Topics/Effects/Wormhole/data/texture.gif b/processing/mode/examples/Topics/Effects/Wormhole/data/texture.gif
similarity index 100%
rename from mode/examples/Topics/Effects/Wormhole/data/texture.gif
rename to processing/mode/examples/Topics/Effects/Wormhole/data/texture.gif
diff --git a/mode/examples/Topics/Effects/Wormhole/data/wormhole.png b/processing/mode/examples/Topics/Effects/Wormhole/data/wormhole.png
similarity index 100%
rename from mode/examples/Topics/Effects/Wormhole/data/wormhole.png
rename to processing/mode/examples/Topics/Effects/Wormhole/data/wormhole.png
diff --git a/mode/examples/Topics/File IO/LoadFile1/LoadFile1.pde b/processing/mode/examples/Topics/File IO/LoadFile1/LoadFile1.pde
similarity index 100%
rename from mode/examples/Topics/File IO/LoadFile1/LoadFile1.pde
rename to processing/mode/examples/Topics/File IO/LoadFile1/LoadFile1.pde
diff --git a/mode/examples/Topics/File IO/LoadFile1/data/positions.txt b/processing/mode/examples/Topics/File IO/LoadFile1/data/positions.txt
similarity index 100%
rename from mode/examples/Topics/File IO/LoadFile1/data/positions.txt
rename to processing/mode/examples/Topics/File IO/LoadFile1/data/positions.txt
diff --git a/mode/examples/Topics/File IO/LoadFile2/LoadFile2.pde b/processing/mode/examples/Topics/File IO/LoadFile2/LoadFile2.pde
similarity index 100%
rename from mode/examples/Topics/File IO/LoadFile2/LoadFile2.pde
rename to processing/mode/examples/Topics/File IO/LoadFile2/LoadFile2.pde
diff --git a/mode/examples/Topics/File IO/LoadFile2/Record.pde b/processing/mode/examples/Topics/File IO/LoadFile2/Record.pde
similarity index 100%
rename from mode/examples/Topics/File IO/LoadFile2/Record.pde
rename to processing/mode/examples/Topics/File IO/LoadFile2/Record.pde
diff --git a/mode/examples/Topics/File IO/LoadFile2/data/TheSans-Plain-12.vlw b/processing/mode/examples/Topics/File IO/LoadFile2/data/TheSans-Plain-12.vlw
similarity index 100%
rename from mode/examples/Topics/File IO/LoadFile2/data/TheSans-Plain-12.vlw
rename to processing/mode/examples/Topics/File IO/LoadFile2/data/TheSans-Plain-12.vlw
diff --git a/mode/examples/Topics/File IO/LoadFile2/data/cars2.tsv b/processing/mode/examples/Topics/File IO/LoadFile2/data/cars2.tsv
similarity index 100%
rename from mode/examples/Topics/File IO/LoadFile2/data/cars2.tsv
rename to processing/mode/examples/Topics/File IO/LoadFile2/data/cars2.tsv
diff --git a/mode/examples/Topics/File IO/SaveFile1/SaveFile1.pde b/processing/mode/examples/Topics/File IO/SaveFile1/SaveFile1.pde
similarity index 100%
rename from mode/examples/Topics/File IO/SaveFile1/SaveFile1.pde
rename to processing/mode/examples/Topics/File IO/SaveFile1/SaveFile1.pde
diff --git a/mode/examples/Topics/File IO/SaveFile2/SaveFile2.pde b/processing/mode/examples/Topics/File IO/SaveFile2/SaveFile2.pde
similarity index 100%
rename from mode/examples/Topics/File IO/SaveFile2/SaveFile2.pde
rename to processing/mode/examples/Topics/File IO/SaveFile2/SaveFile2.pde
diff --git a/mode/examples/Topics/File IO/SaveManyImages/SaveManyImages.pde b/processing/mode/examples/Topics/File IO/SaveManyImages/SaveManyImages.pde
similarity index 100%
rename from mode/examples/Topics/File IO/SaveManyImages/SaveManyImages.pde
rename to processing/mode/examples/Topics/File IO/SaveManyImages/SaveManyImages.pde
diff --git a/mode/examples/Topics/File IO/SaveOneImage/SaveOneImage.pde b/processing/mode/examples/Topics/File IO/SaveOneImage/SaveOneImage.pde
similarity index 100%
rename from mode/examples/Topics/File IO/SaveOneImage/SaveOneImage.pde
rename to processing/mode/examples/Topics/File IO/SaveOneImage/SaveOneImage.pde
diff --git a/mode/examples/Topics/File IO/TileImages/TileImages.pde b/processing/mode/examples/Topics/File IO/TileImages/TileImages.pde
similarity index 100%
rename from mode/examples/Topics/File IO/TileImages/TileImages.pde
rename to processing/mode/examples/Topics/File IO/TileImages/TileImages.pde
diff --git a/mode/examples/Topics/Fractals and L-Systems/Koch/Koch.pde b/processing/mode/examples/Topics/Fractals and L-Systems/Koch/Koch.pde
similarity index 100%
rename from mode/examples/Topics/Fractals and L-Systems/Koch/Koch.pde
rename to processing/mode/examples/Topics/Fractals and L-Systems/Koch/Koch.pde
diff --git a/mode/examples/Topics/Fractals and L-Systems/Mandelbrot/Mandelbrot.pde b/processing/mode/examples/Topics/Fractals and L-Systems/Mandelbrot/Mandelbrot.pde
similarity index 100%
rename from mode/examples/Topics/Fractals and L-Systems/Mandelbrot/Mandelbrot.pde
rename to processing/mode/examples/Topics/Fractals and L-Systems/Mandelbrot/Mandelbrot.pde
diff --git a/mode/examples/Topics/Fractals and L-Systems/PenroseSnowflake/LSystem.pde b/processing/mode/examples/Topics/Fractals and L-Systems/PenroseSnowflake/LSystem.pde
similarity index 100%
rename from mode/examples/Topics/Fractals and L-Systems/PenroseSnowflake/LSystem.pde
rename to processing/mode/examples/Topics/Fractals and L-Systems/PenroseSnowflake/LSystem.pde
diff --git a/mode/examples/Topics/Fractals and L-Systems/PenroseSnowflake/PenroseSnowflake.pde b/processing/mode/examples/Topics/Fractals and L-Systems/PenroseSnowflake/PenroseSnowflake.pde
similarity index 100%
rename from mode/examples/Topics/Fractals and L-Systems/PenroseSnowflake/PenroseSnowflake.pde
rename to processing/mode/examples/Topics/Fractals and L-Systems/PenroseSnowflake/PenroseSnowflake.pde
diff --git a/mode/examples/Topics/Fractals and L-Systems/PenroseSnowflake/PenroseSnowflakeLSystem.pde b/processing/mode/examples/Topics/Fractals and L-Systems/PenroseSnowflake/PenroseSnowflakeLSystem.pde
similarity index 100%
rename from mode/examples/Topics/Fractals and L-Systems/PenroseSnowflake/PenroseSnowflakeLSystem.pde
rename to processing/mode/examples/Topics/Fractals and L-Systems/PenroseSnowflake/PenroseSnowflakeLSystem.pde
diff --git a/mode/examples/Topics/Fractals and L-Systems/PenroseTile/LSystem.pde b/processing/mode/examples/Topics/Fractals and L-Systems/PenroseTile/LSystem.pde
similarity index 100%
rename from mode/examples/Topics/Fractals and L-Systems/PenroseTile/LSystem.pde
rename to processing/mode/examples/Topics/Fractals and L-Systems/PenroseTile/LSystem.pde
diff --git a/mode/examples/Topics/Fractals and L-Systems/PenroseTile/PenroseLSystem.pde b/processing/mode/examples/Topics/Fractals and L-Systems/PenroseTile/PenroseLSystem.pde
similarity index 100%
rename from mode/examples/Topics/Fractals and L-Systems/PenroseTile/PenroseLSystem.pde
rename to processing/mode/examples/Topics/Fractals and L-Systems/PenroseTile/PenroseLSystem.pde
diff --git a/mode/examples/Topics/Fractals and L-Systems/PenroseTile/PenroseTile.pde b/processing/mode/examples/Topics/Fractals and L-Systems/PenroseTile/PenroseTile.pde
similarity index 100%
rename from mode/examples/Topics/Fractals and L-Systems/PenroseTile/PenroseTile.pde
rename to processing/mode/examples/Topics/Fractals and L-Systems/PenroseTile/PenroseTile.pde
diff --git a/mode/examples/Topics/Fractals and L-Systems/Pentigree/LSystem.pde b/processing/mode/examples/Topics/Fractals and L-Systems/Pentigree/LSystem.pde
similarity index 100%
rename from mode/examples/Topics/Fractals and L-Systems/Pentigree/LSystem.pde
rename to processing/mode/examples/Topics/Fractals and L-Systems/Pentigree/LSystem.pde
diff --git a/mode/examples/Topics/Fractals and L-Systems/Pentigree/Pentigree.pde b/processing/mode/examples/Topics/Fractals and L-Systems/Pentigree/Pentigree.pde
similarity index 100%
rename from mode/examples/Topics/Fractals and L-Systems/Pentigree/Pentigree.pde
rename to processing/mode/examples/Topics/Fractals and L-Systems/Pentigree/Pentigree.pde
diff --git a/mode/examples/Topics/Fractals and L-Systems/Pentigree/PentigreeLSystem.pde b/processing/mode/examples/Topics/Fractals and L-Systems/Pentigree/PentigreeLSystem.pde
similarity index 100%
rename from mode/examples/Topics/Fractals and L-Systems/Pentigree/PentigreeLSystem.pde
rename to processing/mode/examples/Topics/Fractals and L-Systems/Pentigree/PentigreeLSystem.pde
diff --git a/mode/examples/Topics/Fractals and L-Systems/Tree/Tree.pde b/processing/mode/examples/Topics/Fractals and L-Systems/Tree/Tree.pde
similarity index 100%
rename from mode/examples/Topics/Fractals and L-Systems/Tree/Tree.pde
rename to processing/mode/examples/Topics/Fractals and L-Systems/Tree/Tree.pde
diff --git a/mode/examples/Topics/GUI/Button/Button.pde b/processing/mode/examples/Topics/GUI/Button/Button.pde
similarity index 100%
rename from mode/examples/Topics/GUI/Button/Button.pde
rename to processing/mode/examples/Topics/GUI/Button/Button.pde
diff --git a/mode/examples/Topics/GUI/Buttons/Buttons.pde b/processing/mode/examples/Topics/GUI/Buttons/Buttons.pde
similarity index 100%
rename from mode/examples/Topics/GUI/Buttons/Buttons.pde
rename to processing/mode/examples/Topics/GUI/Buttons/Buttons.pde
diff --git a/mode/examples/Topics/GUI/Handles/Handles.pde b/processing/mode/examples/Topics/GUI/Handles/Handles.pde
similarity index 100%
rename from mode/examples/Topics/GUI/Handles/Handles.pde
rename to processing/mode/examples/Topics/GUI/Handles/Handles.pde
diff --git a/mode/examples/Topics/GUI/ImageButton/ImageButton.pde b/processing/mode/examples/Topics/GUI/ImageButton/ImageButton.pde
similarity index 100%
rename from mode/examples/Topics/GUI/ImageButton/ImageButton.pde
rename to processing/mode/examples/Topics/GUI/ImageButton/ImageButton.pde
diff --git a/mode/examples/Topics/GUI/ImageButton/data/base.gif b/processing/mode/examples/Topics/GUI/ImageButton/data/base.gif
similarity index 100%
rename from mode/examples/Topics/GUI/ImageButton/data/base.gif
rename to processing/mode/examples/Topics/GUI/ImageButton/data/base.gif
diff --git a/mode/examples/Topics/GUI/ImageButton/data/down.gif b/processing/mode/examples/Topics/GUI/ImageButton/data/down.gif
similarity index 100%
rename from mode/examples/Topics/GUI/ImageButton/data/down.gif
rename to processing/mode/examples/Topics/GUI/ImageButton/data/down.gif
diff --git a/mode/examples/Topics/GUI/ImageButton/data/roll.gif b/processing/mode/examples/Topics/GUI/ImageButton/data/roll.gif
similarity index 100%
rename from mode/examples/Topics/GUI/ImageButton/data/roll.gif
rename to processing/mode/examples/Topics/GUI/ImageButton/data/roll.gif
diff --git a/mode/examples/Topics/GUI/Rollover/Rollover.pde b/processing/mode/examples/Topics/GUI/Rollover/Rollover.pde
similarity index 100%
rename from mode/examples/Topics/GUI/Rollover/Rollover.pde
rename to processing/mode/examples/Topics/GUI/Rollover/Rollover.pde
diff --git a/mode/examples/Topics/GUI/Scrollbar/Scrollbar.pde b/processing/mode/examples/Topics/GUI/Scrollbar/Scrollbar.pde
similarity index 100%
rename from mode/examples/Topics/GUI/Scrollbar/Scrollbar.pde
rename to processing/mode/examples/Topics/GUI/Scrollbar/Scrollbar.pde
diff --git a/mode/examples/Topics/GUI/Scrollbar/data/seedBottom.jpg b/processing/mode/examples/Topics/GUI/Scrollbar/data/seedBottom.jpg
similarity index 100%
rename from mode/examples/Topics/GUI/Scrollbar/data/seedBottom.jpg
rename to processing/mode/examples/Topics/GUI/Scrollbar/data/seedBottom.jpg
diff --git a/mode/examples/Topics/GUI/Scrollbar/data/seedTop.jpg b/processing/mode/examples/Topics/GUI/Scrollbar/data/seedTop.jpg
similarity index 100%
rename from mode/examples/Topics/GUI/Scrollbar/data/seedTop.jpg
rename to processing/mode/examples/Topics/GUI/Scrollbar/data/seedTop.jpg
diff --git a/mode/examples/Topics/Geometry/Icosahedra/Dimension3D.pde b/processing/mode/examples/Topics/Geometry/Icosahedra/Dimension3D.pde
similarity index 100%
rename from mode/examples/Topics/Geometry/Icosahedra/Dimension3D.pde
rename to processing/mode/examples/Topics/Geometry/Icosahedra/Dimension3D.pde
diff --git a/mode/examples/Topics/Geometry/Icosahedra/Icosahedra.pde b/processing/mode/examples/Topics/Geometry/Icosahedra/Icosahedra.pde
similarity index 100%
rename from mode/examples/Topics/Geometry/Icosahedra/Icosahedra.pde
rename to processing/mode/examples/Topics/Geometry/Icosahedra/Icosahedra.pde
diff --git a/mode/examples/Topics/Geometry/Icosahedra/Icosahedron.pde b/processing/mode/examples/Topics/Geometry/Icosahedra/Icosahedron.pde
similarity index 100%
rename from mode/examples/Topics/Geometry/Icosahedra/Icosahedron.pde
rename to processing/mode/examples/Topics/Geometry/Icosahedra/Icosahedron.pde
diff --git a/mode/examples/Topics/Geometry/Icosahedra/Shape3D.pde b/processing/mode/examples/Topics/Geometry/Icosahedra/Shape3D.pde
similarity index 100%
rename from mode/examples/Topics/Geometry/Icosahedra/Shape3D.pde
rename to processing/mode/examples/Topics/Geometry/Icosahedra/Shape3D.pde
diff --git a/mode/examples/Topics/Geometry/NoiseSphere/NoiseSphere.pde b/processing/mode/examples/Topics/Geometry/NoiseSphere/NoiseSphere.pde
similarity index 100%
rename from mode/examples/Topics/Geometry/NoiseSphere/NoiseSphere.pde
rename to processing/mode/examples/Topics/Geometry/NoiseSphere/NoiseSphere.pde
diff --git a/mode/examples/Topics/Geometry/RGBCube/RGBCube.pde b/processing/mode/examples/Topics/Geometry/RGBCube/RGBCube.pde
similarity index 100%
rename from mode/examples/Topics/Geometry/RGBCube/RGBCube.pde
rename to processing/mode/examples/Topics/Geometry/RGBCube/RGBCube.pde
diff --git a/mode/examples/Topics/Geometry/ShapeTransform/ShapeTransform.pde b/processing/mode/examples/Topics/Geometry/ShapeTransform/ShapeTransform.pde
similarity index 100%
rename from mode/examples/Topics/Geometry/ShapeTransform/ShapeTransform.pde
rename to processing/mode/examples/Topics/Geometry/ShapeTransform/ShapeTransform.pde
diff --git a/mode/examples/Topics/Geometry/SpaceJunk/Cube.pde b/processing/mode/examples/Topics/Geometry/SpaceJunk/Cube.pde
similarity index 100%
rename from mode/examples/Topics/Geometry/SpaceJunk/Cube.pde
rename to processing/mode/examples/Topics/Geometry/SpaceJunk/Cube.pde
diff --git a/mode/examples/Topics/Geometry/SpaceJunk/SpaceJunk.pde b/processing/mode/examples/Topics/Geometry/SpaceJunk/SpaceJunk.pde
similarity index 100%
rename from mode/examples/Topics/Geometry/SpaceJunk/SpaceJunk.pde
rename to processing/mode/examples/Topics/Geometry/SpaceJunk/SpaceJunk.pde
diff --git a/mode/examples/Topics/Geometry/Toroid/Toroid.pde b/processing/mode/examples/Topics/Geometry/Toroid/Toroid.pde
similarity index 100%
rename from mode/examples/Topics/Geometry/Toroid/Toroid.pde
rename to processing/mode/examples/Topics/Geometry/Toroid/Toroid.pde
diff --git a/mode/examples/Topics/Geometry/Vertices/Vertices.pde b/processing/mode/examples/Topics/Geometry/Vertices/Vertices.pde
similarity index 100%
rename from mode/examples/Topics/Geometry/Vertices/Vertices.pde
rename to processing/mode/examples/Topics/Geometry/Vertices/Vertices.pde
diff --git a/mode/examples/Topics/Image Processing/Blur/Blur.pde b/processing/mode/examples/Topics/Image Processing/Blur/Blur.pde
similarity index 100%
rename from mode/examples/Topics/Image Processing/Blur/Blur.pde
rename to processing/mode/examples/Topics/Image Processing/Blur/Blur.pde
diff --git a/mode/examples/Topics/Image Processing/Blur/data/trees.jpg b/processing/mode/examples/Topics/Image Processing/Blur/data/trees.jpg
similarity index 100%
rename from mode/examples/Topics/Image Processing/Blur/data/trees.jpg
rename to processing/mode/examples/Topics/Image Processing/Blur/data/trees.jpg
diff --git a/mode/examples/Topics/Image Processing/Brightness/Brightness.pde b/processing/mode/examples/Topics/Image Processing/Brightness/Brightness.pde
similarity index 100%
rename from mode/examples/Topics/Image Processing/Brightness/Brightness.pde
rename to processing/mode/examples/Topics/Image Processing/Brightness/Brightness.pde
diff --git a/mode/examples/Topics/Image Processing/Brightness/data/wires.jpg b/processing/mode/examples/Topics/Image Processing/Brightness/data/wires.jpg
similarity index 100%
rename from mode/examples/Topics/Image Processing/Brightness/data/wires.jpg
rename to processing/mode/examples/Topics/Image Processing/Brightness/data/wires.jpg
diff --git a/mode/examples/Topics/Image Processing/Convolution/Convolution.pde b/processing/mode/examples/Topics/Image Processing/Convolution/Convolution.pde
similarity index 100%
rename from mode/examples/Topics/Image Processing/Convolution/Convolution.pde
rename to processing/mode/examples/Topics/Image Processing/Convolution/Convolution.pde
diff --git a/mode/examples/Topics/Image Processing/Convolution/data/end.jpg b/processing/mode/examples/Topics/Image Processing/Convolution/data/end.jpg
similarity index 100%
rename from mode/examples/Topics/Image Processing/Convolution/data/end.jpg
rename to processing/mode/examples/Topics/Image Processing/Convolution/data/end.jpg
diff --git a/mode/examples/Topics/Image Processing/Convolution/data/sunflower.jpg b/processing/mode/examples/Topics/Image Processing/Convolution/data/sunflower.jpg
similarity index 100%
rename from mode/examples/Topics/Image Processing/Convolution/data/sunflower.jpg
rename to processing/mode/examples/Topics/Image Processing/Convolution/data/sunflower.jpg
diff --git a/mode/examples/Topics/Image Processing/EdgeDetection/EdgeDetection.pde b/processing/mode/examples/Topics/Image Processing/EdgeDetection/EdgeDetection.pde
similarity index 100%
rename from mode/examples/Topics/Image Processing/EdgeDetection/EdgeDetection.pde
rename to processing/mode/examples/Topics/Image Processing/EdgeDetection/EdgeDetection.pde
diff --git a/mode/examples/Topics/Image Processing/EdgeDetection/data/house.jpg b/processing/mode/examples/Topics/Image Processing/EdgeDetection/data/house.jpg
similarity index 100%
rename from mode/examples/Topics/Image Processing/EdgeDetection/data/house.jpg
rename to processing/mode/examples/Topics/Image Processing/EdgeDetection/data/house.jpg
diff --git a/mode/examples/Topics/Image Processing/Histogram/Histogram.pde b/processing/mode/examples/Topics/Image Processing/Histogram/Histogram.pde
similarity index 100%
rename from mode/examples/Topics/Image Processing/Histogram/Histogram.pde
rename to processing/mode/examples/Topics/Image Processing/Histogram/Histogram.pde
diff --git a/mode/examples/Topics/Image Processing/Histogram/data/cdi01_g.jpg b/processing/mode/examples/Topics/Image Processing/Histogram/data/cdi01_g.jpg
similarity index 100%
rename from mode/examples/Topics/Image Processing/Histogram/data/cdi01_g.jpg
rename to processing/mode/examples/Topics/Image Processing/Histogram/data/cdi01_g.jpg
diff --git a/mode/examples/Topics/Image Processing/Histogram/data/ystone08.jpg b/processing/mode/examples/Topics/Image Processing/Histogram/data/ystone08.jpg
similarity index 100%
rename from mode/examples/Topics/Image Processing/Histogram/data/ystone08.jpg
rename to processing/mode/examples/Topics/Image Processing/Histogram/data/ystone08.jpg
diff --git a/mode/examples/Topics/Image Processing/LinearImage/LinearImage.pde b/processing/mode/examples/Topics/Image Processing/LinearImage/LinearImage.pde
similarity index 100%
rename from mode/examples/Topics/Image Processing/LinearImage/LinearImage.pde
rename to processing/mode/examples/Topics/Image Processing/LinearImage/LinearImage.pde
diff --git a/mode/examples/Topics/Image Processing/LinearImage/data/florence03.jpg b/processing/mode/examples/Topics/Image Processing/LinearImage/data/florence03.jpg
similarity index 100%
rename from mode/examples/Topics/Image Processing/LinearImage/data/florence03.jpg
rename to processing/mode/examples/Topics/Image Processing/LinearImage/data/florence03.jpg
diff --git a/mode/examples/Topics/Image Processing/PixelArray/PixelArray.pde b/processing/mode/examples/Topics/Image Processing/PixelArray/PixelArray.pde
similarity index 100%
rename from mode/examples/Topics/Image Processing/PixelArray/PixelArray.pde
rename to processing/mode/examples/Topics/Image Processing/PixelArray/PixelArray.pde
diff --git a/mode/examples/Topics/Image Processing/PixelArray/data/ystone08.jpg b/processing/mode/examples/Topics/Image Processing/PixelArray/data/ystone08.jpg
similarity index 100%
rename from mode/examples/Topics/Image Processing/PixelArray/data/ystone08.jpg
rename to processing/mode/examples/Topics/Image Processing/PixelArray/data/ystone08.jpg
diff --git a/mode/examples/Topics/Interaction/Follow1/Follow1.pde b/processing/mode/examples/Topics/Interaction/Follow1/Follow1.pde
similarity index 100%
rename from mode/examples/Topics/Interaction/Follow1/Follow1.pde
rename to processing/mode/examples/Topics/Interaction/Follow1/Follow1.pde
diff --git a/mode/examples/Topics/Interaction/Follow2/Follow2.pde b/processing/mode/examples/Topics/Interaction/Follow2/Follow2.pde
similarity index 100%
rename from mode/examples/Topics/Interaction/Follow2/Follow2.pde
rename to processing/mode/examples/Topics/Interaction/Follow2/Follow2.pde
diff --git a/mode/examples/Topics/Interaction/Follow3/Follow3.pde b/processing/mode/examples/Topics/Interaction/Follow3/Follow3.pde
similarity index 100%
rename from mode/examples/Topics/Interaction/Follow3/Follow3.pde
rename to processing/mode/examples/Topics/Interaction/Follow3/Follow3.pde
diff --git a/mode/examples/Topics/Interaction/Multitouch/Multitouch.pde b/processing/mode/examples/Topics/Interaction/Multitouch/Multitouch.pde
similarity index 100%
rename from mode/examples/Topics/Interaction/Multitouch/Multitouch.pde
rename to processing/mode/examples/Topics/Interaction/Multitouch/Multitouch.pde
diff --git a/mode/examples/Topics/Interaction/Reach1/Reach1.pde b/processing/mode/examples/Topics/Interaction/Reach1/Reach1.pde
similarity index 100%
rename from mode/examples/Topics/Interaction/Reach1/Reach1.pde
rename to processing/mode/examples/Topics/Interaction/Reach1/Reach1.pde
diff --git a/mode/examples/Topics/Interaction/Reach2/Reach2.pde b/processing/mode/examples/Topics/Interaction/Reach2/Reach2.pde
similarity index 100%
rename from mode/examples/Topics/Interaction/Reach2/Reach2.pde
rename to processing/mode/examples/Topics/Interaction/Reach2/Reach2.pde
diff --git a/mode/examples/Topics/Interaction/Reach3/Reach3.pde b/processing/mode/examples/Topics/Interaction/Reach3/Reach3.pde
similarity index 100%
rename from mode/examples/Topics/Interaction/Reach3/Reach3.pde
rename to processing/mode/examples/Topics/Interaction/Reach3/Reach3.pde
diff --git a/mode/examples/Topics/Interaction/Tickle/Tickle.pde b/processing/mode/examples/Topics/Interaction/Tickle/Tickle.pde
similarity index 100%
rename from mode/examples/Topics/Interaction/Tickle/Tickle.pde
rename to processing/mode/examples/Topics/Interaction/Tickle/Tickle.pde
diff --git a/mode/examples/Topics/Interaction/Tickle/data/AmericanTypewriter-24.vlw b/processing/mode/examples/Topics/Interaction/Tickle/data/AmericanTypewriter-24.vlw
similarity index 100%
rename from mode/examples/Topics/Interaction/Tickle/data/AmericanTypewriter-24.vlw
rename to processing/mode/examples/Topics/Interaction/Tickle/data/AmericanTypewriter-24.vlw
diff --git a/mode/examples/Topics/Motion/Bounce/Bounce.pde b/processing/mode/examples/Topics/Motion/Bounce/Bounce.pde
similarity index 100%
rename from mode/examples/Topics/Motion/Bounce/Bounce.pde
rename to processing/mode/examples/Topics/Motion/Bounce/Bounce.pde
diff --git a/mode/examples/Topics/Motion/BouncyBubbles/BouncyBubbles.pde b/processing/mode/examples/Topics/Motion/BouncyBubbles/BouncyBubbles.pde
similarity index 100%
rename from mode/examples/Topics/Motion/BouncyBubbles/BouncyBubbles.pde
rename to processing/mode/examples/Topics/Motion/BouncyBubbles/BouncyBubbles.pde
diff --git a/mode/examples/Topics/Motion/Brownian/Brownian.pde b/processing/mode/examples/Topics/Motion/Brownian/Brownian.pde
similarity index 100%
rename from mode/examples/Topics/Motion/Brownian/Brownian.pde
rename to processing/mode/examples/Topics/Motion/Brownian/Brownian.pde
diff --git a/mode/examples/Topics/Motion/CircleCollision/Ball.pde b/processing/mode/examples/Topics/Motion/CircleCollision/Ball.pde
similarity index 100%
rename from mode/examples/Topics/Motion/CircleCollision/Ball.pde
rename to processing/mode/examples/Topics/Motion/CircleCollision/Ball.pde
diff --git a/mode/examples/Topics/Motion/CircleCollision/CircleCollision.pde b/processing/mode/examples/Topics/Motion/CircleCollision/CircleCollision.pde
similarity index 100%
rename from mode/examples/Topics/Motion/CircleCollision/CircleCollision.pde
rename to processing/mode/examples/Topics/Motion/CircleCollision/CircleCollision.pde
diff --git a/mode/examples/Topics/Motion/Collision/Collision.pde b/processing/mode/examples/Topics/Motion/Collision/Collision.pde
similarity index 100%
rename from mode/examples/Topics/Motion/Collision/Collision.pde
rename to processing/mode/examples/Topics/Motion/Collision/Collision.pde
diff --git a/mode/examples/Topics/Motion/Linear/Linear.pde b/processing/mode/examples/Topics/Motion/Linear/Linear.pde
similarity index 100%
rename from mode/examples/Topics/Motion/Linear/Linear.pde
rename to processing/mode/examples/Topics/Motion/Linear/Linear.pde
diff --git a/mode/examples/Topics/Motion/MovingOnCurves/MovingOnCurves.pde b/processing/mode/examples/Topics/Motion/MovingOnCurves/MovingOnCurves.pde
similarity index 100%
rename from mode/examples/Topics/Motion/MovingOnCurves/MovingOnCurves.pde
rename to processing/mode/examples/Topics/Motion/MovingOnCurves/MovingOnCurves.pde
diff --git a/mode/examples/Topics/Motion/Puff/Puff.pde b/processing/mode/examples/Topics/Motion/Puff/Puff.pde
similarity index 100%
rename from mode/examples/Topics/Motion/Puff/Puff.pde
rename to processing/mode/examples/Topics/Motion/Puff/Puff.pde
diff --git a/mode/examples/Topics/Motion/Reflection1/Reflection1.pde b/processing/mode/examples/Topics/Motion/Reflection1/Reflection1.pde
similarity index 100%
rename from mode/examples/Topics/Motion/Reflection1/Reflection1.pde
rename to processing/mode/examples/Topics/Motion/Reflection1/Reflection1.pde
diff --git a/mode/examples/Topics/Motion/Reflection2/Ground.pde b/processing/mode/examples/Topics/Motion/Reflection2/Ground.pde
similarity index 100%
rename from mode/examples/Topics/Motion/Reflection2/Ground.pde
rename to processing/mode/examples/Topics/Motion/Reflection2/Ground.pde
diff --git a/mode/examples/Topics/Motion/Reflection2/Orb.pde b/processing/mode/examples/Topics/Motion/Reflection2/Orb.pde
similarity index 100%
rename from mode/examples/Topics/Motion/Reflection2/Orb.pde
rename to processing/mode/examples/Topics/Motion/Reflection2/Orb.pde
diff --git a/mode/examples/Topics/Motion/Reflection2/Reflection2.pde b/processing/mode/examples/Topics/Motion/Reflection2/Reflection2.pde
similarity index 100%
rename from mode/examples/Topics/Motion/Reflection2/Reflection2.pde
rename to processing/mode/examples/Topics/Motion/Reflection2/Reflection2.pde
diff --git a/mode/examples/Topics/Shaders/BlurFilter/BlurFilter.pde b/processing/mode/examples/Topics/Shaders/BlurFilter/BlurFilter.pde
similarity index 100%
rename from mode/examples/Topics/Shaders/BlurFilter/BlurFilter.pde
rename to processing/mode/examples/Topics/Shaders/BlurFilter/BlurFilter.pde
diff --git a/studio/apps/fast2d/src/main/assets/edges.glsl b/processing/mode/examples/Topics/Shaders/BlurFilter/data/blur.glsl
similarity index 82%
rename from studio/apps/fast2d/src/main/assets/edges.glsl
rename to processing/mode/examples/Topics/Shaders/BlurFilter/data/blur.glsl
index 62109e3e3..2aa9d6079 100644
--- a/studio/apps/fast2d/src/main/assets/edges.glsl
+++ b/processing/mode/examples/Topics/Shaders/BlurFilter/data/blur.glsl
@@ -24,7 +24,7 @@ void main(void) {
vec2 tc6 = vertTexCoord.st + vec2(-texOffset.s, +texOffset.t);
vec2 tc7 = vertTexCoord.st + vec2( 0.0, +texOffset.t);
vec2 tc8 = vertTexCoord.st + vec2(+texOffset.s, +texOffset.t);
-
+
vec4 col0 = texture2D(texture, tc0);
vec4 col1 = texture2D(texture, tc1);
vec4 col2 = texture2D(texture, tc2);
@@ -35,6 +35,8 @@ void main(void) {
vec4 col7 = texture2D(texture, tc7);
vec4 col8 = texture2D(texture, tc8);
- vec4 sum = 8.0 * col4 - (col0 + col1 + col2 + col3 + col5 + col6 + col7 + col8);
- gl_FragColor = vec4(sum.rgb, 1.0) * vertColor;
+ vec4 sum = (1.0 * col0 + 2.0 * col1 + 1.0 * col2 +
+ 2.0 * col3 + 4.0 * col4 + 2.0 * col4 +
+ 1.0 * col5 + 2.0 * col6 + 1.0 * col7) / 16.0;
+ gl_FragColor = vec4(sum.rgb, 1.0) * vertColor;
}
diff --git a/mode/examples/Topics/Shaders/EdgeDetect/EdgeDetect.pde b/processing/mode/examples/Topics/Shaders/EdgeDetect/EdgeDetect.pde
similarity index 100%
rename from mode/examples/Topics/Shaders/EdgeDetect/EdgeDetect.pde
rename to processing/mode/examples/Topics/Shaders/EdgeDetect/EdgeDetect.pde
diff --git a/mode/examples/Topics/Shaders/EdgeDetect/data/edges.glsl b/processing/mode/examples/Topics/Shaders/EdgeDetect/data/edges.glsl
similarity index 100%
rename from mode/examples/Topics/Shaders/EdgeDetect/data/edges.glsl
rename to processing/mode/examples/Topics/Shaders/EdgeDetect/data/edges.glsl
diff --git a/processing/mode/examples/Topics/Shaders/EdgeDetect/data/leaves.jpg b/processing/mode/examples/Topics/Shaders/EdgeDetect/data/leaves.jpg
new file mode 100644
index 000000000..72c86a092
Binary files /dev/null and b/processing/mode/examples/Topics/Shaders/EdgeDetect/data/leaves.jpg differ
diff --git a/mode/examples/Topics/Shaders/EdgeFilter/EdgeFilter.pde b/processing/mode/examples/Topics/Shaders/EdgeFilter/EdgeFilter.pde
similarity index 100%
rename from mode/examples/Topics/Shaders/EdgeFilter/EdgeFilter.pde
rename to processing/mode/examples/Topics/Shaders/EdgeFilter/EdgeFilter.pde
diff --git a/mode/examples/Topics/Shaders/EdgeFilter/data/edges.glsl b/processing/mode/examples/Topics/Shaders/EdgeFilter/data/edges.glsl
similarity index 100%
rename from mode/examples/Topics/Shaders/EdgeFilter/data/edges.glsl
rename to processing/mode/examples/Topics/Shaders/EdgeFilter/data/edges.glsl
diff --git a/mode/examples/Topics/Shaders/LowLevelGL/LowLevelGL.pde b/processing/mode/examples/Topics/Shaders/LowLevelGL/LowLevelGL.pde
similarity index 100%
rename from mode/examples/Topics/Shaders/LowLevelGL/LowLevelGL.pde
rename to processing/mode/examples/Topics/Shaders/LowLevelGL/LowLevelGL.pde
diff --git a/mode/examples/Topics/Shaders/LowLevelGL/data/frag.glsl b/processing/mode/examples/Topics/Shaders/LowLevelGL/data/frag.glsl
similarity index 100%
rename from mode/examples/Topics/Shaders/LowLevelGL/data/frag.glsl
rename to processing/mode/examples/Topics/Shaders/LowLevelGL/data/frag.glsl
diff --git a/mode/examples/Topics/Shaders/LowLevelGL/data/vert.glsl b/processing/mode/examples/Topics/Shaders/LowLevelGL/data/vert.glsl
similarity index 100%
rename from mode/examples/Topics/Shaders/LowLevelGL/data/vert.glsl
rename to processing/mode/examples/Topics/Shaders/LowLevelGL/data/vert.glsl
diff --git a/mode/examples/Topics/Shaders/ToonShading/ToonShading.pde b/processing/mode/examples/Topics/Shaders/ToonShading/ToonShading.pde
similarity index 100%
rename from mode/examples/Topics/Shaders/ToonShading/ToonShading.pde
rename to processing/mode/examples/Topics/Shaders/ToonShading/ToonShading.pde
diff --git a/mode/examples/Topics/Shaders/ToonShading/data/ToonFrag.glsl b/processing/mode/examples/Topics/Shaders/ToonShading/data/ToonFrag.glsl
similarity index 100%
rename from mode/examples/Topics/Shaders/ToonShading/data/ToonFrag.glsl
rename to processing/mode/examples/Topics/Shaders/ToonShading/data/ToonFrag.glsl
diff --git a/mode/examples/Topics/Shaders/ToonShading/data/ToonVert.glsl b/processing/mode/examples/Topics/Shaders/ToonShading/data/ToonVert.glsl
similarity index 100%
rename from mode/examples/Topics/Shaders/ToonShading/data/ToonVert.glsl
rename to processing/mode/examples/Topics/Shaders/ToonShading/data/ToonVert.glsl
diff --git a/mode/examples/Topics/Simulate/Chain/Chain.pde b/processing/mode/examples/Topics/Simulate/Chain/Chain.pde
similarity index 100%
rename from mode/examples/Topics/Simulate/Chain/Chain.pde
rename to processing/mode/examples/Topics/Simulate/Chain/Chain.pde
diff --git a/mode/examples/Topics/Simulate/Flocking/Boid.pde b/processing/mode/examples/Topics/Simulate/Flocking/Boid.pde
similarity index 100%
rename from mode/examples/Topics/Simulate/Flocking/Boid.pde
rename to processing/mode/examples/Topics/Simulate/Flocking/Boid.pde
diff --git a/mode/examples/Topics/Simulate/Flocking/Flock.pde b/processing/mode/examples/Topics/Simulate/Flocking/Flock.pde
similarity index 100%
rename from mode/examples/Topics/Simulate/Flocking/Flock.pde
rename to processing/mode/examples/Topics/Simulate/Flocking/Flock.pde
diff --git a/mode/examples/Topics/Simulate/Flocking/Flocking.pde b/processing/mode/examples/Topics/Simulate/Flocking/Flocking.pde
similarity index 100%
rename from mode/examples/Topics/Simulate/Flocking/Flocking.pde
rename to processing/mode/examples/Topics/Simulate/Flocking/Flocking.pde
diff --git a/mode/examples/Topics/Simulate/ForcesWithVectors/ForcesWithVectors.pde b/processing/mode/examples/Topics/Simulate/ForcesWithVectors/ForcesWithVectors.pde
similarity index 100%
rename from mode/examples/Topics/Simulate/ForcesWithVectors/ForcesWithVectors.pde
rename to processing/mode/examples/Topics/Simulate/ForcesWithVectors/ForcesWithVectors.pde
diff --git a/mode/examples/Topics/Simulate/ForcesWithVectors/Liquid.pde b/processing/mode/examples/Topics/Simulate/ForcesWithVectors/Liquid.pde
similarity index 100%
rename from mode/examples/Topics/Simulate/ForcesWithVectors/Liquid.pde
rename to processing/mode/examples/Topics/Simulate/ForcesWithVectors/Liquid.pde
diff --git a/mode/examples/Topics/Simulate/ForcesWithVectors/Mover.pde b/processing/mode/examples/Topics/Simulate/ForcesWithVectors/Mover.pde
similarity index 100%
rename from mode/examples/Topics/Simulate/ForcesWithVectors/Mover.pde
rename to processing/mode/examples/Topics/Simulate/ForcesWithVectors/Mover.pde
diff --git a/mode/examples/Topics/Simulate/GravitationalAttraction3D/GravitationalAttraction3D.pde b/processing/mode/examples/Topics/Simulate/GravitationalAttraction3D/GravitationalAttraction3D.pde
similarity index 100%
rename from mode/examples/Topics/Simulate/GravitationalAttraction3D/GravitationalAttraction3D.pde
rename to processing/mode/examples/Topics/Simulate/GravitationalAttraction3D/GravitationalAttraction3D.pde
diff --git a/mode/examples/Topics/Simulate/GravitationalAttraction3D/Planet.pde b/processing/mode/examples/Topics/Simulate/GravitationalAttraction3D/Planet.pde
similarity index 100%
rename from mode/examples/Topics/Simulate/GravitationalAttraction3D/Planet.pde
rename to processing/mode/examples/Topics/Simulate/GravitationalAttraction3D/Planet.pde
diff --git a/mode/examples/Topics/Simulate/GravitationalAttraction3D/Sun.pde b/processing/mode/examples/Topics/Simulate/GravitationalAttraction3D/Sun.pde
similarity index 100%
rename from mode/examples/Topics/Simulate/GravitationalAttraction3D/Sun.pde
rename to processing/mode/examples/Topics/Simulate/GravitationalAttraction3D/Sun.pde
diff --git a/mode/examples/Topics/Simulate/MultipleParticleSystems/CrazyParticle.pde b/processing/mode/examples/Topics/Simulate/MultipleParticleSystems/CrazyParticle.pde
similarity index 100%
rename from mode/examples/Topics/Simulate/MultipleParticleSystems/CrazyParticle.pde
rename to processing/mode/examples/Topics/Simulate/MultipleParticleSystems/CrazyParticle.pde
diff --git a/mode/examples/Topics/Simulate/MultipleParticleSystems/MultipleParticleSystems.pde b/processing/mode/examples/Topics/Simulate/MultipleParticleSystems/MultipleParticleSystems.pde
similarity index 100%
rename from mode/examples/Topics/Simulate/MultipleParticleSystems/MultipleParticleSystems.pde
rename to processing/mode/examples/Topics/Simulate/MultipleParticleSystems/MultipleParticleSystems.pde
diff --git a/mode/examples/Topics/Simulate/MultipleParticleSystems/Particle.pde b/processing/mode/examples/Topics/Simulate/MultipleParticleSystems/Particle.pde
similarity index 100%
rename from mode/examples/Topics/Simulate/MultipleParticleSystems/Particle.pde
rename to processing/mode/examples/Topics/Simulate/MultipleParticleSystems/Particle.pde
diff --git a/mode/examples/Topics/Simulate/MultipleParticleSystems/ParticleSystem.pde b/processing/mode/examples/Topics/Simulate/MultipleParticleSystems/ParticleSystem.pde
similarity index 100%
rename from mode/examples/Topics/Simulate/MultipleParticleSystems/ParticleSystem.pde
rename to processing/mode/examples/Topics/Simulate/MultipleParticleSystems/ParticleSystem.pde
diff --git a/mode/examples/Topics/Simulate/SimpleParticleSystem/Particle.pde b/processing/mode/examples/Topics/Simulate/SimpleParticleSystem/Particle.pde
similarity index 100%
rename from mode/examples/Topics/Simulate/SimpleParticleSystem/Particle.pde
rename to processing/mode/examples/Topics/Simulate/SimpleParticleSystem/Particle.pde
diff --git a/mode/examples/Topics/Simulate/SimpleParticleSystem/ParticleSystem.pde b/processing/mode/examples/Topics/Simulate/SimpleParticleSystem/ParticleSystem.pde
similarity index 100%
rename from mode/examples/Topics/Simulate/SimpleParticleSystem/ParticleSystem.pde
rename to processing/mode/examples/Topics/Simulate/SimpleParticleSystem/ParticleSystem.pde
diff --git a/mode/examples/Topics/Simulate/SimpleParticleSystem/SimpleParticleSystem.pde b/processing/mode/examples/Topics/Simulate/SimpleParticleSystem/SimpleParticleSystem.pde
similarity index 100%
rename from mode/examples/Topics/Simulate/SimpleParticleSystem/SimpleParticleSystem.pde
rename to processing/mode/examples/Topics/Simulate/SimpleParticleSystem/SimpleParticleSystem.pde
diff --git a/mode/examples/Topics/Simulate/SmokeParticleSystem/Particle.pde b/processing/mode/examples/Topics/Simulate/SmokeParticleSystem/Particle.pde
similarity index 100%
rename from mode/examples/Topics/Simulate/SmokeParticleSystem/Particle.pde
rename to processing/mode/examples/Topics/Simulate/SmokeParticleSystem/Particle.pde
diff --git a/mode/examples/Topics/Simulate/SmokeParticleSystem/ParticleSystem.pde b/processing/mode/examples/Topics/Simulate/SmokeParticleSystem/ParticleSystem.pde
similarity index 100%
rename from mode/examples/Topics/Simulate/SmokeParticleSystem/ParticleSystem.pde
rename to processing/mode/examples/Topics/Simulate/SmokeParticleSystem/ParticleSystem.pde
diff --git a/mode/examples/Topics/Simulate/SmokeParticleSystem/SmokeParticleSystem.pde b/processing/mode/examples/Topics/Simulate/SmokeParticleSystem/SmokeParticleSystem.pde
similarity index 100%
rename from mode/examples/Topics/Simulate/SmokeParticleSystem/SmokeParticleSystem.pde
rename to processing/mode/examples/Topics/Simulate/SmokeParticleSystem/SmokeParticleSystem.pde
diff --git a/mode/examples/Topics/Simulate/SmokeParticleSystem/data/texture.gif b/processing/mode/examples/Topics/Simulate/SmokeParticleSystem/data/texture.gif
similarity index 100%
rename from mode/examples/Topics/Simulate/SmokeParticleSystem/data/texture.gif
rename to processing/mode/examples/Topics/Simulate/SmokeParticleSystem/data/texture.gif
diff --git a/mode/examples/Topics/Simulate/SmokeParticleSystem/data/texture.png b/processing/mode/examples/Topics/Simulate/SmokeParticleSystem/data/texture.png
similarity index 100%
rename from mode/examples/Topics/Simulate/SmokeParticleSystem/data/texture.png
rename to processing/mode/examples/Topics/Simulate/SmokeParticleSystem/data/texture.png
diff --git a/mode/examples/Topics/Simulate/SoftBody/SoftBody.pde b/processing/mode/examples/Topics/Simulate/SoftBody/SoftBody.pde
similarity index 100%
rename from mode/examples/Topics/Simulate/SoftBody/SoftBody.pde
rename to processing/mode/examples/Topics/Simulate/SoftBody/SoftBody.pde
diff --git a/mode/examples/Topics/Simulate/Spring/Spring.pde b/processing/mode/examples/Topics/Simulate/Spring/Spring.pde
similarity index 100%
rename from mode/examples/Topics/Simulate/Spring/Spring.pde
rename to processing/mode/examples/Topics/Simulate/Spring/Spring.pde
diff --git a/mode/examples/Topics/Simulate/Springs/Springs.pde b/processing/mode/examples/Topics/Simulate/Springs/Springs.pde
similarity index 100%
rename from mode/examples/Topics/Simulate/Springs/Springs.pde
rename to processing/mode/examples/Topics/Simulate/Springs/Springs.pde
diff --git a/mode/examples/Topics/Textures/TextureCube/TextureCube.pde b/processing/mode/examples/Topics/Textures/TextureCube/TextureCube.pde
similarity index 100%
rename from mode/examples/Topics/Textures/TextureCube/TextureCube.pde
rename to processing/mode/examples/Topics/Textures/TextureCube/TextureCube.pde
diff --git a/mode/examples/Topics/Textures/TextureCube/data/berlin-1.jpg b/processing/mode/examples/Topics/Textures/TextureCube/data/berlin-1.jpg
similarity index 100%
rename from mode/examples/Topics/Textures/TextureCube/data/berlin-1.jpg
rename to processing/mode/examples/Topics/Textures/TextureCube/data/berlin-1.jpg
diff --git a/mode/examples/Topics/Textures/TextureCube/data/uvtex.jpg b/processing/mode/examples/Topics/Textures/TextureCube/data/uvtex.jpg
similarity index 100%
rename from mode/examples/Topics/Textures/TextureCube/data/uvtex.jpg
rename to processing/mode/examples/Topics/Textures/TextureCube/data/uvtex.jpg
diff --git a/mode/examples/Topics/Textures/TextureCylinder/TextureCylinder.pde b/processing/mode/examples/Topics/Textures/TextureCylinder/TextureCylinder.pde
similarity index 100%
rename from mode/examples/Topics/Textures/TextureCylinder/TextureCylinder.pde
rename to processing/mode/examples/Topics/Textures/TextureCylinder/TextureCylinder.pde
diff --git a/mode/examples/Topics/Textures/TextureCylinder/data/berlin-1.jpg b/processing/mode/examples/Topics/Textures/TextureCylinder/data/berlin-1.jpg
similarity index 100%
rename from mode/examples/Topics/Textures/TextureCylinder/data/berlin-1.jpg
rename to processing/mode/examples/Topics/Textures/TextureCylinder/data/berlin-1.jpg
diff --git a/mode/examples/Topics/Textures/TextureQuad/TextureQuad.pde b/processing/mode/examples/Topics/Textures/TextureQuad/TextureQuad.pde
similarity index 100%
rename from mode/examples/Topics/Textures/TextureQuad/TextureQuad.pde
rename to processing/mode/examples/Topics/Textures/TextureQuad/TextureQuad.pde
diff --git a/mode/examples/Topics/Textures/TextureQuad/data/berlin-1.jpg b/processing/mode/examples/Topics/Textures/TextureQuad/data/berlin-1.jpg
similarity index 100%
rename from mode/examples/Topics/Textures/TextureQuad/data/berlin-1.jpg
rename to processing/mode/examples/Topics/Textures/TextureQuad/data/berlin-1.jpg
diff --git a/mode/examples/Topics/Textures/TextureSphere/TextureSphere.pde b/processing/mode/examples/Topics/Textures/TextureSphere/TextureSphere.pde
similarity index 100%
rename from mode/examples/Topics/Textures/TextureSphere/TextureSphere.pde
rename to processing/mode/examples/Topics/Textures/TextureSphere/TextureSphere.pde
diff --git a/mode/examples/Topics/Textures/TextureSphere/data/world32k.jpg b/processing/mode/examples/Topics/Textures/TextureSphere/data/world32k.jpg
similarity index 100%
rename from mode/examples/Topics/Textures/TextureSphere/data/world32k.jpg
rename to processing/mode/examples/Topics/Textures/TextureSphere/data/world32k.jpg
diff --git a/mode/examples/Topics/Textures/TextureTriangle/TextureTriangle.pde b/processing/mode/examples/Topics/Textures/TextureTriangle/TextureTriangle.pde
similarity index 100%
rename from mode/examples/Topics/Textures/TextureTriangle/TextureTriangle.pde
rename to processing/mode/examples/Topics/Textures/TextureTriangle/TextureTriangle.pde
diff --git a/mode/examples/Topics/Textures/TextureTriangle/data/berlin-1.jpg b/processing/mode/examples/Topics/Textures/TextureTriangle/data/berlin-1.jpg
similarity index 100%
rename from mode/examples/Topics/Textures/TextureTriangle/data/berlin-1.jpg
rename to processing/mode/examples/Topics/Textures/TextureTriangle/data/berlin-1.jpg
diff --git a/mode/examples/Topics/Vectors/AccelerationWithVectors/AccelerationWithVectors.pde b/processing/mode/examples/Topics/Vectors/AccelerationWithVectors/AccelerationWithVectors.pde
similarity index 100%
rename from mode/examples/Topics/Vectors/AccelerationWithVectors/AccelerationWithVectors.pde
rename to processing/mode/examples/Topics/Vectors/AccelerationWithVectors/AccelerationWithVectors.pde
diff --git a/mode/examples/Topics/Vectors/AccelerationWithVectors/Mover.pde b/processing/mode/examples/Topics/Vectors/AccelerationWithVectors/Mover.pde
similarity index 100%
rename from mode/examples/Topics/Vectors/AccelerationWithVectors/Mover.pde
rename to processing/mode/examples/Topics/Vectors/AccelerationWithVectors/Mover.pde
diff --git a/mode/examples/Topics/Vectors/BouncingBall/BouncingBall.pde b/processing/mode/examples/Topics/Vectors/BouncingBall/BouncingBall.pde
similarity index 100%
rename from mode/examples/Topics/Vectors/BouncingBall/BouncingBall.pde
rename to processing/mode/examples/Topics/Vectors/BouncingBall/BouncingBall.pde
diff --git a/mode/examples/Topics/Vectors/Normalize/Normalize.pde b/processing/mode/examples/Topics/Vectors/Normalize/Normalize.pde
similarity index 100%
rename from mode/examples/Topics/Vectors/Normalize/Normalize.pde
rename to processing/mode/examples/Topics/Vectors/Normalize/Normalize.pde
diff --git a/mode/examples/Topics/Vectors/VectorMath/VectorMath.pde b/processing/mode/examples/Topics/Vectors/VectorMath/VectorMath.pde
similarity index 100%
rename from mode/examples/Topics/Vectors/VectorMath/VectorMath.pde
rename to processing/mode/examples/Topics/Vectors/VectorMath/VectorMath.pde
diff --git a/mode/examples/Topics/Wallpapers/Circles/Circles.pde b/processing/mode/examples/Topics/Wallpapers/Circles/Circles.pde
similarity index 100%
rename from mode/examples/Topics/Wallpapers/Circles/Circles.pde
rename to processing/mode/examples/Topics/Wallpapers/Circles/Circles.pde
diff --git a/mode/examples/Topics/Wallpapers/Circles/code/sketch.properties b/processing/mode/examples/Topics/Wallpapers/Circles/code/sketch.properties
similarity index 100%
rename from mode/examples/Topics/Wallpapers/Circles/code/sketch.properties
rename to processing/mode/examples/Topics/Wallpapers/Circles/code/sketch.properties
diff --git a/mode/examples/Topics/Watchfaces/WatchFace/WatchFace.pde b/processing/mode/examples/Topics/Watchfaces/WatchFace/WatchFace.pde
similarity index 100%
rename from mode/examples/Topics/Watchfaces/WatchFace/WatchFace.pde
rename to processing/mode/examples/Topics/Watchfaces/WatchFace/WatchFace.pde
diff --git a/mode/examples/Topics/Watchfaces/WatchFace/code/sketch.properties b/processing/mode/examples/Topics/Watchfaces/WatchFace/code/sketch.properties
similarity index 100%
rename from mode/examples/Topics/Watchfaces/WatchFace/code/sketch.properties
rename to processing/mode/examples/Topics/Watchfaces/WatchFace/code/sketch.properties
diff --git a/processing/mode/icons/launcher_144.png b/processing/mode/icons/launcher_144.png
new file mode 100644
index 000000000..78fed6592
Binary files /dev/null and b/processing/mode/icons/launcher_144.png differ
diff --git a/processing/mode/icons/launcher_192.png b/processing/mode/icons/launcher_192.png
new file mode 100644
index 000000000..48d3a34fe
Binary files /dev/null and b/processing/mode/icons/launcher_192.png differ
diff --git a/processing/mode/icons/launcher_36.png b/processing/mode/icons/launcher_36.png
new file mode 100644
index 000000000..e276bbd6f
Binary files /dev/null and b/processing/mode/icons/launcher_36.png differ
diff --git a/processing/mode/icons/launcher_48.png b/processing/mode/icons/launcher_48.png
new file mode 100644
index 000000000..9dde1a58f
Binary files /dev/null and b/processing/mode/icons/launcher_48.png differ
diff --git a/processing/mode/icons/launcher_72.png b/processing/mode/icons/launcher_72.png
new file mode 100644
index 000000000..ff769c587
Binary files /dev/null and b/processing/mode/icons/launcher_72.png differ
diff --git a/processing/mode/icons/launcher_96.png b/processing/mode/icons/launcher_96.png
new file mode 100644
index 000000000..d9b25dba2
Binary files /dev/null and b/processing/mode/icons/launcher_96.png differ
diff --git a/processing/mode/icons/preview_circular.png b/processing/mode/icons/preview_circular.png
new file mode 100644
index 000000000..40a11bf0d
Binary files /dev/null and b/processing/mode/icons/preview_circular.png differ
diff --git a/processing/mode/icons/preview_rectangular.png b/processing/mode/icons/preview_rectangular.png
new file mode 100644
index 000000000..9c9d9ed41
Binary files /dev/null and b/processing/mode/icons/preview_rectangular.png differ
diff --git a/processing/mode/keywords.txt b/processing/mode/keywords.txt
new file mode 100644
index 000000000..b16ac21d4
--- /dev/null
+++ b/processing/mode/keywords.txt
@@ -0,0 +1,50 @@
+# Android-specific keywords
+
+# For an explanation of these tags, see Token.java
+# processing/app/src/processing/app/syntax/Token.java
+
+VR LITERAL2
+AR LITERAL2
+STEREO LITERAL2
+MONO LITERAL2
+PORTRAIT LITERAL2
+LANDSCAPE LITERAL2
+displayDensity KEYWORD4
+
+orientation FUNCTION1
+hasPermission FUNCTION1
+requestPermission FUNCTION1
+touches KEYWORD4
+touchEnded FUNCTION4
+touchMoved FUNCTION4
+touchStarted FUNCTION4
+closeKeyboard FUNCTION1
+openKeyboard FUNCTION1
+wallpaperHomeCount FUNCTION1
+wallpaperOffset FUNCTION1
+wallpaperPreview FUNCTION1
+wearAmbient FUNCTION1
+wearBurnIn FUNCTION1
+wearInsets FUNCTION1
+wearInteractive FUNCTION1
+wearLowBit FUNCTION1
+wearRound FUNCTION1
+wearSquare FUNCTION1
+cameraUp FUNCTION1
+eye FUNCTION1
+getEyeMatrix FUNCTION1
+getObjectMatrix FUNCTION1
+getRayFromScreen FUNCTION1
+intersectsSphere FUNCTION1
+intersectsBox FUNCTION1
+intersectsPlane FUNCTION1
+calculate FUNCTION1
+push FUNCTION1
+pop FUNCTION1
+circle FUNCTION1
+square FUNCTION1
+
+VRCamera KEYWORD5
+ARTracker KEYWORD5
+ARTrackable KEYWORD5
+ARAnchor KEYWORD5
diff --git a/processing/mode/languages/mode.properties b/processing/mode/languages/mode.properties
new file mode 100644
index 000000000..a87ae41d9
--- /dev/null
+++ b/processing/mode/languages/mode.properties
@@ -0,0 +1,328 @@
+
+
+# ---------------------------------------
+# Language: English (en) (default)
+# ---------------------------------------
+
+
+# ---------------------------------------
+# Menu
+
+# | File | Edit | Sketch | Android | Tools | Help |
+# | File |
+
+menu.sketch.stop = Stop
+menu.file.new = New
+menu.file.open = Open
+menu.file.save = Save
+
+menu.file.export_signed_package = Export Signed Package
+menu.file.export_signed_bundle = Export Signed Bundle
+menu.file.export_android_project = Export Android Project
+
+
+# | File | Edit | Sketch | Android | Tools | Help |
+# | Sketch |
+
+menu.sketch.run_on_device = Run on Device
+menu.sketch.run_in_emulator = Run in Emulator
+
+# | File | Edit | Sketch | Android | Tools | Help |
+# | Android |
+
+menu.android = Android
+menu.android.sketch_permissions = Sketch Permissions
+menu.android.app = App
+menu.android.wallpaper = Wallpaper
+menu.android.watch_face = Watch Face
+menu.android.vr = VR
+menu.android.ar = AR
+menu.android.devices = Devices
+menu.android.devices.no_connected_devices = No connected devices
+menu.android.sdk_updater = SDK Updater
+menu.android.reset_adb = Reset ADB
+
+# | File | Edit | Sketch | Android | Tools | Help |
+# | Help |
+
+menu.help.processing_for_android_site = Processing for Android Site
+menu.help.android_developer_site = Android Developer Site
+
+# ---------------------------------------
+# Android Build
+
+android_build.error.build_folder = Build folder: %s
+android_build.error.export_file_does_not_exist = "%s" is mentioned in export.txt, but it's a big fat lie and does not exist.
+android_build.error.cannot_create_build_folder = Cannot create temp dir "%s" to build android sketch
+android_build.error.zip_files_not_allowed = .zip files are not allowed in Android libraries.\nPlease rename "%s to be a .jar file.
+android_build.error.cannot_copy_icons = Problem while copying icons.
+android_build.error.cannot_create_icon_folder = Could not create "%s" folder
+android_build.warn.cannot_find_zipalign.title = Cannot find zipaling...
+android_build.warn.cannot_find_zipalign.body = The zipalign build tool needed to prepare the export bundle is missing.\nMake sure that your Android SDK was downloaded correctly.
+
+# ---------------------------------------
+# Android Debugger
+
+android_debugger.info.attaching_debugger = Attaching debugger...
+android_debugger.info.debugger_attached = Debugger attached
+android_debugger.error.debugger_exception = Debugger error: %s
+
+# ---------------------------------------
+# Android Editor
+
+android_editor.status.exporting_project = Exporting an Android project of the sketch...
+android_editor.status.project_export_completed = Done with project export.
+android_editor.status.project_export_failed = Error with project export.
+android_editor.status.exporting_package = Exporting signed package...
+android_editor.status.package_export_completed = Done with package export.
+android_editor.status.package_export_failed = Error with package export.
+android_editor.status.exporting_bundle = Exporting signed bundle...
+android_editor.status.bundle_export_completed = Done with bundle export.
+android_editor.status.bundle_export_failed = Error with bundle export.
+
+android_editor.error.cannot_create_sketch_properties = Error While creating sketch properties file "%s": %s
+
+# ---------------------------------------
+# Android Keystore
+
+android_keystore.warn.cannot_create_folders.title = Folders, folders, folders
+android_keystore.warn.cannot_create_folders.body = Could not create the necessary folders to build.\nPerhaps you have some file permissions to sort out?
+android_keystore.warn.cannot_find_keystore.title = Well, this is unexpected...
+android_keystore.warn.cannot_find_keystore.body = The keystore was succesfully created but cannot be found.\nPerhaps was it deleted accidentally?
+android_keystore.error.cannot_create_keystore = The keystore could not be created, due to the following error:
+
+# ---------------------------------------
+# Android Mode
+
+android_mode.dialog.watchface_debug_title = Is the watch connected to the computer?
+android_mode.dialog.watchface_debug_body = Processing will install watch faces on a smartwatch either over Wi-Fi or via Bluetooth, in which case the watch needs to be paired with a phone.debugging an Android Wear App for more details.
+android_mode.dialog.wallpaper_installed_title = Wallpaper installed!
+android_mode.dialog.wallpaper_installed_body = Processing just built and installed your sketch as a live wallpaper on the selected device.this online tutorial .
+android_mode.dialog.cannot_use_default_icons_title = Cannot complete export...
+android_mode.dialog.cannot_use_default_icons_body = The sketch does not include all required app icons. Processing could use its default set of Android icons, which are okay to test the app on your device, but a bad idea to distribute it on the Play store. Create a full set of unique icons for your app, and copy them into the sketch folder. Once you have done that, try exporting the sketch again.this online tutorial .
+android_mode.warn.cannot_load_sdk_title = Bad news...
+android_mode.warn.cannot_load_sdk_body = The Android SDK could not be loaded.\nThe Android Mode will be disabled.
+android_mode.info.cannot_open_sdk_path = "Android SDK path couldn't be opened.";
+android_mode.error.cannot_create_avd = "Could not create a virtual device for the emulator.";
+android_mode.error.emulator_installation_failed = "Encountered Issues with the emulator installation. Result Code is non-zero";
+android_mode.dialog.no_devices_found_title = No devices found!
+android_mode.dialog.no_devices_found_body = Processing did not find any device where to run\nyour sketch on. Make sure that your handheld or\nwearable is properly connected to the computer\nand that USB or Bluetooth debugging is enabled.
+android_mode.status.no_devices_found = No devices found.
+android_mode.status.starting_project_build = Starting build...
+android_mode.status.building_project = Building Android project...
+android_mode.status.project_build_failed = Build failed.
+android_mode.status.downloading_emulator = Downloading Emulator...
+android_mode.status.downloading_emulator_successful = Emulator installation was successful.
+
+# ---------------------------------------
+# Android Preprocessor
+
+android_preprocessor.error.cannot_parse_size = More about the size() command on Android can be\nfound here: http://wiki.processing.org/w/Android
+android_preprocessor.error.cannot_parse_size_exception = Could not parse the size() command.
+android_preprocessor.error.cannot_parse_smooth = More about the smooth() command on Android can be\nfound here: http://wiki.processing.org/w/Android
+android_preprocessor.error.cannot_parse_smooth_exception = Could not parse the smooth() command.
+android_preprocessor.warn.cannot_find_smooth_level_title = Could not find smooth level
+android_preprocessor.warn.cannot_find_smooth_level_body = The smooth level of this applet could not automatically\nbe determined from your code. Use only a numeric\nvalue (not variables) for the smooth() command.\nSee the smooth() reference for an explanation.
+
+# ---------------------------------------
+# Android Runner
+
+android_runner.status.waiting_for_device = Waiting for %s to become available...
+android_runner.status.lost_connection_with_device = Lost connection with %s while launching. Try again.
+android_runner.status.cannot_install_sketch = Could not install the sketch.
+android_runner.warn.non_watch_device_title = Selected device is not a watch...
+android_runner.warn.non_watch_device_body = You are trying to install a watch face on a non-watch device.\n" + "Select the correct device, or use the emulator.
+android_runner.warn.watch_device_title = Selected device is a watch...
+android_runner.warn.watch_device_body = You are trying to install a non-watch app on a watch. Select the correct device, or use the emulator.
+android_runner.status.installing_sketch = Installing sketch on %s
+android_runner.status.lost_connection = Lost connection with %s while installing. Try again.
+android_runner.status.sketch_installed = Sketch installed
+android_runner.status.cannot_install_sketch = Could not install the sketch.
+android_runner.status.launching_sketch = Starting sketch on %s
+android_runner.status.sketch_launched= Sketch installed
+android_runner.status.cannot_launch_sketch = Could not start the sketch.
+android_runner.status.in_emulator = in the emulator
+android_runner.status.on_device = on the device
+android_runner.status.cancel_waiting_for_device = No, on second thought, I'm giving up on waiting for that device to show up.
+android_runner.error.cannot_parse_stacktrace = Can't parse this exception line:
+android_runner.status.unknwon_exception = Unknown exception
+
+# ---------------------------------------
+# Android SDK
+
+android_sdk.dialog.found_installed_sdk_title = Found an Android SDK!
+android_sdk.dialog.found_installed_sdk_body = Processing found a valid Android SDK that seems to be in use already. Processing could use this SDK too, or download a new one.here . Make sure to install the SDK platform for API %s.
+android_sdk.dialog.invalid_sdk_title = Android SDK is not valid...
+android_sdk.dialog.invalid_sdk_body = Processing found an Android SDK, but is not valid. It could be missing some files, or might not be including the required platform for API %s.here . Make sure to install the SDK platform for API %s.
+android_sdk.option.download_sdk = Download SDK automatically
+android_sdk.option.locate_sdk = Locate SDK path manually
+android_sdk.dialog.download_phone_image_title = Download phone system image?
+android_sdk.dialog.download_phone_image_body = The system image needed by the emulator does not appear to be installed. Do you want Processing to download and install it now?
+android_sdk.dialog.download_watch_image_title = Download watch system image?
+android_sdk.dialog.download_watch_image_body = The system image needed by the emulator does not appear to be installed. Do you want Processing to download and install it now?
+android_sdk.dialog.select_sdk_folder = Choose the location of the Android SDK
+android_sdk.error.sdk_selection_canceled = User canceled attempt to find SDK
+android_sdk.error.sdk_download_canceled = User canceled SDK download
+android_sdk.error.sdk_download_failed = SDK could not be downloaded
+android_sdk.dialog.sdk_installed_title = SDK installed!
+android_sdk.dialog.sdk_installed_body = Processing just downloaded and installed the Android SDK successfully. The Android mode is now ready to use!Processing for Android website , and if you updated from version 3 of the mode, check the what's new page .
+android_sdk.dialog.install_usb_driver = these instructions .This thread provides some possible workarounds.
+android_sdk.error.emulator_download_canceled = User canceled emulator download
+android_sdk.error.emulator_download_failed = Emulator could not be downloaded
+android_sdk.dialog.using_existing_sdk_title = SDK configured!
+android_sdk.dialog.using_existing_sdk_body = Processing will use the existing Android SDK. The Android mode is now ready to use!Processing for Android website , and if you updated from version 3 of the mode, check the what's new page .
+android_sdk.dialog.accept_sdk_license_title = Accept SDK license?
+android_sdk.dialog.accept_sdk_license_body = You need to accept the terms of the Android SDK license from Google in order to use the SDK. Read the license from here .
+android_sdk.warn.cannot_run_adb_title = Trouble with adb!
+android_sdk.warn.cannot_run_adb_body = Could not run the adb tool from the Android SDK.\nOne possibility is that its executable permission\nis not properly set. You can try setting this\npermission manually, or re-installing the SDK.\n\nThe mode will be disabled until this problem is fixed.\n
+android_sdk.error.missing_sdk_folder = %s does not exist
+android_sdk.error.missing_cmdtools_folder_found_sdktools = There is no cmdline-tools/latest folder in %s and SDK Tools(sdk/tools) got deprecated.\nInstall cmdline-tools in the existing SDK specifically or Create New SDK.
+android_sdk.error.missing_cmdtools_folder = There is no `cmdline-tools/latest` folder in %s \nInstall cmdline-tools in the existing SDK specifically or Create New SDK.
+android_sdk.error.missing_platform_tools_folder = There is no platform-tools folder in %s
+android_sdk.error.missing_build_tools_folder = There is no build-tools folder in %s
+android_sdk.error.missing_platforms_folder = There is no platforms folder in %s
+android_sdk.error.missing_target_platform = There is no Android %s in %s
+android_sdk.error.missing_android_jar = android.jar for plaform %s is missing from %s
+android_sdk.error.missing_emulator = The emulator files are missing
+android_debugger.info.removing_expired_keystore = Removing expired debug.keystore file.
+android_debugger.error.cannot_remove_expired_keystore = Could not remove the expired debug.keystore file.
+android_debugger.error.request_removing_keystore = Please remove the file %s
+android_debugger.error.invalid_keystore_timestamp = The date '%s' could not be parsed.
+android_debugger.error.request_bug_report = Please report this as a bug so we can fix it.
+
+# ---------------------------------------
+# AVD
+
+android_avd.error.cannot_create_avd_title = Could not create the AVD
+android_avd.error.cannot_create_avd_body = The default Android emulator could not be set up. Make surethis online tutorial .
+
+# ---------------------------------------
+# Devices
+
+android_devices.error.cannot_get_device_list = Received unfamiliar output from \u201Cadb devices\u201D.\nThe device list may have errors.
+
+android_devices.error.no_permissions_title = Found devices with no permissions!
+
+android_devices.error.no_permissions_body = Make sure that the device has USB debugging enabled, and that the required USB drivers are installed on Windows, and that permissions are properly configured on Linux. Also, on Linux, don't set the USB configuration to "charging" while debugging.running apps on hardware device for more details.
+
+ private static final String DEVICE_PERMISSIONS_URL =
+ "https://developer.android.com/studio/run/device.html";
+
+ private static final String DEVICE_PERMISSIONS_TITLE =
+ "";
+
+ private static final String DEVICE_PERMISSIONS_MESSAGE =
+
+# ---------------------------------------
+# Keystore manager
+
+keystore_manager.top_label = Please enter the information below so we can generate a private key for you.bold are required, though you may consider to fill some of optional fields below those to avoid potential problems.here .