rubysketch 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 31a6c8685fd803f34636e81ee5098dfda6c2d82ab500952662e5b77c30601c09
-  data.tar.gz: e4f22f4dbf9d01a0cc4f5f084648698ae42c0a1eddf582c0848849b194ac5933
+  metadata.gz: a700236b7d7c181b106c69193116f9c510025848f07c1bf23f21a034d75fa068
+  data.tar.gz: b881bfe8d43d923e48d6554a8a6af8e8f125831edab7fbb8551cbee7f314a7ab
 SHA512:
-  metadata.gz: 5df3c266fb39715d6c83cda24268e48f27e922292398cda0f3c84412089fe88bc0a08a6373cd4b97faf342b64a79b3c7d7343794081522c7ae4894e8d7cefdc9
-  data.tar.gz: 2c182badae8ae8f471647a2fc8289e7151730985de955b54d29f51c04ed8ee242ea89c274303e2f9d5b4d6189186b7ea635bc464d3ece7af5329124729f5c999
+  metadata.gz: 5dba04b623e671f1247dc0a8d27b60f8f024fd82d37f03da2a59e82040430c1f3645295e5debac488315faf0a57031e44eab5c0d93214faf30b2c7c75bffcba9
+  data.tar.gz: 4766c0a47804872d2aa9fa1119065df62c9b53254521697502a22340630f728bf47483f0bf6f9bf22c3d162e7865050db47bb261a49f7ee9e5c529a2c678c58c

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/examples/clock.rb

