reflexion 0.1.12 → 0.1.13

data/lib/reflex/timer.rb

@@ -0,0 +1,30 @@
+# -*- coding: utf-8 -*-
+
+
+require 'forwardable'
+require 'reflex/ext'
+
+
+module Reflex
+
+
+  class Timer
+
+    attr_accessor :block
+
+    alias view owner
+
+    def inspect ()
+      "#<Reflex::Timer owner:#{owner} id:#{id} interval:#{interval} count:#{count}>"
+    end
+
+    private
+
+      def call_timer_block ()
+        @block.call self if @block
+      end
+
+  end# Timer
+
+
+end# Reflex

data/lib/reflex/timer_event.rb

@@ -0,0 +1,29 @@
+# -*- coding: utf-8 -*-
+
+
+require 'forwardable'
+require 'reflex/ext'
+
+
+module Reflex
+
+
+  class TimerEvent < Event
+
+    extend Forwardable
+
+    def_delegators :timer,
+      :name=, :name,
+      :add_tag, :remove_tag, :each_tag,
+      :selector=, :selector
+
+    alias view owner
+
+    def inspect ()
+      "#<Reflex::TimerEvent owner:#{owner} id:#{id} interval:#{interval} count:#{count}>"
+    end
+
+  end# TimerEvent
+
+
+end# Reflex

data/lib/reflex/update_event.rb

@@ -7,7 +7,7 @@ require 'reflex/ext'
 module Reflex
 
 
-  class UpdateEvent
+  class UpdateEvent < Event
 
     def inspect ()
       "#<Reflex::UpdateEvent dt:#{dt}>"

data/lib/reflex/view.rb

@@ -3,10 +3,13 @@
 
 require 'forwardable'
 require 'xot/setter'
+require 'xot/bit_flag_accessor'
+require 'xot/universal_accessor'
 require 'xot/block_util'
 require 'reflex/ext'
+require 'reflex/selector'
+require 'reflex/style'
 require 'reflex/model_view'
-require 'reflex/flags'
 require 'reflex/helper'
 
 
@@ -22,24 +25,61 @@ module Reflex
 
     extend Forwardable
 
-    def_delegators :body,
-      :static=, :static?, :dynamic=, :dynamic?,
-      :velocity=, :linear_velocity=, :angular_velocity=,
-      :velocity,  :linear_velocity,  :angular_velocity,
-      :apply_force, :apply_torque, :apply_impulse,
-      :apply_linear_impulse, :apply_angular_impulse,
-      :density=, :density, :friction=, :friction, :restitution=, :restitution,
-      :gravity_scale=, :gravity_scale
-
-    alias add    add_child
-    alias remove remove_child
-    alias find   find_children
-    alias meter meter2pixel
+    def_delegators :style,
+      :flow=,                    :flow,
+      :foreground_fill=,         :foreground_fill,
+      :foreground_stroke=,       :foreground_stroke,
+      :foreground_stroke_width=, :foreground_stroke_width,
+      :background_fill=,         :background_fill,
+      :background_stroke=,       :background_stroke,
+      :background_stroke_width=, :background_stroke_width,
+      :foreground=,              :foreground,
+      :background=,              :background,
+      :fore_fill=,               :fore_fill,
+      :fore_stroke=,             :fore_stroke,
+      :fore_stroke_width=,       :fore_stroke_width,
+      :back_fill=,               :back_fill,
+      :back_stroke=,             :back_stroke,
+      :back_stroke_width=,       :back_stroke_width,
+      :fore=,                    :fore,
+      :back=,                    :back,
+      :fill=,                    :fill,
+      :stroke=,                  :stroke,
+      :stroke_width=,            :stroke_width,
+      :image=,                   :image
+
+    bit_flag_accessor :capture do
+      flag :key,     CAPTURE_KEY
+      flag :pointer, CAPTURE_POINTER
+      flag :all,     CAPTURE_ALL
+    end
 
