reflexion 0.1.11 → 0.1.16

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
 

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/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 ()