rubysketch 0.2.4 → 0.3.1

data/lib/rubysketch/window.rb

@@ -3,8 +3,9 @@ module RubySketch
 
   class Window < Reflex::Window
 
-    attr_accessor :setup, :update, :draw, :key, :motion, :resize,
-      :pointer_down, :pointer_up, :pointer_move, :pointer_drag
+    attr_accessor :setup, :update, :draw, :before_draw, :after_draw, :resize,
+      :pointer_down, :pointer_up, :pointer_move, :pointer_drag,
+      :key, :motion
 
     attr_accessor :auto_resize
 
@@ -17,13 +18,11 @@ module RubySketch
 
       reset_canvas 1, 1
 
-      super *args, size: [width, height] do |_|
-        start &block if block
-      end
+      super *args, size: [width, height], &block
     end
 
     def start (&block)
-      @canvas_painter.paint do |_|
+      draw_canvas do
         block.call if block
         on_setup
       end
@@ -43,14 +42,12 @@ module RubySketch
     end
 
     def on_draw (e)
-      @canvas_painter.paint do |painter|
-        call_block @draw, e, painter
-      end
+      draw_canvas {call_block @draw, e} if @draw
       e.painter.image @canvas
     end
 
     def on_key (e)
-      call_block @key, e
+      draw_canvas {call_block @key, e} if @key
     end
 
     def on_pointer (e)
@@ -59,16 +56,16 @@ module RubySketch
         when :up   then @pointer_up
         when :move then e.drag? ? @pointer_drag : @pointer_move
       end
-      call_block block, e if block
+      draw_canvas {call_block block, e} if block
     end
 
     def on_motion (e)
-      call_block @motion, e
+      draw_canvas {call_block @motion, e} if @motion
     end
 
     def on_resize (e)
       reset_canvas e.width, e.height if @auto_resize
-      call_block @resize, e
+      draw_canvas {call_block @resize, e} if @resize
     end
 
     private
@@ -80,7 +77,7 @@ module RubySketch
       old_canvas  = @canvas
       old_painter = @canvas_painter
 
-      cs              = old_canvas&.color_space || Rays::ColorSpace::RGBA
+      cs              = old_canvas&.color_space || Rays::RGBA
       @canvas         = Rays::Image.new width, height, cs, painter.pixel_density
       @canvas_painter = @canvas.painter
 
@@ -94,9 +91,29 @@ module RubySketch
       to.fill         = from.fill
       to.stroke       = from.stroke
       to.stroke_width = from.stroke_width
+      to.stroke_cap   = from.stroke_cap
+      to.stroke_join  = from.stroke_join
+      to.miter_limit  = from.miter_limit
       to.font         = from.font
     end
 
+    def draw_canvas (&block)
+      begin_draw
+      block.call
+    ensure
+      end_draw
+    end
+
+    def begin_draw ()
+      @canvas_painter.__send__ :begin_paint
+      @before_draw&.call
+    end
+
+    def end_draw ()
+      @after_draw&.call
+      @canvas_painter.__send__ :end_paint
+    end
+
     def call_block (block, event, *args)
       @events.push event
       block.call event, *args if block && !@error

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubysketch
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.3.1
 platform: ruby
 authors:
 - xordog
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-28 00:00:00.000000000 Z
+date: 2020-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yard
@@ -103,6 +103,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".yardopts"
+- ChangeLog.md
 - LICENSE
 - README.md
 - Rakefile
@@ -117,7 +118,6 @@ files:
 - lib/rubysketch/glsl.rb
 - lib/rubysketch/module.rb
 - lib/rubysketch/processing.rb
-- lib/rubysketch/starter.rb
 - lib/rubysketch/window.rb
 - rubysketch.gemspec
 homepage: https://github.com/xord/rubysketch

data/lib/rubysketch/starter.rb

@@ -1,67 +0,0 @@
-module RubySketch
-
-
-  extend module Functions
-
-    def start (context, start_at_exit: false, &block)
-      window = Window.new do
-        context.instance_eval &block if block
-      end
-
-      context.on_start__ window
-
-      start = proc do
-        Reflex.start {window.show}
-      end
-
-      if start_at_exit
-        at_exit {start.call unless $!}
-      else
-        start.call
-      end
-
-      window
-    end
-
-    private
-
-    def start_on_object_at_exit (object, context)
-      klass   = context.class
-      methods = klass.instance_methods(false)
-        .reject {|name| name =~ /__$/}
-      consts  = klass.constants
-        .reject {|name| name =~ /__$/}
-        .each_with_object({}) {|name, h| h[name] = klass.const_get name}
-
-      object.class.class_eval do
-        methods.each do |name|
-          define_method name do |*args, &block|
-            context.__send__ name, *args, &block
-          end
-        end
-        consts.each do |(name, value)|
-          const_set name, value
-        end
-      end
-
-      window = start context, start_at_exit: true
-
-      window.canvas_painter.__send__ :begin_paint
-      at_exit {window.canvas_painter.__send__ :end_paint}
-    end
-
-    self
-
-  end# Functions
-
-
-  module Starter
-
-    def start (*args, &block)
-      RubySketch.start self.new(*args), start_at_exit: true, &block
-    end
-
-  end# Starter
-
-
-end# RubySketch