@@ -0,0 +1,66 @@
+%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'
+
+COLORS = %w[ #F99292 #FFBC61 #FFC679 #FFF4E0 ]
+
+def now ()
+  Time.now.to_f
+end
+
+start = now
+
+setup do
+  colorMode RGB, 1
+  angleMode DEGREES
+end
+
+draw do
+  background 0
+
+  begin
+    pushMatrix
+    translate width / 2, height / 2
+
+    begin
+      pushMatrix
+      fill COLORS[0]
+      ellipse 0, 0, 20, 20
+      rotate (now - start) / 60.0 * 360
+      stroke COLORS[0]
+      strokeWeight 5
+      line 0, 0, 200, 0
+      fill 1
+      popMatrix
+    end
+
+    begin
+      pushMatrix
+      strokeWeight 3
+      60.times do
+        rotate 6
+        stroke COLORS[1]
+        line 200, 0, 210, 0
+      end
+      popMatrix
+    end
+
+    begin
+      pushMatrix
+      strokeWeight 5
+      12.times do
+        rotate 30
+        stroke COLORS[3]
+        line 190, 0, 210, 0
+      end
+      popMatrix
+    end
+
+    popMatrix
+  end
+
+  textSize 20
+  text "#{frameRate.to_i} FPS", 10, 10
+end

data/examples/shapes.rb

@@ -0,0 +1,121 @@
+%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'
+
+
+setup do
+  colorMode RGB, 1
+  angleMode DEGREES
+end
+
+draw do
+  background 0
+
+  fill 1
+  stroke 1, 0.5, 0.2
+
+  translate 10, 10
+
+  push()
+
+  text 'point', 0, 0
+  point 0, 30
+
+  translate 0, 100
+
+  text 'point with strokeWeight', 0, 0
+  strokeWeight 10
+  point 0, 30
+  strokeWeight 0
+
+  translate 0, 100
+
+  text 'line', 0, 0
+  line 0, 30, 100, 50
+
+  translate 0, 100
+
+  text 'line with strokeWeight (very slow)', 0, 0
+  strokeWeight 10
+  line 0, 30, 100, 50
+  strokeWeight 1
+
+  translate 0, 100
+
+  text 'rect with rectMode(CORNER)', 0, 0
+  rectMode CORNER
+  rect 20, 30, 100, 50
+
+  translate 0, 100
+
+  text 'rect with rectMode(CORNERS)', 0, 0
+  rectMode CORNERS
+  rect 20, 30, 120, 80
+
+  translate 0, 100
+
+  text 'rect with rectMode(CENTER)', 0, 0
+  rectMode CENTER
+  rect 70, 55, 100, 50
+
+  translate 0, 100
+
+  text 'rect with rectMode(RADIUS)', 0, 0
+  rectMode RADIUS
+  rect 70, 55, 50, 25
+
+  pop
+  translate 200, 0
+  push
+
+  text 'circle', 0, 0
+  circle 70, 55, 25
+
+  translate 0, 100
+
+  text 'arc', 0, 0
+  arc 70, 55, 100, 50, 45, 270
+
+  translate 0, 100
+
+  text 'square', 0, 0
+  square 20, 30, 50
+
+  translate 0, 100
+
+  text 'triangle', 0, 0
+  triangle 70, 30, 120, 80, 20, 80
+
+  translate 0, 100
+
+  text 'quad', 0, 0
+  quad 20, 30, 120, 30, 150, 80, 50, 80
+
+  translate 0, 100
+
+  text 'ellipse with ellipseMode(CORNER)', 0, 0
+  ellipseMode CORNER
+  ellipse 20, 30, 100, 50
+
+  translate 0, 100
+
+  text 'ellipse with ellipseMode(CORNERS)', 0, 0
+  ellipseMode CORNERS
+  ellipse 20, 30, 120, 80
+
+  translate 0, 100
+
+  text 'ellipse with ellipseMode(CENTER)', 0, 0
+  ellipseMode CENTER
+  ellipse 70, 55, 100, 50
+
+  translate 0, 100
+
+  text 'ellipse with ellipseMode(RADIUS)', 0, 0
+  ellipseMode RADIUS
+  ellipse 70, 55, 50, 25
+
+  pop
+end

data/lib/rubysketch/processing.rb

@@ -30,6 +30,11 @@ module RubySketch
     #
     DEGREES = :DEGREES
 
+    CORNER  = :CORNER
+    CORNERS = :CORNERS
+    CENTER  = :CENTER
+    RADIUS  = :RADIUS
+
     # @private
     DEG2RAD__ = PI / 180.0
 
@@ -42,14 +47,17 @@ module RubySketch
       @hsbColor__     = false
       @colorMaxes__   = [1.0] * 4
       @angleScale__   = 1.0
+      @styleStack     = []
       @mouseX__       =
       @mouseY__       =
       @mousePrevX__   =
       @mousePrevY__   = 0
       @mousePressed__ = false
 
-      colorMode RGB, 255
-      angleMode RADIANS
+      colorMode   RGB, 255
+      angleMode   RADIANS
+      rectMode    CORNER
+      ellipseMode CENTER
     end
 
     # @private
@@ -277,6 +285,8 @@ module RubySketch
       radian * RAD2DEG__
     end
 
+    # Define setup block.
+    #
     def setup (&block)
       @window__.setup = block
       nil
@@ -286,12 +296,16 @@ module RubySketch
     def setupDrawBlock__ ()
       @window__.draw = proc do |e, painter|
         @painter__ = painter
+        pushStyle
         @drawBlock__.call e if @drawBlock__
+        popStyle
         @frameCount__ += 1
         updateMousePrevPos__
       end
     end
 
+    # Define draw block.
+    #
     def draw (&block)
       @drawBlock__ = block if block
       nil
@@ -483,7 +497,7 @@ module RubySketch
       a, b, c, d = args
       return parse_color__(a, b || alphaMax__) if a.kind_of?(String)
 
-      rgba  = case args.size
+      rgba = case args.size
         when 1, 2 then [a, a, a, b || alphaMax__]
         when 3, 4 then [a, b, c, d || alphaMax__]
         else raise ArgumentError
@@ -519,6 +533,7 @@ module RubySketch
         when DEGREES then 1.0
         else raise ArgumentError, "Invalid angle mode: #{mode}"
       end
+      nil
     end
 
     # @private
@@ -526,6 +541,47 @@ module RubySketch
       angle * @angleScale__
     end
 
+    # Sets rect mode. Default is CORNER.
+    #
+    # CORNER  -> rect(left, top, width, height)
+    # CORNERS -> rect(left, top, right, bottom)
+    # CENTER  -> rect(center_x, center_y, width, height)
+    # RADIUS  -> rect(center_x, center_y, radius_h, radius_v)
+    #
+    # @param mode [CORNER, CORNERS, CENTER, RADIUS]
+    #
+    # @return [nil] nil
+    #
+    def rectMode (mode)
+      @rectMode__ = mode
+    end
+
+    # Sets ellipse mode. Default is CENTER.
+    #
+    # CORNER  -> ellipse(left, top, width, height)
+    # CORNERS -> ellipse(left, top, right, bottom)
+    # CENTER  -> ellipse(center_x, center_y, width, height)
+    # RADIUS  -> ellipse(center_x, center_y, radius_h, radius_v)
+    #
+    # @param mode [CORNER, CORNERS, CENTER, RADIUS]
+    #
+    # @return [nil] nil
+    #
+    def ellipseMode (mode)
+      @ellipseMode__ = mode
+    end
+
+    # @private
+    def to_xywh__ (mode, a, b, c, d)
+      case mode
+      when CORNER  then [a,           b,           c,     d]
+      when CORNERS then [a,           b,           c - a, d - b]
+      when CENTER  then [a - c / 2.0, b - d / 2.0, c,     d]
+      when RADIUS  then [a - c,       b - d,       c * 2, d * 2]
+      else raise ArgumentError # ToDo: refine error message
+      end
+    end
+
     # Clears screen.
     #
     # @overload background(str)
@@ -545,7 +601,16 @@ module RubySketch
     # @return [nil] nil
     #
     def background (*args)
-      @painter__.background(*to_rgba__(*args))
+      rgba = to_rgba__ *args
+      if rgba[3] == 1
+        @painter__.background *rgba
+      else
+        f = @painter__.fill *rgba
+        s = @painter__.stroke nil
+        @painter__.rect 0, 0, width, height
+        @painter__.fill   f
+        @painter__.stroke s
+      end
       nil
     end
 
@@ -647,6 +712,20 @@ module RubySketch
       nil
     end
 
+    # Draws a point.
+    #
+    # @param x [Numeric] horizontal position
+    # @param y [Numeric] vertical position
+    #
+    # @return [nil] nil
+    #
+    def point (x, y)
+      w = @painter__.stroke_width
+      w = 1 if w == 0
+      @painter__.ellipse x - (w / 2.0), y - (w / 2.0), w, w
+      nil
+    end
+
     # Draws a line.
     #
     # @param x1 [Numeric] horizontal position for first point
@@ -663,14 +742,14 @@ module RubySketch
 
     # Draws a rectangle.
     #
-    # @overload rect(x, y, w, h)
-    # @overload rect(x, y, w, h, r)
-    # @overload rect(x, y, w, h, tl, tr, br, bl)
+    # @overload rect(a, b, c, d)
+    # @overload rect(a, b, c, d, r)
+    # @overload rect(a, b, c, d, tl, tr, br, bl)
     #
-    # @param x  [Numeric] horizontal position
-    # @param y  [Numeric] vertical position
-    # @param w  [Numeric] width of the shape
-    # @param h  [Numeric] height of the shape
+    # @param a  [Numeric] horizontal position of the shape by default
+    # @param b  [Numeric] vertical position of the shape by default
+    # @param c  [Numeric] width of the shape by default
+    # @param d  [Numeric] height of the shape by default
     # @param r  [Numeric] radius for all corners
     # @param tl [Numeric] radius for top-left corner
     # @param tr [Numeric] radius for top-right corner
@@ -679,7 +758,8 @@ module RubySketch
     #
     # @return [nil] nil
     #
-    def rect (x, y, w, h, *args)
+    def rect (a, b, c, d, *args)
+      x, y, w, h = to_xywh__ @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]
@@ -689,24 +769,25 @@ module RubySketch
       nil
     end
 
