picrate 2.0.1-java → 2.1.0-java

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'
+EXAMPLES = '0.5.4'
 HOME_DIR = ENV['HOME']
 LIBRARY = File.join(HOME_DIR, '.picrate', 'libraries')
 PROJECT_DIR = File.join(HOME_DIR, 'projects')
@@ -69,9 +70,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, 'examples', 'picrate_sketches.geany')
+    FileUtils.mkdir_p "#{HOME_DIR}/projects/examples"
+    config = GeanyConfig.new(project_dir, 'examples')
+    config.save(File.join(project_dir, 'examples', 'picrate_sketches.geany'))
   end
 end
 

data/vendors/{picrate_sketches.geany → geany.rb}

@@ -1,3 +1,9 @@
+# frozen_string_literal: true
+
+require 'erb'
+
+def geany_config
+  %(
 [editor]
 line_wrapping=false
 line_break_column=72
@@ -19,7 +25,7 @@ indent_mode=2
 
 [project]
 name=picrate_samples
-base_path=/home/pi/projects/picrate_sketches
+base_path=<%= home %>
 description=Exploring PiCrate
 file_patterns=*.rb;*.glsl;*.txt;
 
@@ -28,14 +34,9 @@ long_line_behaviour=1
 long_line_column=72
 
 [files]
-current_page=3
-FILE_NAME_0=667;Ruby;0;EUTF-8;0;1;0;%2Fhome%2Fpi%2Fprojects%2Fpicrate_sketches%2Fbasics%2Farrays%2Farray.rb;0;2
-FILE_NAME_1=1664;Ruby;0;EUTF-8;0;1;0;%2Fhome%2Fpi%2Fprojects%2Fpicrate_sketches%2Fadvanced_data%2Fload_save_json.rb;0;2
-FILE_NAME_2=259;Sh;0;EUTF-8;0;1;0;%2Fhome%2Fpi%2Fjruby_install.sh;0;2
-FILE_NAME_3=236;Sh;0;EUTF-8;0;1;0;%2Fhome%2Fpi%2Ftest.sh;0;2
 
 [VTE]
-last_dir=/home/pi
+last_dir=<%= directory %>
 
 [build-menu]
 EX_00_LB=_Execute
@@ -60,3 +61,27 @@ NF_02_WD=
 RubyFT_02_LB=_Reek
 RubyFT_02_CM=reek --failure-exit-code=0 "%f"
 RubyFT_02_WD=
+  )
+end
+
+# Class to merge ERB template and write config to file
+class GeanyConfig
+  include ERB::Util
+  attr_accessor :home, :directory, :template
+
+  def initialize(home, directory, template = geany_config)
+    @home = home
+    @directory = File.join(home, directory)
+    @template = template
+  end
+
+  def render
+    ERB.new(@template).result(binding)
+  end
+
+  def save(file)
+    File.open(file, 'w+') do |f|
+      f.write(render)
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: picrate
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
 platform: java
 authors:
 - monkstone
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-05-12 00:00:00.000000000 Z
+date: 2020-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -190,7 +190,7 @@ files:
 - lib/jogl-all-natives-linux-amd64.jar
 - lib/jogl-all-natives-linux-armv6hf.jar
 - lib/jogl-all.jar
-- lib/picrate-2.0.1.jar
+- lib/picrate-2.1.0.jar
 - lib/picrate.rb
 - lib/picrate/app.rb
 - lib/picrate/creators/parameters.rb
@@ -253,8 +253,10 @@ files:
 - src/main/java/monkstone/videoevent/MovieEvent.java
 - src/main/java/monkstone/videoevent/package-info.java
 - src/main/java/processing/awt/PGraphicsJava2D.java
+- src/main/java/processing/awt/PImageAWT.java
 - src/main/java/processing/awt/PShapeJava2D.java
 - src/main/java/processing/awt/PSurfaceAWT.java
+- src/main/java/processing/awt/ShimAWT.java
 - src/main/java/processing/core/PApplet.java
 - src/main/java/processing/core/PConstants.java
 - src/main/java/processing/core/PFont.java
@@ -343,8 +345,8 @@ files:
 - test/test_helper.rb
 - test/vecmath_spec_test.rb
 - vendors/Rakefile
+- vendors/geany.rb
 - vendors/picrate.rb
-- vendors/picrate_sketches.geany
 homepage: https://ruby-processing.github.io/PiCrate/
 licenses:
 - GPL-3.0