rubysketch 0.1.5 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ab78b7cd8bbbeedb31234160054509bd9c55de56bce0f7a9251f75fbe60d22b
-  data.tar.gz: 555fff0c98f8d55cc71fcc6923a63ffa521a591a169abd2a8b71901e8dd7401c
+  metadata.gz: 9603661dbdced67794a2d3f89a4e18e1314fc84daeb8721d5d05c47b5a935cd1
+  data.tar.gz: 8793bbe339b07ed9d0af7b82e87fc62a92470ce17ff7c9432215adc38c31f74e
 SHA512:
-  metadata.gz: 0a7d3a9f9b3b229eae77484d7a9b59813fee6eb5f8225264e515f5dd131914c642fa9fcf1a3eb28839a65f395b24afe1c7acefc46a36e877fd3babc6fd9c6d6e
-  data.tar.gz: e7239c1aa04a9ee8ecec79df21efd4c9dbc5004c7814b58a35799abb33ce253f10279a5c899a6442ec3a7553956c13497e452f2da36ad50ad20265f0d1ac7bf5
+  metadata.gz: 6ea4ed4be93eb7a1e2c2b5f187c59b8a7ea035e7ab80f2f3ec00ecd5c7f14861d55a76188e80251dc8efd3b48c8eb2d91217ff3da8e625885a4e55dcee5d76d9
+  data.tar.gz: 71b9f02e1e7a1bcba29ebbbff0d10a4ce0af9f7e12231014300ec23c5f26b15df288975e27ae683f033ba71f09d82ff39db1a0aef72700f34d87bf9474b2d0ba

data/VERSION

@@ -1 +1 @@
-0.1.5
+0.2.4

data/examples/image.rb

@@ -0,0 +1,13 @@
+%w[xot rays reflex rubysketch]
+  .map  {|s| File.expand_path "../../#{s}/lib", __dir__}
+  .each {|s| $:.unshift s if !$:.include?(s) && File.directory?(s)}
+
+require 'rubysketch-processing'
+
+
+icon = loadImage 'https://xord.org/rubysketch/rubysketch.png'
+
+draw do
+  background 0, 10
+  image icon, mouseX, mouseY, icon.width / 10, icon.height / 10
+end

data/lib/rubysketch.rb

@@ -1,3 +1,8 @@
+require 'digest/sha1'
+require 'pathname'
+require 'tmpdir'
+require 'open-uri'
+
 require 'reflex'
 require 'rubysketch/module'
 require 'rubysketch/starter'

data/lib/rubysketch/glsl.rb

@@ -2,7 +2,7 @@ module RubySketch
 
 
   # @private
-  class GLSL1
+  class GLSL
 
     extend Starter
 
@@ -27,10 +27,7 @@ module RubySketch
       end
     end
 
-  end# GLSL1
-
-
-  GLSL = GLSL1
+  end# GLSL
 
 
 end# RubySketch

data/lib/rubysketch/processing.rb

@@ -1,9 +1,9 @@
 module RubySketch
 
 
-  # Processing compatible API v1
+  # Processing compatible API
   #
-  class Processing1
+  class Processing
 
     include Math
 
@@ -43,11 +43,12 @@ module RubySketch
 
     # @private
     def initialize ()
+      @matrixStack__  = []
+      @styleStack__   = []
       @frameCount__   = 0
       @hsbColor__     = false
       @colorMaxes__   = [1.0] * 4
       @angleScale__   = 1.0
-      @styleStack     = []
       @mouseX__       =
       @mouseY__       =
       @mousePrevX__   =
@@ -293,12 +294,17 @@ module RubySketch
     end
 
     # @private
-    def setupDrawBlock__ ()
+    private def setupDrawBlock__ ()
       @window__.draw = proc do |e, painter|
         @painter__ = painter
