propane 3.5.0-java → 3.6.0-java

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

@@ -143,8 +143,9 @@ public class Texture implements PConstants {
 
 
   /**
-   * Creates an instance of PTexture with size width x height. The texture is
-   * initialized (empty) to that size.
+   * Creates an instance of PTexture with size width x height.The texture is
+ initialized (empty) to that size.
+   * @param pg
    * @param width  int
    * @param height  int
    */
@@ -155,7 +156,8 @@ public class Texture implements PConstants {
 
   /**
    * Creates an instance of PTexture with size width x height and with the
-   * specified parameters. The texture is initialized (empty) to that size.
+   * specified parameters.The texture is initialized (empty) to that size.
+   * @param pg
    * @param width int
    * @param height int
    * @param params Parameters
@@ -436,7 +438,8 @@ public class Texture implements PConstants {
 
 
   /**
-   * Copy texture to pixels. Involves video memory to main memory transfer (slow).
+   * Copy texture to pixels.Involves video memory to main memory transfer (slow).
+   * @param pixels
    */
   public void get(int[] pixels) {
     if (pixels == null) {

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

@@ -57,12 +57,12 @@ public class VertexBuffer {
     init();
   }
 
-  protected void create() {
+  protected final void create() {
     context = pgl.getCurrentContext();
     glres = new GLResourceVertexBuffer(this);
   }
 
-  protected void init() {
+  protected final void init() {
     int size = index ? ncoords * INIT_INDEX_BUFFER_SIZE * elementSize :
                        ncoords * INIT_VERTEX_BUFFER_SIZE * elementSize;
     pgl.bindBuffer(target, glId);

data/vendors/Rakefile

@@ -7,15 +7,16 @@ WARNING = <<-WGET
    the correct version of propane-examples (see EXAMPLES vendors directory)
 WGET
 SOUND = 'sound.zip'
-SOUND_VERSION = 'v1.3.2' # version 1.3.2
-GLVIDEO = 'processing-glvideo.zip'
-VIDEO = 'video-2.0-beta4.zip'
-VIDEO_VERSION = 'r6-v2.0-beta4'
-EXAMPLES = '2.8'
+PROCESSING_GITHUB = 'https://github.com/processing'
+PROPANE_EXAMPLES = 'https://github.com/ruby-processing/propane-examples'
+VIDEO = 'video.zip'
+DOWNLOAD = 'releases/download/latest'
+EXAMPLES = '2.9'
 HOME_DIR = ENV['HOME']
+LIBRARY = File.join(HOME_DIR, '.propane', 'libraries')
 MAC_OR_LINUX = /linux|mac|darwin/.match?(RbConfig::CONFIG['host_os'])
 
-CLOBBER.include(EXAMPLES, SOUND, GLVIDEO, VIDEO)
+CLOBBER.include(EXAMPLES, SOUND, VIDEO)
 
 desc 'download, and copy propane examples'
 task default: [:download_and_copy_samples]
@@ -25,7 +26,7 @@ task download_and_copy_samples: %i[download_examples copy_examples]
 
 task :download_examples
 file_name = MAC_OR_LINUX.nil? ? "#{EXAMPLES}.zip" : "#{EXAMPLES}.tar.gz"
-wget_base = 'wget https://github.com/ruby-processing/propane-examples'
+wget_base = ['wget', PROPANE_EXAMPLES].join(' ')
 wget_string = [wget_base, 'archive', file_name].join('/')
 file file_name do
   begin
@@ -43,8 +44,8 @@ task download_and_copy_video: %i[init_dir download_video copy_video clobber]
 
 desc 'download sound library'
 task :download_sound do
-  wget_base = 'wget https://github.com/processing/processing-sound'
-  wget_string = [wget_base, 'releases/download', SOUND_VERSION, SOUND].join('/')
+  wget_base = ['wget', PROCESSING_GITHUB].join(' ')
+  wget_string = [wget_base, 'processing-sound', DOWNLOAD, SOUND].join('/')
   begin
     sh wget_string
   rescue StandardError
@@ -52,10 +53,15 @@ task :download_sound do
   end
 end
 
+desc 'initialize ~/.propane directories'
+task :init_dir do
+  FileUtils.mkdir_p LIBRARY unless File.exist? LIBRARY
+end
+
 desc 'download video library'
 task :download_video do
-  wget_base = 'wget https://github.com/processing/processing-video'
-  wget_string = [wget_base, 'releases/download', VIDEO_VERSION, VIDEO].join('/')
+  wget_base = ['wget', PROCESSING_GITHUB].join(' ')
+  wget_string = [wget_base, 'processing-video', DOWNLOAD, VIDEO].join('/')
   begin
     sh wget_string
   rescue StandardError
@@ -63,14 +69,6 @@ task :download_video do
   end
 end
 
-desc 'initialize ~/.propane directories'
-task :init_dir do
-  unless File.exist? "#{HOME_DIR}/.propane/libraries"
-    sh 'mkdir -p ~/.propane'
-    sh 'mkdir -p ~/.propane/libraries'
-  end
-end
-
 desc 'copy examples'
 task copy_examples: file_name do
   if MAC_OR_LINUX.nil?
@@ -78,32 +76,23 @@ task copy_examples: file_name do
   else
     sh "tar xzvf #{EXAMPLES}.tar.gz"
   end
-  if File.exist? "#{HOME_DIR}/propane_samples"
-    sh "rm -r #{HOME_DIR}/propane_samples"
-  end
+  sh "rm -r #{HOME_DIR}/propane_samples" if File.exist? "#{HOME_DIR}/propane_samples"
   sh "cp -r propane-examples-#{EXAMPLES} #{HOME_DIR}/propane_samples"
   sh "rm -r propane-examples-#{EXAMPLES}"
 end
 
 desc 'copy sound library'
 task copy_sound: SOUND do
-  directory '~/.propane'
-  directory '~/.propane/libraries'
   sh "unzip #{SOUND}"
-  if File.exist? "#{HOME_DIR}/.propane/libraries/sound"
-    sh "rm -r #{HOME_DIR}/.propane/libraries/sound"
-  end
-  sh "cp -r sound #{HOME_DIR}/.propane/libraries"
+  sh "rm -r #{LIBRARY}/sound" if File.exist? "#{LIBRARY}/sound"
+  sh "cp -r sound #{LIBRARY}"
   sh 'rm -r sound'
-  sh 'rm -r __MACOSX'
 end
 
 desc 'copy video library'
 task copy_video: VIDEO do
   sh "unzip #{VIDEO}"
-  if File.exist? "#{HOME_DIR}/.propane/libraries/video"
-    sh "rm -r #{HOME_DIR}/.propane/libraries/video"
-  end
-  sh "cp -r video #{HOME_DIR}/.propane/libraries/video"
+  sh "rm -r #{LIBRARY}/video" if File.exist? "#{LIBRARY}/video"
+  sh "cp -r video #{LIBRARY}"
   sh 'rm -r video'
 end

metadata

@@ -1,63 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: propane
 version: !ruby/object:Gem::Version
-  version: 3.5.0
+  version: 3.6.0
 platform: java
 authors:
 - monkstone
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-04-04 00:00:00.000000000 Z
+date: 2020-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.11'
+        version: 0.1.0
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.3
+  name: jruby-openssl
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.11'
+        version: 0.1.0
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.3
 - !ruby/object:Gem::Dependency
-  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '5.14'
+  name: minitest
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '5.14'
 - !ruby/object:Gem::Dependency
-  name: arcball
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '12.3'
+  name: rake
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '12.3'
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.2
+  name: arcball
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.2
 description: "  A batteries included version of processing in ruby targetting jdk11.\n"
 email:
 - mamba2928@yahoo.co.uk
@@ -91,7 +111,7 @@ files:
 - lib/jogl-all-natives-macosx-universal.jar
 - lib/jogl-all-natives-windows-amd64.jar
 - lib/jogl-all.jar
-- lib/propane-3.5.0.jar
+- lib/propane-3.6.0.jar
 - lib/propane.rb
 - lib/propane/app.rb
 - lib/propane/creators/sketch_class.rb
@@ -261,7 +281,7 @@ licenses:
 - GPL-3.0
 - LGPL-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -278,7 +298,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - java runtime >= 11.0.2+
 rubygems_version: 3.0.6
-signing_key: 
+signing_key:
 specification_version: 4
 summary: ruby implementation of processing-4.0 on MacOS, linux and windows (64bit
   only)