rubysketch 0.1.5 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ab78b7cd8bbbeedb31234160054509bd9c55de56bce0f7a9251f75fbe60d22b
-  data.tar.gz: 555fff0c98f8d55cc71fcc6923a63ffa521a591a169abd2a8b71901e8dd7401c
+  metadata.gz: 8c2d5e6b27dba3d165c946db3fc7cbe09630be01a5dd86238433e6e3b7126138
+  data.tar.gz: b0565c883e6821f133d64428507fc7d39eaf06f5a11fb634a1a205b25856d77b
 SHA512:
-  metadata.gz: 0a7d3a9f9b3b229eae77484d7a9b59813fee6eb5f8225264e515f5dd131914c642fa9fcf1a3eb28839a65f395b24afe1c7acefc46a36e877fd3babc6fd9c6d6e
-  data.tar.gz: e7239c1aa04a9ee8ecec79df21efd4c9dbc5004c7814b58a35799abb33ce253f10279a5c899a6442ec3a7553956c13497e452f2da36ad50ad20265f0d1ac7bf5
+  metadata.gz: 63553c43e5fd2433e7b395aae2b57415b9cc7091a8cbe07934fddede1569383161e73822f6614daa479dde3ef1606d33c545b067ceefbd66ce0c7133149f0ac1
+  data.tar.gz: be2980a7909244174e52f619ec1e80a77a85483501837e59a5ddea84652792b3718402d1ca9a1201058847770dca9a34e315fbdf58ec2033794bd6438100a12e

data/VERSION

@@ -1 +1 @@
-0.1.5
+0.2.0

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__   =
@@ -296,9 +297,14 @@ module RubySketch
     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
@@ -919,7 +925,7 @@ module RubySketch
     # @return [nil] nil
     #
     def pushMatrix ()
-      @painter__.push_matrix
+      @matrixStack__.push @painter__.matrix
       nil
     end
 
@@ -928,7 +934,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 +953,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 +972,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
 
@@ -1000,75 +1017,74 @@ module RubySketch
       Rays.perlin(x, y) / 2.0 + 1.0
     end
 
-    # Font object.
+  end# Processing
+
+
+  # Font object.
+  #
+  class Processing::Font
+
+    # Initialize font.
+    #
+    # @private
     #
-    class Font
+    def initialize (font)
+      @font = font
+    end
 
-      # 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
 
-      # 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
 
-      # 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
+  # Bounding box for text.
+  #
+  class Processing::TextBounds
+
+    # Horizontal position
+    #
+    attr_reader :x
+
+    # Vertical position
+    #
+    attr_reader :y
 
-    end# Font
+    # Width of bounding box
+    #
+    attr_reader :w
 
-  end# Processing1
+    # 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.0
 platform: ruby
 authors:
 - xordog
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-18 00:00:00.000000000 Z
+date: 2020-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yard