reflexion 0.1.12 → 0.1.13

data/include/reflex/view.h

@@ -7,10 +7,14 @@
 #include <vector>
 #include <xot/ref.h>
 #include <xot/pimpl.h>
-#include <reflex/point.h>
-#include <reflex/bounds.h>
-#include <reflex/painter.h>
+#include <xot/util.h>
+#include <rays/point.h>
+#include <rays/bounds.h>
+#include <rays/painter.h>
+#include <reflex/defs.h>
+#include <reflex/selector.h>
 #include <reflex/style.h>
+#include <reflex/shape.h>
 #include <reflex/event.h>
 
 
@@ -22,11 +26,10 @@ namespace Reflex
 
 
 	class Window;
+	class Filter;
 
-	class Body;
 
-
-	class View : public Xot::RefCountable<>
+	class View : public Xot::RefCountable<>, public HasSelector
 	{
 
 		typedef View This;
@@ -35,9 +38,11 @@ namespace Reflex
 
 			typedef Xot::Ref<This> Ref;
 
-			typedef std::vector<Ref>   ChildList;
+			typedef std::vector<Ref>        ChildList;
+
+			typedef std::vector<Style>      StyleList;
 
-			typedef std::vector<Style> StyleList;
+			typedef std::vector<Shape::Ref> ShapeList;
 
 			typedef ChildList::      iterator       child_iterator;
 
@@ -47,18 +52,33 @@ namespace Reflex
 
 			typedef StyleList::const_iterator const_style_iterator;
 
-			typedef Selector::       iterator         tag_iterator;
+			typedef ShapeList::      iterator       shape_iterator;
+
+			typedef ShapeList::const_iterator const_shape_iterator;
+
+			enum Flag
+			{
+
+				FLAG_CLIP           = Xot::bit(0),
 
-			typedef Selector:: const_iterator   const_tag_iterator;
+				FLAG_CACHE          = Xot::bit(1),
+
+				FLAG_RESIZE_TO_FIT  = Xot::bit(2),
+
+				FLAG_SCROLL_TO_FIT  = Xot::bit(3),
+
+				FLAG_LAST           = FLAG_SCROLL_TO_FIT
+
+			};// Flag
 
 			enum Capture
 			{
 
 				CAPTURE_NONE      = 0,
 
-				CAPTURE_KEY       = 0x1 << 0,
+				CAPTURE_KEY       = Xot::bit(0),
 
-				CAPTURE_POINTER   = 0x1 << 1,
+				CAPTURE_POINTER   = Xot::bit(1),
 
 				CAPTURE_ALL       = CAPTURE_KEY | CAPTURE_POINTER,
 
@@ -74,12 +94,38 @@ namespace Reflex
 
 			virtual void redraw ();
 
+			virtual void focus (bool state = true);
+
+			virtual void blur ();
+
+			virtual bool has_focus () const;
+
+			virtual Timer* start_timer    (float seconds, int count = 1);
+
+			virtual Timer* start_interval (float seconds);
+
+			virtual void update_layout ();
+
+			virtual Point from_parent (const Point& point) const;
+
+			virtual Point   to_parent (const Point& point) const;
+
+			virtual Point from_window (const Point& point) const;
+
+			virtual Point   to_window (const Point& point) const;
+
+			virtual Point from_screen (const Point& point) const;
+
+			virtual Point   to_screen (const Point& point) const;
+
 			virtual void             add_child (View* child);
 
 			virtual void          remove_child (View* child);
 
-			virtual void            find_children (
-				ChildList* result, const Selector& selector, bool recursive = false) const;
+			virtual void           clear_children ();
+
+			virtual ChildList       find_children (
+				const Selector& selector, bool recursive = true) const;
 
 			virtual       child_iterator child_begin ();
 
@@ -89,7 +135,7 @@ namespace Reflex
 
 			virtual const_child_iterator child_end () const;
 
-			virtual       Style*         style (bool create = false);
+			virtual       Style*         style (bool create = true);
 
 			virtual const Style*         style () const;
 
@@ -97,12 +143,15 @@ namespace Reflex
 
 			virtual void          remove_style (const Style& style);
 
-			virtual       Style*     get_style (const Selector& selector, bool create = false);
+			virtual void           clear_styles ();
+
+			virtual       Style*     get_style (
+				const Selector& selector, bool create = true);
 
 			virtual const Style*     get_style (const Selector& selector) const;
 
-			virtual void            find_styles (
-				StyleList* result, const Selector& selector, bool recursive = false) const;
+			virtual StyleList       find_styles (
+				const Selector& selector, bool recursive = false) const;
 
 			virtual       style_iterator style_begin ();
 
@@ -112,41 +161,43 @@ namespace Reflex
 
 			virtual const_style_iterator style_end () const;
 
-			virtual void focus (bool state = true);
+			virtual void             set_shape (Shape* shape);
 
-			virtual void blur ();
+			virtual       Shape*         shape (bool create = true);
 
-			virtual bool has_focus () const;
+			virtual const Shape*         shape () const;
 
-			virtual void resize_to_fit ();
+			virtual void             add_shape (Shape* shape);
 
-			virtual Point content_size () const;
+			virtual void          remove_shape (Shape* shape);
 
-			virtual void  make_body ();
+			virtual void           clear_shapes ();
 
-			virtual void clear_body ();
+			virtual ShapeList       find_shapes (const Selector& selector) const;
 
-			virtual void    set_name (const char* name);
+			virtual       shape_iterator shape_begin ();
 
-			virtual const char* name () const;
+			virtual const_shape_iterator shape_begin () const;
 
-			virtual void           add_tag (const char* tag);
+			virtual       shape_iterator shape_end ();
 
-			virtual void        remove_tag (const char* tag);
+			virtual const_shape_iterator shape_end () const;
 
-			virtual       tag_iterator tag_begin ();
+			virtual void      set_filter (Filter* filter);
 
-			virtual const_tag_iterator tag_begin () const;
+			virtual       Filter* filter ();
 
-			virtual       tag_iterator tag_end ();
+			virtual const Filter* filter () const;
 
-			virtual const_tag_iterator tag_end () const;
+			virtual void set_name (const char* name);
 
-			virtual void        set_selector (const Selector& selector);
+			virtual void    add_tag (const char* tag);
 
-			virtual       Selector& selector ();
+			virtual void remove_tag (const char* tag);
 
-			virtual const Selector& selector () const;
+			virtual void  clear_tags ();
+
+			virtual void set_selector (const Selector& selector);
 
 			virtual void      set_frame (coord x, coord y, coord width, coord height);
 
@@ -154,11 +205,13 @@ namespace Reflex
 
 			virtual const Bounds& frame () const;
 
-			virtual void set_zoom (float zoom);
+			virtual Bounds      content_bounds () const;
 
-			virtual float    zoom () const;
+			virtual void fit_to_content ();
 
-			virtual float angle () const;
+			virtual void set_angle (float degree);
+
+			virtual float    angle () const;
 
 			virtual void         scroll_to (coord x, coord y, coord z = 0);
 
@@ -170,10 +223,20 @@ namespace Reflex
 
 			virtual const Point& scroll () const;
 
+			virtual void set_zoom (float zoom);
+
+			virtual float    zoom () const;
+
 			virtual void set_capture (uint types);
 
 			virtual uint     capture () const;
 
+			virtual void    add_flag (uint flags);
+
+			virtual void remove_flag (uint flags);
+
+			virtual bool    has_flag (uint flags) const;
+
 			virtual       View* parent ();
 
 			virtual const View* parent () const;
@@ -182,9 +245,71 @@ namespace Reflex
 
 			virtual const Window* window () const;
 
-			virtual       Body* body ();
+			//
+			// for physics body
+			//
+			virtual void apply_force (coord x, coord y);
+
+			virtual void apply_force (const Point& force);
+
+			virtual void apply_torque (float torque);
+
+			virtual void apply_linear_impulse (coord x, coord y);
+
+			virtual void apply_linear_impulse (const Point& impulse);
+
+			virtual void apply_angular_impulse (float impulse);
+
+			virtual void set_static (bool state = true);
+
+			virtual bool  is_static () const;
+
+			virtual void set_dynamic (bool state = true);
+
+			virtual bool  is_dynamic () const;
+
+			virtual void set_density (float density);
+
+			virtual float    density () const;
+
+			virtual void set_friction (float friction);
+
+			virtual float    friction () const;
+
+			virtual void set_restitution (float restitution);
+
+			virtual float    restitution () const;
+
+			virtual void set_sensor (bool state);
+
+			virtual bool  is_sensor () const;
+
+			virtual void set_category_bits (uint bits);
+
+			virtual uint     category_bits () const;
 
-			virtual const Body* body () const;
+			virtual void set_collision_mask (uint mask);
+
+			virtual uint     collision_mask () const;
+
+			virtual void set_linear_velocity (coord x, coord y);
+
+			virtual void set_linear_velocity (const Point& velocity);
+
+			virtual Point    linear_velocity () const;
+
+			virtual void set_angular_velocity (float velocity);
+
+			virtual float    angular_velocity () const;
+
+			virtual void set_gravity_scale (float scale);
+
+			virtual float    gravity_scale () const;
+
+			//
+			// for physics child world
+			//
+			virtual void update_physics (float duration = 0);
 
 			virtual float meter2pixel (float meter = 1, bool create_world = true);
 
@@ -196,26 +321,21 @@ namespace Reflex
 
 			virtual Point    gravity () const;
 
-			virtual       Body* wall ();
-
-			virtual const Body* wall () const;
-
-			virtual void set_debug (bool state);
+			virtual void set_time_scale (float scale);
 
-			virtual bool     debugging () const;
+			virtual float    time_scale () const;
 
-			virtual Point from_parent (const Point& point) const;
-
-			virtual Point   to_parent (const Point& point) const;
+			virtual       View* wall ();
 
-			virtual Point from_window (const Point& point) const;
+			virtual const View* wall () const;
 
-			virtual Point   to_window (const Point& point) const;
+			virtual void set_debug (bool debug = true);
 
-			virtual Point from_screen (const Point& point) const;
-
-			virtual Point   to_screen (const Point& point) const;
+			virtual bool     debug () const;
 
+			//
+			// event handlers
+			//
 			virtual void on_attach (Event* e);
 
 			virtual void on_detach (Event* e);
@@ -238,8 +358,6 @@ namespace Reflex
 
 			virtual void on_focus (FocusEvent* e);
 
-			virtual void on_blur (FocusEvent* e);
-
 			virtual void on_key      (KeyEvent* e);
 
 			virtual void on_key_down (KeyEvent* e);
@@ -258,6 +376,8 @@ namespace Reflex
 
 			virtual void on_capture (CaptureEvent* e);
 
+			virtual void on_timer (TimerEvent* e);
+
 			virtual void on_contact       (ContactEvent* e);
 
 			virtual void on_contact_begin (ContactEvent* e);
@@ -273,7 +393,7 @@ namespace Reflex
 			Xot::PImpl<Data> self;
 
 			#ifdef REFLEX_VIEW_REF_DEBUG
-				virtual void retain (void* data = NULL) const
+				void retain (intptr_t data) const override
 				{
 					RefCountable::retain(data);
 					String spaces = "";
@@ -281,7 +401,7 @@ namespace Reflex
 					printf("(%d)%s-> %s\n", refc_count(), spaces.c_str(), name());
 				}
 
-				virtual void release (void* data = NULL) const
+				void release (intptr_t data) const override
 				{
 					RefCountable::release(data);
 					String spaces = "";
@@ -294,6 +414,8 @@ namespace Reflex
 
 			virtual ~View ();
 
+			virtual SelectorPtr* get_selector_ptr ();
+
 	};// View
 
 

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/include/reflex.h

@@ -7,18 +7,19 @@
 #include <reflex/defs.h>
 #include <reflex/reflex.h>
 #include <reflex/exception.h>
+#include <reflex/debug.h>
 
 #include <reflex/selector.h>
-#include <reflex/style.h>
 #include <reflex/event.h>
+#include <reflex/style.h>
+#include <reflex/timer.h>
+#include <reflex/shape.h>
+#include <reflex/filter.h>
 
 #include <reflex/application.h>
 #include <reflex/window.h>
 #include <reflex/view.h>
 
-#include <reflex/body.h>
-#include <reflex/fixture.h>
-
 #include <reflex/image_view.h>
 
 

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