reflexion 0.1.12 → 0.1.13

data/lib/reflex/frame_event.rb

@@ -7,7 +7,7 @@ require 'reflex/ext'
 module Reflex
 
 
-  class FrameEvent
+  class FrameEvent < Event
 
     alias dw   dwidth
     alias dh   dheight

data/lib/reflex/helper.rb

@@ -2,6 +2,7 @@
 
 
 require 'xot/hookable'
+require 'xot/universal_accessor'
 require 'reflex/point'
 require 'reflex/bounds'
 
@@ -22,38 +23,28 @@ module Reflex
 
   module HasFrame
 
-    def frame= (*args)
-      set_frame args.flatten
-      get_frame
-    end
-
-    def frame (*args)
-      send :frame=, *args unless args.empty?
-      get_frame
-    end
-
     def move_to (*args)
-      self.frame = get_frame.move_to *args
+      self.frame = frame.move_to *args
       self
     end
 
     def move_by (*args)
-      self.frame = get_frame.move_by *args
+      self.frame = frame.move_by *args
       self
     end
 
     def resize_to (*args)
-      self.frame = get_frame.resize_to *args
+      self.frame = frame.resize_to *args
       self
     end
 
     def resize_by (*args)
-      self.frame = get_frame.resize_by *args
+      self.frame = frame.resize_by *args
       self
     end
 
     def inset_by (*args)
-      self.frame = get_frame.inset_by *args
+      self.frame = frame.inset_by *args
       self
     end
 
@@ -64,20 +55,17 @@ module Reflex
       lt rt lb rb
       position pos size center
     ].each do |name|
