propane 3.1.0.pre-java → 3.2.0-java

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

@@ -1,5 +1,3 @@
-/* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */
-
 /*
   Part of the Processing project - http://processing.org
 
@@ -20,69 +18,69 @@
   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
 public class VertexBuffer {
-  static protected final int INIT_VERTEX_BUFFER_SIZE  = 256;
-  static protected final int INIT_INDEX_BUFFER_SIZE   = 512;
-
-  public int glId;
-  int target;
-  int elementSize;
-  int ncoords;
-  boolean index;
-
-  protected PGL pgl;                // The interface between Processing and OpenGL.
-  protected int context;            // The context that created this texture.
-  private GLResourceVertexBuffer glres;
-
-  VertexBuffer(PGraphicsOpenGL pg, int target, int ncoords, int esize) {
-    this(pg, target, ncoords, esize, false);
-  }
-
-  VertexBuffer(PGraphicsOpenGL pg, int target, int ncoords, int esize, boolean index) {
-    pgl = pg.pgl;
-    context = pgl.createEmptyContext();
-
-    this.target = target;
-    this.ncoords = ncoords;
-    this.elementSize = esize;
-    this.index = index;
-    create();
-    init();
-  }
-
-  protected 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;
-    pgl.bindBuffer(target, glId);
-    pgl.bufferData(target, size, null, PGL.STATIC_DRAW);
-  }
-
-  protected void dispose() {
-    if (glres != null) {
-      glres.dispose();
-      glId = 0;
-      glres = null;
+
+    static protected final int INIT_VERTEX_BUFFER_SIZE = 256;
+    static protected final int INIT_INDEX_BUFFER_SIZE = 512;
+
+    public int glId;
+    int target;
+    int elementSize;
+    int ncoords;
+    boolean index;
+
+    protected PGL pgl;                // The interface between Processing and OpenGL.
+    protected int context;            // The context that created this texture.
+    private GLResourceVertexBuffer glres;
+
+    VertexBuffer(PGraphicsOpenGL pg, int target, int ncoords, int esize) {
+        this(pg, target, ncoords, esize, false);
+    }
+
+    VertexBuffer(PGraphicsOpenGL pg, int target, int ncoords, int esize, boolean index) {
+        pgl = pg.pgl;
+        context = pgl.createEmptyContext();
+
+        this.target = target;
+        this.ncoords = ncoords;
+        this.elementSize = esize;
+        this.index = index;
+        create();
+        init();
+    }
+
+    protected 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;
+        pgl.bindBuffer(target, glId);
+        pgl.bufferData(target, size, null, PGL.STATIC_DRAW);
+    }
+
+    protected void dispose() {
+        if (glres != null) {
+            glres.dispose();
+            glId = 0;
+            glres = null;
+        }
     }
-  }
 
-  protected boolean contextIsOutdated() {
-    boolean outdated = !pgl.contextIsCurrent(context);
-    if (outdated) {
-      dispose();
+    protected boolean contextIsOutdated() {
+        boolean outdated = !pgl.contextIsCurrent(context);
+        if (outdated) {
+            dispose();
+        }
+        return outdated;
     }
-    return outdated;
-  }
 
 }

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 = '2.3'.freeze
+EXAMPLES = '2.4'.freeze
 HOME_DIR = ENV['HOME']
 MAC_OR_LINUX = /linux|mac|darwin/ =~ RbConfig::CONFIG['host_os']
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: propane
 version: !ruby/object:Gem::Version
-  version: 3.1.0.pre
+  version: 3.2.0
 platform: java
 authors:
 - monkstone
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-17 00:00:00.000000000 Z
+date: 2019-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -69,6 +69,7 @@ files:
 - ".github/CONTRIBUTING.md"
 - ".github/ISSUE_TEMPLATE.md"
 - ".gitignore"
+- ".mvn/wrapper/maven-wrapper.properties"
 - ".yardopts"
 - CHANGELOG.md
 - Gemfile
@@ -87,7 +88,7 @@ files:
 - lib/jogl-all-natives-macosx-universal.jar
 - lib/jogl-all-natives-windows-amd64.jar
 - lib/jogl-all.jar
-- lib/propane-3.1.0.jar
+- lib/propane-3.2.0.jar
 - lib/propane.rb
 - lib/propane/app.rb
 - lib/propane/creators/sketch_class.rb
@@ -95,6 +96,7 @@ files:
 - lib/propane/creators/sketch_writer.rb
 - lib/propane/helper_methods.rb
 - lib/propane/helpers/numeric.rb
+- lib/propane/helpers/version_error.rb
 - lib/propane/library.rb
 - lib/propane/library_loader.rb
 - lib/propane/native_folder.rb
@@ -112,6 +114,8 @@ files:
 - library/vector_utils/vector_utils.rb
 - library/video_event/video_event.rb
 - license.txt
+- mvnw
+- mvnw.cmd
 - pom.xml
 - propane.gemspec
 - src/main/java/japplemenubar/JAppleMenuBar.java
@@ -146,6 +150,7 @@ files:
 - src/main/java/processing/awt/PGraphicsJava2D.java
 - src/main/java/processing/awt/PShapeJava2D.java
 - src/main/java/processing/awt/PSurfaceAWT.java
+- src/main/java/processing/core/DesktopHandler.java
 - src/main/java/processing/core/PApplet.java
 - src/main/java/processing/core/PConstants.java
 - src/main/java/processing/core/PFont.java
@@ -161,7 +166,6 @@ files:
 - src/main/java/processing/core/PSurface.java
 - src/main/java/processing/core/PSurfaceNone.java
 - src/main/java/processing/core/PVector.java
-- src/main/java/processing/core/ThinkDifferent.java
 - src/main/java/processing/data/DoubleDict.java
 - src/main/java/processing/data/DoubleList.java
 - src/main/java/processing/data/FloatDict.java
@@ -258,15 +262,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements:
 - java runtime >= 11.0.1+
-rubygems_version: 3.0.1
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
-summary: ruby wrapper for processing-3.4 on MacOS, linux and windows (64bit only)
+summary: ruby wrapper for processing-3.5 on MacOS, linux and windows (64bit only)
 test_files:
 - test/create_test.rb
 - test/deglut_spec_test.rb

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

@@ -1,70 +0,0 @@
-/* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */
-
-/*
-  Part of the Processing project - http://processing.org
-
-  Copyright (c) 2012-2014 The Processing Foundation
-  Copyright (c) 2007-2012 Ben Fry and Casey Reas
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License
-  version 2, as published by the Free Software Foundation.
-
-  This program 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 General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software Foundation,
-  Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
-
-package processing.core;
-
-import java.awt.Image;
-import java.awt.Taskbar;
-import java.awt.Desktop;
-import java.awt.desktop.QuitResponse;
-import java.awt.desktop.QuitEvent;
-
-
-public class ThinkDifferent {
-
-  private static Desktop desktop;
-  private static Taskbar taskbar;
-  static boolean attemptedQuit;
-
-
-  static public void init(final PApplet sketch) {
-    if (taskbar == null) {
-      taskbar = Taskbar.getTaskbar();
-    }
-    if (desktop == null) {
-      desktop = Desktop.getDesktop();
-    }
-
-    desktop.setQuitHandler((QuitEvent event, QuitResponse response) -> {
-        sketch.exit();
-        if (PApplet.uncaughtThrowable == null &&  // no known crash
-                !attemptedQuit) {  // haven't tried yet
-            response.cancelQuit();  // tell OS X we'll handle this
-            attemptedQuit = true;
-        } else {
-            response.performQuit();  // just force it this time
-        }
-    });
-  }
-
-  static public void cleanup() {
-    if (desktop == null) {
-      desktop = Desktop.getDesktop();
-    }
-    desktop.setQuitHandler(null);
-  }
-
-  // Called via reflection from PSurfaceAWT and others
-  static public void setIconImage(Image image) {
-    taskbar.setIconImage(image);
-  }
-}