reflexion 0.1.11 → 0.1.16

data/.doc/ext/reflex/frame_event.cpp

@@ -1,17 +1,11 @@
 #include "reflex/ruby/event.h"
 
 
-#include <rucy.h>
 #include "rays/ruby/point.h"
 #include "rays/ruby/bounds.h"
 #include "defs.h"
 
 
-using namespace Rucy;
-
-using Reflex::coord;
-
-
 RUCY_DEFINE_VALUE_FROM_TO(Reflex::FrameEvent)
 
 #define THIS  to<Reflex::FrameEvent*>(self)
@@ -26,16 +20,15 @@ VALUE alloc(VALUE klass)
 }
 
 static
-VALUE initialize(VALUE self)
+VALUE initialize(VALUE self, VALUE frame, VALUE dx, VALUE dy, VALUE dwidth, VALUE dheight)
 {
 	CHECK;
-	check_arg_count(__FILE__, __LINE__, "FrameEvent#initialize", argc, 0, 1, 2, 3, 4, 5);
 
-	THIS->frame   = (argc >= 1) ? to<Rays::Bounds&>(argv[0]) : Rays::Bounds(0);
-	THIS->dx      = (argc >= 2) ? to<coord>(argv[1]) : 0;
-	THIS->dy      = (argc >= 3) ? to<coord>(argv[2]) : 0;
-	THIS->dwidth  = (argc >= 4) ? to<coord>(argv[3]) : 0;
-	THIS->dheight = (argc >= 5) ? to<coord>(argv[4]) : 0;
+	THIS->frame   = to<Rays::Bounds>(frame);
+	THIS->dx      = to<coord>(dx);
+	THIS->dy      = to<coord>(dy);
+	THIS->dwidth  = to<coord>(dwidth);
+	THIS->dheight = to<coord>(dheight);
 
 	return rb_call_super(0, NULL);
 }
@@ -97,6 +90,41 @@ VALUE dsize(VALUE self)
 	return value(Rays::Point(THIS->dw, THIS->dh));
 }
 
+static
+VALUE angle(VALUE self)
+{
+	CHECK;
+	return value(THIS->angle);
+}
+
+static
+VALUE dangle(VALUE self)
+{
+	CHECK;
+	return value(THIS->dangle);
+}
+
+static
+VALUE is_move(VALUE self)
+{
+	CHECK;
+	return value(THIS->is_move());
+}
+
+static
+VALUE is_resize(VALUE self)
+{
+	CHECK;
+	return value(THIS->is_resize());
+}
+
+static
+VALUE is_rotate(VALUE self)
+{
+	CHECK;
+	return value(THIS->is_rotate());
+}
+
 
 static Class cFrameEvent;
 
@@ -107,7 +135,7 @@ Init_frame_event ()
 
 	cFrameEvent = mReflex.define_class("FrameEvent", Reflex::event_class());
 	rb_define_alloc_func(cFrameEvent, alloc);
-	rb_define_private_method(cFrameEvent, "initialize", RUBY_METHOD_FUNC(initialize), -1);
+	rb_define_private_method(cFrameEvent, "initialize", RUBY_METHOD_FUNC(initialize), 5);
 	rb_define_private_method(cFrameEvent, "initialize_copy", RUBY_METHOD_FUNC(initialize_copy), 1);
 	rb_define_method(cFrameEvent, "frame", RUBY_METHOD_FUNC(frame), 0);
 	rb_define_method(cFrameEvent, "dx", RUBY_METHOD_FUNC(dx), 0);
@@ -116,6 +144,11 @@ Init_frame_event ()
 	rb_define_method(cFrameEvent, "dheight", RUBY_METHOD_FUNC(dheight), 0);
 	rb_define_method(cFrameEvent, "dposition", RUBY_METHOD_FUNC(dposition), 0);
 	rb_define_method(cFrameEvent, "dsize", RUBY_METHOD_FUNC(dsize), 0);
