reflexion 0.1.23 → 0.1.24

data/.doc/ext/reflex/timer_event.cpp

@@ -24,7 +24,7 @@ VALUE initialize(VALUE self, VALUE timer)
 {
 	CHECK;
 
-	THIS->timer = to<Reflex::Timer*>(timer);
+	*THIS = Reflex::TimerEvent(to<Reflex::Timer*>(timer));
 
 	return rb_call_super(0, NULL);
 }
@@ -33,7 +33,7 @@ static
 VALUE initialize_copy(VALUE self, VALUE obj)
 {
 	CHECK;
-	*THIS = to<Reflex::TimerEvent&>(obj);
+	*THIS = to<Reflex::TimerEvent&>(obj).dup();
 	return self;
 }
 
@@ -41,7 +41,7 @@ static
 VALUE timer(VALUE self)
 {
 	CHECK;
-	return value(THIS->timer);
+	return value(THIS->timer());
 }
 
 static
@@ -65,14 +65,6 @@ VALUE interval(VALUE self)
 	return value(THIS->interval());
 }
 
-static
-VALUE set_count(VALUE self, VALUE count)
-{
-	CHECK;
-	THIS->set_count(to<int>(count));
-	return count;
-}
-
 static
 VALUE count(VALUE self)
 {
@@ -103,9 +95,8 @@ Init_timer_event ()
 	rb_define_method(cTimerEvent, "owner", RUBY_METHOD_FUNC(owner), 0);
 	rb_define_method(cTimerEvent, "id", RUBY_METHOD_FUNC(id), 0);
 	rb_define_method(cTimerEvent, "interval", RUBY_METHOD_FUNC(interval), 0);
-	rb_define_method(cTimerEvent, "count=", RUBY_METHOD_FUNC(set_count), 1);
 	rb_define_method(cTimerEvent, "count", RUBY_METHOD_FUNC(count), 0);
-	cTimerEvent.define_method("finish?", is_finished);
+	cTimerEvent.define_method("finished?", is_finished);
 }
 
 

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

@@ -22,8 +22,9 @@ VALUE initialize(VALUE self, VALUE now, VALUE dt)
 {
 	CHECK;
 
-	THIS->now = to<double>(now);
-	THIS->dt  = to<float>(dt);
+	*THIS = Reflex::UpdateEvent(
+		to<double>(now),
+		to<float>(dt));
 
 	return rb_call_super(0, NULL);
 }
@@ -32,7 +33,7 @@ static
 VALUE initialize_copy(VALUE self, VALUE obj)
 {
 	CHECK;
-	*THIS = to<Reflex::UpdateEvent&>(obj);
+	*THIS = to<Reflex::UpdateEvent&>(obj).dup();
 	return self;
 }
 
@@ -40,14 +41,14 @@ static
 VALUE now(VALUE self)
 {
 	CHECK;
-	return value(THIS->now);
+	return value(THIS->now());
 }
 
 static
 VALUE dt(VALUE self)
 {
 	CHECK;
-	return value(THIS->dt);
+	return value(THIS->dt());
 }
 
 

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

@@ -19,13 +19,14 @@ VALUE alloc(VALUE klass)
 }
 
 static
-VALUE initialize(VALUE self, VALUE dx, VALUE dy, VALUE dz)
+VALUE initialize(VALUE self, VALUE x, VALUE y, VALUE z, VALUE dx, VALUE dy, VALUE dz, VALUE modifiers)
 {
 	CHECK;
 
-	THIS->dx = to<coord>(dx);
-	THIS->dy = to<coord>(dy);
-	THIS->dz = to<coord>(dz);
+	*THIS = Reflex::WheelEvent(
+		to<coord>( x), to<coord>( y), to<coord>( z),
+		to<coord>(dx), to<coord>(dy), to<coord>(dz),
+		to<uint>(modifiers));
 
 	return rb_call_super(0, NULL);
 }