-    def initialize (opts = {}, &block)
+    def initialize (options = nil, &block)
       super()
-      set opts
-      @attach_block = block if block
+      set options if options
+      Xot::BlockUtil.instance_eval_or_block_call self, &block if block
+    end
+
+    def timeout (seconds = 0, count: 1, &block)
+      timer = start_timer seconds, count
+      timer.block = block if block
+      timer
+    end
+
+    def interval (seconds = 0, &block)
+      timeout seconds, count: -1, &block
+    end
+
+    def delay (seconds = 0, &block)
+      timeout seconds, &block
+    end
+
+    def remove_self ()
+      parent.remove self if parent
+    end
+
+    def find_child (*args)
+      find_children(*args).first
     end
 
     def children ()
@@ -56,13 +96,28 @@ module Reflex
       s
     end
 
-    def capture= (*args)
-      set_capture CAPTURE_FLAG.symbols2bits(*args.flatten)
+    def shapes ()
+      to_enum :each_shape
+    end
+
+    def categories ()
+      @categories ||= Xot::BitFlag.new(auto: true, all: 1)
+    end
+
+    def category= (*symbols)
+      set_category_bits parent_categories.symbols2bits *symbols
+    end
+
+    def category ()
+      parent_categories.bits2symbols get_category_bits
     end
 
-    def capture (*args)
-      send :capture=, *args unless args.empty?
-      CAPTURE_FLAG.bits2symbols get_capture
+    def collision= (*categories)
+      set_collision_mask parent_categories.symbols2bits *categories
+    end
+
+    def collision ()
+      parent_categories.bits2symbols get_collision_mask
     end
 
     def capturing? (*args)
@@ -70,24 +125,64 @@ module Reflex
       args.all? {|type| cap.include? type}
     end
 
-    def gravity= (*args)
-      case arg = args[0]
-      when Point then set_gravity arg.x, arg.y
-      when Array then set_gravity arg[0], arg[1]
-      else            set_gravity *args
-      end
+    def on_contact (e)
+    end
+
+    def on_contact_begin (e)
     end
 
+    def on_contact_end (e)
+    end
+
+    universal_accessor :shape, :name, :selector, :frame, :angle, :zoom, :capture,
+      :density, :friction, :restitution, :category, :collision,
+      :linear_velocity, :angular_velocity, :gravity_scale,
+      :gravity, :time_scale,
+      clip:          {reader: :clip?},
+      cache:         {reader: :cache?},
+      resize_to_fit: {reader: :resize_to_fit?},
+      scroll_to_fit: {reader: :scroll_to_fit?},
+      static:        {reader: :static?},
+      dynamic:       {reader: :dynamic?},
+      sensor:        {reader: :sensor?},
+      debug:         {reader: :debug?}
+
+    alias add    add_child
+    alias remove remove_child
+    alias find   find_child
+
+    alias apply_impulse apply_linear_impulse
+    alias velocity=     linear_velocity=
+    alias velocity      linear_velocity
+
+    alias meter  meter2pixel
+
     def self.has_model ()
       include ModelView
     end
 
+    protected
+
+      def parent_categories ()
+        raise InvalidStateError unless parent
+        parent.categories
+      end
+
     private
 
-      def call_attach_block ()
-        return unless @attach_block
-        Xot::BlockUtil.instance_eval_or_block_call self, &@attach_block
-        @attach_block = nil
+      def on_contact! (*args)
+        call_contact! *args
+        delay {on_contact *args}# delay to avoid physics world lock
+      end
+
+      def on_contact_begin! (*args)
+        call_contact_begin! *args
+        delay {on_contact_begin *args}
+      end
+
+      def on_contact_end! (*args)
+        call_contact_end! *args
+        delay {on_contact_end *args}
       end
 
   end# View

data/lib/reflex/wheel_event.rb