-        pushStyle
-        @drawBlock__.call e if @drawBlock__
-        popStyle
+        @matrixStack__.clear
+        @styleStack__.clear
+        begin
+          push
+          @drawBlock__.call e if @drawBlock__
+        ensure
+          pop
+        end
         @frameCount__ += 1
         updateMousePrevPos__
       end
@@ -317,7 +323,7 @@ module RubySketch
     end
 
     # @private
-    def setupMousePressedBlock__ ()
+    private def setupMousePressedBlock__ ()
       @window__.pointer_down = proc do |e|
         updateMouseState__ e.x, e.y, true
         @mousePressedBlock__.call e if @mousePressedBlock__
@@ -330,7 +336,7 @@ module RubySketch
     end
 
     # @private
-    def setupMouseReleasedBlock__ ()
+    private def setupMouseReleasedBlock__ ()
       @window__.pointer_up = proc do |e|
         updateMouseState__ e.x, e.y, false
         @mouseReleasedBlock__.call e if @mouseReleasedBlock__
@@ -343,7 +349,7 @@ module RubySketch
     end
 
     # @private
-    def setupMouseMovedBlock__ ()
+    private def setupMouseMovedBlock__ ()
       @window__.pointer_move = proc do |e|
         updateMouseState__ e.x, e.y
         @mouseMovedBlock__.call e if @mouseMovedBlock__
@@ -356,7 +362,7 @@ module RubySketch
     end
 
     # @private
-    def setupMouseDraggedBlock__ ()
+    private def setupMouseDraggedBlock__ ()
       @window__.pointer_drag = proc do |e|
         updateMouseState__ e.x, e.y
         @mouseDraggedBlock__.call e if @mouseDraggedBlock__
@@ -369,20 +375,20 @@ module RubySketch
     end
 
     # @private
-    def updateMouseState__ (x, y, pressed = nil)
+    private def updateMouseState__ (x, y, pressed = nil)
       @mouseX__       = x
       @mouseY__       = y
       @mousePressed__ = pressed if pressed != nil
     end
 
     # @private
-    def updateMousePrevPos__ ()
+    private def updateMousePrevPos__ ()
       @mousePrevX__ = @mouseX__
       @mousePrevY__ = @mouseY__
     end
 
     # @private
-    def size__ (width, height)
+    private def size__ (width, height)
       raise 'size() must be called on startup or setup block' if @started__
 
       @painter__.send :end_paint
@@ -481,7 +487,7 @@ module RubySketch
     # @return [nil] nil
     #
     def colorMode (mode, *maxes)
-      raise ArgumentError, "Invalid color mode: #{mode}" unless [RGB, HSB].include?(mode)
+      raise ArgumentError, "invalid color mode: #{mode}" unless [RGB, HSB].include?(mode)
       raise ArgumentError unless [0, 1, 3, 4].include?(maxes.size)
 
       @hsbColor__ = mode.upcase == HSB
@@ -493,9 +499,9 @@ module RubySketch
     end
 
     # @private
-    def to_rgba__ (*args)
+    private def toRGBA__ (*args)
       a, b, c, d = args
-      return parse_color__(a, b || alphaMax__) if a.kind_of?(String)
+      return parseColor__(a, b || alphaMax__) if a.kind_of?(String)
 
       rgba = case args.size
         when 1, 2 then [a, a, a, b || alphaMax__]
@@ -508,16 +514,16 @@ module RubySketch
     end
 
     # @private
-    def parse_color__ (str, alpha)
+    private def parseColor__ (str, alpha)
       result = str.match /^\s*##{'([0-9a-f]{2})' * 3}\s*$/i
-      raise ArgumentError, "Invalid color code: '#{str}'" unless result
+      raise ArgumentError, "invalid color code: '#{str}'" unless result
 
       rgb = result[1..3].map.with_index {|hex, i| hex.to_i(16) / 255.0}
       return *rgb, (alpha / alphaMax__)
     end
 
     # @private
-    def alphaMax__ ()
+    private def alphaMax__ ()
       @colorMaxes__[3]
     end
 
