propane 2.0.6-java → 2.1.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b171b89a1fbca7ab63db7e379cd918eded803696
-  data.tar.gz: 1b6e910227f25b1ccaeebc58950499884ef894bf
+  metadata.gz: 833e28f17c9ccee6633b4b72e047cb3bb19dac95
+  data.tar.gz: 0bf06a5796ced532ad970af689ac9f734aa569dd
 SHA512:
-  metadata.gz: 10a60b40f76d0d247ecbec945390996e7ee40e504abed3cc0a54496d79d882d4a6535cb0100c2f93a788baff0a8f62731ed5968439a30d9ea21cb7c2fb5fb1fc
-  data.tar.gz: 0c592fba0c235f8e36f354d4339cb151bc34f21c53f8861c1a78441945e9aab3e0adc9ce9d5deba4c47f39e59093703569384212d450a7907e60921da49c033c
+  metadata.gz: a7807f527d2946ec41416819b30e3838ffa27164183080fed34ff13f42dfd9cf69702d48de50614f1764c3bf902fa3a96bdddec6db76bd4b0535b8cda8ccdc24
+  data.tar.gz: 41804e15ab02a6fc37dac4fa34c353c7bbfa836c7ad169cf2e525d009a327f3dc6077a9e63f4423d21ac471bb3e668b373a83e84a5dc060a7202b20da317aa03

data/CHANGELOG.md

@@ -1,6 +1,9 @@
+**v2.1.0** Add missing method to ColorUtil.java, `include HelperMethods, PConstants, Math, MathTool` in `Propane::Proxy`, it is just simpler that way. Mixin Renderer for AppRender and ShapeRender. Changes to `Propane::Proxy` are significant enough to warrant versioning bump, samples making use of new code will not be runable by earlier versions. 
+
 **v2.0.6** Update to core processing-3.2.3
 
 **v2.0.5** Update to processing-3.2.2, fix local library load, add proxy_library expand samples
+
 **v2.0.4** Correct `norm_strict`, add `math_tool_test` add `simplex_noise` expand samples
 
 **v2.0.3** Suggest use of jruby-9.1.4.0, more about loading vanilla libraries
@@ -14,13 +17,13 @@
 **v0.9.0** Implements `data_path` in ruby, you should use this method to return the absolute path to the `data` folder (read and write).  Prefer JRubyArt methods, in the main.
 
 **v0.8.0** Complete samples refactored to `data_path` folder, no longer require jruby-complete to run because we provide an absolute path to `data` folder, but it still probably requires that you run the sketch from the directory. Future direction might be to create a `~/.propane` folder, which would support additionalvanilla processing libraries, also integration with `atom` editor.
-**v0.7.0** Update to JRuby-Complete-9.1.2.0. 
 
