reflexion 0.1.15 → 0.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5161374ea08be1889e5cc2efe3e1428e8d9d620f8bac6073e5b010bd10bedebe
-  data.tar.gz: 2ba43dca1df02955b05cf58f6a9046f21941a605f8c9d8c1bdc744fb8d808ab2
+  metadata.gz: 79fd61794a59ff8ba0b15f2f32515ef63064bc1e62c92adc081712bac777fa4d
+  data.tar.gz: 3a7fdb5fd13bcecebf019185329450ee92b09d18c9b2c5ecefcc8c08d562469c
 SHA512:
-  metadata.gz: 4e237f277deb2ca92edee8663023891f3bba4cc8d2ac8e54ed7317f1dee8907c159afb3e20a7b6c5d798e0d0979b8bec709cf19a18decba5578d782e36c1e8d8
-  data.tar.gz: 61430437a4717c0547f3fb8432e0faa0532391e1bee56fa46083986e4f1c68d7aa194d261264144c1f7416f4c1926e6f7ca4e32a0ca371835337e9a57b5abb65
+  metadata.gz: 78e88670abd02997ea2e9aee2b373687109e9fb78f1f951f74277506f2f4ad2e83fe65cd85847a1be812d34e914671ba186a522db944423df4e8e940d99d3c81
+  data.tar.gz: 9d334478e511ff0d6aea0575d6a11b093e652209693e1d04775eff4807479fba836759eb800f526b48715e7fa854ebbcc54e638101739e24d4695734774912f5

data/.doc/ext/reflex/capture_event.cpp

@@ -19,13 +19,12 @@ VALUE alloc(VALUE klass)
 }
 
 static
-VALUE initialize(VALUE self)
+VALUE initialize(VALUE self, VALUE begin, VALUE end)
 {
 	CHECK;
-	check_arg_count(__FILE__, __LINE__, "CaptureEvent#initialize", argc, 0, 1, 2);
 
-	THIS->begin = (argc >= 1) ? to<uint>(argv[0]) : 0;
-	THIS->end   = (argc >= 2) ? to<uint>(argv[1]) : 0;
+	THIS->begin = to<uint>(begin);
+	THIS->end   = to<uint>(end);
 
 	return rb_call_super(0, NULL);
 }
@@ -62,7 +61,7 @@ Init_capture_event ()
 
 	cCaptureEvent = mReflex.define_class("CaptureEvent", Reflex::event_class());
 	rb_define_alloc_func(cCaptureEvent, alloc);
-	rb_define_private_method(cCaptureEvent, "initialize", RUBY_METHOD_FUNC(initialize), -1);
+	rb_define_private_method(cCaptureEvent, "initialize", RUBY_METHOD_FUNC(initialize), 2);
 	rb_define_private_method(cCaptureEvent, "initialize_copy", RUBY_METHOD_FUNC(initialize_copy), 1);
 	rb_define_private_method(cCaptureEvent, "get_begin", RUBY_METHOD_FUNC(begin), 0);
 	rb_define_private_method(cCaptureEvent, "get_end", RUBY_METHOD_FUNC(end), 0);

data/.doc/ext/reflex/contact_event.cpp

@@ -20,15 +20,12 @@ VALUE alloc(VALUE klass)
 }
 
 static
-VALUE initialize(VALUE self)
+VALUE initialize(VALUE self, VALUE type, VALUE shape)
 {
 	CHECK;
-	check_arg_count(__FILE__, __LINE__, "ContactEvent#initialize", argc, 0, 2);
 
-	THIS->type  = (argc >= 1)
-		?	(Reflex::ContactEvent::Type) to<int>(argv[0])
-		:	Reflex::ContactEvent::NONE;
-	THIS->shape = (argc >= 2) ? to<Reflex::Shape*>(argv[1]) : NULL;
+	THIS->type  = (Reflex::ContactEvent::Type) to<int>(type);
+	THIS->shape = to<Reflex::Shape*>(shape);
 
 	return rb_call_super(0, NULL);
 }
@@ -72,7 +69,7 @@ Init_contact_event ()
 
 	cContactEvent = mReflex.define_class("ContactEvent", Reflex::event_class());
 	rb_define_alloc_func(cContactEvent, alloc);
-	rb_define_private_method(cContactEvent, "initialize", RUBY_METHOD_FUNC(initialize), -1);
+	rb_define_private_method(cContactEvent, "initialize", RUBY_METHOD_FUNC(initialize), 2);
 	rb_define_private_method(cContactEvent, "initialize_copy", RUBY_METHOD_FUNC(initialize_copy), 1);
 	rb_define_method(cContactEvent, "type", RUBY_METHOD_FUNC(type), 0);
 	rb_define_method(cContactEvent, "shape", RUBY_METHOD_FUNC(shape), 0);

data/.doc/ext/reflex/draw_event.cpp

@@ -20,12 +20,11 @@ VALUE alloc(VALUE klass)
 }
 
 static
-VALUE initialize(VALUE self)
+VALUE initialize(VALUE self, VALUE dt)
 {
 	CHECK;
-	check_arg_count(__FILE__, __LINE__, "DrawEvent#initialize", argc, 0, 1);
 
-	THIS->dt = (argc >= 1) ? to<float>(argv[0]) : 0;
+	THIS->dt = to<float>(dt);
 
 	return rb_call_super(0, NULL);
 }
