picrate 1.3.0-java → 2.1.2-java

data/src/main/java/processing/opengl/PShapeOpenGL.java

@@ -1756,7 +1756,7 @@ public class PShapeOpenGL extends PShape {
     }
 
     VertexAttribute attrib = polyAttribs.get(name);
-    float[] array = inGeo.fattribs.get(name);
+    float[] array = (float[]) inGeo.fattribs.get(name);
     for (int i = 0; i < values.length; i++) {
       array[attrib.size * index + 0] = values[i];
     }
@@ -1772,7 +1772,7 @@ public class PShapeOpenGL extends PShape {
     }
 
     VertexAttribute attrib = polyAttribs.get(name);
-    int[] array = inGeo.iattribs.get(name);
+    int[] array = (int[]) inGeo.iattribs.get(name);
     for (int i = 0; i < values.length; i++) {
       array[attrib.size * index + 0] = values[i];
     }
@@ -1788,7 +1788,7 @@ public class PShapeOpenGL extends PShape {
     }
 
     VertexAttribute attrib = polyAttribs.get(name);
-    byte[] array = inGeo.battribs.get(name);
+    byte[] array = (byte[]) inGeo.battribs.get(name);
     for (int i = 0; i < values.length; i++) {
       array[attrib.size * index + 0] = (byte)(values[i]?1:0);
     }
@@ -3968,8 +3968,7 @@ public class PShapeOpenGL extends PShape {
       tessGeo.updateAttribBuffer(attrib.name);
       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);
+      pgl.bufferData(PGL.ARRAY_BUFFER, attrib.sizeInBytes(size), (Buffer) tessGeo.polyAttribBuffers.get(name), glUsage);
     }
 
     pgl.bindBuffer(PGL.ARRAY_BUFFER, 0);
