reflexion 0.1.11 → 0.1.16

data/include/reflex/window.h

@@ -6,9 +6,10 @@
 
 #include <xot/ref.h>
 #include <xot/pimpl.h>
-#include <reflex/point.h>
-#include <reflex/bounds.h>
-#include <reflex/painter.h>
+#include <rays/point.h>
+#include <rays/bounds.h>
+#include <rays/painter.h>
+#include <reflex/defs.h>
 #include <reflex/event.h>
 
 

data/lib/reflex.rb

@@ -8,12 +8,15 @@ require 'reflex/point'
 require 'reflex/bounds'
 require 'reflex/color'
 require 'reflex/color_space'
+require 'reflex/matrix'
+require 'reflex/painter'
+require 'reflex/polyline'
+require 'reflex/polygon'
 require 'reflex/bitmap'
-require 'reflex/texture'
 require 'reflex/image'
 require 'reflex/font'
 require 'reflex/shader'
-require 'reflex/painter'
+require 'reflex/camera'
 
 require 'reflex/reflex'
 require 'reflex/helper'
@@ -21,6 +24,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 +36,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 +55,3 @@ require 'reflex/view'
 require 'reflex/button'
 require 'reflex/text_view'
 require 'reflex/image_view'
-
-require 'reflex/shape_view'

data/lib/reflex/application.rb

@@ -2,6 +2,7 @@
 
 
 require 'xot/setter'
+require 'xot/universal_accessor'
 require 'xot/block_util'
 require 'reflex/ext'
 require 'reflex/helper'
@@ -15,14 +16,16 @@ module Reflex
     include Xot::Setter
     include Hookable
 
-    def initialize (opts = {}, &block)
+    universal_accessor :name
+
+    def initialize (options = nil, &block)
       super()
-      set opts
+      set options if options
       @start_block = block if block
     end
 
     def self.start (*args, &block)
-      self.new(*args, &block).start
+      new(*args, &block).start
     end
 
     private

data/lib/reflex/button.rb

@@ -19,7 +19,7 @@ module Reflex
       self.text = self.name unless self.text
     end
 
-    def content_size ()
+    def content_bounds ()
       f = window.painter.font
       return f.width(@text) + 2, f.height + 2
     end
@@ -28,7 +28,7 @@ module Reflex
     end
 
     def on_draw (e)
-      e.painter.color (pressing? ? :white : :none), :white do |p|
+      e.painter.push fill: (pressing? ? :white : :none), stroke: :white do |p|
         p.rect e.bounds
 
         if @text

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

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

data/lib/reflex/capture_event.rb

@@ -1,29 +1,30 @@
 # -*- coding: utf-8 -*-
 
 
-require 'reflex/flags'
+require 'reflex/ext'
+require 'reflex/view'
 
 
 module Reflex
 
 
-  class CaptureEvent
+  class CaptureEvent < Event
 
     def begin ()
-      CAPTURE_FLAG.bits2symbols get_begin
+      View.capture_flag.bits2symbols get_begin
     end
 
     def begin? (*symbols)
-      bits = CAPTURE_FLAG.symbols2bits *symbols
+      bits = View.capture_flag.symbols2bits *symbols
       (bits & get_begin) == bits
     end
 
     def end ()
-      CAPTURE_FLAG.bits2symbols get_end
+      View.capture_flag.bits2symbols get_end
     end
 
     def end? (*symbols)
-      bits = CAPTURE_FLAG.symbols2bits *symbols
+      bits = View.capture_flag.symbols2bits *symbols
       (bits & get_end) == bits
     end
 

data/lib/reflex/contact_event.rb

@@ -1,17 +1,22 @@
 # -*- coding: utf-8 -*-
 
 
+require 'xot/const_symbol_accessor'
 require 'reflex/ext'
 
 
 module Reflex
 
 
-  class ContactEvent
+  class ContactEvent < Event
 
-    def type ()
-      TYPE2SYM[get_type] || :none
-    end
+    alias get_type type
+
+    const_symbol_reader :type, {
+      none:  TYPE_NONE,
+      begin: TYPE_BEGIN,
+      end:   TYPE_END
+    }
 
     def begin? ()
       get_type == TYPE_BEGIN
@@ -22,16 +27,9 @@ module Reflex
     end
 
     def inspect ()
-      "#<Reflex::ContactEvent type:#{type} view:#{view}>"
+      "#<Reflex::ContactEvent type:#{type} shape:#{shape} view:#{view}>"
     end
 
-    private
-
-      TYPE2SYM = {
-        TYPE_BEGIN => :begin,
-        TYPE_END   => :end,
-      }
-
   end# ContactEvent
 
 

data/lib/reflex/draw_event.rb

@@ -1,13 +1,18 @@
 # -*- coding: utf-8 -*-
 
 
+require 'xot/block_util'
 require 'reflex/ext'
 
 
 module Reflex
 
 
-  class DrawEvent
+  class DrawEvent < Event
+
+    def paint (&block)
+      Xot::BlockUtil.instance_eval_or_block_call painter, &block if block
+    end
 
     def inspect ()
       "#<Reflex::DrawEvent painter:#{painter} bounds:#{bounds} dt:#{dt} fps:#{fps}>"

data/lib/reflex/ellipse_shape.rb

@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+
+
+require 'xot/universal_accessor'
+require 'reflex/shape'
+
+
+module Reflex
+
+
+  class EllipseShape < Shape
+
+    def angle= (range)
+      angle_from range.min
+      angle_to   range.max
+    end
+
+    def angle ()
+      angle_from..angle_to
+    end
+
+    universal_accessor :angle_from, :angle_to, :angle, :hole_size, :nsegment
+
+  end# EllipseShape
+
+
+end# Reflex

data/lib/reflex/filter.rb

@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+
+
+require 'xot/universal_accessor'
+require 'reflex/ext'
+
+
+module Reflex
+
+
+  class Filter
+
+    universal_accessor :shader
+
+  end# Filter
+
+
+end# Reflex

data/lib/reflex/fixture.rb

@@ -2,6 +2,7 @@
 
 
 require 'xot/setter'
+require 'xot/universal_accessor'
 
 
 module Reflex
@@ -11,6 +12,9 @@ module Reflex
 
     include Xot::Setter
 
+    universal_accessor :density, :friction, :restitution,
+      :sensor, :category, :collision
+
   end# Fixture
 
 

data/lib/reflex/focus_event.rb

@@ -1,17 +1,22 @@
 # -*- coding: utf-8 -*-
 
 
+require 'xot/const_symbol_accessor'
 require 'reflex/ext'
 
 
 module Reflex
 
 
-  class FocusEvent
+  class FocusEvent < Event
 
-    def type ()
-      TYPE2SYM[get_type] || :none
-    end
+    alias get_type type
+
+    const_symbol_reader :type, {
+      none:  TYPE_NONE,
+      focus: TYPE_FOCUS,
+      blur:  TYPE_BLUR
+    }
 
     def focus? ()
       get_type == TYPE_FOCUS
@@ -22,16 +27,9 @@ module Reflex
     end
 
     def inspect ()
-      "#<Reflex::FocusEvent type:#{type} focus:#{focus} last:#{last}>"
+      "#<Reflex::FocusEvent type:#{type} current:#{current} last:#{last}>"
     end
 
-    private
-
-      TYPE2SYM = {
-        TYPE_FOCUS => :focus,
-        TYPE_BLUR  => :blur,
-      }
-
   end# FocusEvent
 
 

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