picrate 2.4.0-java → 2.5.1-java

data/src/main/java/processing/core/PImage.java

@@ -1523,24 +1523,24 @@ public class PImage implements PConstants, Cloneable {
    *     Sometimes called "Normal" or "Copy" in other software.
    *
    * <LI>BLEND - linear interpolation of colours:
-   *     <TT>C = A*factor + B</TT>
+   *     <code>C = A*factor + B</code>
    *
    * <LI>ADD - additive blending with white clip:
-   *     <TT>C = min(A*factor + B, 255)</TT>.
+   *     <code>C = min(A*factor + B, 255)</code>.
    *     Clipped to 0..255, Photoshop calls this "Linear Burn",
    *     and Director calls it "Add Pin".
    *
    * <LI>SUBTRACT - subtractive blend with black clip:
-   *     <TT>C = max(B - A*factor, 0)</TT>.
+   *     <code>C = max(B - A*factor, 0)</code>.
    *     Clipped to 0..255, Photoshop calls this "Linear Dodge",
    *     and Director calls it "Subtract Pin".
    *
    * <LI>DARKEST - only the darkest colour succeeds:
-   *     <TT>C = min(A*factor, B)</TT>.
+   *     <code>C = min(A*factor, B)</code>.
    *     Illustrator calls this "Darken".
    *
    * <LI>LIGHTEST - only the lightest colour succeeds:
-   *     <TT>C = max(A*factor, B)</TT>.
+   *     <code>C = max(A*factor, B)</code>.
    *     Illustrator calls this "Lighten".
    *
    * <LI>DIFFERENCE - subtract colors from underlying image.
@@ -1571,12 +1571,12 @@ public class PImage implements PConstants, Cloneable {
    * <P>It is important to note that Processing uses "fast" code, not
    * necessarily "correct" code. No biggie, most software does. A nitpicker
    * can find numerous "off by 1 division" problems in the blend code where
-   * <TT>&gt;&gt;8</TT> or <TT>&gt;&gt;7</TT> is used when strictly speaking
-   * <TT>/255.0</T> or <TT>/127.0</TT> should have been used.</P>
+   * <code>&gt;&gt;8</code> or <code>&gt;&gt;7</code> is used when strictly speaking
+   * <code>/255.0</T> or <code>/127.0</code> should have been used.</P>
    * <P>For instance, exclusion (not intended for real-time use) reads
-   * <TT>r1 + r2 - ((2 * r1 * r2) / 255)</TT> because <TT>255 == 1.0</TT>
-   * not <TT>256 == 1.0</TT>. In other words, <TT>(255*255)>>8</TT> is not
-   * the same as <TT>(255*255)/255</TT>. But for real-time use the shifts
+   * <code>r1 + r2 - ((2 * r1 * r2) / 255)</code> because <code>255 == 1.0</code>
+   * not <code>256 == 1.0</code>. In other words, <code>(255*255)>>8</code> is not
+   * the same as <code>(255*255)/255</code>. But for real-time use the shifts
    * are preferable, and the difference is insignificant for applications
    * built with Processing.</P>
    *
@@ -3104,9 +3104,9 @@ int testFunction(int dst, int src) {
    * </p>
    * Starting with revision 0092, the format setting is taken into account:
    * <UL>
-   * <LI><TT>ALPHA</TT> images written as 8bit grayscale (uses lowest byte)
-   * <LI><TT>RGB</TT> &rarr; 24 bits
-   * <LI><TT>ARGB</TT> &rarr; 32 bits
+   * <LI><code>ALPHA</code> images written as 8bit grayscale (uses lowest byte)
+   * <LI><code>RGB</code> &rarr; 24 bits
+   * <LI><code>ARGB</code> &rarr; 32 bits
    * </UL>
    * All versions are RLE compressed.
    * </p>
@@ -3278,7 +3278,7 @@ int testFunction(int dst, int src) {
    * and the extension used is supported (usually png, jpg, jpeg, bmp,
    * and tiff), then those methods will be used to write the image.
    * To get a list of the supported formats for writing, use: <BR>
-   * <TT>println(javax.imageio.ImageIO.getReaderFormatNames())</TT>
+   * <code>println(javax.imageio.ImageIO.getReaderFormatNames())</code>
    * <p>
    * To use the original built-in image writers, use .tga or .tif as the
    * extension, or don't include an extension. When no extension is used,

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

@@ -181,32 +181,32 @@ public class PGraphicsOpenGL extends PGraphics {
   // Shaders
 
   static protected URL defColorShaderVertURL =
-    PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/ColorVert.glsl");
+    PGraphicsOpenGL.class.getResource("/shaders/ColorVert.glsl");
   static protected URL defTextureShaderVertURL =
-    PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/TexVert.glsl");
+    PGraphicsOpenGL.class.getResource("/shaders/TexVert.glsl");
   static protected URL defLightShaderVertURL =
-    PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/LightVert.glsl");
+    PGraphicsOpenGL.class.getResource("/shaders/LightVert.glsl");
   static protected URL defTexlightShaderVertURL =
-    PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/TexLightVert.glsl");
+    PGraphicsOpenGL.class.getResource("/shaders/TexLightVert.glsl");
   static protected URL defColorShaderFragURL =
-    PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/ColorFrag.glsl");
+    PGraphicsOpenGL.class.getResource("/shaders/ColorFrag.glsl");
   static protected URL defTextureShaderFragURL =
-    PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/TexFrag.glsl");
+    PGraphicsOpenGL.class.getResource("/shaders/TexFrag.glsl");
   static protected URL defLightShaderFragURL =
-    PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/LightFrag.glsl");
+    PGraphicsOpenGL.class.getResource("/shaders/LightFrag.glsl");
   static protected URL defTexlightShaderFragURL =
-    PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/TexLightFrag.glsl");
+    PGraphicsOpenGL.class.getResource("/shaders/TexLightFrag.glsl");
 
   static protected URL defLineShaderVertURL =
-    PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/LineVert.glsl");
+    PGraphicsOpenGL.class.getResource("/shaders/LineVert.glsl");
   static protected URL defLineShaderFragURL =
-    PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/LineFrag.glsl");
+    PGraphicsOpenGL.class.getResource("/shaders/LineFrag.glsl");
   static protected URL defPointShaderVertURL =
-    PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/PointVert.glsl");
+    PGraphicsOpenGL.class.getResource("/shaders/PointVert.glsl");
   static protected URL defPointShaderFragURL =
-    PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/PointFrag.glsl");
+    PGraphicsOpenGL.class.getResource("/shaders/PointFrag.glsl");
   static protected URL maskShaderFragURL =
-    PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/MaskFrag.glsl");
+    PGraphicsOpenGL.class.getResource("/shaders/MaskFrag.glsl");
 
   protected PShader defColorShader;
   protected PShader defTextureShader;

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

@@ -1757,16 +1757,10 @@ public class PShader implements PConstants {
     colorLoc = getAttributeLoc("color");
     texCoordLoc = getAttributeLoc("texCoord");
     normalLoc = getAttributeLoc("normal");
-
     ambientLoc = getAttributeLoc("ambient");
     specularLoc = getAttributeLoc("specular");
     emissiveLoc = getAttributeLoc("emissive");
     shininessLoc = getAttributeLoc("shininess");
-
-    directionLoc = getAttributeLoc("direction");
-
-    offsetLoc = getAttributeLoc("offset");
-
     directionLoc = getAttributeLoc("direction");
     offsetLoc = getAttributeLoc("offset");
 

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

@@ -944,10 +944,10 @@ public class PSurfaceJOGL implements PSurface {
       boolean hide = (sketch != null) &&
         (PApplet.platform == PConstants.WINDOWS);
       if (hide) setVisible(false);
-      
+
       ShimAWT.selectFolderImpl(prompt, callbackMethod, file,
         callbackObject, null);
-      
+
       if (hide) setVisible(true);
     });
   }
@@ -963,7 +963,7 @@ public class PSurfaceJOGL implements PSurface {
       String name = cursorNames.get(kind);
       if (name != null) {
         ImageIcon icon =
-          new ImageIcon(getClass().getResource("cursors/" + name + ".png"));
+          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;
@@ -1538,7 +1538,7 @@ public class PSurfaceJOGL implements PSurface {
 //            String name = cursorNames.get(kind);
 //            if (name != null) {
 //                ImageIcon icon
-//                        = new ImageIcon(getClass().getResource("cursors/" + name + ".png"));
+//                        = 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;

data/test/noise_test.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require_relative 'test_helper'
+
+Java::Monkstone::PicrateLibrary.new.load(JRuby.runtime, false)
+
+# include Processing::HelperMethods
+
+Dir.chdir(File.dirname(__FILE__))
+# Test processing map functions
+class ProcessingNoiseTest < Minitest::Test
+  include NoiseModule
+  def test_noise1d
+    x = 0.5
+    assert_in_delta(noise(x), 0.5, 0.00001)
+  end
+end

data/test/test_helper.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 gem 'minitest'
-require 'java'
+require 'jruby'
 require_relative '../lib/picrate'
 require 'minitest/pride'
 require 'minitest/autorun'

data/vendors/Rakefile

@@ -8,7 +8,7 @@ SOUND = 'sound.zip'
 PROCESSING_GITHUB = 'https://github.com/processing'
 VIDEO = 'video.zip'
 DOWNLOAD = 'releases/download/latest'
-EXAMPLES = '0.5.7'
+EXAMPLES = '0.5.8'
 HOME_DIR = ENV['HOME']
 LIBRARY = File.join(HOME_DIR, '.picrate', 'libraries')
 PROJECT_DIR = File.join(HOME_DIR, 'projects')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: picrate
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.5.1
 platform: java
 authors:
 - monkstone
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-06 00:00:00.000000000 Z
+date: 2021-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -43,10 +43,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: '1.2'
   name: arcball
   prerelease: false
   type: :runtime
@@ -54,10 +51,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: '1.2'
 description: |
   A batteries included version of processing in ruby, for raspberrypi and
   linux. Install samples to configures geany ide.
@@ -82,10 +76,10 @@ files:
 - docs/.gitignore
 - docs/_classes/aabb/aabb.md
 - docs/_classes/app/app.md
-- docs/_classes/app_render/app_render.md
 - docs/_classes/arc_ball/arc_ball.md
 - docs/_classes/chooser/chooser.md
 - docs/_classes/deglut/deglut.md
+- docs/_classes/gfx_render/app_render.md
 - docs/_classes/library_proxy/library_proxy.md
 - docs/_classes/vec2d/vec2d.md
 - docs/_classes/vec3d/vec3d.md
@@ -130,7 +124,7 @@ files:
 - docs/_methods/map1d.md
 - docs/_methods/methods_summary.md
 - docs/_methods/mouse_pressed.md
-- docs/_methods/noise_mode.md
+- docs/_methods/noise_modes.md
 - docs/_methods/post_initialize.md
 - docs/_methods/processing_api.md
 - docs/_methods/settings.md
@@ -191,7 +185,7 @@ files:
 - lib/jogl-all-natives-linux-amd64.jar
 - lib/jogl-all-natives-linux-armv6hf.jar
 - lib/jogl-all.jar
-- lib/picrate-2.4.0.jar
+- lib/picrate-2.5.1.jar
 - lib/picrate.rb
 - lib/picrate/app.rb
 - lib/picrate/creators/parameters.rb
@@ -227,14 +221,11 @@ files:
 - picrate.gemspec
 - pom.rb
 - pom.xml
-- src/main/java/japplemenubar/JAppleMenuBar.java
-- src/main/java/japplemenubar/libjAppleMenuBar.jnilib
 - src/main/java/monkstone/ColorUtil.java
 - src/main/java/monkstone/FastNoiseModuleJava.java
 - src/main/java/monkstone/MathToolModule.java
 - src/main/java/monkstone/PicrateLibrary.java
 - src/main/java/monkstone/SmoothNoiseModuleJava.java
-- src/main/java/monkstone/complex/JComplex.java
 - src/main/java/monkstone/core/LibraryProxy.java
 - src/main/java/monkstone/fastmath/DegLutTables.java
 - src/main/java/monkstone/fastmath/Deglut.java
@@ -251,15 +242,11 @@ files:
 - src/main/java/monkstone/slider/SliderBar.java
 - src/main/java/monkstone/slider/SliderGroup.java
 - src/main/java/monkstone/slider/WheelHandler.java
-- src/main/java/monkstone/vecmath/AppRender.java
 - src/main/java/monkstone/vecmath/GfxRender.java
 - src/main/java/monkstone/vecmath/JRender.java
 - src/main/java/monkstone/vecmath/ShapeRender.java
-- src/main/java/monkstone/vecmath/package-info.java
 - src/main/java/monkstone/vecmath/vec2/Vec2.java
-- src/main/java/monkstone/vecmath/vec2/package-info.java
 - src/main/java/monkstone/vecmath/vec3/Vec3.java
-- src/main/java/monkstone/vecmath/vec3/package-info.java
 - src/main/java/monkstone/videoevent/CaptureEvent.java
 - src/main/java/monkstone/videoevent/MovieEvent.java
 - src/main/java/monkstone/videoevent/package-info.java
@@ -318,28 +305,15 @@ files:
 - src/main/java/processing/opengl/PSurfaceJOGL.java
 - src/main/java/processing/opengl/Texture.java
 - src/main/java/processing/opengl/VertexBuffer.java
-- src/main/java/processing/opengl/cursors/arrow.png
-- src/main/java/processing/opengl/cursors/cross.png
-- src/main/java/processing/opengl/cursors/hand.png
-- src/main/java/processing/opengl/cursors/license.txt
-- src/main/java/processing/opengl/cursors/move.png
-- src/main/java/processing/opengl/cursors/text.png
-- src/main/java/processing/opengl/cursors/wait.png
-- src/main/java/processing/opengl/shaders/ColorFrag.glsl
-- src/main/java/processing/opengl/shaders/ColorVert.glsl
-- src/main/java/processing/opengl/shaders/LightFrag.glsl
-- src/main/java/processing/opengl/shaders/LightVert.glsl
-- src/main/java/processing/opengl/shaders/LineFrag.glsl
-- src/main/java/processing/opengl/shaders/LineVert.glsl
-- src/main/java/processing/opengl/shaders/MaskFrag.glsl
-- src/main/java/processing/opengl/shaders/PointFrag.glsl
-- src/main/java/processing/opengl/shaders/PointVert.glsl
-- src/main/java/processing/opengl/shaders/TexFrag.glsl
-- src/main/java/processing/opengl/shaders/TexLightFrag.glsl
-- src/main/java/processing/opengl/shaders/TexLightVert.glsl
-- src/main/java/processing/opengl/shaders/TexVert.glsl
 - src/main/java/processing/pdf/PGraphicsPDF.java
 - src/main/java/processing/svg/PGraphicsSVG.java
+- src/main/resources/cursors/arrow.png
+- src/main/resources/cursors/cross.png
+- src/main/resources/cursors/hand.png
+- src/main/resources/cursors/license.txt
+- src/main/resources/cursors/move.png
+- src/main/resources/cursors/text.png
+- src/main/resources/cursors/wait.png
 - src/main/resources/icon/icon-128.png
 - src/main/resources/icon/icon-16.png
 - src/main/resources/icon/icon-256.png
@@ -348,10 +322,24 @@ files:
 - src/main/resources/icon/icon-512.png
 - src/main/resources/icon/icon-64.png
 - src/main/resources/license.txt
+- src/main/resources/shaders/ColorFrag.glsl
+- src/main/resources/shaders/ColorVert.glsl
+- src/main/resources/shaders/LightFrag.glsl
+- src/main/resources/shaders/LightVert.glsl
+- src/main/resources/shaders/LineFrag.glsl
+- src/main/resources/shaders/LineVert.glsl
+- src/main/resources/shaders/MaskFrag.glsl
+- src/main/resources/shaders/PointFrag.glsl
+- src/main/resources/shaders/PointVert.glsl
+- src/main/resources/shaders/TexFrag.glsl
+- src/main/resources/shaders/TexLightFrag.glsl
+- src/main/resources/shaders/TexLightVert.glsl
+- src/main/resources/shaders/TexVert.glsl
 - test/color_group_test.rb
 - test/deglut_spec_test.rb
 - test/helper_methods_test.rb
 - test/math_tool_test.rb
+- test/noise_test.rb
 - test/respond_to_test.rb
 - test/sketches/key_event.rb
 - test/sketches/library/my_library/my_library.rb
@@ -381,7 +369,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - java runtime == 11+
-rubygems_version: 3.1.6
+rubygems_version: 3.2.29
 signing_key:
 specification_version: 4
 summary: ruby implementation of processing-3 on raspberrypi and linux64
@@ -390,6 +378,7 @@ test_files:
 - test/deglut_spec_test.rb
 - test/helper_methods_test.rb
 - test/math_tool_test.rb
+- test/noise_test.rb
 - test/respond_to_test.rb
 - test/sketches/key_event.rb
 - test/sketches/library/my_library/my_library.rb

data/src/main/java/japplemenubar/JAppleMenuBar.java

@@ -1,96 +0,0 @@
-/*
-  Part of the Processing project - http://processing.org
-
-  Copyright (c) 2011-12 hansi raber, released under LGPL under agreement
-
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation, version 2.1.
-
-  This library is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General
-  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 japplemenubar;
-
-import java.io.*;
-
-import processing.core.PApplet;
-
-
-/**
- * Starting point for the application. General initialization should be done 
- * inside the ApplicationController's init() method. If certain kinds of 
- * non-Swing initialization takes too long, it should happen in a new Thread 
- * and off the Swing event dispatch thread (EDT).
- * 
- * @author hansi
- */
-public class JAppleMenuBar {
-  static JAppleMenuBar instance;
-  static final String FILENAME = "libjAppleMenuBar.jnilib";
-  
-	static {
-	  try {
-	    File temp = File.createTempFile("processing", "menubar");
-	    temp.delete();  // remove the file itself
-	    temp.mkdirs();  // create a directory out of it
-	    temp.deleteOnExit();
-
-	    File jnilibFile = new File(temp, FILENAME);
-	    InputStream input = JAppleMenuBar.class.getResourceAsStream(FILENAME);
-	    if (input != null) {
-	      if (PApplet.saveStream(jnilibFile, input)) {
-	        System.load(jnilibFile.getAbsolutePath());
-	        instance = new JAppleMenuBar();
-
-	      } else {
-	        sadness("Problem saving " + FILENAME + " for full screen use.");
-	      }
-	    } else {
-        sadness("Could not load " + FILENAME + " from core.jar");
-	    }
-	  } catch (IOException e) {
-	    sadness("Unknown error, here's the stack trace.");
-	    e.printStackTrace();
-	  }
-	}
-	
-	
-	static void sadness(String msg) {
-	  System.err.println("Full screen mode disabled. " + msg);
-	}
-
-	
-//	static public void show() {
-//	  instance.setVisible(true);
-//	}
-
-    /**
-     *
-     */
-
-	
-	static public void hide() {
-	  instance.setVisible(false, false);
-	}
-
-    /**
-     *
-     * @param visibility
-     * @param kioskMode
-     */
-    public native void setVisible(boolean visibility, boolean kioskMode); 
-
-	
-//  public void setVisible(boolean visibility) {
-//    // Keep original API in-tact.  Default kiosk-mode to off.
-//    setVisible(visibility, false);
-//  }
-}