picrate 0.3.0-java → 0.4.0-java

data/src/main/java/processing/event/MouseEvent.java

@@ -1,6 +1,6 @@
 /* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */
 
-/*
+ /*
   Part of the Processing project - http://processing.org
 
   Copyright (c) 2012 The Processing Foundation
@@ -18,132 +18,132 @@
   Public License along with this library; if not, write to the
   Free Software Foundation, Inc., 59 Temple Place, Suite 330,
   Boston, MA  02111-1307  USA
-*/
-
+ */
 package processing.event;
 
 //import processing.core.PConstants;
-
-
 public class MouseEvent extends Event {
-  static public final int PRESS = 1;
-  static public final int RELEASE = 2;
-  static public final int CLICK = 3;
-  static public final int DRAG = 4;
-  static public final int MOVE = 5;
-  static public final int ENTER = 6;
-  static public final int EXIT = 7;
-  static public final int WHEEL = 8;
-
-  protected int x, y;
-  protected int button;
+
+    static public final int PRESS = 1;
+    static public final int RELEASE = 2;
+    static public final int CLICK = 3;
+    static public final int DRAG = 4;
+    static public final int MOVE = 5;
+    static public final int ENTER = 6;
+    static public final int EXIT = 7;
+    static public final int WHEEL = 8;
+
+    protected int x, y;
+    protected int button;
 //  protected int clickCount;
 //  protected float amount;
-  protected int count;
-
+    protected int count;
 
 //  public MouseEvent(int x, int y) {
 //    this(null,
 //         System.currentTimeMillis(), PRESSED, 0,
 //         x, y, PConstants.LEFT, 1);
 //  }
+    public MouseEvent(Object nativeObject,
+            long millis, int action, int modifiers,
+            int x, int y, int button, int count) {  //float amount) {  //int clickCount) {
+        super(nativeObject, millis, action, modifiers);
+        this.flavor = MOUSE;
+        this.x = x;
+        this.y = y;
+        this.button = button;
+        //this.clickCount = clickCount;
+        //this.amount = amount;
+        this.count = count;
+    }
 
+    public int getX() {
+        return x;
+    }
 
-  public MouseEvent(Object nativeObject,
-                    long millis, int action, int modifiers,
-                    int x, int y, int button, int count) {  //float amount) {  //int clickCount) {
-    super(nativeObject, millis, action, modifiers);
-    this.flavor = MOUSE;
-    this.x = x;
-    this.y = y;
-    this.button = button;
-    //this.clickCount = clickCount;
-    //this.amount = amount;
-    this.count = count;
-  }
-
-
-  public int getX() {
-    return x;
-  }
-
-
-  public int getY() {
-    return y;
-  }
-
-
-  /** Which button was pressed, either LEFT, CENTER, or RIGHT. */
-  public int getButton() {
-    return button;
-  }
+    public int getY() {
+        return y;
+    }
 
+    /**
+     * Which button was pressed, either LEFT, CENTER, or RIGHT.
+     *
+     * @return
+     */
+    public int getButton() {
+        return button;
+    }
 
 //  public void setButton(int button) {
 //    this.button = button;
 //  }
+    /**
+     * Do not use, getCount() is the correct method.
+     *
+     * @return
+     */
+    @Deprecated
+    public int getClickCount() {
+        //return (int) amount; //clickCount;
+        return count;
+    }
 
+    /**
+     * Do not use, getCount() is the correct method.
+     *
+     * @return
+     */
+    @Deprecated
+    public float getAmount() {
+        //return amount;
+        return count;
+    }
 
-  /** Do not use, getCount() is the correct method. */
-  @Deprecated
-  public int getClickCount() {
-    //return (int) amount; //clickCount;
-    return count;
-  }
-
-
-  /** Do not use, getCount() is the correct method. */
-  @Deprecated
-  public float getAmount() {
-    //return amount;
-    return count;
-  }
-
-
-  /**
-   * Number of clicks for mouse button events, or the number of steps (positive
-   * or negative depending on direction) for a mouse wheel event.
-   * Wheel events follow Java (see <a href="http://docs.oracle.com/javase/6/docs/api/java/awt/event/MouseWheelEvent.html#getWheelRotation()">here</a>), so
-   * getAmount() will return "negative values if the mouse wheel was rotated
-   * up or away from the user" and positive values in the other direction.
-   * On Mac OS X, this will be reversed when "natural" scrolling is enabled
-   * in System Preferences &rarr Mouse.
-   */
-  public int getCount() {
-    return count;
-  }
-
+    /**
+     * Number of clicks for mouse button events, or the number of steps
+     * (positive or negative depending on direction) for a mouse wheel event.
+     * Wheel events follow Java (see
+     * <a href="http://docs.oracle.com/javase/6/docs/api/java/awt/event/MouseWheelEvent.html#getWheelRotation()">here</a>),
+     * so getAmount() will return "negative values if the mouse wheel was
+     * rotated up or away from the user" and positive values in the other
+     * direction. On Mac OS X, this will be reversed when "natural" scrolling is
+     * enabled in System Preferences &rarr Mouse.
+     *
+     * @return
+     */
+    public int getCount() {
+        return count;
+    }
 
 //  public void setClickCount(int clickCount) {
 //    this.clickCount = clickCount;
 //  }
-
-  private String actionString() {
-    switch (action) {
-    default:
-      return "UNKNOWN";
-    case CLICK:
-      return "CLICK";
-    case DRAG:
-      return "DRAG";
-    case ENTER:
-      return "ENTER";
-    case EXIT:
-      return "EXIT";
-    case MOVE:
-      return "MOVE";
-    case PRESS:
-      return "PRESS";
-    case RELEASE:
-      return "RELEASE";
-    case WHEEL:
-      return "WHEEL";
+    private String actionString() {
+        switch (action) {
+            default:
+                return "UNKNOWN";
+            case CLICK:
+                return "CLICK";
+            case DRAG:
+                return "DRAG";
+            case ENTER:
+                return "ENTER";
+            case EXIT:
+                return "EXIT";
+            case MOVE:
+                return "MOVE";
+            case PRESS:
+                return "PRESS";
+            case RELEASE:
+                return "RELEASE";
+            case WHEEL:
+                return "WHEEL";
+        }
     }
-  }
 
-  @Override
-  public String toString() {
-    return String.format("<MouseEvent %s@%d,%d count:%d button:%d>",
-                         actionString(), x, y, count, button);
-  }
+    @Override
+    public String toString() {
+        return String.format("<MouseEvent %s@%d,%d count:%d button:%d>",
+                actionString(), x, y, count, button);
+    }
 }

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

@@ -503,12 +503,15 @@ public class PJOGL extends PGL {
     return ((Font) font).deriveFont(size);
   }
 
+
   @Override
   protected int getGLSLVersion() {
     VersionNumber vn = context.getGLSLVersionNumber();
     return vn.getMajor() * 100 + vn.getMinor();
   }
 
+
+  @Override
   protected String getGLSLVersionSuffix() {
     VersionNumber vn = context.getGLSLVersionNumber();
     if (context.isGLESProfile() && 1 < vn.getMajor()) {

data/test/color_group_test.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+require_relative 'test_helper'
+require 'java'
+require_relative '../lib/picrate'
+require_relative '../library/color_group/color_group'
+
+Java::Monkstone::PicrateLibrary.new.load(JRuby.runtime, false)
+java_import Java::Monkstone::ColorUtil
+
+Dir.chdir(File.dirname(__FILE__))
+
+PALETTE = %w[#FFFFFF #FF0000 #0000FF].freeze
+COLORS = [16777215, 16711680, 255].to_java(:int)
+
+class ColorGroupTest < Minitest::Test
+  def test_new
+    group = ColorGroup.new(COLORS)
+    assert group.kind_of? ColorGroup
+  end
+
+  def test_web_array
+    group = ColorGroup.from_web_array(PALETTE)
+    assert group.kind_of? ColorGroup
+  end
+
+  def test_ruby_string
+    p5array = [16777215, 16711680, 255]
+    group = ColorGroup.new(COLORS)
+    code_string = "%w[#FFFFFF #FF0000 #0000FF]\n"
+    result = group.ruby_code
+    assert_equal(result, code_string)
+  end
+end

data/vendors/Rakefile

@@ -10,7 +10,7 @@ SOUND_VERSION = 'v1.3.2' # version 1.3.2
 GLVIDEO = 'processing-glvideo.zip'
 VIDEO = 'video-2.zip'
 VIDEO_VERSION = '2' # version 1.0.1
-EXAMPLES = '0.0.5'.freeze
+EXAMPLES = '0.0.6'.freeze
 HOME_DIR = ENV['HOME']
 PI_OR_LINUX = /linux|arm/ =~ RbConfig::CONFIG['host_os']
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: picrate
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: java
 authors:
 - monkstone
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-24 00:00:00.000000000 Z
+date: 2018-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -168,7 +168,7 @@ files:
 - lib/jogl-all-natives-linux-amd64.jar
 - lib/jogl-all-natives-linux-armv6hf.jar
 - lib/jogl-all.jar
-- lib/picrate-0.3.0.jar
+- lib/picrate-0.4.0.jar
 - lib/picrate.rb
 - lib/picrate/app.rb
 - lib/picrate/creators/sketch_class.rb
@@ -184,6 +184,7 @@ files:
 - lib/picrate/version.rb
 - library/boids/boids.rb
 - library/chooser/chooser.rb
+- library/color_group/color_group.rb
 - library/control_panel/control_panel.rb
 - library/library_proxy/README.md
 - library/library_proxy/library_proxy.rb
@@ -306,6 +307,7 @@ files:
 - src/main/resources/icon/icon-512.png
 - src/main/resources/icon/icon-64.png
 - src/main/resources/license.txt
+- test/color_group_test.rb
 - test/create_test.rb
 - test/deglut_spec_test.rb
 - test/helper_methods_test.rb
@@ -338,11 +340,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - java runtime >= 1.8.0_161+
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: ruby wrapper for processing-3.3.7 on raspberrypi and linux64
 test_files:
+- test/color_group_test.rb
 - test/create_test.rb
 - test/deglut_spec_test.rb
 - test/helper_methods_test.rb