picrate 0.7.0-java → 0.8.0-java

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

@@ -24,6 +24,7 @@
 
 package processing.opengl;
 
+import java.lang.reflect.InvocationTargetException;
 import processing.core.PApplet;
 import processing.core.PConstants;
 import processing.core.PGraphics;
@@ -367,7 +368,7 @@ public class Texture implements PConstants {
    * @param height int
    * @param params GLTextureParameters
    */
-  public void init(int width, int height, Parameters params)  {
+  public final void init(int width, int height, Parameters params)  {
     setParameters(params);
     setSize(width, height);
     allocate();
@@ -798,41 +799,51 @@ public class Texture implements PConstants {
     int glMagFilter0 = glMagFilter;
     int glMinFilter0 = glMinFilter;
     if (mipmaps) {
-      if (sampling == POINT) {
-        glMagFilter = PGL.NEAREST;
-        glMinFilter = PGL.NEAREST;
-        usingMipmaps = false;
-      } else if (sampling == LINEAR)  {
-        glMagFilter = PGL.NEAREST;
-        glMinFilter =
-          PGL.MIPMAPS_ENABLED ? PGL.LINEAR_MIPMAP_NEAREST : PGL.LINEAR;
-        usingMipmaps = true;
-      } else if (sampling == BILINEAR)  {
-        glMagFilter = PGL.LINEAR;
-        glMinFilter =
-          PGL.MIPMAPS_ENABLED ? PGL.LINEAR_MIPMAP_NEAREST : PGL.LINEAR;
-        usingMipmaps = true;
-      } else if (sampling == TRILINEAR)  {
-        glMagFilter = PGL.LINEAR;
-        glMinFilter =
-          PGL.MIPMAPS_ENABLED ? PGL.LINEAR_MIPMAP_LINEAR : PGL.LINEAR;
-        usingMipmaps = true;
-      } else {
-        throw new RuntimeException("Unknown texture filtering mode");
+      switch (sampling) {
+        case POINT:
+          glMagFilter = PGL.NEAREST;
+          glMinFilter = PGL.NEAREST;
+          usingMipmaps = false;
+          break;
+        case LINEAR:
+          glMagFilter = PGL.NEAREST;
+          glMinFilter =
+            PGL.MIPMAPS_ENABLED ? PGL.LINEAR_MIPMAP_NEAREST : PGL.LINEAR;
+          usingMipmaps = true;
+          break;
+        case BILINEAR:
+          glMagFilter = PGL.LINEAR;
+          glMinFilter =
+            PGL.MIPMAPS_ENABLED ? PGL.LINEAR_MIPMAP_NEAREST : PGL.LINEAR;
+          usingMipmaps = true;
+          break;
+        case TRILINEAR:
+          glMagFilter = PGL.LINEAR;
+          glMinFilter =
+            PGL.MIPMAPS_ENABLED ? PGL.LINEAR_MIPMAP_LINEAR : PGL.LINEAR;
+          usingMipmaps = true;
+          break;
+        default:
+          throw new RuntimeException("Unknown texture filtering mode");
       }
     } else {
       usingMipmaps = false;
-      if (sampling == POINT) {
-        glMagFilter = PGL.NEAREST;
-        glMinFilter = PGL.NEAREST;
-      } else if (sampling == LINEAR)  {
-        glMagFilter = PGL.NEAREST;
-        glMinFilter = PGL.LINEAR;
-      } else if (sampling == BILINEAR || sampling == TRILINEAR)  {
-        glMagFilter = PGL.LINEAR;
-        glMinFilter = PGL.LINEAR;
-      } else {
-        throw new RuntimeException("Unknown texture filtering mode");
+      switch (sampling) {
+        case POINT:
+          glMagFilter = PGL.NEAREST;
+          glMinFilter = PGL.NEAREST;
+          break;
+        case LINEAR:
+          glMagFilter = PGL.NEAREST;
+          glMinFilter = PGL.LINEAR;
+          break;
+        case BILINEAR:
+        case TRILINEAR:
+          glMagFilter = PGL.LINEAR;
+          glMinFilter = PGL.LINEAR;
+          break;
+        default:
+          throw new RuntimeException("Unknown texture filtering mode");
       }
     }
 
@@ -1168,7 +1179,7 @@ public class Texture implements PConstants {
     public void copyBufferFromSource(Object natRef, ByteBuffer byteBuf,
                                    int w, int h) {
     if (bufferCache == null) {
-      bufferCache = new LinkedList<BufferData>();
+      bufferCache = new LinkedList<>();
     }
 
     if (bufferCache.size() + 1 <= MAX_BUFFER_CACHE_SIZE) {
@@ -1179,7 +1190,6 @@ public class Texture implements PConstants {
       try {
         usedBuffers.add(new BufferData(natRef, byteBuf.asIntBuffer(), w, h));
       } catch (Exception e) {
-        e.printStackTrace();
       }
     }
   }
@@ -1231,7 +1241,7 @@ public class Texture implements PConstants {
       // renderer draws the texture, and hence put the pixels put of sync, we
       // simply empty the cache.
       if (usedBuffers == null) {
-        usedBuffers = new LinkedList<BufferData>();
+        usedBuffers = new LinkedList<>();
       }
       while (0 < bufferCache.size()) {
         data = bufferCache.remove(0);
@@ -1279,7 +1289,7 @@ public class Texture implements PConstants {
       // Putting the buffer in the used buffers list to dispose at the end of
       // draw.
       if (usedBuffers == null) {
-        usedBuffers = new LinkedList<BufferData>();
+        usedBuffers = new LinkedList<>();
       }
       usedBuffers.add(data);
 
@@ -1296,7 +1306,7 @@ public class Texture implements PConstants {
     try {
       disposeBufferMethod = bufferSource.getClass().
         getMethod("disposeBuffer", new Class[] { Object.class });
-    } catch (Exception e) {
+    } catch (NoSuchMethodException | SecurityException e) {
       throw new RuntimeException("Provided source object doesn't have a " +
                                  "disposeBuffer method.");
     }
@@ -1828,7 +1838,6 @@ public class Texture implements PConstants {
   /**
    * Sets texture target and internal format according to the target and
    * type specified.
-   * @param target int
    * @param params GLTextureParameters
    */
   protected void setParameters(Parameters params) {
@@ -1838,14 +1847,18 @@ public class Texture implements PConstants {
       throw new RuntimeException("Unknown texture target");
     }
 
-    if (params.format == RGB)  {
-      glFormat = PGL.RGB;
-    } else  if (params.format == ARGB) {
-      glFormat = PGL.RGBA;
-    } else  if (params.format == ALPHA) {
-      glFormat = PGL.ALPHA;
-    } else {
-      throw new RuntimeException("Unknown texture format");
+    switch (params.format) {
+      case RGB:
+        glFormat = PGL.RGB;
+        break;
+      case ARGB:
+        glFormat = PGL.RGBA;
+        break;
+      case ALPHA:
+        glFormat = PGL.ALPHA;
+        break;
+      default:
+        throw new RuntimeException("Unknown texture format");
     }
 
     boolean mipmaps = params.mipmaps && PGL.MIPMAPS_ENABLED;
@@ -1857,36 +1870,47 @@ public class Texture implements PConstants {
       mipmaps = false;
     }
 
-    if (params.sampling == POINT) {
-      glMagFilter = PGL.NEAREST;
-      glMinFilter = PGL.NEAREST;
-    } else if (params.sampling == LINEAR)  {
-      glMagFilter = PGL.NEAREST;
-      glMinFilter = mipmaps ? PGL.LINEAR_MIPMAP_NEAREST : PGL.LINEAR;
-    } else if (params.sampling == BILINEAR)  {
-      glMagFilter = PGL.LINEAR;
-      glMinFilter = mipmaps ? PGL.LINEAR_MIPMAP_NEAREST : PGL.LINEAR;
-    } else if (params.sampling == TRILINEAR)  {
-      glMagFilter = PGL.LINEAR;
-      glMinFilter = mipmaps ? PGL.LINEAR_MIPMAP_LINEAR : PGL.LINEAR;
-    } else {
-      throw new RuntimeException("Unknown texture filtering mode");
+    switch (params.sampling) {
+      case POINT:
+        glMagFilter = PGL.NEAREST;
+        glMinFilter = PGL.NEAREST;
+        break;
+      case LINEAR:
+        glMagFilter = PGL.NEAREST;
+        glMinFilter = mipmaps ? PGL.LINEAR_MIPMAP_NEAREST : PGL.LINEAR;
+        break;
+      case BILINEAR:
+        glMagFilter = PGL.LINEAR;
+        glMinFilter = mipmaps ? PGL.LINEAR_MIPMAP_NEAREST : PGL.LINEAR;
+        break;
+      case TRILINEAR:
+        glMagFilter = PGL.LINEAR;
+        glMinFilter = mipmaps ? PGL.LINEAR_MIPMAP_LINEAR : PGL.LINEAR;
+        break;
+      default:
+        throw new RuntimeException("Unknown texture filtering mode");
     }
 
-    if (params.wrapU == CLAMP) {
-      glWrapS = PGL.CLAMP_TO_EDGE;
-    } else if (params.wrapU == REPEAT)  {
-      glWrapS = PGL.REPEAT;
-    } else {
-      throw new RuntimeException("Unknown wrapping mode");
+    switch (params.wrapU) {
+      case CLAMP:
+        glWrapS = PGL.CLAMP_TO_EDGE;
+        break;
+      case REPEAT:
+        glWrapS = PGL.REPEAT;
+        break;
+      default:
+        throw new RuntimeException("Unknown wrapping mode");
     }
 
-    if (params.wrapV == CLAMP) {
-      glWrapT = PGL.CLAMP_TO_EDGE;
-    } else if (params.wrapV == REPEAT)  {
-      glWrapT = PGL.REPEAT;
-    } else {
-      throw new RuntimeException("Unknown wrapping mode");
+    switch (params.wrapV) {
+      case CLAMP:
+        glWrapT = PGL.CLAMP_TO_EDGE;
+        break;
+      case REPEAT:
+        glWrapT = PGL.REPEAT;
+        break;
+      default:
+        throw new RuntimeException("Unknown wrapping mode");
     }
 
     usingMipmaps = glMinFilter == PGL.LINEAR_MIPMAP_NEAREST ||
@@ -2103,7 +2127,7 @@ public class Texture implements PConstants {
        *
        * @param src
        */
-      public void set(Parameters src) {
+      public final void set(Parameters src) {
       this.target = src.target;
       this.format = src.format;
       this.sampling = src.sampling;
@@ -2137,8 +2161,7 @@ public class Texture implements PConstants {
         disposeBufferMethod.invoke(bufferSource, new Object[] { natBuf });
         natBuf = null;
         rgbBuf = null;
-      } catch (Exception e) {
-        e.printStackTrace();
+      } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
       }
     }
   }

data/src/main/java/processing/opengl/VertexBuffer.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-15 The Processing Foundation
@@ -20,48 +20,46 @@
   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.opengl;
 
 import processing.opengl.PGraphicsOpenGL.GLResourceVertexBuffer;
 
 // TODO: need to combine with PGraphicsOpenGL.VertexAttribute
-
 /**
  *
  * @author Martin Prout
  */
 public class VertexBuffer {
 
-    /**
-     *
-     */
-    static protected final int INIT_VERTEX_BUFFER_SIZE  = 256;
+  /**
+   *
+   */
+  static protected final int INIT_VERTEX_BUFFER_SIZE = 256;
 
-    /**
-     *
-     */
-    static protected final int INIT_INDEX_BUFFER_SIZE   = 512;
+  /**
+   *
+   */
+  static protected final int INIT_INDEX_BUFFER_SIZE = 512;
 
-    /**
-     *
-     */
-    public int glId;
+  /**
+   *
+   */
+  public int glId;
   int target;
   int elementSize;
   int ncoords;
   boolean index;
 
-    /**
-     *
-     */
-    protected PGL pgl;                // The interface between Processing and OpenGL.
+  /**
+   *
+   */
+  protected PGL pgl;                // The interface between Processing and OpenGL.
 
-    /**
-     *
-     */
-    protected int context;            // The context that created this texture.
+  /**
+   *
+   */
+  protected int context;            // The context that created this texture.
   private GLResourceVertexBuffer glres;
 
   VertexBuffer(PGraphicsOpenGL pg, int target, int ncoords, int esize) {
@@ -80,28 +78,28 @@ public class VertexBuffer {
     init();
   }
 
-    /**
-     *
-     */
-    protected void create() {
+  /**
+   *
+   */
+  protected final void create() {
     context = pgl.getCurrentContext();
     glres = new GLResourceVertexBuffer(this);
   }
 
-    /**
-     *
-     */
-    protected void init() {
-    int size = index ? ncoords * INIT_INDEX_BUFFER_SIZE * elementSize :
-                       ncoords * INIT_VERTEX_BUFFER_SIZE * elementSize;
+  /**
+   *
+   */
+  protected final void init() {
+    int size = index ? ncoords * INIT_INDEX_BUFFER_SIZE * elementSize
+      : ncoords * INIT_VERTEX_BUFFER_SIZE * elementSize;
     pgl.bindBuffer(target, glId);
     pgl.bufferData(target, size, null, PGL.STATIC_DRAW);
   }
 
-    /**
-     *
-     */
-    protected void dispose() {
+  /**
+   *
+   */
+  protected void dispose() {
     if (glres != null) {
       glres.dispose();
       glId = 0;
@@ -109,11 +107,11 @@ public class VertexBuffer {
     }
   }
 
-    /**
-     *
-     * @return
-     */
-    protected boolean contextIsOutdated() {
+  /**
+   *
+   * @return
+   */
+  protected boolean contextIsOutdated() {
     boolean outdated = !pgl.contextIsCurrent(context);
     if (outdated) {
       dispose();

data/vendors/Rakefile

@@ -9,7 +9,7 @@ SOUND_VERSION = 'v1.3.2'
 GLVIDEO = 'processing-glvideo.zip'
 VIDEO = 'video-2.zip'
 VIDEO_VERSION = '2'
-EXAMPLES = '0.2.0'
+EXAMPLES = '0.3.0'
 HOME_DIR = ENV['HOME']
 CLOBBER.include(EXAMPLES, SOUND, GLVIDEO, VIDEO)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: picrate
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: java
 authors:
 - monkstone
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-10 00:00:00.000000000 Z
+date: 2019-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -70,6 +70,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".mvn/extensions.xml"
+- ".mvn/wrapper/MavenWrapperDownloader.java"
 - ".mvn/wrapper/maven-wrapper.properties"
 - ".travis.yml"
 - CHANGELOG.md
@@ -179,7 +180,7 @@ files:
 - lib/jogl-all-natives-linux-amd64.jar
 - lib/jogl-all-natives-linux-armv6hf.jar
 - lib/jogl-all.jar
-- lib/picrate-0.7.0.jar
+- lib/picrate-0.8.0.jar
 - lib/picrate.rb
 - lib/picrate/app.rb
 - lib/picrate/creators/parameters.rb
@@ -204,6 +205,7 @@ files:
 - library/video_event/video_event.rb
 - license.txt
 - mvnw
+- mvnw.cmd
 - picrate.gemspec
 - pom.rb
 - pom.xml
@@ -227,6 +229,7 @@ files:
 - 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
@@ -352,7 +355,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - java runtime >= 1.8.0_161+
-rubygems_version: 3.0.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: ruby wrapper for processing-3.5.3 on raspberrypi and linux64