reflexion 0.1.7 → 0.1.8

data/include/reflex/ruby/view.h

@@ -28,8 +28,6 @@ namespace Reflex
 			RUCY_OVERRIDE_BEGIN(Rucy::ClassWrapper<T>)
 
 			RUCY_OVERRIDE_ID(content_size)
-			RUCY_OVERRIDE_ID(on_attach)
-			RUCY_OVERRIDE_ID(on_detach)
 			RUCY_OVERRIDE_ID(on_update)
 			RUCY_OVERRIDE_ID(on_draw)
 			RUCY_OVERRIDE_ID(on_move)
@@ -49,22 +47,10 @@ namespace Reflex
 
 			RUCY_OVERRIDE_END
 
-			virtual void show ()
-			{
-				RUCY_SYM(show);
-				this->value.call(show);
-			}
-
-			virtual void hide ()
-			{
-				RUCY_SYM(hide);
-				this->value.call(hide);
-			}
-
 			virtual Point content_size () const
 			{
 				RUCY_SYM(content_size);
-				if (RUCY_IS_OVERRIDDEN(content_size, view_class()))
+				if (RUCY_IS_OVERRIDDEN(content_size))
 				{
 					Rucy::Value ret = this->value.call(content_size);
 					return ret.is_nil() ? Super::content_size() : Rucy::to<Point>(ret);
@@ -73,28 +59,40 @@ namespace Reflex
 					return Super::content_size();
 			}
 
+			virtual void make_body ()
+			{
+				RUCY_SYM(make_body);
+				this->value.call(make_body);
+			}
+
 			virtual void on_attach (Event* e)
 			{
 				RUCY_SYM(on_attach);
-				if (RUCY_IS_OVERRIDDEN(on_attach, view_class()))
-					this->value.call(on_attach, Rucy::value(e));
-				else
-					Super::on_attach(e);
+				this->value.call(on_attach, Rucy::value(e));
 			}
 
 			virtual void on_detach (Event* e)
 			{
 				RUCY_SYM(on_detach);
-				if (RUCY_IS_OVERRIDDEN(on_detach, view_class()))
-					this->value.call(on_detach, Rucy::value(e));
-				else
-					Super::on_detach(e);
+				this->value.call(on_detach, Rucy::value(e));
+			}
+
+			virtual void on_show (Event* e)
+			{
+				RUCY_SYM(on_show);
+				this->value.call(on_show, Rucy::value(e));
+			}
+
+			virtual void on_hide (Event* e)
+			{
+				RUCY_SYM(on_hide);
+				this->value.call(on_hide, Rucy::value(e));
 			}
 
 			virtual void on_update (UpdateEvent* e)
 			{
 				RUCY_SYM(on_update);
-				if (RUCY_IS_OVERRIDDEN(on_update, view_class()))
+				if (RUCY_IS_OVERRIDDEN(on_update))
 					this->value.call(on_update, Rucy::value(e));
 				else
 					Super::on_update(e);
@@ -103,7 +101,7 @@ namespace Reflex
 			virtual void on_draw (DrawEvent* e)
 			{
 				RUCY_SYM(on_draw);
-				if (RUCY_IS_OVERRIDDEN(on_draw, view_class()))
+				if (RUCY_IS_OVERRIDDEN(on_draw))
 					this->value.call(on_draw, Rucy::value(e));
 				else
 					Super::on_draw(e);
@@ -112,7 +110,7 @@ namespace Reflex
 			virtual void on_move (FrameEvent* e)
 			{
 				RUCY_SYM(on_move);
-				if (RUCY_IS_OVERRIDDEN(on_move, view_class()))
+				if (RUCY_IS_OVERRIDDEN(on_move))
 					this->value.call(on_move, Rucy::value(e));
 				else
 					Super::on_move(e);
@@ -121,7 +119,7 @@ namespace Reflex
 			virtual void on_resize (FrameEvent* e)
 			{
 				RUCY_SYM(on_resize);
-				if (RUCY_IS_OVERRIDDEN(on_resize, view_class()))
+				if (RUCY_IS_OVERRIDDEN(on_resize))
 					this->value.call(on_resize, Rucy::value(e));
 				else
 					Super::on_resize(e);
@@ -130,7 +128,7 @@ namespace Reflex
 			virtual void on_scroll (ScrollEvent* e)
 			{
 				RUCY_SYM(on_scroll);
-				if (RUCY_IS_OVERRIDDEN(on_scroll, view_class()))
+				if (RUCY_IS_OVERRIDDEN(on_scroll))
 					this->value.call(on_scroll, Rucy::value(e));
 				else
 					Super::on_scroll(e);
@@ -139,7 +137,7 @@ namespace Reflex
 			virtual void on_focus (FocusEvent* e)
 			{
 				RUCY_SYM(on_focus);
-				if (RUCY_IS_OVERRIDDEN(on_focus, view_class()))
+				if (RUCY_IS_OVERRIDDEN(on_focus))
 					this->value.call(on_focus, Rucy::value(e));
 				else
 					Super::on_focus(e);
@@ -148,7 +146,7 @@ namespace Reflex
 			virtual void on_blur (FocusEvent* e)
 			{
 				RUCY_SYM(on_blur);
-				if (RUCY_IS_OVERRIDDEN(on_blur, view_class()))
+				if (RUCY_IS_OVERRIDDEN(on_blur))
 					this->value.call(on_blur, Rucy::value(e));
 				else
 					Super::on_blur(e);
@@ -157,7 +155,7 @@ namespace Reflex
 			virtual void on_key (KeyEvent* e)
 			{
 				RUCY_SYM(on_key);
-				if (RUCY_IS_OVERRIDDEN(on_key, view_class()))
+				if (RUCY_IS_OVERRIDDEN(on_key))
 					this->value.call(on_key, Rucy::value(e));
 				else
 					Super::on_key(e);
@@ -166,7 +164,7 @@ namespace Reflex
 			virtual void on_key_down (KeyEvent* e)
 			{
 				RUCY_SYM(on_key_down);
-				if (RUCY_IS_OVERRIDDEN(on_key_down, view_class()))
+				if (RUCY_IS_OVERRIDDEN(on_key_down))
 					this->value.call(on_key_down, Rucy::value(e));
 				else
 					Super::on_key_down(e);
@@ -175,7 +173,7 @@ namespace Reflex
 			virtual void on_key_up (KeyEvent* e)
 			{
 				RUCY_SYM(on_key_up);
-				if (RUCY_IS_OVERRIDDEN(on_key_up, view_class()))
+				if (RUCY_IS_OVERRIDDEN(on_key_up))
 					this->value.call(on_key_up, Rucy::value(e));
 				else
 					Super::on_key_up(e);
@@ -184,7 +182,7 @@ namespace Reflex
 			virtual void on_pointer (PointerEvent* e)
 			{
 				RUCY_SYM(on_pointer);
-				if (RUCY_IS_OVERRIDDEN(on_pointer, view_class()))
+				if (RUCY_IS_OVERRIDDEN(on_pointer))
 					this->value.call(on_pointer, Rucy::value(e));
 				else
 					Super::on_pointer(e);
@@ -193,7 +191,7 @@ namespace Reflex
 			virtual void on_pointer_down (PointerEvent* e)
 			{
 				RUCY_SYM(on_pointer_down);
-				if (RUCY_IS_OVERRIDDEN(on_pointer_down, view_class()))
+				if (RUCY_IS_OVERRIDDEN(on_pointer_down))
 					this->value.call(on_pointer_down, Rucy::value(e));
 				else
 					Super::on_pointer_down(e);
@@ -202,7 +200,7 @@ namespace Reflex
 			virtual void on_pointer_up (PointerEvent* e)
 			{
 				RUCY_SYM(on_pointer_up);
-				if (RUCY_IS_OVERRIDDEN(on_pointer_up, view_class()))
+				if (RUCY_IS_OVERRIDDEN(on_pointer_up))
 					this->value.call(on_pointer_up, Rucy::value(e));
 				else
 					Super::on_pointer_up(e);
@@ -211,7 +209,7 @@ namespace Reflex
 			virtual void on_pointer_move (PointerEvent* e)
 			{
 				RUCY_SYM(on_pointer_move);
-				if (RUCY_IS_OVERRIDDEN(on_pointer_move, view_class()))
+				if (RUCY_IS_OVERRIDDEN(on_pointer_move))
 					this->value.call(on_pointer_move, Rucy::value(e));
 				else
 					Super::on_pointer_move(e);
@@ -220,7 +218,7 @@ namespace Reflex
 			virtual void on_wheel (WheelEvent* e)
 			{
 				RUCY_SYM(on_wheel);
-				if (RUCY_IS_OVERRIDDEN(on_wheel, view_class()))
+				if (RUCY_IS_OVERRIDDEN(on_wheel))
 					this->value.call(on_wheel, Rucy::value(e));
 				else
 					Super::on_wheel(e);
@@ -229,7 +227,7 @@ namespace Reflex
 			virtual void on_capture (CaptureEvent* e)
 			{
 				RUCY_SYM(on_capture);
-				if (RUCY_IS_OVERRIDDEN(on_capture, view_class()))
+				if (RUCY_IS_OVERRIDDEN(on_capture))
 					this->value.call(on_capture, Rucy::value(e));
 				else
 					Super::on_capture(e);
@@ -248,6 +246,12 @@ namespace Rucy
 {
 
 
+	template <> inline Class
+	get_ruby_class<Reflex::View> ()
+	{
+		return Reflex::view_class();
+	}
+
 	inline Value
 	value (Reflex::View::Ref& ref, Value klass = Reflex::view_class())
 	{

data/include/reflex/ruby/window.h

@@ -42,28 +42,28 @@ namespace Reflex
 
 			RUCY_OVERRIDE_END
 
-			virtual void show ()
+			virtual void on_show (Event* e)
 			{
-				RUCY_SYM(show);
-				this->value.call(show);
+				RUCY_SYM(on_show);
+				this->value.call(on_show, Rucy::value(e));
 			}
 
-			virtual void hide ()
+			virtual void on_hide (Event* e)
 			{
-				RUCY_SYM(hide);
-				this->value.call(hide);
+				RUCY_SYM(on_hide);
+				this->value.call(on_hide, Rucy::value(e));
 			}
 
-			virtual void close ()
+			virtual void on_close (Event* e)
 			{
-				RUCY_SYM(close);
-				this->value.call(close);
+				RUCY_SYM(on_close);
+				this->value.call(on_close, Rucy::value(e));
 			}
 
 			virtual void on_update (UpdateEvent* e)
 			{
 				RUCY_SYM(on_update);
-				if (RUCY_IS_OVERRIDDEN(on_update, window_class()))
+				if (RUCY_IS_OVERRIDDEN(on_update))
 					this->value.call(on_update, Rucy::value(e));
 				else
 					Super::on_update(e);
@@ -72,7 +72,7 @@ namespace Reflex
 			virtual void on_draw (DrawEvent* e)
 			{
 				RUCY_SYM(on_draw);
-				if (RUCY_IS_OVERRIDDEN(on_draw, window_class()))
+				if (RUCY_IS_OVERRIDDEN(on_draw))
 					this->value.call(on_draw, Rucy::value(e));
 				else
 					Super::on_draw(e);
@@ -81,7 +81,7 @@ namespace Reflex
 			virtual void on_move (FrameEvent* e)
 			{
 				RUCY_SYM(on_move);
-				if (RUCY_IS_OVERRIDDEN(on_move, window_class()))
+				if (RUCY_IS_OVERRIDDEN(on_move))
 					this->value.call(on_move, Rucy::value(e));
 				else
 					Super::on_move(e);
@@ -90,7 +90,7 @@ namespace Reflex
 			virtual void on_resize (FrameEvent* e)
 			{
 				RUCY_SYM(on_resize);
-				if (RUCY_IS_OVERRIDDEN(on_resize, window_class()))
+				if (RUCY_IS_OVERRIDDEN(on_resize))
 					this->value.call(on_resize, Rucy::value(e));
 				else
 					Super::on_resize(e);
@@ -99,7 +99,7 @@ namespace Reflex
 			virtual void on_key (KeyEvent* e)
 			{
 				RUCY_SYM(on_key);
-				if (RUCY_IS_OVERRIDDEN(on_key, window_class()))
+				if (RUCY_IS_OVERRIDDEN(on_key))
 					this->value.call(on_key, Rucy::value(e));
 				else
 					Super::on_key(e);
@@ -108,7 +108,7 @@ namespace Reflex
 			virtual void on_key_down (KeyEvent* e)
 			{
 				RUCY_SYM(on_key_down);
-				if (RUCY_IS_OVERRIDDEN(on_key_down, window_class()))
+				if (RUCY_IS_OVERRIDDEN(on_key_down))
 					this->value.call(on_key_down, Rucy::value(e));
 				else
 					Super::on_key_down(e);
@@ -117,7 +117,7 @@ namespace Reflex
 			virtual void on_key_up (KeyEvent* e)
 			{
 				RUCY_SYM(on_key_up);
-				if (RUCY_IS_OVERRIDDEN(on_key_up, window_class()))
+				if (RUCY_IS_OVERRIDDEN(on_key_up))
 					this->value.call(on_key_up, Rucy::value(e));
 				else
 					Super::on_key_up(e);
@@ -126,7 +126,7 @@ namespace Reflex
 			virtual void on_pointer (PointerEvent* e)
 			{
 				RUCY_SYM(on_pointer);
-				if (RUCY_IS_OVERRIDDEN(on_pointer, window_class()))
+				if (RUCY_IS_OVERRIDDEN(on_pointer))
 					this->value.call(on_pointer, Rucy::value(e));
 				else
 					Super::on_pointer(e);
@@ -135,7 +135,7 @@ namespace Reflex
 			virtual void on_pointer_down (PointerEvent* e)
 			{
 				RUCY_SYM(on_pointer_down);
-				if (RUCY_IS_OVERRIDDEN(on_pointer_down, window_class()))
+				if (RUCY_IS_OVERRIDDEN(on_pointer_down))
 					this->value.call(on_pointer_down, Rucy::value(e));
 				else
 					Super::on_pointer_down(e);
@@ -144,7 +144,7 @@ namespace Reflex
 			virtual void on_pointer_up (PointerEvent* e)
 			{
 				RUCY_SYM(on_pointer_up);
-				if (RUCY_IS_OVERRIDDEN(on_pointer_up, window_class()))
+				if (RUCY_IS_OVERRIDDEN(on_pointer_up))
 					this->value.call(on_pointer_up, Rucy::value(e));
 				else
 					Super::on_pointer_up(e);
@@ -153,7 +153,7 @@ namespace Reflex
 			virtual void on_pointer_move (PointerEvent* e)
 			{
 				RUCY_SYM(on_pointer_move);
-				if (RUCY_IS_OVERRIDDEN(on_pointer_move, window_class()))
+				if (RUCY_IS_OVERRIDDEN(on_pointer_move))
 					this->value.call(on_pointer_move, Rucy::value(e));
 				else
 					Super::on_pointer_move(e);
@@ -162,7 +162,7 @@ namespace Reflex
 			virtual void on_wheel (WheelEvent* e)
 			{
 				RUCY_SYM(on_wheel);
-				if (RUCY_IS_OVERRIDDEN(on_wheel, window_class()))
+				if (RUCY_IS_OVERRIDDEN(on_wheel))
 					this->value.call(on_wheel, Rucy::value(e));
 				else
 					Super::on_wheel(e);
@@ -181,6 +181,12 @@ namespace Rucy
 {
 
 
+	template <> inline Class
+	get_ruby_class<Reflex::Window> ()
+	{
+		return Reflex::window_class();
+	}
+
 	inline Value
 	value (Reflex::Window::Ref& ref, Value klass = Reflex::window_class())
 	{

data/include/reflex/ruby.h

@@ -11,6 +11,8 @@
 #include <reflex/ruby/selector.h>
 #include <reflex/ruby/style.h>
 #include <reflex/ruby/event.h>
+#include <reflex/ruby/body.h>
+#include <reflex/ruby/fixture.h>
 
 
 #endif//EOH

data/include/reflex/shader.h

@@ -0,0 +1,20 @@
+// -*- c++ -*-
+#pragma once
+#ifndef __REFLEX_SHADER_H__
+#define __REFLEX_SHADER_H__
+
+
+#include <rays/shader.h>
+
+
+namespace Reflex
+{
+
+
+	using Rays::Shader;
+
+
+}// Reflex
+
+
+#endif//EOH

data/include/reflex/style.h

@@ -5,9 +5,8 @@
 
 
 #include <xot/ref.h>
-#include <rays/color.h>
-#include <rays/image.h>
-#include <reflex/defs.h>
+#include <reflex/color.h>
+#include <reflex/image.h>
 #include <reflex/selector.h>
 #include <reflex/style_length.h>
 

data/include/reflex/texture.h

@@ -0,0 +1,20 @@
+// -*- c++ -*-
+#pragma once
+#ifndef __REFLEX_TEXTURE_H__
+#define __REFLEX_TEXTURE_H__
+
+
+#include <rays/texture.h>
+
+
+namespace Reflex
+{
+
+
+	using Rays::Texture;
+
+
+}// Reflex
+
+
+#endif//EOH

data/include/reflex/view.h

@@ -7,8 +7,9 @@
 #include <vector>
 #include <xot/ref.h>
 #include <xot/pimpl.h>
-#include <rays/point.h>
-#include <reflex/defs.h>
+#include <reflex/point.h>
+#include <reflex/bounds.h>
+#include <reflex/painter.h>
 #include <reflex/style.h>
 #include <reflex/event.h>
 
@@ -16,22 +17,14 @@
 //#define REFLEX_VIEW_REF_DEBUG 1
 
 
-namespace Rays
-{
-
-	struct Bounds;
-
-	class Painter;
-
-};// Rays
-
-
 namespace Reflex
 {
 
 
 	class Window;
 
+	class Body;
+
 
 	class View : public Xot::RefCountable<>
 	{
@@ -127,7 +120,11 @@ namespace Reflex
 
 			virtual void resize_to_fit ();
 
-			virtual Rays::Point content_size () const;
+			virtual Point content_size () const;
+
+			virtual void make_body ();
+
+			virtual void clear_body ();
 
 			virtual void    set_name (const char* name);
 
@@ -157,15 +154,15 @@ namespace Reflex
 
 			virtual const Bounds& frame () const;
 
-			virtual void               scroll_to (coord x, coord y, coord z = 0);
+			virtual void         scroll_to (coord x, coord y, coord z = 0);
 
-			virtual void               scroll_to (const Rays::Point& scroll);
+			virtual void         scroll_to (const Point& scroll);
 
-			virtual void               scroll_by (coord x, coord y, coord z = 0);
+			virtual void         scroll_by (coord x, coord y, coord z = 0);
 
-			virtual void               scroll_by (const Rays::Point& dscroll);
+			virtual void         scroll_by (const Point& dscroll);
 
-			virtual const Rays::Point& scroll () const;
+			virtual const Point& scroll () const;
 
 			virtual void set_capture (uint types);
 
@@ -179,22 +176,46 @@ namespace Reflex
 
 			virtual const Window* window () const;
 
-			virtual Rays::Point from_parent (const Rays::Point& point) const;
+			virtual       Body* body ();
+
+			virtual const Body* body () const;
+
+			virtual void set_density (float density);
 
-			virtual Rays::Point   to_parent (const Rays::Point& point) const;
+			virtual void set_friction (float friction);
 
-			virtual Rays::Point from_window (const Rays::Point& point) const;
+			virtual void set_restitution (float restitution);
 
-			virtual Rays::Point   to_window (const Rays::Point& point) const;
+			virtual void set_gravity (coord x, coord y);
 
-			virtual Rays::Point from_screen (const Rays::Point& point) const;
+			virtual void set_gravity (const Point& vector);
 
-			virtual Rays::Point   to_screen (const Rays::Point& point) const;
+			virtual Point    gravity () const;
+
+			virtual void set_debug (bool state);
+
+			virtual bool  is_debug () const;
+
+			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 on_attach (Event* e);
 
 			virtual void on_detach (Event* e);
 
+			virtual void on_show (Event* e);
+
+			virtual void on_hide (Event* e);
+
 			virtual void on_update (UpdateEvent* e);
 
 			virtual void on_draw   (DrawEvent* e);

data/include/reflex/window.h

@@ -6,21 +6,12 @@
 
 #include <xot/ref.h>
 #include <xot/pimpl.h>
-#include <rays/point.h>
-#include <reflex/defs.h>
+#include <reflex/point.h>
+#include <reflex/bounds.h>
+#include <reflex/painter.h>
 #include <reflex/event.h>
 
 
-namespace Rays
-{
-
-	struct Bounds;
-
-	class Painter;
-
-}// Rays
-
-
 namespace Reflex
 {
 
@@ -71,9 +62,15 @@ namespace Reflex
 
 			virtual const Painter* painter () const;
 
-			virtual Rays::Point from_screen (const Rays::Point& point) const;
+			virtual Point from_screen (const Point& point) const;
+
+			virtual Point   to_screen (const Point& point) const;
+
+			virtual void on_show (Event* e);
+
+			virtual void on_hide (Event* e);
 
-			virtual Rays::Point   to_screen (const Rays::Point& point) const;
+			virtual void on_close (Event* e);
 
 			virtual void on_update (UpdateEvent* e);
 

data/include/reflex.h

@@ -16,6 +16,9 @@
 #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

@@ -18,11 +18,15 @@ module Reflex
     def initialize (opts = {}, &block)
       super()
       set opts
-      @start_block = block
+      @on_start = block if block
     end
 
     def on_start (e)
-      Xot::BlockUtil.instance_eval_or_block_call self, &@start_block if @start_block
+      if @on_start
+        Xot::BlockUtil.instance_eval_or_block_call self, &@on_start
+        @on_start = nil
+      end
+      on_start! e
     end
 
     def self.start (*args, &block)

data/lib/reflex/body.rb

@@ -0,0 +1,17 @@
+# -*- coding: utf-8 -*-
+
+
+require 'xot/setter'
+
+
+module Reflex
+
+
+  class Body
+
+    include Xot::Setter
+
+  end# Body
+
+
+end# Reflex

data/lib/reflex/fixture.rb

@@ -0,0 +1,17 @@
+# -*- coding: utf-8 -*-
+
+
+require 'xot/setter'
+
+
+module Reflex
+
+
+  class Fixture
+
+    include Xot::Setter
+
+  end# Fixture
+
+
+end# Reflex

data/lib/reflex/view.rb

@@ -26,7 +26,7 @@ module Reflex
     def initialize (opts = {}, &block)
       super()
       set opts
-      Xot::BlockUtil.instance_eval_or_block_call self, &block if block
+      @on_attach = block if block
     end
 
     def children ()
@@ -57,6 +57,21 @@ 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
+      else            set_gravity *args
+      end
+    end
+
+    def on_attach (e)
+      on_attach! e
+      if @on_attach
+        Xot::BlockUtil.instance_eval_or_block_call self, &@on_attach
+        @on_attach = nil
+      end
+    end
+
     def self.has_model ()
       include ModelView
     end