@@ -76,7 +75,7 @@ Init_draw_event ()
 
 	cDrawEvent = mReflex.define_class("DrawEvent", Reflex::event_class());
 	rb_define_alloc_func(cDrawEvent, alloc);
-	rb_define_private_method(cDrawEvent, "initialize", RUBY_METHOD_FUNC(initialize), -1);
+	rb_define_private_method(cDrawEvent, "initialize", RUBY_METHOD_FUNC(initialize), 1);
 	rb_define_private_method(cDrawEvent, "initialize_copy", RUBY_METHOD_FUNC(initialize_copy), 1);
 	rb_define_method(cDrawEvent, "painter", RUBY_METHOD_FUNC(painter), 0);
 	rb_define_method(cDrawEvent, "bounds", RUBY_METHOD_FUNC(bounds), 0);

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

@@ -20,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);
 }
@@ -136,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);

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

@@ -18,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);
 }
@@ -92,7 +91,7 @@ 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, "type", RUBY_METHOD_FUNC(type), 0);
 	rb_define_method(cKeyEvent, "chars", RUBY_METHOD_FUNC(chars), 0);

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

@@ -19,13 +19,11 @@ VALUE alloc(VALUE klass)
 }
 
 static
-VALUE initialize(VALUE self)
+VALUE initialize(VALUE self, VALUE gravity)
 {
 	CHECK;
-	check_arg_count(__FILE__, __LINE__, "MotionEvent#initialize", argc, 0, 1);
 
-	if (argc >= 1)
-		THIS->gravity = to<Rays::Point>(argv[0]);
+	THIS->gravity = to<Rays::Point>(gravity);
 
 	return rb_call_super(0, NULL);
 }
@@ -55,7 +53,7 @@ Init_motion_event ()
 
 	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", 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);
 }

data/.doc/ext/reflex/pointer_event.cpp

@@ -19,19 +19,23 @@ VALUE alloc(VALUE klass)
 }
 
 static
-VALUE initialize(VALUE self)
+VALUE initialize(VALUE self, VALUE type, VALUE pointer_type, VALUE modifiers, VALUE count, VALUE drag, VALUE positions)
 {
 	CHECK;
-	check_arg_count(__FILE__, __LINE__, "PointerEvent#initialize", argc, 0, 1, 2, 3, 4, 5, 6, 7);
 
-	THIS->type         = (argc >= 1) ? (Reflex::PointerEvent::Type) to<int>(argv[0]) : Reflex::PointerEvent::NONE;
-	THIS->pointer_type = (argc >= 2) ? to<uint>(argv[1])  : Reflex::POINTER_NONE;
-	THIS->x            = (argc >= 3) ? to<coord>(argv[2]) : 0;
-	THIS->y            = (argc >= 4) ? to<coord>(argv[3]) : 0;
-	THIS->size         = 1;
-	THIS->modifiers    = (argc >= 5) ? to<uint>(argv[4])  : (uint) Reflex::MOD_NONE;
-	THIS->count        = (argc >= 6) ? to<uint>(argv[5])  : 0;
-	THIS->drag         = (argc >= 7) ? to<bool>(argv[6])  : false;
+	int size = positions.size();
+	if (size <= 0 || Reflex::PointerEvent::MAX < size)
+		argument_error(__FILE__, __LINE__);
+
+	THIS->type         = (Reflex::PointerEvent::Type) to<int>(type);
+	THIS->pointer_type = to<uint>(pointer_type);
+	THIS->modifiers    = to<uint>(modifiers);
+	THIS->count        = to<uint>(count);
+	THIS->drag         = to<bool>(drag);
+	THIS->size         = (size_t) size;
+
+	for (int i = 0; i < size; ++i)
+		THIS->positions[i] = to<Rays::Point>(positions[i]);
 
 	return rb_call_super(0, NULL);
 }
@@ -118,10 +122,15 @@ VALUE position(VALUE self)
 }
 
 static
-VALUE array_get(VALUE self, VALUE index)
+VALUE get_at(VALUE self, VALUE index)
 {
 	CHECK;
-	return value((*THIS)[to<int>(index)]);
+
+	int i = to<int>(index);
+	if (i < 0 || THIS->size <= (size_t) i)
+		index_error(__FILE__, __LINE__);
+
+	return value((*THIS)[i]);
 }
 
 
@@ -134,7 +143,7 @@ Init_pointer_event ()
 
 	cPointerEvent = mReflex.define_class("PointerEvent", Reflex::event_class());
 	rb_define_alloc_func(cPointerEvent, alloc);
-	rb_define_private_method(cPointerEvent, "initialize", RUBY_METHOD_FUNC(initialize), -1);
+	rb_define_private_method(cPointerEvent, "initialize", RUBY_METHOD_FUNC(initialize), 6);
 	rb_define_private_method(cPointerEvent, "initialize_copy", RUBY_METHOD_FUNC(initialize_copy), 1);
 	rb_define_method(cPointerEvent, "type", RUBY_METHOD_FUNC(type), 0);
 	rb_define_method(cPointerEvent, "pointer_type", RUBY_METHOD_FUNC(pointer_type), 0);