@@ -4333,7 +4332,7 @@ public class PShapeOpenGL extends PShape {
   protected void copyPolyAttrib(VertexAttribute attrib, int offset, int size) {
     tessGeo.updateAttribBuffer(attrib.name, offset, size);
     pgl.bindBuffer(PGL.ARRAY_BUFFER, attrib.buf.glId);
-    Buffer buf = tessGeo.polyAttribBuffers.get(attrib.name);
+    Buffer buf = (Buffer) tessGeo.polyAttribBuffers.get(attrib.name);
     buf.position(attrib.size * offset);
     pgl.bufferSubData(PGL.ARRAY_BUFFER, attrib.sizeInBytes(offset),
                       attrib.sizeInBytes(size), buf);

data/src/main/java/processing/opengl/PSurfaceJOGL.java

@@ -63,6 +63,10 @@ import com.jogamp.newt.awt.NewtCanvasAWT;
 import com.jogamp.newt.event.InputEvent;
 import com.jogamp.newt.opengl.GLWindow;
 import com.jogamp.opengl.util.FPSAnimator;
+import java.awt.EventQueue;
+import java.awt.FileDialog;
+import processing.awt.PImageAWT;
+import processing.awt.ShimAWT;
 
 import processing.core.PApplet;
 import processing.core.PConstants;
@@ -438,21 +442,6 @@ public class PSurfaceJOGL implements PSurface {
      *
      */
     protected void initAnimator() {
-        if (PApplet.platform == PConstants.WINDOWS) {
-            // Force Windows to keep timer resolution high by
-            // sleeping for time which is not a multiple of 10 ms.
-            // See section "Clocks and Timers on Windows":
-            //   https://blogs.oracle.com/dholmes/entry/inside_the_hotspot_vm_clocks
-            Thread highResTimerThread = new Thread(() -> {
-                try {
-                    Thread.sleep(Long.MAX_VALUE);
-                } catch (InterruptedException ignore) {
-                }
-            }, "HighResTimerThread");
-            highResTimerThread.setDaemon(true);
-            highResTimerThread.start();
-        }
-
         animator = new FPSAnimator(window, 60);
         drawException = null;
         animator.setUncaughtExceptionHandler((final GLAnimatorControl animator1, final GLAutoDrawable drawable, final Throwable cause) -> {
@@ -462,34 +451,31 @@ public class PSurfaceJOGL implements PSurface {
             }
         });
 
-        drawExceptionHandler = new Thread(new Runnable() {
-            @Override
-            public void run() {
-                synchronized (drawExceptionMutex) {
-                    try {
-                        while (drawException == null) {
-                            drawExceptionMutex.wait();
-                        }
-                        // System.err.println("Caught exception: " + drawException.getMessage());
-                        if (drawException != null) {
-                            Throwable cause = drawException.getCause();
-                            if (cause instanceof ThreadDeath) {
-                                // System.out.println("caught ThreadDeath");
-                                // throw (ThreadDeath)cause;
-                            } else if (cause instanceof RuntimeException) {
-                                throw (RuntimeException) cause;
-                            } else if (cause instanceof UnsatisfiedLinkError) {
-                                throw new UnsatisfiedLinkError(cause.getMessage());
-                            } else if (cause == null) {
-                                throw new RuntimeException(drawException.getMessage());
-                            } else {
-                                throw new RuntimeException(cause);
-                            }
-                        }
-                    } catch (InterruptedException e) {
-                    }
+        drawExceptionHandler = new Thread(() -> {
+          synchronized (drawExceptionMutex) {
+            try {
+              while (drawException == null) {
+                drawExceptionMutex.wait();
+              }
+              // System.err.println("Caught exception: " + drawException.getMessage());
+              if (drawException != null) {
+                Throwable cause = drawException.getCause();
+                if (cause instanceof ThreadDeath) {
+                  // System.out.println("caught ThreadDeath");
+                  // throw (ThreadDeath)cause;
+                } else if (cause instanceof RuntimeException) {
+                  throw (RuntimeException) cause;
+                } else if (cause instanceof UnsatisfiedLinkError) {
+                  throw new UnsatisfiedLinkError(cause.getMessage());
+                } else if (cause == null) {
+                  throw new RuntimeException(drawException.getMessage());
+                } else {
+                  throw new RuntimeException(cause);
                 }
+              }
+            } catch (InterruptedException e) {
             }
+          }
         });
         drawExceptionHandler.start();
     }
@@ -532,7 +518,7 @@ public class PSurfaceJOGL implements PSurface {
      *
      */
     protected void initIcons() {
-        IOUtil.ClassResources res = null;
+        IOUtil.ClassResources res;
         if (PJOGL.icons == null || PJOGL.icons.length == 0) {
             // Default Processing icons
             final int[] sizes = {16, 32, 48, 64, 128, 256, 512};
@@ -560,7 +546,7 @@ public class PSurfaceJOGL implements PSurface {
     @SuppressWarnings("resource")
     private String resourceFilename(String filename) {
         // The code below comes from PApplet.createInputRaw() with a few adaptations
-        InputStream stream = null;
+        InputStream stream;
         try {
             // First see if it's in a data folder. This may fail by throwing
             // a SecurityException. If so, this whole block will be skipped.
@@ -592,10 +578,10 @@ public class PSurfaceJOGL implements PSurface {
             }
 
             stream = new FileInputStream(file);
-            if (stream != null) {
+           // if (stream != null) {
                 stream.close();
                 return file.getCanonicalPath();
-            }
+          //  }
 
             // have to break these out because a general Exception might
             // catch the RuntimeException being thrown above
@@ -641,29 +627,29 @@ public class PSurfaceJOGL implements PSurface {
                 try {
                     String path = sketch.dataPath(filename);
                     stream = new FileInputStream(path);
-                    if (stream != null) {
+                   // if (stream != null) {
                         stream.close();
                         return path;
-                    }
+                   // }
                 } catch (IOException e2) {
                 }
 
                 try {
                     String path = sketch.sketchPath(filename);
                     stream = new FileInputStream(path);
-                    if (stream != null) {
+                    //if (stream != null) {
                         stream.close();
                         return path;
-                    }
+                  //  }
                 } catch (IOException e) {
                 }  // ignored
 
                 try {
                     stream = new FileInputStream(filename);
-                    if (stream != null) {
+                   // if (stream != null) {
                         stream.close();
                         return filename;
-                    }
+                   // }
                 } catch (IOException e1) {
                 }
 
@@ -909,6 +895,148 @@ public class PSurfaceJOGL implements PSurface {
         });
     }
 
+// TODO rewrite before 4.0 release
+  @Override
+  public PImage loadImage(String path, Object... args) {
+    return ShimAWT.loadImage(sketch, path, args);
+  }
+
+
+  @Override
+  public void selectInput(String prompt, String callbackMethod,
+                          File file, Object callbackObject) {
+    EventQueue.invokeLater(() -> {
+      // https://github.com/processing/processing/issues/3831
+      boolean hide = (sketch != null) &&
+        (PApplet.platform == PConstants.WINDOWS);
+      if (hide) setVisible(false);
+
+      ShimAWT.selectImpl(prompt, callbackMethod, file,
+                         callbackObject, null, FileDialog.LOAD);
+
+      if (hide) setVisible(true);
+    });
+  }
+
+
+  @Override
+  public void selectOutput(String prompt, String callbackMethod,
+                           File file, Object callbackObject) {
+    EventQueue.invokeLater(() -> {
+      // https://github.com/processing/processing/issues/3831
+      boolean hide = (sketch != null) &&
+        (PApplet.platform == PConstants.WINDOWS);
+      if (hide) setVisible(false);
+
+      ShimAWT.selectImpl(prompt, callbackMethod, file,
+                         callbackObject, null, FileDialog.SAVE);
+
+      if (hide) setVisible(true);
+    });
+  }
+
+
+  @Override
+  public void selectFolder(String prompt, String callbackMethod,
+                           File file, Object callbackObject) {
+    EventQueue.invokeLater(() -> {
+      // https://github.com/processing/processing/issues/3831
+      boolean hide = (sketch != null) &&
+        (PApplet.platform == PConstants.WINDOWS);
+      if (hide) setVisible(false);
+      
+      ShimAWT.selectFolderImpl(prompt, callbackMethod, file,
+        callbackObject, null);
+      
+      if (hide) setVisible(true);
+    });
+  }
+
+   @Override
+  public void setCursor(int kind) {
+    if (!cursorNames.containsKey(kind)) {
+      PGraphics.showWarning("Unknown cursor type: " + kind);
+      return;
+    }
+    CursorInfo cursor = cursors.get(kind);
+    if (cursor == null) {
+      String name = cursorNames.get(kind);
+      if (name != null) {
+        ImageIcon icon =
+          new ImageIcon(getClass().getResource("cursors/" + name + ".png"));
+        PImage img = new PImageAWT(icon.getImage());
+        // Most cursors just use the center as the hotspot...
+        int x = img.width / 2;
+        int y = img.height / 2;
+        // ...others are more specific
+        switch (kind) {
+          case PConstants.ARROW:
+            x = 10;
+            y = 7;
+            break;
+          case PConstants.HAND:
+            x = 12;
+            y = 8;
+            break;
+          case PConstants.TEXT:
+            x = 16;
+            y = 22;
+            break;
+          default:
+            break;
+        }
+        cursor = new CursorInfo(img, x, y);
+        cursors.put(kind, cursor);
+      }
+    }
+    if (cursor != null) {
+      cursor.set();
+    } else {
+      PGraphics.showWarning("Cannot load cursor type: " + kind);
+    }
+  }
+
+
+  @Override
+  public void setCursor(PImage image, int hotspotX, int hotspotY) {
+    Display disp = window.getScreen().getDisplay();
+    BufferedImage bimg = (BufferedImage)image.getNative();
+    DataBufferInt dbuf = (DataBufferInt)bimg.getData().getDataBuffer();
+    int[] ipix = dbuf.getData();
+    ByteBuffer pixels = ByteBuffer.allocate(ipix.length * 4);
+    pixels.asIntBuffer().put(ipix);
+    PixelFormat format = PixelFormat.ARGB8888;
+    final Dimension size = new Dimension(bimg.getWidth(), bimg.getHeight());
+    PixelRectangle pixelrect = new PixelRectangle.GenericPixelRect(format, size, 0, false, pixels);
+    final PointerIcon pi = disp.createPointerIcon(pixelrect, hotspotX, hotspotY);
+    display.getEDTUtil().invoke(false, () -> {
+      window.setPointerVisible(true);
+      window.setPointerIcon(pi);
+    });
+  }
+
+
+  @Override
+  public void showCursor() {
+    display.getEDTUtil().invoke(false, () -> {
+      window.setPointerVisible(true);
+    });
+  }
+
+
+  @Override
+  public void hideCursor() {
+    display.getEDTUtil().invoke(false, () -> {
+      window.setPointerVisible(false);
+    });
+  }
+
+
+  @Override
+  public boolean openLink(String url) {
+    return ShimAWT.openLink(url);
+  }
+
     class DrawListener implements GLEventListener {
 
         @Override
@@ -1371,108 +1499,95 @@ public class PSurfaceJOGL implements PSurface {
         return def;
     }
 
-    // . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
-    class CursorInfo {
-
-        PImage image;
-        int x, y;
-
-        CursorInfo(PImage image, int x, int y) {
-            this.image = image;
-            this.x = x;
-            this.y = y;
-        }
-
-        void set() {
-            setCursor(image, x, y);
-        }
-    }
 
-    static Map<Integer, CursorInfo> cursors = new HashMap<>();
-    static Map<Integer, String> cursorNames = new HashMap<>();
 
-    static {
-        cursorNames.put(PConstants.ARROW, "arrow");
-        cursorNames.put(PConstants.CROSS, "cross");
-        cursorNames.put(PConstants.WAIT, "wait");
-        cursorNames.put(PConstants.MOVE, "move");
-        cursorNames.put(PConstants.HAND, "hand");
-        cursorNames.put(PConstants.TEXT, "text");
-    }
+    class CursorInfo {
+    PImage image;
+    int x, y;
 
-    @Override
-    public void setCursor(int kind) {
-        if (!cursorNames.containsKey(kind)) {
-            PGraphics.showWarning("Unknown cursor type: " + kind);
-            return;
-        }
-        CursorInfo cursor = cursors.get(kind);
-        if (cursor == null) {
-            String name = cursorNames.get(kind);
-            if (name != null) {
-                ImageIcon icon
-                        = new ImageIcon(getClass().getResource("cursors/" + name + ".png"));
-                PImage img = new PImage(icon.getImage());
-                // Most cursors just use the center as the hotspot...
-                int x = img.width / 2;
-                int y = img.height / 2;
-                // ...others are more specific
-                switch (kind) {
-                    case PConstants.ARROW:
-                        x = 10;
-                        y = 7;
-                        break;
-                    case PConstants.HAND:
-                        x = 12;
-                        y = 8;
-                        break;
-                    case PConstants.TEXT:
-                        x = 16;
-                        y = 22;
-                        break;
-                    default:
-                        break;
-                }
-                cursor = new CursorInfo(img, x, y);
-                cursors.put(kind, cursor);
-            }
-        }
-        if (cursor != null) {
-            cursor.set();
-        } else {
-            PGraphics.showWarning("Cannot load cursor type: " + kind);
-        }
+    CursorInfo(PImage image, int x, int y) {
+      this.image = image;
+      this.x = x;
+      this.y = y;
     }
 
-    @Override
-    public void setCursor(PImage image, int hotspotX, int hotspotY) {
-        Display disp = window.getScreen().getDisplay();
-        BufferedImage bimg = (BufferedImage) image.getNative();
-        DataBufferInt dbuf = (DataBufferInt) bimg.getData().getDataBuffer();
-        int[] ipix = dbuf.getData();
-        ByteBuffer pixels = ByteBuffer.allocate(ipix.length * 4);
-        pixels.asIntBuffer().put(ipix);
-        PixelFormat format = PixelFormat.ARGB8888;
-        final Dimension size = new Dimension(bimg.getWidth(), bimg.getHeight());
-        PixelRectangle pixelrect = new PixelRectangle.GenericPixelRect(format, size, 0, false, pixels);
-        final PointerIcon pi = disp.createPointerIcon(pixelrect, hotspotX, hotspotY);
-        display.getEDTUtil().invoke(false, () -> {
-            window.setPointerVisible(true);
-            window.setPointerIcon(pi);
-        });
+    void set() {
+      setCursor(image, x, y);
     }
+  }
+
+  static Map<Integer, CursorInfo> cursors = new HashMap<>();
+    static Map<Integer, String> cursorNames = Map.of(
+          PConstants.ARROW, "arrow",
+          PConstants.CROSS, "cross",
+          PConstants.WAIT, "wait",
+          PConstants.MOVE, "move",
+          PConstants.HAND, "hand",
+          PConstants.TEXT, "text"
+  );
+
+
+//    @Override
+//    public void setCursor(int kind) {
+//        if (!cursorNames.containsKey(kind)) {
+//            PGraphics.showWarning("Unknown cursor type: " + kind);
+//            return;
+//        }
+//        CursorInfo cursor = cursors.get(kind);
+//        if (cursor == null) {
+//            String name = cursorNames.get(kind);
+//            if (name != null) {
+//                ImageIcon icon
+//                        = new ImageIcon(getClass().getResource("cursors/" + name + ".png"));
+//                PImage img = new PImage(icon.getImage());
+//                // Most cursors just use the center as the hotspot...
+//                int x = img.width / 2;
+//                int y = img.height / 2;
+//                // ...others are more specific
+//                switch (kind) {
+//                    case PConstants.ARROW:
+//                        x = 10;
+//                        y = 7;
+//                        break;
+//                    case PConstants.HAND:
+//                        x = 12;
+//                        y = 8;
+//                        break;
+//                    case PConstants.TEXT:
+//                        x = 16;
+//                        y = 22;
+//                        break;
+//                    default:
+//                        break;
+//                }
+//                cursor = new CursorInfo(img, x, y);
+//                cursors.put(kind, cursor);
+//            }
+//        }
+//        if (cursor != null) {
+//            cursor.set();
+//        } else {
+//            PGraphics.showWarning("Cannot load cursor type: " + kind);
+//        }
+//    }
+//
+//    @Override
+//    public void setCursor(PImage image, int hotspotX, int hotspotY) {
+//        Display disp = window.getScreen().getDisplay();
+//        BufferedImage bimg = (BufferedImage) image.getNative();
+//        DataBufferInt dbuf = (DataBufferInt) bimg.getData().getDataBuffer();
+//        int[] ipix = dbuf.getData();
+//        ByteBuffer pixels = ByteBuffer.allocate(ipix.length * 4);
+//        pixels.asIntBuffer().put(ipix);
+//        PixelFormat format = PixelFormat.ARGB8888;
+//        final Dimension size = new Dimension(bimg.getWidth(), bimg.getHeight());
+//        PixelRectangle pixelrect = new PixelRectangle.GenericPixelRect(format, size, 0, false, pixels);
+//        final PointerIcon pi = disp.createPointerIcon(pixelrect, hotspotX, hotspotY);
+//        display.getEDTUtil().invoke(false, () -> {
+//            window.setPointerVisible(true);
+//            window.setPointerIcon(pi);
+//        });
+//    }
 
-    @Override
-    public void showCursor() {
-        display.getEDTUtil().invoke(false, () -> {
-            window.setPointerVisible(true);
-        });
-    }
 
-    @Override
-    public void hideCursor() {
-        display.getEDTUtil().invoke(false, () -> {
-            window.setPointerVisible(false);
-        });
-    }
 }