@@ -7,7 +7,15 @@ require 'reflex/ext'
 module Reflex
 
 
-  class WheelEvent
+  class WheelEvent < Event
+
+    def position ()
+      Point.new x, y, z
+    end
+
+    def delta ()
+      Point.new dx, dy, dz
+    end
 
     def inspect ()
       "#<Reflex::WheelEvent dx:#{dx} dy:#{dy} dz:#{dz} x:#{x} y:#{y} z:#{z} mod:#{modifiers}>"

data/lib/reflex/window.rb

@@ -3,6 +3,7 @@
 
 require 'forwardable'
 require 'xot/setter'
+require 'xot/universal_accessor'
 require 'xot/block_util'
 require 'reflex/ext'
 require 'reflex/helper'
@@ -20,20 +21,39 @@ module Reflex
     extend Forwardable
 
     def_delegators :root,
-      :add_child, :remove_child, :find_children, :style, :styles,
-      :meter2pixel, :meter, :gravity=, :gravity, :wall, :debug=, :debug?
+      :timeout, :delay, :interval,
+      :add_child,     :add,
+      :remove_child,  :remove,
+      :find_child,    :find, :find_children,
+      :style, :styles, :scroll_to, :scroll_by, :scroll,
+      :meter2pixel, :meter, :wall,
+      :zoom=,              :zoom,
+      :clip=,              :clip,  :clip?,
+      :cache=,             :cache, :cache?,
+      :flow=,              :flow,
+      :fill=,              :fill,
+      :stroke=,            :stroke,
+      :foreground=,        :foreground,
+      :background=,        :background,
+      :foreground_fill=,   :foreground_fill,
+      :foreground_stroke=, :foreground_stroke,
+      :background_fill=,   :background_fill,
+      :background_stroke=, :background_stroke,
+      :image=,             :image,
+      :gravity=,           :gravity,
+      :time_scale=,        :time_scale,
+      :debug=,             :debug, :debug?
 
     def_delegators :wall,
-      :friction=, :friction, :restitution=, :restitution
+      :friction=,    :friction,
+      :restitution=, :restitution
 
-    alias add    add_child
-    alias remove remove_child
-    alias find   find_children
+    universal_accessor :title, :frame
 
-    def initialize (opts = {}, &block)
+    def initialize (options = nil, &block)
       super()
-      set opts
-      @show_block = block if block
+      set options if options
+      @show_block = block
     end
 
     def paint (&block)

data/lib/reflex.rb

@@ -8,8 +8,10 @@ require 'reflex/point'
 require 'reflex/bounds'
 require 'reflex/color'
 require 'reflex/color_space'
+require 'reflex/matrix'
+require 'reflex/polyline'
+require 'reflex/polygon'
 require 'reflex/bitmap'
-require 'reflex/texture'
 require 'reflex/image'
 require 'reflex/font'
 require 'reflex/shader'
@@ -21,6 +23,8 @@ require 'reflex/helper'
 require 'reflex/selector'
 require 'reflex/style'
 require 'reflex/style_length'
+require 'reflex/timer'
+require 'reflex/filter'
 
 require 'reflex/update_event'
 require 'reflex/draw_event'
@@ -31,10 +35,14 @@ require 'reflex/key_event'
 require 'reflex/pointer_event'
 require 'reflex/wheel_event'
 require 'reflex/capture_event'
+require 'reflex/timer_event'
 require 'reflex/contact_event'
 
-require 'reflex/body'
-require 'reflex/fixture'
+require 'reflex/shape'
+require 'reflex/polygon_shape'
+require 'reflex/line_shape'
+require 'reflex/rect_shape'
+require 'reflex/ellipse_shape'
 
 require 'reflex/model'
 require 'reflex/model_owner'
@@ -46,5 +54,3 @@ require 'reflex/view'
 require 'reflex/button'
 require 'reflex/text_view'
 require 'reflex/image_view'
