rubysketch 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f63f771b469d060307fa88a2992cc373c2439cec8facf531984533303f0a023
-  data.tar.gz: 5787db4cf63408b746fb538a6a612c2b90f440e08c1ded38b382b69200d372c9
+  metadata.gz: 83aecf951db1320693714768446ccc95aa0a87f23012e02fff31b032c88be3c6
+  data.tar.gz: 6d1f67cbe65c15468cb606666acceacf19f56bf8c83dd1abae2a1b21d7daf94b
 SHA512:
-  metadata.gz: 1bcb9bfe5d0f1732c7e44a509d8c5e83b5b84f28bb988fe3e4d9083cb342b6fc4cb44df48c0f176a18599cfd334583e808db41dadb377ac5c78436ed55533c29
-  data.tar.gz: ac78631d29b3843a32f376b7330011477523e33f40b1adb5d40dc1a66335bc294fdf91720146194b016497e4444b9531dbdc9529723c936c939c518df343c671
+  metadata.gz: 9946ba3029ce56a90042daa9be9e6c2f74f5d7ef7d318b5263b10c03ca35c26f5f7e67c61e6f78bd90f4224c267f732dcb937d86030adbe2b0ac51350a225f6e
+  data.tar.gz: 627eb17aa1e83da474f9ab9457b449b278ecf95d84956f98b82d3185c6bc87fa9b5788ad65c1144f80364171b14a4f7322d86a42066925ccbca8f2e19ff46cc3

data/ChangeLog.md

@@ -1,6 +1,14 @@
 # RubySketch ChangeLog
 
 
+## [0.3.2] - 2020-07-22
+
+- text() draws to the baseline by default
+- add textWidth(), textAscent(), textDescent() and textAlign()
+- change initial color for fill() and stroke()
+- change initial background color to grayscale 0.8
+
+
 ## [0.3.1] - 2020-07-17
 
 - add touchStarted(), touchEnded(), touchMoved() and touches()

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.3.2

data/lib/rubysketch/processing.rb

@@ -211,7 +211,7 @@ module RubySketch
       #
       CORNERS = :CORNERS
 
-      # Mode for rectMode(), ellipseMode() and imageMode().
+      # Mode for rectMode(), ellipseMode(), imageMode() and textAlign().
       #
       CENTER  = :CENTER
 
@@ -219,6 +219,21 @@ module RubySketch
       #
       RADIUS  = :RADIUS
 
+      # Mode for textAlign().
+      LEFT     = :LEFT
+
+      # Mode for textAlign().
+      RIGHT    = :RIGHT
+
+      # Mode for textAlign().
+      TOP      = :TOP
+
+      # Mode for textAlign().
+      BOTTOM   = :BOTTOM
+
+      # Mode for textAlign().
+      BASELINE = :BASELINE
+
       # Mode for strokeCap().
       #
       BUTT   = :butt
@@ -235,7 +250,10 @@ module RubySketch
       #
       SQUARE = :square
 
-      def setup__ ()
+      def setup__ (painter)
+        @painter__             = painter
+        @painter__.miter_limit = 10
+
         @drawing       = false
         @hsbColor__    = false
         @colorMaxes__  = [1.0] * 4
@@ -243,6 +261,8 @@ module RubySketch
         @rectMode__    = nil
         @ellipseMode__ = nil
         @imageMode__   = nil
+        @textAlignH__  = nil
+        @textAlignV__  = nil
         @matrixStack__ = []
         @styleStack__  = []
 
@@ -251,6 +271,10 @@ module RubySketch
         rectMode    CORNER
         ellipseMode CENTER
         imageMode   CORNER
+        textAlign   LEFT
+
+        fill 255
+        stroke 0
       end
 
       def beginDraw ()
@@ -288,10 +312,11 @@ module RubySketch
       # @return [nil] nil
       #
       def colorMode (mode, *maxes)
+        mode = mode.upcase.to_sym
         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
+        @hsbColor__ = mode == HSB
         case maxes.size
         when 1    then @colorMaxes__                 = [maxes.first.to_f] * 4
         when 3, 4 then @colorMaxes__[0...maxes.size] = maxes.map &:to_f
@@ -335,7 +360,7 @@ module RubySketch
       # @return [nil] nil
       #
       def angleMode (mode)
-        @angleScale__ = case mode
+        @angleScale__ = case mode.upcase.to_sym
           when RADIANS then Utility::RAD2DEG__
           when DEGREES then 1.0
           else raise ArgumentError, "invalid angle mode: #{mode}"
@@ -523,6 +548,23 @@ module RubySketch
         nil
       end
 
+      def textWidth (str)
+        @painter__.font.width str
+      end
+
+      def textAscent ()
+        @painter__.font.ascent
+      end
+
+      def textDescent ()
+        @painter__.font.descent
+      end
+
+      def textAlign (horizontal, vertical = BASELINE)
+        @textAlignH__ = horizontal
+        @textAlignV__ = vertical
+      end
+
       # @private
       def setFont__ (name, size)
         size = 256 if size && size > 256
@@ -758,15 +800,35 @@ module RubySketch
       #
       # @overload text(str)
       # @overload text(str, x, y)
+      # @overload text(str, a, b, c, d)
       #
       # @param str [String]  text to draw
       # @param x   [Numeric] horizontal position of the text
       # @param y   [Numeric] vertical position of the text
+      # @param a   [Numeric] equivalent to parameters of the rect(), see rectMode()
+      # @param b   [Numeric] equivalent to parameters of the rect(), see rectMode()
+      # @param c   [Numeric] equivalent to parameters of the rect(), see rectMode()
+      # @param d   [Numeric] equivalent to parameters of the rect(), see rectMode()
       #
       # @return [nil] nil
       #
-      def text (str, x, y)
+      def text (str, x, y, x2 = nil, y2 = nil)
         assertDrawing__
+        if x2
+          raise ArgumentError, "missing y2 parameter" unless y2
+          x, y, w, h = toXYWH__ @rectMode__, x, y, x2, y2
+          case @textAlignH__
+          when RIGHT  then x +=  w - @painter__.font.width(str)
+          when CENTER then x += (w - @painter__.font.width(str)) / 2
+          end
+          case @textAlignV__
+          when BOTTOM then y +=  h - @painter__.font.height
+          when CENTER then y += (h - @painter__.font.height) / 2
+          else
+          end
+        else
+          y -= @painter__.font.ascent
+        end
         @painter__.text str, x, y
         nil
       end
@@ -982,9 +1044,8 @@ module RubySketch
       include GraphicsContext
 
       def initialize (width, height)
-        setup__
-        @image__   = Rays::Image.new width, height
-        @painter__ = @image__.painter
+        @image__ = Rays::Image.new width, height
+        setup__ @image__.painter
       end
 
       def beginDraw ()
@@ -1288,7 +1349,10 @@ module RubySketch
 
       # @private
       def setup__ (window)
-        super()
+        @window__ = window
+        @image__  = @window__.canvas
+        super @window__.canvas_painter.paint {background 0.8}
+
         @loop__         = true
         @redraw__       = false
         @frameCount__   = 0
@@ -1297,12 +1361,6 @@ module RubySketch
         @mousePressed__ = false
         @touches__      = []
 
-        @window__  = window
-        @image__   = @window__.canvas
-        @painter__ = @window__.canvas_painter
-
-        @painter__.miter_limit = 10
-
         @window__.before_draw = proc {beginDraw}
         @window__.after_draw  = proc {endDraw}
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubysketch
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - xordog
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-16 00:00:00.000000000 Z
+date: 2020-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yard