@@ -146,7 +155,7 @@ Init_pointer_event ()
 	rb_define_method(cPointerEvent, "x", RUBY_METHOD_FUNC(x), 0);
 	rb_define_method(cPointerEvent, "y", RUBY_METHOD_FUNC(y), 0);
 	rb_define_method(cPointerEvent, "position", RUBY_METHOD_FUNC(position), -1);
-	cPointerEvent.define_method("[]", array_get);
+	cPointerEvent.define_method("[]", get_at);
 	cPointerEvent.define_const("TYPE_NONE", Reflex::PointerEvent::NONE);
 	cPointerEvent.define_const("TYPE_DOWN", Reflex::PointerEvent::DOWN);
 	cPointerEvent.define_const("TYPE_UP",   Reflex::PointerEvent::UP);

data/.doc/ext/reflex/scroll_event.cpp

@@ -19,17 +19,16 @@ VALUE alloc(VALUE klass)
 }
 
 static
-VALUE initialize(VALUE self)
+VALUE initialize(VALUE self, VALUE x, VALUE y, VALUE z, VALUE dx, VALUE dy, VALUE dz)
 {
 	CHECK;
-	check_arg_count(__FILE__, __LINE__, "ScrollEvent#initialize", argc, 0, 1, 2, 3, 4, 5, 6);
 
-	THIS->x       = (argc >= 1) ? to<coord>(argv[0]) : 0;
-	THIS->y       = (argc >= 2) ? to<coord>(argv[1]) : 0;
-	THIS->z       = (argc >= 3) ? to<coord>(argv[2]) : 0;
-	THIS->dx      = (argc >= 4) ? to<coord>(argv[3]) : 0;
-	THIS->dy      = (argc >= 5) ? to<coord>(argv[4]) : 0;
-	THIS->dz      = (argc >= 6) ? to<coord>(argv[5]) : 0;
+	THIS->x  = to<coord>(x);
+	THIS->y  = to<coord>(y);
+	THIS->z  = to<coord>(z);
+	THIS->dx = to<coord>(dx);
+	THIS->dy = to<coord>(dy);
+	THIS->dz = to<coord>(dz);
 
 	return rb_call_super(0, NULL);
 }
@@ -108,7 +107,7 @@ Init_scroll_event ()
 
 	cScrollEvent = mReflex.define_class("ScrollEvent", Reflex::event_class());
 	rb_define_alloc_func(cScrollEvent, alloc);
-	rb_define_private_method(cScrollEvent, "initialize", RUBY_METHOD_FUNC(initialize), -1);
+	rb_define_private_method(cScrollEvent, "initialize", RUBY_METHOD_FUNC(initialize), 6);
 	rb_define_private_method(cScrollEvent, "initialize_copy", RUBY_METHOD_FUNC(initialize_copy), 1);
 	rb_define_method(cScrollEvent, "x", RUBY_METHOD_FUNC(x), 0);
 	rb_define_method(cScrollEvent, "y", RUBY_METHOD_FUNC(y), 0);

data/.doc/ext/reflex/update_event.cpp

@@ -18,13 +18,12 @@ VALUE alloc(VALUE klass)
 }
 
 static
-VALUE initialize(VALUE self)
+VALUE initialize(VALUE self, VALUE now, VALUE dt)
 {
 	CHECK;
-	check_arg_count(__FILE__, __LINE__, "UpdateEvent#initialize", argc, 0, 1, 2);
 
-	THIS->now = (argc >= 1) ? to<double>(argv[0]) : 0;
-	THIS->dt  = (argc >= 2) ? to<float>(argv[1])  : 0;
+	THIS->now = to<double>(now);
+	THIS->dt  = to<float>(dt);
 
 	return rb_call_super(0, NULL);
 }
@@ -61,7 +60,7 @@ Init_update_event ()
 
 	cUpdateEvent = mReflex.define_class("UpdateEvent", Reflex::event_class());
 	rb_define_alloc_func(cUpdateEvent, alloc);
-	rb_define_private_method(cUpdateEvent, "initialize", RUBY_METHOD_FUNC(initialize), -1);
+	rb_define_private_method(cUpdateEvent, "initialize", RUBY_METHOD_FUNC(initialize), 2);
 	rb_define_private_method(cUpdateEvent, "initialize_copy", RUBY_METHOD_FUNC(initialize_copy), 1);
 	rb_define_method(cUpdateEvent, "now", RUBY_METHOD_FUNC(now), 0);
 	rb_define_method(cUpdateEvent, "dt", RUBY_METHOD_FUNC(dt), 0);

data/.doc/ext/reflex/wheel_event.cpp

@@ -19,14 +19,13 @@ VALUE alloc(VALUE klass)
 }
 
 static
-VALUE initialize(VALUE self)
+VALUE initialize(VALUE self, VALUE dx, VALUE dy, VALUE dz)
 {
 	CHECK;
-	check_arg_count(__FILE__, __LINE__, "WheelEvent#initialize", argc, 0, 1, 2, 3);
 
-	THIS->dx = (argc >= 1) ? to<coord>(argv[0]) : 0;
-	THIS->dy = (argc >= 2) ? to<coord>(argv[1]) : 0;
-	THIS->dz = (argc >= 3) ? to<coord>(argv[2]) : 0;
+	THIS->dx = to<coord>(dx);
+	THIS->dy = to<coord>(dy);
+	THIS->dz = to<coord>(dz);
 
 	return rb_call_super(0, NULL);
 }