@@ -531,13 +537,13 @@ module RubySketch
       @angleScale__ = case mode
         when RADIANS then RAD2DEG__
         when DEGREES then 1.0
-        else raise ArgumentError, "Invalid angle mode: #{mode}"
+        else raise ArgumentError, "invalid angle mode: #{mode}"
       end
       nil
     end
 
     # @private
-    def to_angle__ (angle)
+    private def toAngle__ (angle)
       angle * @angleScale__
     end
 
@@ -572,7 +578,7 @@ module RubySketch
     end
 
     # @private
-    def to_xywh__ (mode, a, b, c, d)
+    private def toXYWH__ (mode, a, b, c, d)
       case mode
       when CORNER  then [a,           b,           c,     d]
       when CORNERS then [a,           b,           c - a, d - b]
@@ -601,7 +607,7 @@ module RubySketch
     # @return [nil] nil
     #
     def background (*args)
-      rgba = to_rgba__ *args
+      rgba = toRGBA__ *args
       if rgba[3] == 1
         @painter__.background *rgba
       else
@@ -631,7 +637,7 @@ module RubySketch
     # @return [nil] nil
     #
     def fill (*args)
-      @painter__.fill(*to_rgba__(*args))
+      @painter__.fill(*toRGBA__(*args))
       nil
     end
 
@@ -654,7 +660,7 @@ module RubySketch
     # @return [nil] nil
     #
     def stroke (*args)
-      @painter__.stroke(*to_rgba__(*args))
+      @painter__.stroke(*toRGBA__(*args))
       nil
     end
 
@@ -757,7 +763,7 @@ module RubySketch
     # @return [nil] nil
     #
     def rect (a, b, c, d, *args)
-      x, y, w, h = to_xywh__ @rectMode__, a, b, c, d
+      x, y, w, h = toXYWH__ @rectMode__, a, b, c, d
       case args.size
         when 0 then @painter__.rect x, y, w, h
         when 1 then @painter__.rect x, y, w, h, round: args[0]
@@ -777,7 +783,7 @@ module RubySketch
     # @return [nil] nil
     #
     def ellipse (a, b, c, d)
-      x, y, w, h = to_xywh__ @ellipseMode__, a, b, c, d
+      x, y, w, h = toXYWH__ @ellipseMode__, a, b, c, d
       @painter__.ellipse x, y, w, h
       nil
     end
@@ -806,9 +812,9 @@ module RubySketch
     # @return [nil] nil
     #
     def arc (a, b, c, d, start, stop)
-      x, y, w, h = to_xywh__ @ellipseMode__, a, b, c, d
-      start      = to_angle__ start
-      stop       = to_angle__ stop
+      x, y, w, h = toXYWH__ @ellipseMode__, a, b, c, d
+      start      = toAngle__ start
+      stop       = toAngle__ stop
       @painter__.ellipse x, y, w, h, from: start, to: stop
       nil
     end
@@ -875,6 +881,26 @@ module RubySketch
       nil
     end
 
+    # Draws an image.
+    #
+    # @overload image(img, x, y)
+    # @overload image(img, x, y, w, h)
+    #
+    # @param img [Image] image to draw
+    # @param x   [Numeric] horizontal position of the image
+    # @param y   [Numeric] vertical position of the image
+    # @param w   [Numeric] width of the image
+    # @param h   [Numeric] height of the image
+    #
+    # @return [nil] nil
+    #
+    def image (img, x, y, w = nil, h = nil)
+      w ||= img.width
+      h ||= img.height
+      @painter__.image img.internal, x, y, w, h
+      nil
+    end
+
     # Applies translation matrix to current transformation matrix.
     #
     # @param x [Numeric] horizontal transformation
@@ -910,7 +936,7 @@ module RubySketch
     # @return [nil] nil
     #
     def rotate (angle)