+	rb_define_method(cFrameEvent, "angle", RUBY_METHOD_FUNC(angle), 0);
+	rb_define_method(cFrameEvent, "dangle", RUBY_METHOD_FUNC(dangle), 0);
+	cFrameEvent.define_method("move?",   is_move);
+	cFrameEvent.define_method("resize?", is_resize);
+	cFrameEvent.define_method("rotate?", is_rotate);
 }
 
 

data/.doc/ext/reflex/image_view.cpp

@@ -1,14 +1,9 @@
 #include "reflex/ruby/image_view.h"
 
 
-#include <rucy.h>
 #include <rays/ruby/point.h>
 #include "reflex/ruby/view.h"
-
-
-using namespace Rucy;
-
-using Reflex::coord;
+#include "defs.h"
 
 
 RUCY_DEFINE_WRAPPER_VALUE_FROM_TO(Reflex::ImageView)
@@ -42,9 +37,6 @@ VALUE set_image(VALUE self, VALUE image)
 	return image;
 }
 
-static
-RUCY_DEF_clear_override_flags(cof, Reflex::ImageView);
-
 
 static Class cImageView;
 
@@ -57,7 +49,6 @@ Init_image_view ()
 	rb_define_alloc_func(cImageView, alloc);
 	rb_define_private_method(cImageView, "set_image", RUBY_METHOD_FUNC(set_image), 1);
 	rb_define_method(cImageView, "image", RUBY_METHOD_FUNC(get_image), 0);
-	
 }
 
 

data/.doc/ext/reflex/key_event.cpp

@@ -1,13 +1,9 @@
 #include "reflex/ruby/event.h"
 
 
-#include <rucy.h>
 #include "defs.h"
 
 
-using namespace Rucy;
-
-
 RUCY_DEFINE_VALUE_FROM_TO(Reflex::KeyEvent)
 
 #define THIS  to<Reflex::KeyEvent*>(self)
@@ -22,16 +18,15 @@ VALUE alloc(VALUE klass)
 }
 
 static
-VALUE initialize(VALUE self)
+VALUE initialize(VALUE self, VALUE type, VALUE chars, VALUE code, VALUE repeat, VALUE modifiers)
 {
 	CHECK;
-	check_arg_count(__FILE__, __LINE__, "KeyEvent#initialize", argc, 0, 1, 2, 3, 4, 5);
 
-	THIS->type      = (argc >= 1) ? (Reflex::KeyEvent::Type) to<int>(argv[0]) : Reflex::KeyEvent::NONE;
-	THIS->chars     = (argc >= 2) ? argv[1].c_str()   : NULL;
-	THIS->code      = (argc >= 3) ? to<int>(argv[2])  : Reflex::KEY_NONE;
-	THIS->repeat    = (argc >= 4) ? to<int>(argv[3])  : 1;
-	THIS->modifiers = (argc >= 5) ? to<uint>(argv[4]) : (uint) Reflex::MOD_NONE;
+	THIS->type      = (Reflex::KeyEvent::Type) to<int>(type);
+	THIS->chars     = chars.c_str();
+	THIS->code      = to<int>(code);
+	THIS->repeat    = to<int>(repeat);
+	THIS->modifiers = to<uint>(modifiers);
 
 	return rb_call_super(0, NULL);
 }
@@ -45,7 +40,7 @@ VALUE initialize_copy(VALUE self, VALUE obj)
 }
 
 static