@@ -98,7 +97,7 @@ Init_wheel_event ()
 
 	cWheelEvent = mReflex.define_class("WheelEvent", Reflex::event_class());
 	rb_define_alloc_func(cWheelEvent, alloc);
-	rb_define_private_method(cWheelEvent, "initialize", RUBY_METHOD_FUNC(initialize), -1);
+	rb_define_private_method(cWheelEvent, "initialize", RUBY_METHOD_FUNC(initialize), 3);
 	rb_define_private_method(cWheelEvent, "initialize_copy", RUBY_METHOD_FUNC(initialize_copy), 1);
 	rb_define_method(cWheelEvent, "dx", RUBY_METHOD_FUNC(dx), 0);
 	rb_define_method(cWheelEvent, "dy", RUBY_METHOD_FUNC(dy), 0);

data/VERSION

@@ -1 +1 @@
-0.1.15
+0.1.16

data/ext/reflex/capture_event.cpp

@@ -20,13 +20,12 @@ RUCY_DEF_ALLOC(alloc, klass)
 RUCY_END
 
 static
-RUCY_DEFN(initialize)
+RUCY_DEF2(initialize, begin, end)
 {
 	CHECK;
-	check_arg_count(__FILE__, __LINE__, "CaptureEvent#initialize", argc, 0, 1, 2);
 
-	THIS->begin = (argc >= 1) ? to<uint>(argv[0]) : 0;
-	THIS->end   = (argc >= 2) ? to<uint>(argv[1]) : 0;
+	THIS->begin = to<uint>(begin);
+	THIS->end   = to<uint>(end);
 
 	return rb_call_super(0, NULL);
 }

data/ext/reflex/contact_event.cpp

@@ -21,15 +21,12 @@ RUCY_DEF_ALLOC(alloc, klass)
 RUCY_END
 
 static
-RUCY_DEFN(initialize)
+RUCY_DEF2(initialize, type, shape)
 {
 	CHECK;
-	check_arg_count(__FILE__, __LINE__, "ContactEvent#initialize", argc, 0, 2);
 
-	THIS->type  = (argc >= 1)
-		?	(Reflex::ContactEvent::Type) to<int>(argv[0])
-		:	Reflex::ContactEvent::NONE;
-	THIS->shape = (argc >= 2) ? to<Reflex::Shape*>(argv[1]) : NULL;
+	THIS->type  = (Reflex::ContactEvent::Type) to<int>(type);
+	THIS->shape = to<Reflex::Shape*>(shape);
 
 	return rb_call_super(0, NULL);
 }

data/ext/reflex/draw_event.cpp

@@ -21,12 +21,11 @@ RUCY_DEF_ALLOC(alloc, klass)
 RUCY_END
 
 static
-RUCY_DEFN(initialize)
+RUCY_DEF1(initialize, dt)
 {
 	CHECK;
-	check_arg_count(__FILE__, __LINE__, "DrawEvent#initialize", argc, 0, 1);
 
-	THIS->dt = (argc >= 1) ? to<float>(argv[0]) : 0;
+	THIS->dt = to<float>(dt);
 
 	return rb_call_super(0, NULL);
 }

data/ext/reflex/frame_event.cpp

@@ -21,16 +21,15 @@ RUCY_DEF_ALLOC(alloc, klass)
 RUCY_END
 
 static
-RUCY_DEFN(initialize)
+RUCY_DEF5(initialize, frame, dx, dy, dwidth, 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);
 }

data/ext/reflex/key_event.cpp

@@ -19,16 +19,15 @@ RUCY_DEF_ALLOC(alloc, klass)
 RUCY_END
 
 static
-RUCY_DEFN(initialize)
+RUCY_DEF5(initialize, type, chars, code, repeat, 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);
 }

data/ext/reflex/motion_event.cpp

@@ -20,13 +20,11 @@ RUCY_DEF_ALLOC(alloc, klass)
 RUCY_END
 
 static
-RUCY_DEFN(initialize)
+RUCY_DEF1(initialize, gravity)
 {
 	CHECK;
-	check_arg_count(__FILE__, __LINE__, "MotionEvent#initialize", argc, 0, 1);
 
-	if (argc >= 1)
-		THIS->gravity = to<Rays::Point>(argv[0]);
+	THIS->gravity = to<Rays::Point>(gravity);
 
 	return rb_call_super(0, NULL);
 }

data/ext/reflex/pointer_event.cpp

@@ -20,19 +20,23 @@ RUCY_DEF_ALLOC(alloc, klass)
 RUCY_END
 
 static