-      @painter__.rotate to_angle__ angle
+      @painter__.rotate toAngle__ angle
       nil
     end
 
@@ -919,7 +945,7 @@ module RubySketch
     # @return [nil] nil
     #
     def pushMatrix ()
-      @painter__.push_matrix
+      @matrixStack__.push @painter__.matrix
       nil
     end
 
@@ -928,7 +954,8 @@ module RubySketch
     # @return [nil] nil
     #
     def popMatrix ()
-      @painter__.pop_matrix
+      raise "matrix stack underflow" if @matrixStack__.empty?
+      @painter__.matrix = @matrixStack__.pop
       nil
     end
 
@@ -946,8 +973,11 @@ module RubySketch
     # @return [nil] nil
     #
     def pushStyle ()
-      @painter__.push_state
-      @styleStack.push [
+      @styleStack__.push [
+        @painter__.fill,
+        @painter__.stroke,
+        @painter__.stroke_width,
+        @painter__.font,
         @hsbColor__,
         @colorMaxes__,
         @angleScale__,
@@ -962,9 +992,16 @@ module RubySketch
     # @return [nil] nil
     #
     def popStyle ()
-      @painter__.pop_state
-      @hsbColor__, @colorMaxes__, @angleScale__, @rectMode__, @ellipseMode__ =
-        @styleStack.pop
+      raise "style stack underflow" if @styleStack__.empty?
+      @painter__.fill,
+      @painter__.stroke,
+      @painter__.stroke_width,
+      @painter__.font,
+      @hsbColor__,
+      @colorMaxes__,
+      @angleScale__,
+      @rectMode__,
+      @ellipseMode__ = @styleStack__.pop
       nil
     end
 
@@ -990,85 +1027,163 @@ module RubySketch
     #
     # @overload noise(x)
     # @overload noise(x, y)
+    # @overload noise(x, y, z)
     #
     # @param x [Numeric] horizontal point in noise space
     # @param y [Numeric] vertical point in noise space
+    # @param z [Numeric] depth point in noise space
     #
     # @return [Numeric] noise value (0.0..1.0)
     #
-    def noise (x, y = 0)
-      Rays.perlin(x, y) / 2.0 + 1.0
+    def noise (x, y = 0, z = 0)
+      Rays.perlin(x, y, z) / 2.0 + 0.5
     end
 
-    # Font object.
+    # Loads image.
     #
-    class Font
+    # @param filename  [String] file name to load image
+    # @param extension [String] type of image to load (ex. 'png')
+    #
+    # @return [Image] loaded image object
+    #
+    def loadImage (filename, extension = nil)
+      filename = getImage__ filename, extension if filename =~ %r|^https?://|
+      Image.new Rays::Image.load filename
+    end
 
-      # Initialize font.
-      #
-      # @private
-      #
-      def initialize (font)
-        @font = font
+    # @private
+    private def getImage__ (uri, ext)
+      ext ||= File.extname uri
+      raise "unsupported image type" unless ext =~ /^\.?(png)$/i
+
+      tmpdir = Pathname(Dir.tmpdir) + Digest::SHA1.hexdigest(self.class.name)
+      path   = tmpdir + Digest::SHA1.hexdigest(uri)
+      path   = path.sub_ext ext
+
+      unless path.file?
+        p "getting #{uri}"
+        URI.open uri do |input|
+          tmpdir.mkdir unless tmpdir.directory?
+          path.open('w') do |output|
+            while buf = input.read(2 ** 16)
+              output.write buf
+            end
+          end
+        end
       end
+      path.to_s
+    end
 
-      # Returns bounding box.
-      #
-      # @overload textBounds(str)
-      # @overload textBounds(str, x, y)
-      # @overload textBounds(str, x, y, fontSize)
-      #
-      # @param str      [String]  text to calculate bounding box
-      # @param x        [Numeric] horizontal position of bounding box
-      # @param y        [Numeric] vertical position of bounding box
-      # @param fontSize [Numeric] font size
-      #
-      # @return [TextBounds] bounding box for text
-      #
-      def textBounds (str, x = 0, y = 0, fontSize = nil)
-        f = fontSize ? Rays::Font.new(@font.name, fontSize) : @font
-        TextBounds.new x, y, x + f.width(str), y + f.height
-      end
+  end# Processing
 
-      # Bounding box for text.
-      #
-      class TextBounds
-
-        # Horizontal position
-        #
-        attr_reader :x
-
-        # Vertical position
-        #
-        attr_reader :y
-
-        # Width of bounding box
-        #
-        attr_reader :w
-
-        # Height of bounding box
-        #
-        attr_reader :h
-
-        # Initialize bouding box.
-        #
-        # @param x [Numeric] horizontal position
-        # @param y [Numeric] vertical position
-        # @param w [Numeric] width of bounding box
-        # @param h [Numeric] height of bounding box
-        #
-        def initialize (x, y, w, h)
-          @x, @y, @w, @h = x, y, w, h
-        end
 
-      end# TextBounds
+  # Image object.
+  #
+  class Processing::Image
+
+    # Initialize image.
+    #
+    def initialize (image)
+      @image = image
+    end
+
+    # Gets width of image.
+    #
+    # @return [Numeric] width of image
+    #
+    def width ()
+      @image.width
+    end
+
+    # Gets height of image.
+    #
+    # @return [Numeric] height of image
+    #
+    def height ()
+      @image.height
+    end
+
+    # Saves image to file.
+    #
+    # @param filename [String] file name to save image
+    #
+    def save (filename)
+      @image.save filename
+    end
+
+    # @private
+    def internal ()
+      @image
+    end
+
+  end# Processing::Image
+
+
+  # Font object.
+  #
+  class Processing::Font
+
+    # Initialize font.
+    #
+    # @private
+    #
+    def initialize (font)
+      @font = font
+    end
+
+    # Returns bounding box.
+    #
+    # @overload textBounds(str)
+    # @overload textBounds(str, x, y)
+    # @overload textBounds(str, x, y, fontSize)
+    #
+    # @param str      [String]  text to calculate bounding box
+    # @param x        [Numeric] horizontal position of bounding box
+    # @param y        [Numeric] vertical position of bounding box
+    # @param fontSize [Numeric] font size
+    #
+    # @return [TextBounds] bounding box for text
+    #
+    def textBounds (str, x = 0, y = 0, fontSize = nil)
+      f = fontSize ? Rays::Font.new(@font.name, fontSize) : @font
+      TextBounds.new x, y, x + f.width(str), y + f.height
+    end
+
+  end# Processing::Font
 
-    end# Font
 
-  end# Processing1
+  # Bounding box for text.
+  #
+  class Processing::TextBounds
 
+    # Horizontal position
+    #
+    attr_reader :x
+
+    # Vertical position
+    #
+    attr_reader :y
+
+    # Width of bounding box
+    #
+    attr_reader :w
+
+    # Height of bounding box
+    #
+    attr_reader :h
+
+    # Initialize bouding box.
+    #
+    # @param x [Numeric] horizontal position
+    # @param y [Numeric] vertical position
+    # @param w [Numeric] width of bounding box
+    # @param h [Numeric] height of bounding box
+    #
+    def initialize (x, y, w, h)
+      @x, @y, @w, @h = x, y, w, h
+    end
 
-  Processing = Processing1
+  end# Processing::TextBounds
 
 
 end# RubySketch

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubysketch
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.4
 platform: ruby
 authors:
 - xordog
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-18 00:00:00.000000000 Z
+date: 2020-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yard
@@ -110,6 +110,7 @@ files:
 - examples/clock.rb
 - examples/glsl.rb
 - examples/hello.rb
+- examples/image.rb
 - examples/shapes.rb
 - lib/rubysketch-processing.rb
 - lib/rubysketch.rb