-**v0.6.0** Includes a sketch creator utility 3D still only for linux64 and macosx, any Windows developers are welcome to extend to windows (should be easy), includes slider in sketch library, change to requiring jdk8. Update to JRuby-Complete-9.1.0.0, request updated arcball (to run samples). 
+**v0.7.0** Update to JRuby-Complete-9.1.2.0.
+
+**v0.6.0** Includes a sketch creator utility 3D still only for linux64 and macosx, any Windows developers are welcome to extend to windows (should be easy), includes slider in sketch library, change to requiring jdk8. Update to JRuby-Complete-9.1.0.0, request updated arcball (to run samples).
 
 **v0.5.0** Includes a sketch creator utility 3D still only for linux64 and macosx, any Windows developers are welcome to extend to windows (should be easy).
 
 **v0.4.0.pre** Inclusion of jogl-all.jar should fix 3D if install fails try getting rid of previous versions of gem (especially if you had done local installs, foxed me first) 3D still only for linux64 and macosx, any Windows developers are welcome to extend to windows (should be easy).
 
 **v0.3.0.pre** First pre-release of propane.gem turns out 3D was not working because of missing jar in gem (3D was only going to work on macosx and linux64 OS anyways.
-

data/lib/propane/app.rb

@@ -9,12 +9,17 @@ module Propane
   Java::Monkstone::PropaneLibrary.load(JRuby.runtime)
   SKETCH_ROOT = File.absolute_path('.')
 
+  module Render
+    java_import 'monkstone.vecmath.AppRender'
+    java_import 'monkstone.vecmath.ShapeRender'
+  end
+
   # This class is the base class the user should inherit from when making
   # their own sketch.
   #
   # i.e.
   # require 'propane'
-  # 
+  #
   # class MySketch < Propane::App
   #
   #   def draw
@@ -40,14 +45,14 @@ module Propane
 
   # All sketches extend this class
   class App < PApplet
-    include Math, MathTool, HelperMethods
+    include Math, MathTool, HelperMethods, Render
     # Alias some methods for familiarity for Shoes coders.
     alias oval ellipse
     alias stroke_width stroke_weight
     alias rgb color
     alias gray color
     field_reader :surface
-    
+
     def sketch_class
       self.class.sketch_class
     end
@@ -58,7 +63,7 @@ module Propane
       super(subclass)
       @sketch_class = subclass
     end
-    
+
     # App should be instantiated with an optional list of options
     # and array of arguments.
     #
@@ -119,7 +124,7 @@ module Propane
       import_opengl if /opengl/ =~ mode
       super(*args)
     end
-    
+
     def sketch_title(title)
       surface.set_title(title)
     end
@@ -155,15 +160,15 @@ module Propane
     end
   end
 
-  # Importing PConstants to access to processing constants,
-  # to keep namespace clean use PConstants::TRIANGLE (for example)
-  # or to use bare TRIANGLE also 'include PConstants'
+  # Importing PConstants to access processing constants, we also need to
+  # 'include PConstants' to avoid requiring the `PConstants::` prefix
+  # `include Math etc because we expect to use them`
   # Using :method_missing to mimic inner class methods
   # @HACK you should consider using 'forwardable' to avoid this
   # egregious hack...
   module Proxy
     java_import 'processing.core.PConstants'
-
+    include Math, MathTool, HelperMethods, PConstants
     def respond_to_missing?(name, include_private = false)
       $app.respond_to?(name) || super
     end

data/lib/propane/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Propane
-  VERSION = '2.0.6'.freeze
+  VERSION = '2.1.0'.freeze
 end

data/pom.rb

@@ -1,7 +1,7 @@
 require 'fileutils'
 project 'rp5extras', 'https://github.com/monkstone/propane' do
   model_version '4.0.0'
-  id 'propane:propane', '2.0.6'
+  id 'propane:propane', '2.1.0'
   packaging 'jar'
   description 'rp5extras for propane'
   organization 'ruby-processing', 'https://ruby-processing.github.io'

data/pom.xml

@@ -11,7 +11,7 @@ DO NOT MODIFIY - GENERATED CODE
   <modelVersion>4.0.0</modelVersion>
   <groupId>propane</groupId>
   <artifactId>propane</artifactId>
-  <version>2.0.6</version>
+  <version>2.1.0</version>
   <name>rp5extras</name>
   <description>rp5extras for propane</description>
   <url>https://github.com/monkstone/propane</url>

data/src/monkstone/ColorUtil.java

@@ -1,11 +1,14 @@
 /**
- * The purpose of this utility is to allow ruby-processing users to use an alternative 
- * to processing.org color their sketches (to cope with ruby FixNumber vs java int)
- * Copyright (C) 2015-16 Martin Prout. This tool 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; either version
- * 2.1 of the License, or (at your option) any later version.
- * 
+ * This utility allows JRubyArt users to use the processing.org color method
+ * in their sketches. Includes a method to efficiently convert an array of web
+ * strings to an array of color int, and another to convert an array of color
+ * int to a string that can be used in ruby code (to generate web color array).
+ * Copyright (c) 2015-16 Martin Prout.
+ * This utility 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; either version 2.1 of the License, or (at
+ * your option) any later version.
+ *
  * Obtain a copy of the license at http://www.gnu.org/licenses/lgpl-2.1.html
  */
 package monkstone;
@@ -16,9 +19,10 @@ package monkstone;
  */
 public class ColorUtil {
 
-   /**
+    /**
      * Returns hex long as a positive int unless greater than Integer.MAX_VALUE
      * else return the complement as a negative integer or something like that
+     *
      * @param hexlong long
      * @return rgb int
      */
@@ -38,32 +42,32 @@ public class ColorUtil {
     static public int colorString(String hexstring) {
         return java.awt.Color.decode(hexstring).getRGB();
     }
-    
+
     /**
      *
      * @param web Array of web (hex) String
      * @return array of color int according to java
      */
-    
-    static public int[] webArray(String[] web){
+    static public int[] webArray(String[] web) {
         int[] result = new int[web.length];
-        for (int i = 0; i < web.length; i++ ){
+        for (int i = 0; i < web.length; i++) {
             result[i] = java.awt.Color.decode(web[i]).getRGB();
         }
         return result;
     }
-    
-   /**
-    * Return a ruby string of the form "%w(a b c)" where a, b, c
-    * are raw web strings. This string can be used in ruby code.
-    * @param hex int array
-    * @return String for use in ruby
-    */
-    static public String rubyString(int[] hex){
+
+    /**
+     * Return a ruby string of the form "%w(a b c)" where a, b, c are raw web
+     * strings. This string can be used in ruby code.
+     *
+     * @param hex int array
+     * @return String for use in ruby
+     */
+    static public String rubyString(int[] hex) {
         StringBuilder result = new StringBuilder("%w(");
-        for (int i = 0; i < hex.length; i++ ){
+        for (int i = 0; i < hex.length; i++) {
             result.append(String.format("#%06X", (0xFFFFFF & hex[i])));
-            if (i < hex.length - 1){
+            if (i < hex.length - 1) {
                 result.append(' ');
             }
         }
@@ -79,14 +83,14 @@ public class ColorUtil {
     static public float colorLong(double hex) {
         return (float) hex;
     }
-    
+
     /**
      *
      * @param hexlong long
      * @return hexlong int
      */
-    static public int colorLong(long hexlong){
-       return hexLong(hexlong);
+    static public int colorLong(long hexlong) {
+        return hexLong(hexlong);
     }
 
     /**
@@ -94,7 +98,18 @@ public class ColorUtil {
      * @param hex double
      * @return hex float
      */
-    static public float colorDouble(double hex){
-       return (float)hex;
+    static public float colorDouble(double hex) {
+        return (float) hex;
+    }
+
+    /**
+     *
+     * @param hue
+     * @param sat
+     * @param brightness
+     * @return
+     */
+    static public int hsbToRgB(double hue, double sat, double brightness) {
+        return java.awt.Color.HSBtoRGB((float) hue, (float) sat, (float) brightness);
     }
 }

data/vendors/Rakefile

@@ -9,7 +9,7 @@ SOUND = 'sound.zip'.freeze
 SOUND_VERSION = 'v1.3.2' # version 1.3.2
 VIDEO = 'video-2.zip'
 VIDEO_VERSION = '2' # version 1.0.1
-EXAMPLES = '0.6'.freeze
+EXAMPLES = '0.7'.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: 2.0.6
+  version: 2.1.0
 platform: java
 authors:
 - monkstone
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-12 00:00:00.000000000 Z
+date: 2016-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arcball