-RUCY_DEFN(initialize)
+RUCY_DEF6(initialize, type, pointer_type, modifiers, count, drag, positions)
 {
 	CHECK;
-	check_arg_count(__FILE__, __LINE__, "PointerEvent#initialize", argc, 0, 1, 2, 3, 4, 5, 6, 7);
 
-	THIS->type         = (argc >= 1) ? (Reflex::PointerEvent::Type) to<int>(argv[0]) : Reflex::PointerEvent::NONE;
-	THIS->pointer_type = (argc >= 2) ? to<uint>(argv[1])  : Reflex::POINTER_NONE;
-	THIS->x            = (argc >= 3) ? to<coord>(argv[2]) : 0;
-	THIS->y            = (argc >= 4) ? to<coord>(argv[3]) : 0;
-	THIS->size         = 1;
-	THIS->modifiers    = (argc >= 5) ? to<uint>(argv[4])  : (uint) Reflex::MOD_NONE;
-	THIS->count        = (argc >= 6) ? to<uint>(argv[5])  : 0;
-	THIS->drag         = (argc >= 7) ? to<bool>(argv[6])  : false;
+	int size = positions.size();
+	if (size <= 0 || Reflex::PointerEvent::MAX < size)
+		argument_error(__FILE__, __LINE__);
+
+	THIS->type         = (Reflex::PointerEvent::Type) to<int>(type);
+	THIS->pointer_type = to<uint>(pointer_type);
+	THIS->modifiers    = to<uint>(modifiers);
+	THIS->count        = to<uint>(count);
+	THIS->drag         = to<bool>(drag);
+	THIS->size         = (size_t) size;
+
+	for (int i = 0; i < size; ++i)
+		THIS->positions[i] = to<Rays::Point>(positions[i]);
 
 	return rb_call_super(0, NULL);
 }
@@ -131,10 +135,15 @@ RUCY_DEFN(position)
 RUCY_END
 
 static
-RUCY_DEF1(array_get, index)
+RUCY_DEF1(get_at, index)
 {
 	CHECK;
-	return value((*THIS)[to<int>(index)]);
+
+	int i = to<int>(index);
+	if (i < 0 || THIS->size <= (size_t) i)
+		index_error(__FILE__, __LINE__);
+
+	return value((*THIS)[i]);
 }
 RUCY_END
 
@@ -160,7 +169,7 @@ Init_pointer_event ()
 	cPointerEvent.define_method("x", x);
 	cPointerEvent.define_method("y", y);
 	cPointerEvent.define_method("position", position);
-	cPointerEvent.define_method("[]", array_get);
+	cPointerEvent.define_method("[]", get_at);
 	cPointerEvent.define_const("TYPE_NONE", Reflex::PointerEvent::NONE);
 	cPointerEvent.define_const("TYPE_DOWN", Reflex::PointerEvent::DOWN);
 	cPointerEvent.define_const("TYPE_UP",   Reflex::PointerEvent::UP);

data/ext/reflex/scroll_event.cpp

@@ -20,17 +20,16 @@ RUCY_DEF_ALLOC(alloc, klass)
 RUCY_END
 
 static
-RUCY_DEFN(initialize)
+RUCY_DEF6(initialize, x, y, z, dx, dy, dz)
 {
 	CHECK;
-	check_arg_count(__FILE__, __LINE__, "ScrollEvent#initialize", argc, 0, 1, 2, 3, 4, 5, 6);
-
-	THIS->x       = (argc >= 1) ? to<coord>(argv[0]) : 0;
-	THIS->y       = (argc >= 2) ? to<coord>(argv[1]) : 0;
-	THIS->z       = (argc >= 3) ? to<coord>(argv[2]) : 0;
-	THIS->dx      = (argc >= 4) ? to<coord>(argv[3]) : 0;
-	THIS->dy      = (argc >= 5) ? to<coord>(argv[4]) : 0;
-	THIS->dz      = (argc >= 6) ? to<coord>(argv[5]) : 0;
+
+	THIS->x  = to<coord>(x);
+	THIS->y  = to<coord>(y);
+	THIS->z  = to<coord>(z);
+	THIS->dx = to<coord>(dx);
+	THIS->dy = to<coord>(dy);
+	THIS->dz = to<coord>(dz);
 
 	return rb_call_super(0, NULL);
 }

data/ext/reflex/update_event.cpp

@@ -19,13 +19,12 @@ RUCY_DEF_ALLOC(alloc, klass)
 RUCY_END
 
 static
-RUCY_DEFN(initialize)
+RUCY_DEF2(initialize, now, dt)
 {
 	CHECK;
-	check_arg_count(__FILE__, __LINE__, "UpdateEvent#initialize", argc, 0, 1, 2);
 
-	THIS->now = (argc >= 1) ? to<double>(argv[0]) : 0;
-	THIS->dt  = (argc >= 2) ? to<float>(argv[1])  : 0;
+	THIS->now = to<double>(now);
+	THIS->dt  = to<float>(dt);
 
 	return rb_call_super(0, NULL);
 }

data/ext/reflex/wheel_event.cpp

@@ -20,14 +20,13 @@ RUCY_DEF_ALLOC(alloc, klass)
 RUCY_END
 
 static
-RUCY_DEFN(initialize)
+RUCY_DEF3(initialize, dx, dy, dz)
 {
 	CHECK;
-	check_arg_count(__FILE__, __LINE__, "WheelEvent#initialize", argc, 0, 1, 2, 3);
 
-	THIS->dx = (argc >= 1) ? to<coord>(argv[0]) : 0;
-	THIS->dy = (argc >= 2) ? to<coord>(argv[1]) : 0;
-	THIS->dz = (argc >= 3) ? to<coord>(argv[2]) : 0;
+	THIS->dx = to<coord>(dx);
+	THIS->dy = to<coord>(dy);
+	THIS->dz = to<coord>(dz);
 
 	return rb_call_super(0, NULL);
 }

data/include/reflex/event.h

@@ -37,16 +37,6 @@ namespace Reflex
 	};// Event
 
 