@@ -34,57 +35,71 @@ static
 VALUE initialize_copy(VALUE self, VALUE obj)
 {
 	CHECK;
-	*THIS = to<Reflex::WheelEvent&>(obj);
+	*THIS = to<Reflex::WheelEvent&>(obj).dup();
 	return self;
 }
 
 static
-VALUE dx(VALUE self)
+VALUE x(VALUE self)
 {
 	CHECK;
-	return value(THIS->dx);
+	return value(THIS->position().x);
 }
 
 static
-VALUE dy(VALUE self)
+VALUE y(VALUE self)
 {
 	CHECK;
-	return value(THIS->dy);
+	return value(THIS->position().y);
 }
 
 static
-VALUE dz(VALUE self)
+VALUE z(VALUE self)
 {
 	CHECK;
-	return value(THIS->dz);
+	return value(THIS->position().z);
 }
 
 static
-VALUE x(VALUE self)
+VALUE dx(VALUE self)
 {
 	CHECK;
-	return value(THIS->x);
+	return value(THIS->dposition().x);
 }
 
 static
-VALUE y(VALUE self)
+VALUE dy(VALUE self)
 {
 	CHECK;
-	return value(THIS->y);
+	return value(THIS->dposition().y);
 }
 
 static
-VALUE z(VALUE self)
+VALUE dz(VALUE self)
+{
+	CHECK;
+	return value(THIS->dposition().z);
+}
+
+static
+VALUE position(VALUE self)
+{
+	CHECK;
+	return value(THIS->position());
+}
+
+static
+VALUE dposition(VALUE self)
 {
 	CHECK;
-	return value(THIS->z);
+	return value(THIS->dposition());
 }
 
 static
 VALUE modifiers(VALUE self)
 {
 	CHECK;
-	return value(THIS->modifiers);
+	return value(THIS->modifiers());
 }
 
 
@@ -97,14 +112,16 @@ 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), 3);
+	rb_define_private_method(cWheelEvent, "initialize", RUBY_METHOD_FUNC(initialize), 7);
 	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);
-	rb_define_method(cWheelEvent, "dz", RUBY_METHOD_FUNC(dz), 0);
 	rb_define_method(cWheelEvent, "x", RUBY_METHOD_FUNC(x), 0);
 	rb_define_method(cWheelEvent, "y", RUBY_METHOD_FUNC(y), 0);
 	rb_define_method(cWheelEvent, "z", RUBY_METHOD_FUNC(z), 0);
+	rb_define_method(cWheelEvent, "dx", RUBY_METHOD_FUNC(dx), 0);
+	rb_define_method(cWheelEvent, "dy", RUBY_METHOD_FUNC(dy), 0);
+	rb_define_method(cWheelEvent, "dz", RUBY_METHOD_FUNC(dz), 0);
+	rb_define_method(cWheelEvent, "position", RUBY_METHOD_FUNC(position), 0);
+	rb_define_method(cWheelEvent, "dposition", RUBY_METHOD_FUNC(dposition), 0);
 	rb_define_method(cWheelEvent, "modifiers", RUBY_METHOD_FUNC(modifiers), 0);
 }
 

data/VERSION

@@ -1 +1 @@
-0.1.23
+0.1.24

data/ext/reflex/capture_event.cpp

@@ -24,8 +24,9 @@ RUCY_DEF2(initialize, begin, end)
 {
 	CHECK;
 
-	THIS->begin = to<uint>(begin);
-	THIS->end   = to<uint>(end);
+	*THIS = Reflex::CaptureEvent(
+		to<uint>(begin),
+		to<uint>(end));
 
 	return rb_call_super(0, NULL);
 }
@@ -35,7 +36,7 @@ static
 RUCY_DEF1(initialize_copy, obj)
 {
 	CHECK;
-	*THIS = to<Reflex::CaptureEvent&>(obj);
+	*THIS = to<Reflex::CaptureEvent&>(obj).dup();
 	return self;
 }
 RUCY_END
@@ -44,7 +45,7 @@ static
 RUCY_DEF0(begin)
 {
 	CHECK;
-	return value(THIS->begin);
+	return value(THIS->begin());
 }
 RUCY_END
 