-    # Draws a ellipse.
+    # Draws an ellipse.
     #
-    # @param x [Numeric] horizontal position
-    # @param y [Numeric] vertical position
-    # @param w [Numeric] width of the shape
-    # @param h [Numeric] height of the shape
+    # @param a [Numeric] horizontal position of the shape
+    # @param b [Numeric] vertical position of the shape
+    # @param c [Numeric] width of the shape
+    # @param d [Numeric] height of the shape
     #
     # @return [nil] nil
     #
-    def ellipse (x, y, w, h = w)
-      @painter__.ellipse (x - w / 2.0), (y - h / 2.0), w, h
+    def ellipse (a, b, c, d)
+      x, y, w, h = to_xywh__ @ellipseMode__, a, b, c, d
+      @painter__.ellipse x, y, w, h
       nil
     end
 
     # Draws a circle.
     #
-    # @param x      [Numeric] horizontal position
-    # @param y      [Numeric] vertical position
+    # @param x      [Numeric] horizontal position of the shape
+    # @param y      [Numeric] vertical position of the shape
     # @param extent [Numeric] width and height of the shape
     #
     # @return [nil] nil
@@ -717,31 +798,66 @@ module RubySketch
 
     # Draws an arc.
     #
-    # @param x     [Numeric] horizontal position
-    # @param y     [Numeric] vertical position
-    # @param w     [Numeric] width of the shape
-    # @param h     [Numeric] height of the shape
+    # @param a     [Numeric] horizontal position of the shape
+    # @param b     [Numeric] vertical position of the shape
+    # @param c     [Numeric] width of the shape
+    # @param d     [Numeric] height of the shape
     # @param start [Numeric] angle to start the arc
     # @param stop  [Numeric] angle to stop the arc
     #
     # @return [nil] nil
     #