-	struct MotionEvent : public Event
-	{
-
-		Point gravity;
-
-		MotionEvent (const Point& gravity = Point(0, 9.8));
-
-	};// MotionEvent
-
-
 	struct UpdateEvent : public Event
 	{
 
@@ -115,14 +105,14 @@ namespace Reflex
 		{
 			struct {coord x, y, z;};
 
-			Rays::Coord3 scroll_;
+			Coord3 scroll_;
 		};
 
 		union
 		{
 			struct {coord dx, dy, dz;};
 
-			Rays::Coord3 delta_;
+			Coord3 delta_;
 		};
 
 		ScrollEvent ();
@@ -203,7 +193,7 @@ namespace Reflex
 		{
 			struct {coord x, y, z;};
 
-			Rays::Coord3 positions[MAX];
+			Coord3 positions[MAX];
 		};
 
 		PointerEvent ();
@@ -234,14 +224,14 @@ namespace Reflex
 		{
 			struct {coord dx, dy, dz;};
 
-			Rays::Coord3 delta_;
+			Coord3 delta_;
 		};
 
 		union
 		{
 			struct {coord x, y, z;};
 
-			Rays::Coord3 position_;
+			Coord3 position_;
 		};
 
 		uint modifiers;
@@ -315,6 +305,16 @@ namespace Reflex
 	};// ContactEvent
 
 
+	struct MotionEvent : public Event
+	{
+
+		Point gravity;
+
+		MotionEvent (const Point& gravity = Point(0, 9.8));
+
+	};// MotionEvent
+
+
 }// Reflex
 
 

data/include/reflex/exception.h

@@ -38,11 +38,17 @@ namespace Reflex
 
 		using namespace Xot::ErrorFunctions;
 
-		void reflex_error (const char* file, int line, const char* format = NULL, ...);
+		[[noreturn]]
+		void reflex_error (
+			const char* file, int line, const char* format = NULL, ...);
 
-		void layout_error (const char* file, int line, const char* format = NULL, ...);
+		[[noreturn]]
+		void layout_error (
+			const char* file, int line, const char* format = NULL, ...);
 
-		void physics_error (const char* file, int line, const char* format = NULL, ...);
+		[[noreturn]]
+		void physics_error (
+			const char* file, int line, const char* format = NULL, ...);
 
 	}// ErrorFunctions
 

data/include/reflex/ruby/event.h

@@ -17,9 +17,6 @@ namespace Reflex
 	Rucy::Class event_class ();
 	// class Reflex::Event
 
-	Rucy::Class motion_event_class ();
-	// class Reflex::MotionEvent
-
 	Rucy::Class update_event_class ();
 	// class Reflex::UpdateEvent
 
@@ -53,14 +50,15 @@ namespace Reflex
 	Rucy::Class contact_event_class ();
 	// class Reflex::ContactEvent
 
+	Rucy::Class motion_event_class ();
+	// class Reflex::MotionEvent
+
 
 }// Reflex
 
 
 RUCY_DECLARE_VALUE_FROM_TO(Reflex::Event)
 
-RUCY_DECLARE_VALUE_FROM_TO(Reflex::MotionEvent)
-
 RUCY_DECLARE_VALUE_FROM_TO(Reflex::UpdateEvent)
 
 RUCY_DECLARE_VALUE_FROM_TO(Reflex::DrawEvent)
@@ -83,6 +81,8 @@ RUCY_DECLARE_VALUE_FROM_TO(Reflex::TimerEvent)
 
 RUCY_DECLARE_VALUE_FROM_TO(Reflex::ContactEvent)
 
+RUCY_DECLARE_VALUE_FROM_TO(Reflex::MotionEvent)
+
 
 namespace Rucy
 {
@@ -94,12 +94,6 @@ namespace Rucy
 		return Reflex::event_class();
 	}
 
-	template <> inline Class
-	get_ruby_class<Reflex::MotionEvent> ()
-	{
-		return Reflex::motion_event_class();
-	}
-
 	template <> inline Class
 	get_ruby_class<Reflex::UpdateEvent> ()
 	{
@@ -166,6 +160,12 @@ namespace Rucy
 		return Reflex::contact_event_class();
 	}
 
+	template <> inline Class
+	get_ruby_class<Reflex::MotionEvent> ()
+	{
+		return Reflex::motion_event_class();
+	}
+
 
 }// Rucy
 

data/lib/reflex.rb

@@ -9,13 +9,14 @@ 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/image'
 require 'reflex/font'
 require 'reflex/shader'
-require 'reflex/painter'
+require 'reflex/camera'
 
 require 'reflex/reflex'
 require 'reflex/helper'

data/lib/reflex/camera.rb

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

data/lib/reflex/pointer_event.rb

@@ -64,6 +64,10 @@ module Reflex
       (get_pointer_type & POINTER_PEN) != 0
     end
 
+    def positions ()
+      size.times.map {|i| position i}
+    end
+
     def inspect ()
       "#<Reflex::PointerEvent type:#{type}/#{pointer_type} x:#{x} y:#{y} size:#{size} mod:#{modifiers} count:#{count} drag:#{drag?}>"
     end

data/samples/camera.rb