@@ -52,7 +53,7 @@ static
 RUCY_DEF0(end)
 {
 	CHECK;
-	return value(THIS->end);
+	return value(THIS->end());
 }
 RUCY_END
 

data/ext/reflex/contact_event.cpp

@@ -3,6 +3,7 @@
 
 #include "reflex/ruby/shape.h"
 #include "reflex/ruby/view.h"
+#include "reflex/ruby/shape.h"
 #include "defs.h"
 
 
@@ -21,12 +22,13 @@ RUCY_DEF_ALLOC(alloc, klass)
 RUCY_END
 
 static
-RUCY_DEF2(initialize, type, shape)
+RUCY_DEF2(initialize, action, shape)
 {
 	CHECK;
 
-	THIS->type  = (Reflex::ContactEvent::Type) to<int>(type);
-	THIS->shape = to<Reflex::Shape*>(shape);
+	*THIS = Reflex::ContactEvent(
+		(Reflex::ContactEvent::Action) to<uint>(action),
+		to<Reflex::Shape*>(shape));
 
 	return rb_call_super(0, NULL);
 }
@@ -36,16 +38,16 @@ static
 RUCY_DEF1(initialize_copy, obj)
 {
 	CHECK;
-	*THIS = to<Reflex::ContactEvent&>(obj);
+	*THIS = to<Reflex::ContactEvent&>(obj).dup();
 	return self;
 }
 RUCY_END
 
 static
-RUCY_DEF0(get_type)
+RUCY_DEF0(get_action)
 {
 	CHECK;
-	return value(THIS->type);
+	return value(THIS->action());
 }
 RUCY_END
 
@@ -53,7 +55,7 @@ static
 RUCY_DEF0(get_shape)
 {
 	CHECK;
-	return value(THIS->shape);
+	return value(THIS->shape());
 }
 RUCY_END
 
@@ -61,7 +63,7 @@ static
 RUCY_DEF0(get_view)
 {
 	CHECK;
-	return value(THIS->view);
+	return value(THIS->view());
 }
 RUCY_END
 
@@ -77,12 +79,12 @@ Init_contact_event ()
 	cContactEvent.define_alloc_func(alloc);
 	cContactEvent.define_private_method("initialize",      initialize);
 	cContactEvent.define_private_method("initialize_copy", initialize_copy);
-	cContactEvent.define_method("type",  get_type);
-	cContactEvent.define_method("shape", get_shape);
-	cContactEvent.define_method("view",  get_view);
-	cContactEvent.define_const("TYPE_NONE",  Reflex::ContactEvent::NONE);
-	cContactEvent.define_const("TYPE_BEGIN", Reflex::ContactEvent::BEGIN);
-	cContactEvent.define_const("TYPE_END",   Reflex::ContactEvent::END);
+	cContactEvent.define_method("action", get_action);
+	cContactEvent.define_method("shape",  get_shape);
+	cContactEvent.define_method("view",   get_view);
+	cContactEvent.define_const("ACTION_NONE", Reflex::ContactEvent::ACTION_NONE);
+	cContactEvent.define_const("BEGIN",       Reflex::ContactEvent::BEGIN);
+	cContactEvent.define_const("END",         Reflex::ContactEvent::END);
 }
 
 

data/ext/reflex/draw_event.cpp

@@ -21,11 +21,13 @@ RUCY_DEF_ALLOC(alloc, klass)
 RUCY_END
 
 static
-RUCY_DEF1(initialize, dt)
+RUCY_DEF2(initialize, dt, fps)
 {
 	CHECK;
 
-	THIS->dt = to<float>(dt);
+	*THIS = Reflex::DrawEvent(
+		to<float>(dt),
+		to<float>(fps));
 
 	return rb_call_super(0, NULL);
 }
@@ -35,7 +37,7 @@ static
 RUCY_DEF1(initialize_copy, obj)
 {
 	CHECK;
-	*THIS = to<Reflex::DrawEvent&>(obj);
+	*THIS = to<Reflex::DrawEvent&>(obj).dup();
 	return self;
 }
 RUCY_END
