picrate 2.0.0.pre-java → 2.2.0-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;
@@ -891,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
@@ -1353,24 +1499,24 @@ 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;
-        }
+    class CursorInfo {
+    PImage image;
+    int x, y;
 
-        void set() {
-            setCursor(image, x, y);
-        }
+    CursorInfo(PImage image, int x, int y) {
+      this.image = image;
+      this.x = x;
+      this.y = y;
     }
 
-    static Map<Integer, CursorInfo> cursors = new HashMap<>();
+    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",
@@ -1381,79 +1527,67 @@ public class PSurfaceJOGL implements PSurface {
   );
 
 
-    @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 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);
-        });
-    }
 }

data/vendors/Rakefile

@@ -2,12 +2,13 @@
 
 require 'fileutils'
 require 'rake/clean'
+require_relative './geany'
 WARNING = 'WARNING: wget download failed you could do a manual download'
 SOUND = 'sound.zip'
-SOUND_VERSION = 'v1.3.2'
-VIDEO = 'video-2.0-beta4.zip'
-VIDEO_VERSION = 'r6-v2.0-beta4'
-EXAMPLES = '0.5.2'
+PROCESSING_GITHUB = 'https://github.com/processing'
+VIDEO = 'video.zip'
+DOWNLOAD = 'releases/download/latest'
+EXAMPLES = '0.5.5'
 HOME_DIR = ENV['HOME']
 LIBRARY = File.join(HOME_DIR, '.picrate', 'libraries')
 PROJECT_DIR = File.join(HOME_DIR, 'projects')
@@ -46,16 +47,24 @@ task download_samples: ["#{EXAMPLES}.tar.gz"]
 
 desc 'download sound library'
 task :download_sound do
-  wget_base = 'wget -P https://github.com/processing/processing-sound'
-  wget_string = [wget_base, 'releases/download/latest', SOUND].join('/')
-  system wget_string
+  wget_base = ['wget', PROCESSING_GITHUB].join(' ')
+  wget_string = [wget_base, 'processing-sound', DOWNLOAD, SOUND].join('/')
+  begin
+    sh wget_string
+  rescue StandardError
+    warn(WARNING)
+  end
 end
 
 desc 'download video library'
 task :download_video do
-  wget_base = 'wget -P /tmp https://github.com/processing/processing-video'
-  wget_string = [wget_base, 'releases/download', VIDEO_VERSION, VIDEO].join('/')
-  system wget_string
+  wget_base = ['wget', PROCESSING_GITHUB].join(' ')
+  wget_string = [wget_base, 'processing-video', DOWNLOAD, VIDEO].join('/')
+  begin
+    sh wget_string
+  rescue StandardError
+    warn(WARNING)
+  end
 end
 
 desc 'initialize ~/.picrate directories'
@@ -69,9 +78,11 @@ task :install_config do
     FileUtils.mkdir_p "#{HOME_DIR}/.config/geany/templates/files"
     FileUtils.cp 'picrate.rb', "#{HOME_DIR}/.config/geany/templates/files"
   end
-  unless File.exist? "#{HOME_DIR}/projects/sketchbook/picrate_sketches.geany"
-    FileUtils.mkdir_p "#{HOME_DIR}/projects/sketchbook"
-    FileUtils.cp 'picrate_sketches.geany', "#{HOME_DIR}/projects/sketchbook"
+  project_dir = File.join(HOME_DIR, 'projects')
+  unless File.exist? File.join(project_dir, 'picrate_sketches.geany')
+    FileUtils.mkdir_p "#{HOME_DIR}/projects"
+    config = GeanyConfig.new(project_dir)
+    config.save(File.join(project_dir, 'picrate_sketches.geany'))
   end
 end
 
@@ -86,15 +97,16 @@ end
 
 desc 'copy sound library'
 task copy_sound: SOUND do
-  system "unzip -d /tmp /tmp/#{SOUND}"
-  FileUtils.rm_r "#{LIBRARY}/sound" if File.exist? "#{LIBRARY}/sound"
-  FileUtils.cp_r '/tmp/sound', LIBRARY
+  sh "unzip #{SOUND}"
+  sh "rm -r #{LIBRARY}/sound" if File.exist? "#{LIBRARY}/sound"
+  sh "cp -r sound #{LIBRARY}"
+  sh 'rm -r sound'
 end
 
 desc 'copy video library'
-task copy_video: "/tmp/#{VIDEO}" do
-  system "unzip -d /tmp /tmp/#{VIDEO}"
-  FileUtils.rm_r "#{LIBRARY}/video" if File.exist? "#{LIBRARY}/video"
-  FileUtils.mkdir_p "#{LIBRARY}/video/library"
-  FileUtils.mv Dir.glob('/tmp/video/library/*.jar'), "#{LIBRARY}/video/library"
+task copy_video: VIDEO do
+  sh "unzip #{VIDEO}"
+  sh "rm -r #{LIBRARY}/video" if File.exist? "#{LIBRARY}/video"
+  sh "cp -r video #{LIBRARY}"
+  sh 'rm -r video'
 end