@@ -0,0 +1,32 @@
+# -*- coding: utf-8 -*-
+
+
+%w[xot rays reflex]
+  .map  {|s| File.expand_path "../../../#{s}/lib", __FILE__}
+  .each {|s| $:.unshift s if !$:.include?(s) && File.directory?(s)}
+
+require 'reflex'
+
+
+class Win < Reflex::Window
+
+  def initialize ()
+    super title: "Camera Example", frame: [100, 100, 800, 600]
+    @camera = Rays::Camera.new {start}
+  end
+
+  def on_draw (e)
+    p = e.painter
+    p.image @camera.image, 0, 0 if @camera.image
+    p.text "#{e.fps.to_i} FPS", 10, 10
+  end
+
+  def on_update (e)
+    redraw
+  end
+
+end
+
+Reflex.start do
+  Win.new.show
+end

data/src/event.cpp

@@ -28,12 +28,6 @@ namespace Reflex
 	}
 
 
-	MotionEvent::MotionEvent (const Point& gravity)
-	:	gravity(gravity)
-	{
-	}
-
-
 	UpdateEvent::UpdateEvent (double now, float dt)
 	:	now(now), dt(dt)
 	{
@@ -170,7 +164,7 @@ namespace Reflex
 		if (positions_)
 		{
 			for (size_t i = 0; i < size; ++i)
-				positions[i] = *(Rays::Coord3*) &positions_[i];
+				positions[i] = *(Coord3*) &positions_[i];
 		}
 	}
 
@@ -302,4 +296,10 @@ namespace Reflex
 	}
 
 
+	MotionEvent::MotionEvent (const Point& gravity)
+	:	gravity(gravity)
+	{
+	}
+
+
 }// Reflex

data/src/timer.cpp