@@ -44,7 +46,7 @@ static
 RUCY_DEF0(painter)
 {
 	CHECK;
-	return value(THIS->painter);
+	return value(THIS->painter());
 }
 RUCY_END
 
@@ -52,7 +54,7 @@ static
 RUCY_DEF0(bounds)
 {
 	CHECK;
-	return value(THIS->bounds);
+	return value(THIS->bounds());
 }
 RUCY_END
 
@@ -60,7 +62,7 @@ static
 RUCY_DEF0(dt)
 {
 	CHECK;
-	return value(THIS->dt);
+	return value(THIS->dt());
 }
 RUCY_END
 
@@ -68,7 +70,7 @@ static
 RUCY_DEF0(fps)
 {
 	CHECK;
-	return value(THIS->fps);
+	return value(THIS->fps());
 }
 RUCY_END
 

data/ext/reflex/event.cpp

@@ -1,6 +1,7 @@
 #include "reflex/ruby/event.h"
 
 
+#include "reflex/exception.h"
 #include "defs.h"
 
 
@@ -14,16 +15,7 @@ RUCY_DEFINE_VALUE_FROM_TO(Reflex::Event)
 static
 RUCY_DEF_ALLOC(alloc, klass)
 {
-	return new_type<Reflex::Event>(klass);
-}
-RUCY_END
-
-static
-RUCY_DEF1(initialize_copy, obj)
-{
-	CHECK;
-	*THIS = to<Reflex::Event&>(obj);
-	return self;
+	Reflex::reflex_error(__FILE__, __LINE__, "can not instantiate Event class.");
 }
 RUCY_END
 
@@ -61,7 +53,6 @@ Init_event ()
 
 	cEvent = mReflex.define_class("Event");
 	cEvent.define_alloc_func(alloc);
-	cEvent.define_private_method("initialize_copy", initialize_copy);
 	cEvent.define_method("block",    block);
 	cEvent.define_method("blocked?", is_blocked);
 	cEvent.define_method("time",     get_time);

data/ext/reflex/focus_event.cpp

@@ -20,13 +20,14 @@ RUCY_DEF_ALLOC(alloc, klass)
 RUCY_END
 
 static
-RUCY_DEF3(initialize, type, current, last)
+RUCY_DEF3(initialize, action, current, last)
 {
 	CHECK;
 
-	THIS->type    = (Reflex::FocusEvent::Type) to<uint>(type);
-	THIS->current = to<Reflex::View*>(current);
-	THIS->last    = to<Reflex::View*>(last);
+	*THIS = Reflex::FocusEvent(
+		(Reflex::FocusEvent::Action) to<uint>(action),
+		to<Reflex::View*>(current),
+		to<Reflex::View*>(last));
 
 	return rb_call_super(0, NULL);
 }
@@ -36,16 +37,16 @@ static
 RUCY_DEF1(initialize_copy, obj)
 {
 	CHECK;
-	*THIS = to<Reflex::FocusEvent&>(obj);
+	*THIS = to<Reflex::FocusEvent&>(obj).dup();
 	return self;
 }
 RUCY_END
 
 static
-RUCY_DEF0(get_type)
+RUCY_DEF0(get_action)
 {
 	CHECK;
-	return value(THIS->type);
+	return value(THIS->action());
 }
 RUCY_END
 
@@ -53,7 +54,7 @@ static
 RUCY_DEF0(get_current)
 {
 	CHECK;
-	return THIS->current ? value(THIS->current) : nil();
+	return THIS->current() ? value(THIS->current()) : nil();
 }
 RUCY_END
 
@@ -61,7 +62,7 @@ static
 RUCY_DEF0(get_last)
 {
 	CHECK;
-	return THIS->last ? value(THIS->last) : nil();
+	return THIS->last() ? value(THIS->last()) : nil();
 }
 RUCY_END
 
@@ -77,12 +78,12 @@ Init_focus_event ()
 	cFocusEvent.define_alloc_func(alloc);
 	cFocusEvent.define_private_method("initialize",      initialize);
 	cFocusEvent.define_private_method("initialize_copy", initialize_copy);