-VALUE get_type(VALUE self)
+VALUE type(VALUE self)
 {
 	CHECK;
 	return value(THIS->type);
@@ -96,9 +91,9 @@ Init_key_event ()
 
 	cKeyEvent = mReflex.define_class("KeyEvent", Reflex::event_class());
 	rb_define_alloc_func(cKeyEvent, alloc);
-	rb_define_private_method(cKeyEvent, "initialize", RUBY_METHOD_FUNC(initialize), -1);
+	rb_define_private_method(cKeyEvent, "initialize", RUBY_METHOD_FUNC(initialize), 5);
 	rb_define_private_method(cKeyEvent, "initialize_copy", RUBY_METHOD_FUNC(initialize_copy), 1);
-	rb_define_method(cKeyEvent, "get_type", RUBY_METHOD_FUNC(get_type), 0);
+	rb_define_method(cKeyEvent, "type", RUBY_METHOD_FUNC(type), 0);
 	rb_define_method(cKeyEvent, "chars", RUBY_METHOD_FUNC(chars), 0);
 	rb_define_method(cKeyEvent, "code", RUBY_METHOD_FUNC(code), 0);
 	rb_define_method(cKeyEvent, "modifiers", RUBY_METHOD_FUNC(modifiers), 0);

data/.doc/ext/reflex/line_shape.cpp

@@ -0,0 +1,99 @@
+#include "reflex/ruby/shape.h"
+
+
+#include <rays/ruby/point.h>
+#include "defs.h"
+
+
+RUCY_DEFINE_WRAPPER_VALUE_FROM_TO(Reflex::LineShape)
+
+#define THIS      to<Reflex::LineShape*>(self)
+
+#define CHECK     RUCY_CHECK_OBJ(Reflex::LineShape, self)
+
+#define CALL(fun) RUCY_CALL_SUPER(THIS, fun)
+
+
+static
+VALUE alloc(VALUE klass)
+{
+	return value(new Reflex::RubyShape<Reflex::LineShape>, klass);
+}
+
+static
+VALUE add_point(VALUE self)
+{
+	CHECK;
+	check_arg_count(__FILE__, __LINE__, "LineShape#add_point", argc, 1, 2, 3);
+
+	THIS->add_point(to<Rays::Point>(argc, argv));
+	return self;
+}
+
+static
+VALUE add_points(VALUE self)
+{
+	CHECK;
+
+	if (argc <= 0) return self;
+
+	if (argv[0].is_num())
+	{
+		if (argc % 2 != 0)
+			argument_error(__FILE__, __LINE__);
+
+		for (int i = 0; i < argc; i += 2)
+			THIS->add_point(to<coord>(argv[i]), to<coord>(argv[i + 1]));
+	}
+	else
+	{
+		for (int i = 0; i < argc; ++i)
+			THIS->add_point(to<Rays::Point>(argv[i]));
+	}
+	return self;
+}
+
+static
+VALUE set_loop(VALUE self, VALUE loop)
+{
+	CHECK;
+	THIS->set_loop(loop);
+	return loop;
+}
+
+static
+VALUE get_loop(VALUE self)
+{
+	CHECK;
+	return value(THIS->loop());
+}
+
+
+static Class cLineShape;
+
+void
+Init_line_shape ()
+{
+	Module mReflex = rb_define_module("Reflex");
+
+	cLineShape = mReflex.define_class("LineShape", Reflex::shape_class());
+	rb_define_alloc_func(cLineShape, alloc);
+	rb_define_method(cLineShape, "add_point", RUBY_METHOD_FUNC(add_point), -1);
+	rb_define_method(cLineShape, "add_points", RUBY_METHOD_FUNC(add_points), -1);
+	rb_define_method(cLineShape, "loop=", RUBY_METHOD_FUNC(set_loop), 1);
+	rb_define_method(cLineShape, "loop", RUBY_METHOD_FUNC(get_loop), 0);
+}
+
+
+namespace Reflex
+{
+
+
+	Class
+	line_shape_class ()
+	{
+		return cLineShape;
+	}
+
+
+}// Reflex

data/.doc/ext/reflex/motion_event.cpp

@@ -0,0 +1,73 @@
+#include "reflex/ruby/event.h"
+
+
+#include "rays/ruby/point.h"
+#include "defs.h"
+
+
+RUCY_DEFINE_VALUE_FROM_TO(Reflex::MotionEvent)
+
+#define THIS  to<Reflex::MotionEvent*>(self)
+
+#define CHECK RUCY_CHECK_OBJ(Reflex::MotionEvent, self)
+
+
+static
+VALUE alloc(VALUE klass)
+{
+	return new_type<Reflex::MotionEvent>(klass);
+}
+
+static
+VALUE initialize(VALUE self, VALUE gravity)
+{
+	CHECK;
+
+	THIS->gravity = to<Rays::Point>(gravity);
+
+	return rb_call_super(0, NULL);
+}
+
+static
+VALUE initialize_copy(VALUE self, VALUE obj)
+{
+	CHECK;
+	*THIS = to<Reflex::MotionEvent&>(obj);
+	return self;
+}
+
+static
+VALUE gravity(VALUE self)
+{
+	CHECK;
+	return value(THIS->gravity);
+}
+
+
+static Class cMotionEvent;
+
+void
+Init_motion_event ()
+{
+	Module mReflex = rb_define_module("Reflex");
+
+	cMotionEvent = mReflex.define_class("MotionEvent", Reflex::event_class());
+	rb_define_alloc_func(cMotionEvent, alloc);
+	rb_define_private_method(cMotionEvent, "initialize", RUBY_METHOD_FUNC(initialize), 1);
+	rb_define_private_method(cMotionEvent, "initialize_copy", RUBY_METHOD_FUNC(initialize_copy), 1);
+	rb_define_method(cMotionEvent, "gravity", RUBY_METHOD_FUNC(gravity), 0);
+}
+
+
+namespace Reflex
+{
+
+
+	Class
+	motion_event_class ()
+	{
+		return cMotionEvent;
+	}
+
+
+}// Reflex

data/.doc/ext/reflex/native.cpp

@@ -1,17 +1,16 @@
-#include <rucy.h>
 #include "defs.h"
 
 
-using namespace Rucy;
-
-
 void Init_reflex ();
 
 void Init_selector ();
 void Init_style ();
 void Init_style_length ();
+void Init_timer ();
+void Init_filter ();
 
 void Init_event ();
+void Init_motion_event ();
 void Init_update_event ();
 void Init_draw_event ();
 void Init_frame_event ();
@@ -21,10 +20,14 @@ void Init_key_event ();
 void Init_pointer_event ();
 void Init_wheel_event ();
 void Init_capture_event ();
+void Init_timer_event ();
 void Init_contact_event ();
 
-void Init_body ();
-void Init_fixture ();
+void Init_shape ();
+void Init_polygon_shape ();
+void Init_line_shape ();
+void Init_rect_shape ();
+void Init_ellipse_shape ();
 
 void Init_application ();
 void Init_window ();
@@ -32,11 +35,6 @@ void Init_view ();
 
 void Init_image_view ();
 
-void Init_shape_view ();
-void Init_rect_shape ();
-void Init_ellipse_shape ();
-void Init_arc_shape ();
-
 
 extern "C" void
 #ifdef COCOAPODS
@@ -54,8 +52,11 @@ extern "C" void
 	Init_selector();
 	Init_style();
 	Init_style_length();
+	Init_timer();
+	Init_filter();
 
 	Init_event();
+	Init_motion_event();
 	Init_update_event();
 	Init_draw_event();
 	Init_frame_event();
@@ -65,10 +66,14 @@ extern "C" void
 	Init_pointer_event();
 	Init_wheel_event();
 	Init_capture_event();
+	Init_timer_event();
 	Init_contact_event();
 
-	Init_body();
-	Init_fixture();
+	Init_shape();
+	Init_polygon_shape();
+	Init_line_shape();
+	Init_rect_shape();
+	Init_ellipse_shape();
 
 	Init_application();
 	Init_window();
@@ -76,10 +81,5 @@ extern "C" void
 
 	Init_image_view();
 
-	Init_shape_view();
-	Init_rect_shape();
-	Init_ellipse_shape();
-	Init_arc_shape();
-
 	RUCY_CATCH
 }