synced the latest changes in the java opengl renderer

Author: codeanticode

core/src/processing/opengl/PGL.java

@@ -590,8 +590,7 @@ protected void endDraw(boolean clear0) {
       disable(BLEND);
       drawTexture(TEXTURE_2D, glColorTex.get(backTex),
                   fboWidth, fboHeight, pg.width, pg.height,
-                                       0, 0, pg.width, pg.height,
-                                       0, 0, pg.width, pg.height);
+                  0, 0, pg.width, pg.height, 0, 0, pg.width, pg.height);
 
       // Swapping front and back textures.
       int temp = frontTex;

core/src/processing/opengl/PGraphicsOpenGL.java

@@ -2602,7 +2602,7 @@ void rawPolys() {
     float[] vertices = tessGeo.polyVertices;
     int[] color = tessGeo.polyColors;
     float[] uv = tessGeo.polyTexCoords;
-    short[] indices = tessGeo.polyIndices;
+    //short[] indices = tessGeo.polyIndices;  // unused [fry]
 
 
     sortTriangles();
@@ -3392,8 +3392,8 @@ protected void shape(PShape shape, float x, float y, float z) {
       pushMatrix();
 
       if (shapeMode == CENTER) {
-        translate(x - shape.getWidth() / 2, y - shape.getHeight() / 2, z
-            - shape.getDepth() / 2);
+        translate(x - shape.getWidth() / 2, y - shape.getHeight() / 2,
+                  z - shape.getDepth() / 2);
 
       } else if ((shapeMode == CORNER) || (shapeMode == CORNERS)) {
         translate(x, y, z);
@@ -3696,12 +3696,15 @@ protected void textCharShapeImpl(char ch, float x, float y) {
     float lastX = 0;
     float lastY = 0;
 
+    boolean open = false;
     beginShape();
     while (!outline.isDone()) {
       int type = outline.currentSegment(textPoints);
-      if (type == PGL.SEG_MOVETO) {         // 1 point (2 vars) in textPoints
-      } else if (type == PGL.SEG_LINETO) {  // 1 point
-        if (type == PGL.SEG_MOVETO) beginContour();
+      if (!open) {
+        beginContour();
+        open = true;
+      }
+      if (type == PGL.SEG_MOVETO || type == PGL.SEG_LINETO) {  // 1 point
         vertex(x + textPoints[0], y + textPoints[1]);
         lastX = textPoints[0];
         lastY = textPoints[1];
@@ -3731,6 +3734,7 @@ protected void textCharShapeImpl(char ch, float x, float y) {
         lastY = textPoints[5];
       } else if (type == PGL.SEG_CLOSE) {
         endContour();
+        open = false;
       }
       outline.next();
     }
@@ -5890,21 +5894,27 @@ public void copy(PImage src,
       scrX0 = dx;
       scrX1 = dx + dw;
     }
+
+    int texX0 = sx;
+    int texX1 = sx + sw;
+    int texY0, texY1;
     if (invY) {
       scrY0 = height - (dy + dh);
       scrY1 = height - dy;
+      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);
+      texY0 = sy;
+      texY1 = sy + sh;
     }
 
     pgl.drawTexture(tex.glTarget, tex.glName,
                     tex.glWidth, tex.glHeight, width, height,
-                    sx, tex.height - (sy + sh),
-                    sx + sw, tex.height - sy,
-                    scrX0, scrY0,
-                    scrX1, scrY1);
+                    texX0, texY0, texX1, texY1,
+                    scrX0, scrY0, scrX1, scrY1);
 
 
     if (needEndDraw) {

core/src/processing/opengl/Texture.java

@@ -1252,22 +1252,22 @@ protected void copyTexture(Texture tex, int x, int y, int w, int h,
     pg.setFramebuffer(tempFbo);
     // Clear the color buffer to make sure that the alpha channel is set to
     // full transparency
-    pgl.clearColor(0, 0, 0, 0);
+    pgl.clearColor(1, 1, 1, 1);
     pgl.clear(PGL.COLOR_BUFFER_BIT);
     if (scale) {
       // Rendering tex into "this", and scaling the source rectangle
       // to cover the entire destination region.
       pgl.drawTexture(tex.glTarget, tex.glName,
                       tex.glWidth, tex.glHeight, tempFbo.width, tempFbo.height,
-                      x, y, w, h, 0, 0, width, height);
+                      x, y, x + w, y + h, 0, 0, width, height);
 
     } else {
       // Rendering tex into "this" but without scaling so the contents
       // of the source texture fall in the corresponding texels of the
       // destination.
       pgl.drawTexture(tex.glTarget, tex.glName,
                       tex.glWidth, tex.glHeight, tempFbo.width, tempFbo.height,
-                      x, y, w, h, x, y, w, h);
+                      x, y, x + w, y + h, x, y, x + w, y + h);
     }
     pg.popFramebuffer();