-	cFocusEvent.define_method("type",    get_type);
+	cFocusEvent.define_method("action",  get_action);
 	cFocusEvent.define_method("current", get_current);
 	cFocusEvent.define_method("last",    get_last);
-	cFocusEvent.define_const("TYPE_NONE",  Reflex::FocusEvent::NONE);
-	cFocusEvent.define_const("TYPE_FOCUS", Reflex::FocusEvent::FOCUS);
-	cFocusEvent.define_const("TYPE_BLUR",  Reflex::FocusEvent::BLUR);
+	cFocusEvent.define_const("ACTION_NONE", Reflex::FocusEvent::ACTION_NONE);
+	cFocusEvent.define_const("FOCUS",       Reflex::FocusEvent::FOCUS);
+	cFocusEvent.define_const("BLUR",        Reflex::FocusEvent::BLUR);
 }
 
 

data/ext/reflex/frame_event.cpp

@@ -21,15 +21,15 @@ RUCY_DEF_ALLOC(alloc, klass)
 RUCY_END
 
 static
-RUCY_DEF5(initialize, frame, dx, dy, dwidth, dheight)
+RUCY_DEF7(initialize, frame, dx, dy, dwidth, dheight, angle, dangle)
 {
 	CHECK;
 
-	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);
+	*THIS = Reflex::FrameEvent(
+		to<Rays::Bounds>(frame),
+		to<coord>(dx),     to<coord>(dy),
+		to<coord>(dwidth), to<coord>(dheight),
+		to<float>(angle),  to<float>(dangle));
 
 	return rb_call_super(0, NULL);
 }
@@ -39,7 +39,7 @@ static
 RUCY_DEF1(initialize_copy, obj)
 {
 	CHECK;
-	*THIS = to<Reflex::FrameEvent&>(obj);
+	*THIS = to<Reflex::FrameEvent&>(obj).dup();
 	return self;
 }
 RUCY_END
@@ -48,7 +48,7 @@ static
 RUCY_DEF0(frame)
 {
 	CHECK;
-	return value(THIS->frame);
+	return value(THIS->frame());
 }
 RUCY_END
 
@@ -56,7 +56,7 @@ static
 RUCY_DEF0(dx)
 {
 	CHECK;
-	return value(THIS->dx);
+	return value(THIS->dx());
 }
 RUCY_END
 
@@ -64,7 +64,7 @@ static
 RUCY_DEF0(dy)
 {
 	CHECK;
-	return value(THIS->dy);
+	return value(THIS->dy());
 }
 RUCY_END
 
@@ -72,7 +72,7 @@ static
 RUCY_DEF0(dwidth)
 {
 	CHECK;
-	return value(THIS->dwidth);
+	return value(THIS->dwidth());
 }
 RUCY_END
 
@@ -80,7 +80,7 @@ static
 RUCY_DEF0(dheight)
 {
 	CHECK;
-	return value(THIS->dheight);
+	return value(THIS->dheight());
 }
 RUCY_END
 
@@ -88,7 +88,7 @@ static
 RUCY_DEF0(dposition)
 {
 	CHECK;
-	return value(Rays::Point(THIS->dx, THIS->dy));
+	return value(Rays::Point(THIS->dx(), THIS->dy()));
 }
 RUCY_END
 
@@ -96,7 +96,7 @@ static
 RUCY_DEF0(dsize)
 {
 	CHECK;
-	return value(Rays::Point(THIS->dw, THIS->dh));
+	return value(Rays::Point(THIS->dwidth(), THIS->dheight()));
 }
 RUCY_END
 
@@ -104,7 +104,7 @@ static
 RUCY_DEF0(angle)
 {
 	CHECK;
-	return value(THIS->angle);
+	return value(THIS->angle());
 }
 RUCY_END
 
@@ -112,7 +112,7 @@ static
 RUCY_DEF0(dangle)
 {
 	CHECK;
-	return value(THIS->dangle);
+	return value(THIS->dangle());
 }
 RUCY_END