-      name_assign = "#{name}=".intern
-      name        = name.intern
-
-      define_method name do |*args|
-        send name_assign, *args unless args.empty?
-        get_frame.send name
-      end
-
-      define_method name_assign do |*args|
-        b   = get_frame
-        ret = b.send name_assign, *args
-        set_frame b
-        ret
-      end
+      class_eval <<-END
+        def #{name} ()
+          frame.#{name}
+        end
+        def #{name}= (*args)
+          self.frame = frame.tap {|b| b.send :#{name}=, *args}
+          #{name}
+        end
+      END
+
+      universal_accessor name
     end
 
   end# HasFrame

data/lib/reflex/key_event.rb

@@ -1,17 +1,22 @@
 # -*- coding: utf-8 -*-
 
 
+require 'xot/const_symbol_accessor'
 require 'reflex/ext'
 
 
 module Reflex
 
 
-  class KeyEvent
+  class KeyEvent < Event
 
-    def type ()
-      TYPE2SYM[get_type] || :none
-    end
+    alias get_type type
+
+    const_symbol_reader :type, {
+      none: TYPE_NONE,
+      down: TYPE_DOWN,
+      up:   TYPE_UP
+    }
 
     def down? ()
       get_type == TYPE_DOWN
@@ -21,17 +26,14 @@ module Reflex
       get_type == TYPE_UP
     end
 
+    def repeat? ()
+      repeat >= 1
+    end
+
     def inspect ()
       "#<Reflex::KeyEvent type:#{type} chars:'#{chars}' code:#{code} mod:#{modifiers} repeat:#{repeat} capture?:#{capture?}>"
     end
 
-    private
-
-      TYPE2SYM = {
-        TYPE_DOWN => :down,
-        TYPE_UP   => :up,
-      }
-
   end# KeyEvent
 
 

data/lib/reflex/line_shape.rb

@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+
+
+require 'xot/universal_accessor'
+require 'reflex/shape'
+
+
+module Reflex
+
+
+  class LineShape < Shape
+
+    universal_accessor :loop
+
+  end# LineShape
+
+
+end# Reflex

data/lib/reflex/{texture.rb → matrix.rb}

@@ -1,13 +1,13 @@
 # -*- coding: utf-8 -*-
 
 
-require 'rays/texture'
+require 'rays/matrix'
 
 
 module Reflex
 
 
-  Texture = Rays::Texture
+  Matrix = Rays::Matrix
 
 
 end# Reflex

data/lib/reflex/module.rb

@@ -6,6 +6,8 @@ module Reflex
 
   module Module
 
+    module_function
+
     def name ()
       super.split('::')[-2]
     end
@@ -15,10 +17,10 @@ module Reflex
     end
 
     def root_dir (path = '')
-      File.expand_path "../../../#{path}", __FILE__
+      File.expand_path "../../#{path}", __dir__
     end
 
-    def include_dir ()
+    def inc_dir ()
       root_dir 'include'
     end
 
@@ -26,23 +28,6 @@ module Reflex
       root_dir 'lib'
     end
 
-    def task_dir ()
-      root_dir 'task'
-    end
-
-    def load_tasks (*names)
-      if names.empty?
-        Dir["#{task_dir}/**/*.rake"].each {|path| load path}
-      else
-        names.each do |name|
-          path = "#{task_dir}/#{name}.rake"
-          load path if File.exist? path
-        end
-      end
-    end
-
-    extend self
-
   end# Module
 
 

data/lib/reflex/pointer_event.rb

@@ -1,19 +1,36 @@
 # -*- coding: utf-8 -*-
 
 
+require 'xot/bit_flag_accessor'
+require 'xot/const_symbol_accessor'
 require 'reflex/ext'
 
 
 module Reflex
 
 
-  class PointerEvent
+  class PointerEvent < Event
 
     alias pos position
 
-    def type ()
-      TYPE2SYM[get_type] || :none
-    end
+    alias get_type         type
+    alias get_pointer_type pointer_type
+
+    const_symbol_reader :type, {
+      none: TYPE_NONE,
+      down: TYPE_DOWN,
+      up:   TYPE_UP,
+      move: TYPE_MOVE
+    }
+
+    bit_flag_reader :pointer_type, {
+      none:         POINTER_NONE,
+      mouse_left:   POINTER_MOUSE_LEFT,
+      mouse_right:  POINTER_MOUSE_RIGHT,
+      mouse_middle: POINTER_MOUSE_MIDDLE,
+      touch:        POINTER_TOUCH,
+      pen:          POINTER_PEN
+    }
 
     def down? ()
       get_type == TYPE_DOWN
@@ -28,57 +45,29 @@ module Reflex
     end
 
     def left? ()
-      pointer_type.include? :mouse_left
+      (get_pointer_type & POINTER_MOUSE_LEFT) != 0
     end
 
     def right? ()
-      pointer_type.include? :mouse_right
+      (get_pointer_type & POINTER_MOUSE_RIGHT) != 0
     end
 
     def middle? ()
-      pointer_type.include? :mouse_middle
+      (get_pointer_type & POINTER_MOUSE_MIDDLE) != 0
     end
 
     def touch? ()
-      pointer_type.include? :touch
+      (get_pointer_type & POINTER_TOUCH) != 0
     end
 
     def pen? ()
-      pointer_type.include? :pen
-    end
-
-    def pointer_type ()
-      type_, array = get_pointer_type, []
-      POINTER_TYPE_LAST.to_s(2).sub(/^0+/, '').size.times do |i|
-        bit = 0x1 << i
-        if (type_ & bit) != 0
-          sym = POINTERTYPE2SYM[bit]
-          array << sym if sym
-        end
-      end
-      array
+      (get_pointer_type & POINTER_PEN) != 0
     end
 
     def inspect ()
       "#<Reflex::PointerEvent type:#{type}/#{pointer_type} x:#{x} y:#{y} size:#{size} mod:#{modifiers} count:#{count} drag:#{drag?}>"
     end
 
-    private
-
-      TYPE2SYM = {
-        TYPE_DOWN => :down,
-        TYPE_UP   => :up,
-        TYPE_MOVE => :move
-      }
-
-      POINTERTYPE2SYM = {
-        POINTER_MOUSE_LEFT   => :mouse_left,
-        POINTER_MOUSE_RIGHT  => :mouse_right,
-        POINTER_MOUSE_MIDDLE => :mouse_middle,
-        POINTER_TOUCH        => :touch,
-        POINTER_PEN          => :pen,
-      }
-
   end# PointerEvent
 
 

data/lib/reflex/polygon.rb

@@ -0,0 +1,14 @@
+# -*- coding: utf-8 -*-
+
+
+require 'rays/polygon'
+require 'rays/polygon_line'
+
+
+module Reflex
+
+
+  Polygon = Rays::Polygon
+
+
+end# Reflex

data/lib/reflex/polygon_shape.rb

@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+
+
+require 'xot/universal_accessor'
+require 'reflex/shape'
+
+
+module Reflex
+
+
+  class PolygonShape < Shape
+
+    universal_accessor :polygon
+
+    def initialize (polygon, *args, &block)
+      super *args, &block
+      self.polygon = polygon
+    end
+
+  end# PolygonShape
+
+
+end# Reflex

data/lib/reflex/polyline.rb

@@ -0,0 +1,13 @@
+# -*- coding: utf-8 -*-
+
+
+require 'rays/polyline'
+
+
+module Reflex
+
+
+  Polyline = Rays::Polyline
+
+
+end# Reflex

data/lib/reflex/rect_shape.rb

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+
+
+require 'xot/universal_accessor'
+require 'reflex/shape'
+
+
+module Reflex
+
+
+  class RectShape < Shape
+
+    universal_accessor :nsegment, :round,
+      :round_left_top,    :round_right_top,
+      :round_left_bottom, :round_right_bottom
+
+  end# RectShape
+
+
+end# Reflex

data/lib/reflex/reflex.rb

@@ -19,9 +19,7 @@ module Reflex
     end
 
     def window (*args, &block)
-      w = Window.new *args, &block
-      w.show
-      w
+      Window.new(*args, &block).tap {|w| w.show}
     end
 
     self

data/lib/reflex/scroll_event.rb

@@ -7,7 +7,7 @@ require 'reflex/ext'
 module Reflex
 
 
-  class ScrollEvent
+  class ScrollEvent < Event
 
     def inspect ()
       "#<Reflex::ScrollEvent x:#{x} y:#{y} z:#{z} dx:#{dx} dy:#{dy} dz:#{dz}>"

data/lib/reflex/selector.rb

@@ -20,9 +20,9 @@ module Reflex
       arg0.kind_of?(Selector) ? arg0 : self.new(*args)
     end
 
-    def initialize (opts = {}, &block)
+    def initialize (options = nil, &block)
       super()
-      set opts
+      set options if options
       Xot::BlockUtil.instance_eval_or_block_call self, &block if block
     end
 

data/lib/reflex/shape.rb

@@ -0,0 +1,62 @@
+# -*- coding: utf-8 -*-
+
+
+require 'xot/setter'
+require 'xot/universal_accessor'
+require 'xot/block_util'
+require 'reflex/ext'
+require 'reflex/helper'
+
+
+module Reflex
+
+
+  class Shape
+
+    include Xot::Setter
+    include Hookable
+    include HasFrame
+    include HasTags
+
+    alias sensor? sensor
+
+    universal_accessor :name, :selector,
+      :density, :friction, :restitution, :sensor,
+      :category_bits, :collision_mask
+
+    def initialize (options = nil, &block)
+      super()
+      set options if options
+      Xot::BlockUtil.instance_eval_or_block_call self, &block if block
+    end
+
+    def on_contact (e)
+    end
+
+    def on_contact_begin (e)
+    end
+
+    def on_contact_end (e)
+    end
+
+    private
+
+      def on_contact! (*args)
+        call_contact! *args
+        owner&.delay {on_contact *args}# delay to avoid physics world lock
+      end
+
+      def on_contact_begin! (*args)
+        call_contact_begin! *args
+        owner&.delay {on_contact_begin *args}
+      end
+
+      def on_contact_end! (*args)
+        call_contact_end! *args
+        owner&.delay {on_contact_end *args}
+      end
+
+  end# Shape
+
+
+end# Reflex

data/lib/reflex/style.rb

@@ -2,6 +2,7 @@
 
 
 require 'xot/setter'
+require 'xot/universal_accessor'
 require 'xot/block_util'
 require 'reflex/ext'
 require 'reflex/helper'
@@ -15,9 +16,9 @@ module Reflex
     include Xot::Setter
     include HasTags
 
-    def initialize (opts = {}, &block)
+    def initialize (options = nil, &block)
       super()
-      set opts
+      set options if options
       Xot::BlockUtil.instance_eval_or_block_call self, &block if block
     end
 
@@ -29,17 +30,83 @@ module Reflex
       get_flow.map {|n| flow2sym n}
     end
 
+    def foreground= (fill, stroke = nil)
+      self.foreground_fill   = fill
+      self.foreground_stroke = stroke
+    end
+
+    def foreground ()
+      return foreground_fill, foreground_stroke
+    end
+
+    def background= (fill, stroke = nil)
+      self.background_fill   = fill
+      self.background_stroke = stroke
+    end
+
+    def background ()
+      return background_fill, background_stroke
+    end
+
+    universal_accessor :name, :selector, :flow, :width, :height, :size,
+              :left,         :top,         :right,         :bottom, :position,
+       :margin_left,  :margin_top,  :margin_right,  :margin_bottom, :margin,
+      :padding_left, :padding_top, :padding_right, :padding_bottom, :padding,
+      :center, :center_x, :center_y,
+      :foreground_fill, :foreground_stroke, :foreground_stroke_width,
+      :background_fill, :background_stroke, :background_stroke_width,
+      :foreground, :background,
+      :image
+
+    alias x=   left=
+    alias x    left
+    alias y=   top=
+    alias y    top
+    alias w=   width=
+    alias w    width
+    alias h=   height=
+    alias h    height
+    alias pos= position=
+    alias pos  position
+
+    alias fore_fill=         foreground_fill=
+    alias fore_fill          foreground_fill
+    alias fore_stroke=       foreground_stroke=
+    alias fore_stroke        foreground_stroke
+    alias fore_stroke_width= foreground_stroke_width=
+    alias fore_stroke_width  foreground_stroke_width
+
+    alias back_fill=         background_fill=
+    alias back_fill          background_fill
+    alias back_stroke=       background_stroke=
+    alias back_stroke        background_stroke
+    alias back_stroke_width= background_stroke_width=
+    alias back_stroke_width  background_stroke_width
+
+    alias fore= foreground_fill=
+    alias fore  foreground_fill
+    alias back= background_fill=
+    alias back  background_fill
+
+    alias fill=         foreground_fill=
+    alias fill          foreground_fill
+    alias stroke=       foreground_stroke=
+    alias stroke        foreground_stroke
+    alias stroke_width= foreground_stroke_width=
+    alias stroke_width  foreground_stroke_width
+
     def inspect ()
       attrs = {
-        selector:         selector,
-        flow:             flow,
-        size:             size,
-        position:         position,
-        offset:           offset,
-        margin:           margin,
-        padding:          padding,
-        background_color: background_color,
-        background_image: background_image
+        selector:   selector,
+        flow:       flow,
+        size:       size,
+        position:   position,
+        margin:     margin,
+        padding:    padding,
+        center:     center,
+        foreground: foreground,
+        background: background,
+        image:      image
       }
       "#<Reflex::Style #{attrs.map {|k, v| %(#{k}:#{v.to_s})}.join ' '}>"
     end

data/lib/reflex/style_length.rb

@@ -9,17 +9,6 @@ module Reflex
 
   class StyleLength
 
-    def initialize (*args)
-      return if args.empty?
-      case args[0]
-      when Numeric
-        args << :px if args.size < 2
-        setup_num *args
-      when String
-        setup_str *args
-      end
-    end
-
     def inspect ()
       "#<#{self.class.name} #{to_s}>"
     end

data/lib/reflex/text_view.rb

@@ -15,12 +15,10 @@ module Reflex
 
     attr_accessor :font
 
-    def initialize (*args, &block)
-      @outdated = false
-      super
-    end
+    alias text= data=
+    alias text  data
 
-    def content_size ()
+    def content_bounds ()
       s = string
       return 0, 0 unless s && window
       font = @font || window.painter.font
@@ -28,26 +26,11 @@ module Reflex
     end
 
     def on_draw (e)
-      @image = create_text_image if @outdated
-      return unless @image
-
-      pa = e.painter
-      pa.color 1
-      pa.image @image
-    end
-
-    def on_data_update (e)
-      @outdated = true
-      super
-    end
-
-    private
-
-      def create_text_image ()
-        str, size = string, content_size
-        return nil unless str && size.all? {|n| n > 0}
-        Image.new Bitmap.new(*size, :GRAY).draw_string(str), true
+      s = string
+      e.painter.push font: @font do
+        text s
       end
+    end
 
   end# TextView