From ef2181839d1d76a4b8c98a71c20d9026ae13539d Mon Sep 17 00:00:00 2001 From: codeanticode Date: Thu, 21 Jun 2012 20:52:09 +0000 Subject: [PATCH] Removed references to P3D in warning, error messages --- .../src/processing/opengl/PGraphicsOpenGL.java | 14 +++++++------- .../core/src/processing/opengl/PShapeOpenGL.java | 4 ++-- .../src/processing/opengl/PGraphicsOpenGL.java | 14 +++++++------- .../opengl/src/processing/opengl/PShapeOpenGL.java | 4 ++-- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/android/core/src/processing/opengl/PGraphicsOpenGL.java b/android/core/src/processing/opengl/PGraphicsOpenGL.java index c60188e8a..499d5e249 100644 --- a/android/core/src/processing/opengl/PGraphicsOpenGL.java +++ b/android/core/src/processing/opengl/PGraphicsOpenGL.java @@ -1420,7 +1420,7 @@ public class PGraphicsOpenGL extends PGraphics { public void beginDraw() { if (drawing) { - showWarning("P3D: Already called beginDraw()."); + showWarning("Already called beginDraw()."); return; } @@ -1430,7 +1430,7 @@ public class PGraphicsOpenGL extends PGraphics { // offscreen surface, still drawing on another // offscreen surface. This situation is not // catched by the drawing check above. - showWarning("P3D: Already called beginDraw() for another P3D object."); + showWarning("Already called beginDraw() for another PGraphicsOpenGL object."); return; } @@ -1618,7 +1618,7 @@ public class PGraphicsOpenGL extends PGraphics { flush(); if (!drawing) { - showWarning("P3D: Cannot call endDraw() before beginDraw()."); + showWarning("Cannot call endDraw() before beginDraw()."); return; } @@ -2106,7 +2106,7 @@ public class PGraphicsOpenGL extends PGraphics { public void beginContour() { if (openContour) { - showWarning("P3D: Already called beginContour()."); + showWarning("Already called beginContour()."); return; } openContour = true; @@ -2116,7 +2116,7 @@ public class PGraphicsOpenGL extends PGraphics { public void endContour() { if (!openContour) { - showWarning("P3D: Need to call beginContour() first."); + showWarning("Need to call beginContour() first."); return; } openContour = false; @@ -9251,7 +9251,7 @@ public class PGraphicsOpenGL extends PGraphics { int nPtVert = PApplet.max(MIN_POINT_ACCURACY, (int) (TWO_PI * strokeWeight / POINT_ACCURACY_FACTOR)) + 1; if (PGL.MAX_VERTEX_INDEX1 <= nPtVert) { - throw new RuntimeException("P3D: error in point tessellation."); + throw new RuntimeException("Error in point tessellation."); } updateTex(); int nvertTot = nPtVert * nInVert; @@ -10519,7 +10519,7 @@ public class PGraphicsOpenGL extends PGraphics { vertCount++; } else { - throw new RuntimeException("P3D: the tessellator is generating too many vertices, reduce complexity of shape."); + throw new RuntimeException("The tessellator is generating too many vertices, reduce complexity of shape."); } } else { diff --git a/android/core/src/processing/opengl/PShapeOpenGL.java b/android/core/src/processing/opengl/PShapeOpenGL.java index 2a67fb237..c362c94ef 100644 --- a/android/core/src/processing/opengl/PShapeOpenGL.java +++ b/android/core/src/processing/opengl/PShapeOpenGL.java @@ -776,7 +776,7 @@ public class PShapeOpenGL extends PShape { } if (openContour) { - PGraphics.showWarning("P3D: Already called beginContour()."); + PGraphics.showWarning("Already called beginContour()."); return; } openContour = true; @@ -790,7 +790,7 @@ public class PShapeOpenGL extends PShape { } if (!openContour) { - PGraphics.showWarning("P3D: Need to call beginContour() first."); + PGraphics.showWarning("Need to call beginContour() first."); return; } openContour = false; diff --git a/java/libraries/opengl/src/processing/opengl/PGraphicsOpenGL.java b/java/libraries/opengl/src/processing/opengl/PGraphicsOpenGL.java index c60188e8a..499d5e249 100644 --- a/java/libraries/opengl/src/processing/opengl/PGraphicsOpenGL.java +++ b/java/libraries/opengl/src/processing/opengl/PGraphicsOpenGL.java @@ -1420,7 +1420,7 @@ public class PGraphicsOpenGL extends PGraphics { public void beginDraw() { if (drawing) { - showWarning("P3D: Already called beginDraw()."); + showWarning("Already called beginDraw()."); return; } @@ -1430,7 +1430,7 @@ public class PGraphicsOpenGL extends PGraphics { // offscreen surface, still drawing on another // offscreen surface. This situation is not // catched by the drawing check above. - showWarning("P3D: Already called beginDraw() for another P3D object."); + showWarning("Already called beginDraw() for another PGraphicsOpenGL object."); return; } @@ -1618,7 +1618,7 @@ public class PGraphicsOpenGL extends PGraphics { flush(); if (!drawing) { - showWarning("P3D: Cannot call endDraw() before beginDraw()."); + showWarning("Cannot call endDraw() before beginDraw()."); return; } @@ -2106,7 +2106,7 @@ public class PGraphicsOpenGL extends PGraphics { public void beginContour() { if (openContour) { - showWarning("P3D: Already called beginContour()."); + showWarning("Already called beginContour()."); return; } openContour = true; @@ -2116,7 +2116,7 @@ public class PGraphicsOpenGL extends PGraphics { public void endContour() { if (!openContour) { - showWarning("P3D: Need to call beginContour() first."); + showWarning("Need to call beginContour() first."); return; } openContour = false; @@ -9251,7 +9251,7 @@ public class PGraphicsOpenGL extends PGraphics { int nPtVert = PApplet.max(MIN_POINT_ACCURACY, (int) (TWO_PI * strokeWeight / POINT_ACCURACY_FACTOR)) + 1; if (PGL.MAX_VERTEX_INDEX1 <= nPtVert) { - throw new RuntimeException("P3D: error in point tessellation."); + throw new RuntimeException("Error in point tessellation."); } updateTex(); int nvertTot = nPtVert * nInVert; @@ -10519,7 +10519,7 @@ public class PGraphicsOpenGL extends PGraphics { vertCount++; } else { - throw new RuntimeException("P3D: the tessellator is generating too many vertices, reduce complexity of shape."); + throw new RuntimeException("The tessellator is generating too many vertices, reduce complexity of shape."); } } else { diff --git a/java/libraries/opengl/src/processing/opengl/PShapeOpenGL.java b/java/libraries/opengl/src/processing/opengl/PShapeOpenGL.java index 2a67fb237..c362c94ef 100644 --- a/java/libraries/opengl/src/processing/opengl/PShapeOpenGL.java +++ b/java/libraries/opengl/src/processing/opengl/PShapeOpenGL.java @@ -776,7 +776,7 @@ public class PShapeOpenGL extends PShape { } if (openContour) { - PGraphics.showWarning("P3D: Already called beginContour()."); + PGraphics.showWarning("Already called beginContour()."); return; } openContour = true; @@ -790,7 +790,7 @@ public class PShapeOpenGL extends PShape { } if (!openContour) { - PGraphics.showWarning("P3D: Need to call beginContour() first."); + PGraphics.showWarning("Need to call beginContour() first."); return; } openContour = false;