-
-require 'reflex/shape_view'

data/lib/reflexion.rb

@@ -18,6 +18,23 @@ module Reflexion
   }
 
 
+  def call_event (event, *args, &block)
+    $event = event
+    Xot::BlockUtil.instance_eval_or_block_call *args, &block if block
+    $event = nil
+  end
+
+
+  class App < Application
+
+    def on_motion (e)
+      super
+      call_event e, e, &$motion
+    end
+
+  end# App
+
+
   class MainWindow < Window
 
     attr_reader :event
@@ -49,11 +66,6 @@ module Reflexion
       call_event e, e, &$pointer
     end
 
-    def call_event (event, *args, &block)
-      @event = event
-      Xot::BlockUtil.instance_eval_or_block_call *args, &block if block
-    end
-
   end# MainWindow
 
 
@@ -64,7 +76,7 @@ module Reflexion
   end
 
   def event ()
-    window.event
+    $event
   end
 
   def setup (&block)
@@ -87,8 +99,12 @@ module Reflexion
     $pointer = block
   end
 
+  def motion (&block)
+    $motion = block
+  end
+
   def start ()
-    Reflex.start {window.show}
+    App.new {window.show}.start
   end
 
   def quit ()

data/reflex.gemspec

@@ -21,19 +21,17 @@ Gem::Specification.new do |s|
   s.description = 'This library helps you to develop interactive graphical user interface.'
   s.version     = mod.version
 
-  s.authors  = %w[snori]
-  s.email    = 'snori@xord.org'
+  s.authors  = %w[xordog]
+  s.email    = 'xordog@gmail.com'
   s.homepage = "https://github.com/xord/reflex"
 
   s.platform              = Gem::Platform::RUBY
-  s.required_ruby_version = '>=1.9.0'
-
-  s.add_runtime_dependency 'rake'
-  s.add_runtime_dependency 'xot'
-  s.add_runtime_dependency 'rucy'
-  s.add_runtime_dependency 'beeps'
-  s.add_runtime_dependency 'rays'
-  s.add_development_dependency 'gemcutter'
+  s.required_ruby_version = '~> 2'
+
+  s.add_runtime_dependency 'xot',   '~> 0.1'
+  s.add_runtime_dependency 'rucy',  '~> 0.1'
+  s.add_runtime_dependency 'beeps', '~> 0.1'
+  s.add_runtime_dependency 'rays',  '~> 0.1'
 
   s.files            = `git ls-files`.split $/
   s.executables      = s.files.grep(%r{^bin/}) {|f| File.basename f}

data/samples/bats.rb

@@ -38,9 +38,9 @@ win = Reflex::Window.new do
       on :draw do |e|
         p, b = e.painter, e.bounds
         p.fill *c
-        #p.rect *b.to_a
-        p.arc *b.to_a, angle, angle + 90
-        p.arc *b.to_a, angle + 180, angle + 270
+        #p.rect b
+        p.ellipse b, from: angle,       to: angle + 90
+        p.ellipse b, from: angle + 180, to: angle + 270
       end
     }
     update_count
@@ -80,7 +80,7 @@ win = Reflex::Window.new do
   root.on :draw do |e|
     p = e.painter
     p.fill 1
-    p.text "draw on root view.", 10, 30
+    p.text "draw on root view. (#{e.fps.to_i} FPS)", 10, 30
   end
 
   #100.times {spawn *frame.move_to(0).center.to_a}

data/samples/fans.rb

@@ -61,7 +61,7 @@ class Ring
 
   def fin (p, angle, width)
     angle += @angle
-    p.arc @x, @y, @width, @height, angle, angle + width, @min
+    p.ellipse @x, @y, @width, @height, from: angle, to: angle + width, hole: @min
   end
 
 end# Ring

data/samples/fps.rb

@@ -30,19 +30,21 @@ w = Reflex::Window
       yy = y + Math.cos(n) * 50
       p.rect xx, yy, 50, 50
     end
