rubysketch 0.2.0 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c2d5e6b27dba3d165c946db3fc7cbe09630be01a5dd86238433e6e3b7126138
-  data.tar.gz: b0565c883e6821f133d64428507fc7d39eaf06f5a11fb634a1a205b25856d77b
+  metadata.gz: aeebec01d05ee86260f24da80e85d4ac04bb41029145d8d47e7acc800919e00d
+  data.tar.gz: d227536ed72e88ef159c347c8ace10ff20532d52cbeb4588956f0c6e794283d7
 SHA512:
-  metadata.gz: 63553c43e5fd2433e7b395aae2b57415b9cc7091a8cbe07934fddede1569383161e73822f6614daa479dde3ef1606d33c545b067ceefbd66ce0c7133149f0ac1
-  data.tar.gz: be2980a7909244174e52f619ec1e80a77a85483501837e59a5ddea84652792b3718402d1ca9a1201058847770dca9a34e315fbdf58ec2033794bd6438100a12e
+  metadata.gz: 9e144994fd11251d589853d0c6439b2d9924a4e76751b6c6147ad1bc4ebb6081d720f1bca5a77b9c1e69228fb4ab87b4807d463db3ca565243a1261f098caed1
+  data.tar.gz: fd03275e8730519d1095d60f1dbbca5a33ddc93f2e412ff32548f22c678cbe614bdd42fd9166de7c8dac9370d698a95482c2f71575d8c6bdac581d57bd5722fb

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.5

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/processing.rb

@@ -294,7 +294,7 @@ module RubySketch
     end
 
     # @private
-    def setupDrawBlock__ ()
+    private def setupDrawBlock__ ()
       @window__.draw = proc do |e, painter|
         @painter__ = painter
         @matrixStack__.clear
@@ -323,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__
@@ -336,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__
@@ -349,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__
@@ -362,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__
@@ -375,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
@@ -487,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
@@ -499,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__]
@@ -514,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
 
@@ -537,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
 
@@ -578,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]
@@ -607,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
@@ -637,7 +637,7 @@ module RubySketch
     # @return [nil] nil
     #
     def fill (*args)
-      @painter__.fill(*to_rgba__(*args))
+      @painter__.fill(*toRGBA__(*args))
       nil
     end
 
@@ -660,7 +660,7 @@ module RubySketch
     # @return [nil] nil
     #
     def stroke (*args)
-      @painter__.stroke(*to_rgba__(*args))
+      @painter__.stroke(*toRGBA__(*args))
       nil
     end
 
@@ -763,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]
@@ -783,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
@@ -812,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
@@ -881,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
@@ -916,7 +936,7 @@ module RubySketch
     # @return [nil] nil
     #
     def rotate (angle)
-      @painter__.rotate to_angle__ angle
+      @painter__.rotate toAngle__ angle
       nil
     end
 
@@ -934,7 +954,7 @@ module RubySketch
     # @return [nil] nil
     #
     def popMatrix ()
-      raise "Matrix stack underflow" if @matrixStack__.empty?
+      raise "matrix stack underflow" if @matrixStack__.empty?
       @painter__.matrix = @matrixStack__.pop
       nil
     end
@@ -972,7 +992,7 @@ module RubySketch
     # @return [nil] nil
     #
     def popStyle ()
-      raise "Style stack underflow" if @styleStack__.empty?
+      raise "style stack underflow" if @styleStack__.empty?
       @painter__.fill,
       @painter__.stroke,
       @painter__.stroke_width,
@@ -1007,19 +1027,97 @@ 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
+
+    # Loads image.
+    #
+    # @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
+
+    # @private
+    private def getImage__ (uri, ext)
+      ext ||= File.extname uri
+      raise "unsupported image type -- #{ext}" 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?
+        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
 
   end# Processing
 
 
+  # 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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubysketch
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.5
 platform: ruby
 authors:
 - xordog
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-05 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