@@ -162,8 +162,7 @@ namespace Reflex
 	{
 		assert(timer && *timer);
 
-		List::iterator end = timers.end();
-		for (List::iterator it = timers.begin(); it != end; ++it)
+		for (auto it = timers.begin(), end = timers.end(); it != end; ++it)
 		{
 			if (timer->self->next_time < (*it)->self->next_time)
 			{
@@ -219,8 +218,7 @@ namespace Reflex
 		if (!timer)
 			argument_error(__FILE__, __LINE__);
 
-		List::iterator end = timers.end();
-		for (List::iterator it = timers.begin(); it != end; ++it)
+		for (auto it = timers.begin(), end = timers.end(); it != end; ++it)
 		{
 			if (timer->id() == (*it)->id())
 				timers.erase(it);
@@ -261,8 +259,7 @@ namespace Reflex
 	void
 	Timers::fire (double now)
 	{
-		List::iterator end = timers.end();
-		for (List::iterator it = timers.begin(); it != end; ++it)
+		for (auto it = timers.begin(), end = timers.end(); it != end; ++it)
 		{
 			Timer* timer = it->get();
 			if (!is_time_to_fire(timer, now))

data/test/test_pointer_event.rb

@@ -6,80 +6,125 @@ require_relative 'helper'
 
 class TestPointerEvent < Test::Unit::TestCase
 
+  E = Reflex::PointerEvent
   T = true
   F = false
 
-  def event (*args)
-    Reflex::PointerEvent.new *args
+  TYPE_NONE = E::TYPE_NONE
+  DOWN      = E::TYPE_DOWN
+  UP        = E::TYPE_UP
+  MOVE      = E::TYPE_MOVE
+
+  POINTER_NONE = E::POINTER_NONE
+  LEFT         = E::POINTER_MOUSE_LEFT
+  RIGHT        = E::POINTER_MOUSE_RIGHT
+  MIDDLE       = E::POINTER_MOUSE_MIDDLE
+  TOUCH        = E::POINTER_TOUCH
+  PEN          = E::POINTER_PEN
+
+  def event (
+    type = TYPE_NONE, pointer_type = POINTER_NONE,
+    modifiers = 0, count = 0, drag = false,
+    positions: [0])
+
+    Reflex::PointerEvent.new type, pointer_type, modifiers, count, drag, positions
   end
 
-  def type (arg)
-    event(arg).tap do |o|
-      def o.test ()
-        [type, down?, up?, move?]
-      end
-    end
+  def test_initialize ()
+    assert_nothing_raised       {event positions: 10.times.to_a}
+    assert_raise(ArgumentError) {event positions: 11.times.to_a}
+    assert_raise(ArgumentError) {event positions: []}
   end
 
   def test_type ()
-    o = type Reflex::PointerEvent::TYPE_NONE
+    def type (arg)
+      event(arg).tap do |o|
+        def o.test ()
+          [type, down?, up?, move?]
+        end
+      end
+    end
+
+    o = type TYPE_NONE
     assert_equal [:none, F, F, F], o.test
 
-    o = type Reflex::PointerEvent::TYPE_DOWN
+    o = type DOWN
     assert_equal [:down, T, F, F], o.test
 
-    o = type Reflex::PointerEvent::TYPE_UP
+    o = type UP
     assert_equal [:up,   F, T, F], o.test
 
-    o = type Reflex::PointerEvent::TYPE_MOVE
+    o = type MOVE
     assert_equal [:move, F, F, T], o.test
   end
 
-  def pointer_type (arg)
-    event(Reflex::PointerEvent::TYPE_NONE, arg).tap do |o|
-      def o.test ()
-        [pointer_type, left?, right?, middle?, touch?, pen?]
+  def test_pointer_type ()
+    def pointer_type (arg)
+      event(TYPE_NONE, arg).tap do |o|
+        def o.test ()
+          [pointer_type, left?, right?, middle?, touch?, pen?]
+        end
       end
     end
-  end
 
-  def test_pointer_type ()
-    o = pointer_type Reflex::PointerEvent::POINTER_NONE
+    o = pointer_type POINTER_NONE
     assert_equal [[],              F, F, F, F, F], o.test
 
-    o = pointer_type Reflex::PointerEvent::POINTER_MOUSE_LEFT
+    o = pointer_type LEFT
     assert_equal [[:mouse_left],   T, F, F, F, F], o.test
 
-    o = pointer_type Reflex::PointerEvent::POINTER_MOUSE_RIGHT
+    o = pointer_type RIGHT
     assert_equal [[:mouse_right],  F, T, F, F, F], o.test
 
-    o = pointer_type Reflex::PointerEvent::POINTER_MOUSE_MIDDLE
+    o = pointer_type MIDDLE
     assert_equal [[:mouse_middle], F, F, T, F, F], o.test
 
-    o = pointer_type Reflex::PointerEvent::POINTER_TOUCH
+    o = pointer_type TOUCH
     assert_equal [[:touch],        F, F, F, T, F], o.test
 
-    o = pointer_type Reflex::PointerEvent::POINTER_PEN
+    o = pointer_type PEN
     assert_equal [[:pen],          F, F, F, F, T], o.test
 
-    o = pointer_type Reflex::PointerEvent::POINTER_MOUSE_LEFT |
-      Reflex::PointerEvent::POINTER_MOUSE_RIGHT
+    o = pointer_type LEFT | RIGHT
     types = [:mouse_left, :mouse_right]
     assert_equal [types, T, T, F, F, F], o.test
 
-    o = pointer_type Reflex::PointerEvent::POINTER_MOUSE_LEFT |
-      Reflex::PointerEvent::POINTER_MOUSE_RIGHT |
-      Reflex::PointerEvent::POINTER_MOUSE_MIDDLE
+    o = pointer_type LEFT | RIGHT | MIDDLE
     types = [:mouse_left, :mouse_right, :mouse_middle]
     assert_equal [types, T, T, T, F, F], o.test
 
-    o = pointer_type Reflex::PointerEvent::POINTER_MOUSE_LEFT |
-      Reflex::PointerEvent::POINTER_MOUSE_RIGHT |
-      Reflex::PointerEvent::POINTER_MOUSE_MIDDLE |
-      Reflex::PointerEvent::POINTER_TOUCH |
-      Reflex::PointerEvent::POINTER_PEN
+    o = pointer_type LEFT | RIGHT | MIDDLE | TOUCH | PEN
     types = [:mouse_left, :mouse_right, :mouse_middle, :touch, :pen]
     assert_equal [types, T, T, T, T, T], o.test
   end
 
+  def test_size ()
+    assert_equal 1, event(positions: [0]   ).size
+    assert_equal 2, event(positions: [0, 1]).size
+  end
+
+  def test_xy ()
+    assert_equal 0, event(positions: [[0, 1], [2, 3]]).x
+    assert_equal 1, event(positions: [[0, 1], [2, 3]]).y
+  end
+
+  def test_position ()
+    assert_equal [0, 1], event(positions: [[0, 1], [2, 3]]).position.to_a
+  end
+
+  def test_positions ()
+    assert_equal [[0, 0]],         event(positions: [0]   ).positions.map(&:to_a)
+    assert_equal [[0, 0], [1, 1]], event(positions: [0, 1]).positions.map(&:to_a)
+
+    assert_equal [[0, 1]],         event(positions: [[0, 1]]        ).positions.map(&:to_a)
+    assert_equal [[0, 1], [2, 3]], event(positions: [[0, 1], [2, 3]]).positions.map(&:to_a)
+  end
+
+  def test_at ()
+    assert_equal [0, 1], event(positions: [[0, 1], [2, 3]])[0].to_a
+    assert_equal [2, 3], event(positions: [[0, 1], [2, 3]])[1].to_a
+    assert_raise(IndexError) {event(positions: [[0, 1], [2, 3]])[-1]}
+    assert_raise(IndexError) {event(positions: [[0, 1], [2, 3]])[2]}
+  end
+
 end# TestPointerEvent

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reflexion
 version: !ruby/object:Gem::Version
-  version: 0.1.15
+  version: 0.1.16
 platform: ruby
 authors:
 - xordog
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-04-16 00:00:00.000000000 Z
+date: 2020-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xot
@@ -200,6 +200,7 @@ files:
 - lib/reflex/bitmap.rb
 - lib/reflex/bounds.rb
 - lib/reflex/button.rb
+- lib/reflex/camera.rb
 - lib/reflex/capture_event.rb
 - lib/reflex/color.rb
 - lib/reflex/color_space.rb
@@ -249,6 +250,7 @@ files:
 - reflex.gemspec
 - samples/app.rb
 - samples/bats.rb
+- samples/camera.rb
 - samples/checker.rb
 - samples/fans.rb
 - samples/fps.rb
@@ -359,7 +361,7 @@ files:
 homepage: https://github.com/xord/reflex
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -375,7 +377,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.3
-signing_key: 
+signing_key:
 specification_version: 4
 summary: A Graphical User Interface Tool Kit.
 test_files: