reflexion 0.1.7 → 0.1.8

data/ext/reflex/view.cpp

@@ -8,6 +8,7 @@
 #include "reflex/ruby/window.h"
 #include "reflex/ruby/selector.h"
 #include "reflex/ruby/style.h"
+#include "reflex/ruby/body.h"
 
 
 using namespace Rucy;
@@ -15,13 +16,11 @@ using namespace Rucy;
 using Reflex::coord;
 
 
-static Class cView;
-
-RUCY_DEFINE_WRAPPER_VALUE_FROM_TO(Reflex::View, cView)
+RUCY_DEFINE_WRAPPER_VALUE_FROM_TO(Reflex::View)
 
 #define THIS      to<Reflex::View*>(self)
 
-#define CHECK     RUCY_CHECK_OBJECT(Reflex::View, cView, self)
+#define CHECK     RUCY_CHECK_OBJECT(Reflex::View, self)
 
 #define CALL(fun) RUCY_WRAPPER_CALL(Reflex::View, THIS, fun)
 
@@ -47,7 +46,7 @@ static
 RUCY_DEF0(show)
 {
 	CHECK;
-	CALL(show());
+	THIS->show();
 	return self;
 }
 RUCY_END
@@ -56,7 +55,7 @@ static
 RUCY_DEF0(hide)
 {
 	CHECK;
-	CALL(hide());
+	THIS->hide();
 	return self;
 }
 RUCY_END
@@ -228,6 +227,22 @@ RUCY_DEF0(content_size)
 }
 RUCY_END
 
+static
+RUCY_DEF0(make_body)
+{
+	CHECK;
+	CALL(make_body());
+}
+RUCY_END
+
+static
+RUCY_DEF0(clear_body)
+{
+	CHECK;
+	THIS->clear_body();
+}
+RUCY_END
+
 static
 RUCY_DEF1(set_name, name)
 {
@@ -386,6 +401,75 @@ RUCY_DEF0(window)
 }
 RUCY_END
 
+static
+RUCY_DEF0(body)
+{
+	CHECK;
+	return value(THIS->body());
+}
+RUCY_END
+
+static
+RUCY_DEF1(set_density, value)
+{
+	CHECK;
+	THIS->set_density(value.as_f(true));
+	return value;
+}
+RUCY_END
+
+static
+RUCY_DEF1(set_friction, value)
+{
+	CHECK;
+	THIS->set_friction(value.as_f(true));
+	return value;
+}
+RUCY_END
+
+static
+RUCY_DEF1(set_restitution, value)
+{
+	CHECK;
+	THIS->set_restitution(value.as_f(true));
+	return value;
+}
+RUCY_END
+
+static
+RUCY_DEF2(set_gravity, x, y)
+{
+	CHECK;
+	THIS->set_gravity(x.as_f(true), y.as_f(true));
+	return self;
+}
+RUCY_END
+
+static
+RUCY_DEF0(get_gravity)
+{
+	CHECK;
+	return value(THIS->gravity());
+}
+RUCY_END
+
+static
+RUCY_DEF1(set_debug, state)
+{
+	CHECK;
+	THIS->set_debug(state);
+	return state;
+}
+RUCY_END
+
+static
+RUCY_DEF0(is_debug)
+{
+	CHECK;
+	return value(THIS->is_debug());
+}
+RUCY_END
+
 static
 RUCY_DEF1(on_attach, event)
 {
@@ -402,6 +486,22 @@ RUCY_DEF1(on_detach, event)
 }
 RUCY_END
 
+static
+RUCY_DEF1(on_show, event)
+{
+	CHECK;
+	CALL(on_show(to<Reflex::Event*>(event)));
+}
+RUCY_END
+
+static
+RUCY_DEF1(on_hide, event)
+{
+	CHECK;
+	CALL(on_hide(to<Reflex::Event*>(event)));
+}
+RUCY_END
+
 static
 RUCY_DEF1(on_update, event)
 {
@@ -531,9 +631,11 @@ RUCY_DEF1(on_capture, event)
 RUCY_END
 
 static
-RUCY_DEF_clear_override_flags(cof, Reflex::View, cView);
+RUCY_DEF_clear_override_flags(cof, Reflex::View);
 
 
+static Class cView;
+
 void
 Init_view ()
 {
@@ -559,13 +661,15 @@ Init_view ()
 	cView.define_method("focus?", has_focus);
 	cView.define_method("resize_to_fit", resize_to_fit);
 	cView.define_method("content_size",  content_size);
+	cView.define_method("make_body",  make_body);
+	cView.define_method("clear_body", clear_body);
 	cView.define_method("name=", set_name);
 	cView.define_method("name",  get_name);
 	cView.define_method("add_tag",    add_tag);
 	cView.define_method("remove_tag", remove_tag);
 	cView.define_method("each_tag", each_tag);
 	cView.define_method("selector=", set_selector);
-	cView.define_method("selector", get_selector);
+	cView.define_method("selector",  get_selector);
 	cView.define_private_method("set_frame", set_frame);
 	cView.define_private_method("get_frame", get_frame);
 	cView.define_method("scroll_to", scroll_to);
@@ -575,15 +679,25 @@ Init_view ()
 	cView.define_method("get_capture", get_capture);
 	cView.define_method("parent", parent);
 	cView.define_method("window", window);
-	cView.define_method("on_attach", on_attach);
-	cView.define_method("on_detach", on_detach);
+	cView.define_method("body", body);
+	cView.define_method("density=",     set_density);
+	cView.define_method("friction=",    set_friction);
+	cView.define_method("restitution=", set_restitution);
+	cView.define_method("set_gravity",  set_gravity);
+	cView.define_method("gravity",      get_gravity);
+	cView.define_method("debug=", set_debug);
+	cView.define_method("debug?",  is_debug);
+	cView.define_method("on_attach!", on_attach);
+	cView.define_method("on_detach",  on_detach);
+	cView.define_method("on_show", on_show);
+	cView.define_method("on_hide", on_hide);
 	cView.define_method("on_update", on_update);
 	cView.define_method("on_draw",   on_draw);
 	cView.define_method("on_move",   on_move);
 	cView.define_method("on_resize", on_resize);
 	cView.define_method("on_scroll", on_scroll);
-	cView.define_method("on_focus",  on_focus);
-	cView.define_method("on_blur",   on_blur);
+	cView.define_method("on_focus", on_focus);
+	cView.define_method("on_blur",  on_blur);
 	cView.define_method("on_key",      on_key);
 	cView.define_method("on_key_down", on_key_down);
 	cView.define_method("on_key_up",   on_key_up);

data/ext/reflex/wheel_event.cpp

@@ -11,13 +11,11 @@ using namespace Rucy;
 using Reflex::coord;
 
 
-static Class cWheelEvent;
-
-RUCY_DEFINE_VALUE_FROM_TO(Reflex::WheelEvent, cWheelEvent)
+RUCY_DEFINE_VALUE_FROM_TO(Reflex::WheelEvent)
 
 #define THIS  to<Reflex::WheelEvent*>(self)
 
-#define CHECK RUCY_CHECK_OBJ(Reflex::WheelEvent, cWheelEvent, self)
+#define CHECK RUCY_CHECK_OBJ(Reflex::WheelEvent, self)
 
 
 static
@@ -123,6 +121,8 @@ RUCY_DEF0(position)
 RUCY_END
 
 
+static Class cWheelEvent;
+
 void
 Init_wheel_event ()
 {

data/ext/reflex/window.cpp

@@ -12,13 +12,11 @@ using namespace Rucy;
 using Reflex::coord;
 
 
-static Class cWindow;
-
-RUCY_DEFINE_WRAPPER_VALUE_FROM_TO(Reflex::Window, cWindow)
+RUCY_DEFINE_WRAPPER_VALUE_FROM_TO(Reflex::Window)
 
 #define THIS      to<Reflex::Window*>(self)
 
-#define CHECK     RUCY_CHECK_OBJECT(Reflex::Window, cWindow, self)
+#define CHECK     RUCY_CHECK_OBJECT(Reflex::Window, self)
 
 #define CALL(fun) RUCY_WRAPPER_CALL(Reflex::Window, THIS, fun)
 
@@ -31,28 +29,28 @@ RUCY_DEF_ALLOC(alloc, klass)
 RUCY_END
 
 static
-RUCY_DEF0(close)
+RUCY_DEF0(show)
 {
 	CHECK;
-	CALL(close());
+	THIS->show();
 	return self;
 }
 RUCY_END
 
 static
-RUCY_DEF0(show)
+RUCY_DEF0(hide)
 {
 	CHECK;
-	CALL(show());
+	THIS->hide();
 	return self;
 }
 RUCY_END
 
 static
-RUCY_DEF0(hide)
+RUCY_DEF0(close)
 {
 	CHECK;
-	CALL(hide());
+	THIS->close();
 	return self;
 }
 RUCY_END
@@ -131,6 +129,30 @@ RUCY_DEF0(painter)
 }
 RUCY_END
 
+static
+RUCY_DEF1(on_show, event)
+{
+	CHECK;
+	CALL(on_show(to<Reflex::Event*>(event)));
+}
+RUCY_END
+
+static
+RUCY_DEF1(on_hide, event)
+{
+	CHECK;
+	CALL(on_hide(to<Reflex::Event*>(event)));
+}
+RUCY_END
+
+static
+RUCY_DEF1(on_close, event)
+{
+	CHECK;
+	CALL(on_close(to<Reflex::Event*>(event)));
+}
+RUCY_END
+
 static
 RUCY_DEF1(on_update, event)
 {
@@ -228,9 +250,11 @@ RUCY_DEF1(on_wheel, event)
 RUCY_END
 
 static
-RUCY_DEF_clear_override_flags(cof, Reflex::Window, cWindow);
+RUCY_DEF_clear_override_flags(cof, Reflex::Window);
 
 
+static Class cWindow;
+
 void
 Init_window ()
 {
@@ -238,9 +262,9 @@ Init_window ()
 
 	cWindow = mReflex.define_class("Window");
 	cWindow.define_alloc_func(alloc);
-	cWindow.define_method("close", close);
 	cWindow.define_method("show", show);
 	cWindow.define_method("hide", hide);
+	cWindow.define_method("close", close);
 	cWindow.define_method("redraw", redraw);
 	cWindow.define_method("title=", set_title);
 	cWindow.define_method("title", get_title);
@@ -250,6 +274,9 @@ Init_window ()
 	cWindow.define_method("root", root);
 	cWindow.define_method("focus", focus);
 	cWindow.define_method("painter", painter);
+	cWindow.define_method("on_show!", on_show);
+	cWindow.define_method("on_hide",  on_hide);
+	cWindow.define_method("on_close", on_close);
 	cWindow.define_method("on_update", on_update);
 	cWindow.define_method("on_draw",   on_draw);
 	cWindow.define_method("on_move",   on_move);

data/include/reflex/bitmap.h

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

data/include/reflex/body.h

@@ -0,0 +1,82 @@
+// -*- c++ -*-
+#pragma once
+#ifndef __REFLEX_BODY_H__
+#define __REFLEX_BODY_H__
+
+
+#include <reflex/point.h>
+#include <reflex/fixture.h>
+
+
+namespace Reflex
+{
+
+
+	class Body
+	{
+
+		public:
+
+			typedef void* Handle;
+
+			typedef FixtureIterator<      Fixture>       iterator;
+
+			typedef FixtureIterator<const Fixture> const_iterator;
+
+			Fixture add_box (float width, float height);
+
+			Fixture add_circle (float size);
+
+			Fixture add_edge (const Point& begin, const Point& end);
+
+			Fixture add_edge    (const Point* points, size_t size, bool loop = false);
+
+			Fixture add_polygon (const Point* points, size_t size);
+
+			void clear_fixtures ();
+
+			Point position () const;
+
+			float angle () const;
+
+			void set_static (bool state);
+
+			bool  is_static () const;
+
+			void set_dynamic (bool state);
+
+			bool  is_dynamic () const;
+
+			void set_density (float density);
+
+			void set_friction (float friction);
+
+			void set_restitution (float restitution);
+
+			      iterator begin ();
+
+			const_iterator begin () const;
+
+			      iterator end ();
+
+			const_iterator end () const;
+
+		protected:
+
+			Body (Handle h, float scale);
+
+		private:
+
+			friend class World;
+
+			Handle handle;
+
+			float scale;
+
+	};// Body
+
+
+}// Reflex
+
+
+#endif//EOH

data/include/reflex/bounds.h

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

data/include/reflex/color.h

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

data/include/reflex/color_space.h

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

data/include/reflex/defs.h

@@ -11,7 +11,11 @@ namespace Reflex
 {
 
 
-	using namespace Rays;
+	using namespace Xot::Types;
+
+	using Rays::String;
+
+	using Rays::coord;
 
 
 	enum KeyCode

data/include/reflex/event.h

@@ -4,17 +4,10 @@
 #define __REFLEX_EVENT_H__
 
 
-#include <rays/point.h>
-#include <rays/bounds.h>
 #include <reflex/defs.h>
-
-
-namespace Rays
-{
-
-	class Painter;
-
-}// Rays
+#include <reflex/point.h>
+#include <reflex/bounds.h>
+#include <reflex/painter.h>
 
 
 namespace Reflex
@@ -29,8 +22,6 @@ namespace Reflex
 
 		public:
 
-			struct Coord3 {coord x, y, z;};
-
 			Event ();
 
 			void block ();
@@ -111,13 +102,13 @@ namespace Reflex
 
 		ScrollEvent (coord x, coord y, coord z, coord dx, coord dy, coord dz);
 
-		      Rays::Point& scroll ();
+		      Point& scroll ();
 
-		const Rays::Point& scroll () const;
+		const Point& scroll () const;
 
-		      Rays::Point& delta ();
+		      Point& delta ();
 
-		const Rays::Point& delta () const;
+		const Point& delta () const;
 
 	};// ScrollEvent
 
@@ -194,16 +185,16 @@ namespace Reflex
 			uint modifiers = 0, uint count = 1, bool drag = false);
 
 		PointerEvent (
-			Type type, uint pointer_type, const Rays::Point* positions, size_t size,
+			Type type, uint pointer_type, const Point* positions, size_t size,
 			uint modifiers = 0, uint count = 1, bool drag = false);
 
-		      Rays::Point& position (size_t i = 0);
+		      Point& position (size_t i = 0);
 
-		const Rays::Point& position (size_t i = 0) const;
+		const Point& position (size_t i = 0) const;
 
-		      Rays::Point& operator [] (size_t i);
+		      Point& operator [] (size_t i);
 
-		const Rays::Point& operator [] (size_t i) const;
+		const Point& operator [] (size_t i) const;
 
 	};// PointerEvent
 
@@ -231,13 +222,13 @@ namespace Reflex
 			coord dx, coord dy, coord dz, coord x = 0, coord y = 0, coord z = 0,
 			uint modifiers = 0);
 
-		      Rays::Point& delta ();
+		      Point& delta ();
 
-		const Rays::Point& delta () const;
+		const Point& delta () const;
 
-		      Rays::Point& position ();
+		      Point& position ();
 
-		const Rays::Point& position () const;
+		const Point& position () const;
 
 	};// WheelEvent