-    def arc (x, y, w, h, start, stop)
-      start = to_angle__ start
-      stop  = to_angle__ stop
-      @painter__.ellipse x - w / 2, y - h / 2, w, h, from: start, to: stop
+    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
+      @painter__.ellipse x, y, w, h, from: start, to: stop
       nil
     end
 
-    # Draws a point.
+    # Draws a square.
     #
-    # @param x [Numeric] horizontal position
-    # @param y [Numeric] vertical position
+    # @param x      [Numeric] horizontal position of the shape
+    # @param y      [Numeric] vertical position of the shape
+    # @param extent [Numeric] width and height of the shape
     #
     # @return [nil] nil
     #
-    def point (x, y)
-      @painter__.rect x - 0.5, y - 0.5, 1, 1
+    def square (x, y, extent)
+      rect x, y, extent, extent
+    end
+
+    # Draws a triangle.
+    #
+    # @param x1 [Numeric] horizontal position of first point
+    # @param y1 [Numeric] vertical position of first point
+    # @param x2 [Numeric] horizontal position of second point
+    # @param y2 [Numeric] vertical position of second point
+    # @param x3 [Numeric] horizontal position of third point
+    # @param y3 [Numeric] vertical position of third point
+    #
+    # @return [nil] nil
+    #
+    def triangle (x1, y1, x2, y2, x3, y3)
+      @painter__.line x1, y1, x2, y2, x3, y3, loop: true
+      nil
+    end
+
+    # Draws a quad.
+    #
+    # @param x1 [Numeric] horizontal position of first point
+    # @param y1 [Numeric] vertical position of first point
+    # @param x2 [Numeric] horizontal position of second point
+    # @param y2 [Numeric] vertical position of second point
+    # @param x3 [Numeric] horizontal position of third point
+    # @param y3 [Numeric] vertical position of third point
+    # @param x4 [Numeric] horizontal position of fourth point
+    # @param y4 [Numeric] vertical position of fourth point
+    #
+    # @return [nil] nil
+    #
+    def quad (x1, y1, x2, y2, x3, y3, x4, y4)
+      @painter__.line x1, y1, x2, y2, x3, y3, x4, y4, loop: true
       nil
     end
 
@@ -751,12 +867,12 @@ module RubySketch
     # @overload text(str, x, y)
     #
     # @param str [String]  text to draw
-    # @param x   [Numeric] horizontal position
-    # @param y   [Numeric] vertical position
+    # @param x   [Numeric] horizontal position of the text
+    # @param y   [Numeric] vertical position of the text
     #
     # @return [nil] nil
     #
-    def text (str, x = 0, y = 0)
+    def text (str, x, y)
       @painter__.text str, x, y
       nil
     end
@@ -827,6 +943,51 @@ module RubySketch
       nil
     end
 
+    # Save current style values to the style stack.
+    #
+    # @return [nil] nil
+    #
+    def pushStyle ()
+      @painter__.push_state
+      @styleStack.push [
+        @hsbColor__,
+        @colorMaxes__,
+        @angleScale__,
+        @rectMode__,
+        @ellipseMode__
+      ]
+      nil
+    end
+
+    # Restore style values from the style stack.
+    #
+    # @return [nil] nil
+    #
+    def popStyle ()
+      @painter__.pop_state
+      @hsbColor__, @colorMaxes__, @angleScale__, @rectMode__, @ellipseMode__ =
+        @styleStack.pop
+      nil
+    end
+
+    # Save current styles and transformations to stack.
+    #
+    # @return [nil] nil
+    #
+    def push ()
+      pushMatrix
+      pushStyle
+    end
+
+    # Restore styles and transformations from stack.
+    #
+    # @return [nil] nil
+    #
+    def pop ()
+      popMatrix
+      popStyle
+    end
+
     # Returns the perlin noise value.
     #
     # @overload noise(x)

data/lib/rubysketch/window.rb

@@ -100,7 +100,7 @@ module RubySketch
     def call_block (block, event, *args)
       @events.push event
       block.call event, *args if block && !@error
-    rescue => e
+    rescue Exception => e
       @error = e
       $stderr.puts e.full_message
     ensure

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubysketch
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - xordog
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-12 00:00:00.000000000 Z
+date: 2020-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yard
@@ -107,8 +107,10 @@ files:
 - README.md
 - Rakefile
 - VERSION
+- examples/clock.rb
 - examples/glsl.rb
 - examples/hello.rb
+- examples/shapes.rb
 - lib/rubysketch-processing.rb
 - lib/rubysketch.rb
 - lib/rubysketch/glsl.rb