+
+    p.font font
+
     p.fill = 1
-    p.text "hello Rays/Reflex!", x, y + 32, font
+    p.text "hello Rays/Reflex!", x, y + 32
     x = (x + 1) % 100
     y = (y + 1) % 100
 
     now = Time.now
     fps = 1 / (now - prev) if x % 10 == 0
     p.fill = 1, 1, 1, 1
-    p.text "#{fps.to_i} FPS", 0, sz.y - font.height, font
+    p.text "#{fps.to_i} FPS", 0, sz.y - font.height
     prev = now
   end
 
-
 Reflex.start do
   w.show
 end

data/samples/hello.rb

@@ -11,9 +11,7 @@ require 'reflex'
 class HelloWindow < Reflex::Window
 
   def initialize ()
-    super
-    set :title,  "Hello Reflex!"
-    set :frame, 100, 100, 320, 240
+    super title: "Hello Reflex!", frame: [100, 100, 320, 240]
     p = painter
     p.font Reflex::Font.new "Menlo", 32
     p.background 0
@@ -26,13 +24,13 @@ class HelloWindow < Reflex::Window
     p.text "hello world!", 5, 5
   end
 
-  def on_update_ (e)
+  def on_update (e)
     painter.background = rand, rand, rand
     redraw
   end
 
-  def draw_grid (p)
-    p.push do |_|
+  def draw_grid (painter)
+    painter.push do |p|
       w, h = frame.size.to_a
       p.stroke 0.5, 0.4
       (0..w).step(5).each {|x| p.line x, 0, x, h}

data/samples/image.rb

@@ -13,9 +13,9 @@ include Reflex
 win = Window.new do
   image = Image.new(32, 32).tap do |img|
     img.paint do
-      color :white
+      fill :white
       rect img.bounds
-      color :red
+      fill :red
       ellipse img.bounds.inset_by(2, 2)
     end
   end
@@ -29,14 +29,15 @@ win = Window.new do
   end
 
   after :draw do |e|
-    e.painter.color :blank do
+    e.painter.push fill: :black do
       rect 0, 0, 100, 40
       fill :white
       text "#{e.fps.to_i} FPS", 10, 10
     end
   end
 
-  set title: 'Many Image Views', frame: [100, 100, 500, 400]
+  title 'Many Image Views'
+  frame 100, 100, 500, 400
 end
 
 

data/samples/ios/hello/hello.xcodeproj/project.pbxproj

@@ -915,7 +915,6 @@
 					../../../../reflex/include,
 					../../../../rays/include,
 					../../../../xot/include,
-					/usr/local/Cellar/boost/1.53.0/include,
 					"$(inherited)",
 					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
 				);
@@ -940,7 +939,6 @@
 					../../../../reflex/include,
 					../../../../rays/include,
 					../../../../xot/include,
-					/usr/local/Cellar/boost/1.53.0/include,
 					"$(inherited)",
 					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
 				);

data/samples/layout.rb

@@ -11,11 +11,8 @@ include Reflex
 
 module Reflex
   class View
-    def view (frame = [0, 0, rand(10..200), rand(10..200)], color = [rand, rand, rand], &block)
-      v = RectShape.new &block
-      v.set frame: frame, color: color
-      add v
-      v
+    def view (color: [rand, rand, rand], &block)
+      add View.new background: color, &block
     end
 
     alias text view
@@ -25,8 +22,20 @@ module Reflex
 end
 
 win = Window.new title: 'Layout Sample', frame: [100, 100, 500, 400] do
-  20.times do
-    root.view
+  flow :right, :down
+  100.times do |i|
+    root.view do
+      style {
+        width  100
+        height 200
+        left top '50%' if i == 5
+      }
+    end
+  end
+  root.view do
+    style {
+      left top right bottom '45%'
+    }
   end
 =begin
   lock_screen = View.new do