reflexion 0.1.10 → 0.1.11

data/.doc/ext/reflex/style_length.cpp

@@ -1,4 +1,4 @@
-#include "reflex/ruby/style_length.h"
+#include "reflex/ruby/style.h"
 
 
 #include <rucy.h>

data/.doc/ext/reflex/view.cpp

@@ -130,15 +130,17 @@ VALUE remove_style(VALUE self, VALUE style)
 }
 
 static
-VALUE get_style(VALUE self)
+VALUE get_style(VALUE self, VALUE selector)
 {
 	CHECK;
-	check_arg_count(__FILE__, __LINE__, "View#get_style", argc, 0, 1);
 
-	if (argc == 0)
-		return value(THIS->style());
+	Reflex::Style* s = NULL;
+	if (selector)
+		s = THIS->get_style(to<Reflex::Selector>(selector), true);
 	else
-		return value(THIS->get_style(to<Reflex::Selector>(argv[0])));
+		s = THIS->style(true);
+
+	return s ? value(*s) : nil();
 }
 
 static
@@ -290,6 +292,20 @@ VALUE get_frame(VALUE self)
 	return value(THIS->frame());
 }
 
+static
+VALUE set_zoom(VALUE self, VALUE zoom)
+{
+	CHECK;
+	THIS->set_zoom(to<float>(zoom));
+}
+
+static
+VALUE get_zoom(VALUE self)
+{
+	CHECK;
+	return value(THIS->zoom());
+}
+
 static
 VALUE get_angle(VALUE self)
 {
@@ -621,7 +637,7 @@ Init_view ()
 	rb_define_method(cView, "each_child", RUBY_METHOD_FUNC(each_child), 0);
 	rb_define_method(cView, "add_style", RUBY_METHOD_FUNC(add_style), 1);
 	rb_define_method(cView, "remove_style", RUBY_METHOD_FUNC(remove_style), 1);
-	rb_define_method(cView, "get_style", RUBY_METHOD_FUNC(get_style), -1);
+	rb_define_method(cView, "get_style", RUBY_METHOD_FUNC(get_style), 1);
 	rb_define_method(cView, "find_styles", RUBY_METHOD_FUNC(find_styles), -1);
 	rb_define_method(cView, "each_style", RUBY_METHOD_FUNC(each_style), 0);
 	rb_define_method(cView, "focus", RUBY_METHOD_FUNC(focus), -1);
@@ -640,6 +656,8 @@ Init_view ()
 	rb_define_method(cView, "selector", RUBY_METHOD_FUNC(get_selector), 0);
 	rb_define_private_method(cView, "set_frame", RUBY_METHOD_FUNC(set_frame), 1);
 	rb_define_private_method(cView, "get_frame", RUBY_METHOD_FUNC(get_frame), 0);
+	rb_define_method(cView, "zoom=", RUBY_METHOD_FUNC(set_zoom), 1);
+	rb_define_method(cView, "zoom", RUBY_METHOD_FUNC(get_zoom), 0);
 	rb_define_method(cView, "angle", RUBY_METHOD_FUNC(get_angle), 0);
 	rb_define_method(cView, "scroll_to", RUBY_METHOD_FUNC(scroll_to), -1);
 	rb_define_method(cView, "scroll_by", RUBY_METHOD_FUNC(scroll_by), -1);

data/VERSION

@@ -1 +1 @@
-0.1.10
+0.1.11

data/ext/reflex/body.cpp

@@ -156,6 +156,42 @@ RUCY_DEF0(get_angular_velocity)
 }
 RUCY_END
 
+static
+RUCY_DEF1(apply_force, force)
+{
+	CHECK;
+	THIS->apply_force(to<Rays::Point&>(force));
+	return self;
+}
+RUCY_END
+
+static
+RUCY_DEF1(apply_torque, torque)
+{
+	CHECK;
+	THIS->apply_torque(torque.as_f(true));
+	return self;
+}
+RUCY_END
+
+static
+RUCY_DEF1(apply_linear_impulse, impulse)
+{
+	CHECK;
+	THIS->apply_linear_impulse(to<Rays::Point&>(impulse));
+	return self;
+}
+RUCY_END
+
+static
+RUCY_DEF1(apply_angular_impulse, impulse)
+{
+	CHECK;
+	THIS->apply_angular_impulse(impulse.as_f(true));
+	return self;
+}
+RUCY_END
+
 static
 RUCY_DEF1(set_density, density)
 {
@@ -207,6 +243,23 @@ RUCY_DEF0(get_restitution)
 }
 RUCY_END
 
+static
+RUCY_DEF1(set_gravity_scale, scale)
+{
+	CHECK;
+	THIS->set_gravity_scale(scale.as_f(true));
+	return self;
+}
+RUCY_END
+
+static
+RUCY_DEF0(get_gravity_scale)
+{
+	CHECK;
+	return value(THIS->gravity_scale());
+}
+RUCY_END
+
 static
 RUCY_DEF0(each)
 {
@@ -245,12 +298,18 @@ Init_body ()
 	cBody.define_method("linear_velocity",   get_linear_velocity);
 	cBody.define_method("angular_velocity=", set_angular_velocity);
 	cBody.define_method("angular_velocity",  get_angular_velocity);
+	cBody.define_method("apply_force",  apply_force);
+	cBody.define_method("apply_torque", apply_torque);
+	cBody.define_method("apply_linear_impulse",  apply_linear_impulse);
+	cBody.define_method("apply_angular_impulse", apply_angular_impulse);
 	cBody.define_method("density=",     set_density);
 	cBody.define_method("density",      get_density);
 	cBody.define_method("friction=",    set_friction);
 	cBody.define_method("friction",     get_friction);
 	cBody.define_method("restitution=", set_restitution);
 	cBody.define_method("restitution",  get_restitution);
+	cBody.define_method("gravity_scale=", set_gravity_scale);
+	cBody.define_method("gravity_scale",  get_gravity_scale);
 	cBody.define_method("each", each);
 }
 

data/ext/reflex/native.cpp

@@ -10,8 +10,6 @@ void Init_reflex ();
 void Init_selector ();
 void Init_style ();
 void Init_style_length ();
-void Init_style_length2 ();
-void Init_style_length4 ();
 
 void Init_event ();
 void Init_update_event ();
@@ -56,8 +54,6 @@ extern "C" void
 	Init_selector();
 	Init_style();
 	Init_style_length();
-	Init_style_length2();
-	Init_style_length4();
 
 	Init_event();
 	Init_update_event();

data/ext/reflex/selector.cpp

@@ -77,10 +77,10 @@ RUCY_DEF0(each_tag)
 RUCY_END
 
 static
-RUCY_DEF1(match, selector)
+RUCY_DEF1(contains, selector)
 {
 	CHECK;
-	return value(THIS->match(to<Reflex::Selector&>(selector)));
+	return value(THIS->contains(to<Reflex::Selector&>(selector)));
 }
 RUCY_END
 
@@ -108,7 +108,7 @@ Init_selector ()
 	cSelector.define_method("add_tag",    add_tag);
 	cSelector.define_method("remove_tag", remove_tag);
 	cSelector.define_method("each_tag", each_tag);
-	cSelector.define_method("match", match);
+	cSelector.define_method("contains", contains);
 	cSelector.define_method("==", equal);
 }
 

data/ext/reflex/style.cpp

@@ -5,7 +5,6 @@
 #include "rays/ruby/color.h"
 #include "rays/ruby/image.h"
 #include "reflex/ruby/selector.h"
-#include "reflex/ruby/style_length.h"
 #include "defs.h"
 
 
@@ -103,7 +102,7 @@ RUCY_DEFN(set_flow)
 	check_arg_count(__FILE__, __LINE__, "Style#set_flow", argc, 1, 2);
 
 	THIS->set_flow(
-		argc >= 1 ? (Reflex::Style::Flow) argv[0].as_i() : Reflex::Style::FLOW_DOWN,
+		(Reflex::Style::Flow) argv[0].as_i(),
 		argc >= 2 ? (Reflex::Style::Flow) argv[1].as_i() : Reflex::Style::FLOW_NONE);
 }
 RUCY_END
@@ -119,10 +118,45 @@ RUCY_DEF0(get_flow)
 RUCY_END
 
 static
-RUCY_DEF1(set_size, size)
+RUCY_DEF1(set_width, width)
 {
 	CHECK;
-	THIS->set_size(to<Reflex::StyleLength2>(size));
+	THIS->set_width(to<Reflex::StyleLength>(width));
+}
+RUCY_END
+
+static
+RUCY_DEF0(get_width)
+{
+	CHECK;
+	return value(THIS->width());
+}
+RUCY_END
+
+static
+RUCY_DEF1(set_height, height)
+{
+	CHECK;
+	THIS->set_height(to<Reflex::StyleLength>(height));
+}
+RUCY_END
+
+static
+RUCY_DEF0(get_height)
+{
+	CHECK;
+	return value(THIS->height());
+}
+RUCY_END
+
+static
+RUCY_DEFN(set_size)
+{
+	CHECK;
+	check_arg_count(__FILE__, __LINE__, "Style#set_size", argc, 1, 2);
+
+	set_width (self, argv[0]);
+	set_height(self, argc >= 2 ? argv[1] : argv[0]);
 }
 RUCY_END
 
@@ -130,15 +164,82 @@ static
 RUCY_DEF0(get_size)
 {
 	CHECK;
-	return value(THIS->size());
+	return array(get_width(self), get_height(self));
+}
+RUCY_END
+
+static
+RUCY_DEF1(set_left, left)
+{
+	CHECK;
+	THIS->set_left(to<Reflex::StyleLength>(left));
 }
 RUCY_END
 
 static
-RUCY_DEF1(set_position, position)
+RUCY_DEF0(get_left)
 {
 	CHECK;
-	THIS->set_position(to<Reflex::StyleLength4>(position));
+	return value(THIS->left());
+}
+RUCY_END
+
+static
+RUCY_DEF1(set_top, top)
+{
+	CHECK;
+	THIS->set_top(to<Reflex::StyleLength>(top));
+}
+RUCY_END
+
+static
+RUCY_DEF0(get_top)
+{
+	CHECK;
+	return value(THIS->top());
+}
+RUCY_END
+
+static
+RUCY_DEF1(set_right, right)
+{
+	CHECK;
+	THIS->set_right(to<Reflex::StyleLength>(right));
+}
+RUCY_END
+
+static
+RUCY_DEF0(get_right)
+{
+	CHECK;
+	return value(THIS->right());
+}
+RUCY_END
+
+static
+RUCY_DEF1(set_bottom, bottom)
+{
+	CHECK;
+	THIS->set_bottom(to<Reflex::StyleLength>(bottom));
+}
+RUCY_END
+
+static
+RUCY_DEF0(get_bottom)
+{
+	CHECK;
+	return value(THIS->bottom());
+}
+RUCY_END
+
+static
+RUCY_DEF4(set_position, left, top, right, bottom)
+{
+	CHECK;
+	set_left  (self, left);
+	set_top   (self, top);
+	set_right (self, right);
+	set_bottom(self, bottom);
 }
 RUCY_END
 
@@ -146,15 +247,173 @@ static
 RUCY_DEF0(get_position)
 {
 	CHECK;
-	return value(THIS->position());
+	return array(
+		get_left(self),
+		get_top(self),
+		get_right(self),
+		get_bottom(self));
+}
+RUCY_END
+
+static
+RUCY_DEF1(set_offset_left, left)
+{
+	CHECK;
+	THIS->set_offset_left(to<Reflex::StyleLength>(left));
+}
+RUCY_END
+
+static
+RUCY_DEF0(get_offset_left)
+{
+	CHECK;
+	return value(THIS->offset_left());
+}
+RUCY_END
+
+static
+RUCY_DEF1(set_offset_top, top)
+{
+	CHECK;
+	THIS->set_offset_top(to<Reflex::StyleLength>(top));
+}
+RUCY_END
+
+static
+RUCY_DEF0(get_offset_top)
+{
+	CHECK;
+	return value(THIS->offset_top());
+}
+RUCY_END
+
+static
+RUCY_DEF1(set_offset_right, right)
+{
+	CHECK;
+	THIS->set_offset_right(to<Reflex::StyleLength>(right));
+}
+RUCY_END
+
+static
+RUCY_DEF0(get_offset_right)
+{
+	CHECK;
+	return value(THIS->offset_right());
+}
+RUCY_END
+
+static
+RUCY_DEF1(set_offset_bottom, bottom)
+{
+	CHECK;
+	THIS->set_offset_bottom(to<Reflex::StyleLength>(bottom));
+}
+RUCY_END
+
+static
+RUCY_DEF0(get_offset_bottom)
+{
+	CHECK;
+	return value(THIS->offset_bottom());
+}
+RUCY_END
+
+static
+RUCY_DEF4(set_offset, left, top, right, bottom)
+{
+	CHECK;
+	set_offset_left  (self, left);
+	set_offset_top   (self, top);
+	set_offset_right (self, right);
+	set_offset_bottom(self, bottom);
+}
+RUCY_END
+
+static
+RUCY_DEF0(get_offset)
+{
+	CHECK;
+	return array(
+		get_offset_left(self),
+		get_offset_top(self),
+		get_offset_right(self),
+		get_offset_bottom(self));
+}
+RUCY_END
+
+static
+RUCY_DEF1(set_margin_left, left)
+{
+	CHECK;
+	THIS->set_margin_left(to<Reflex::StyleLength>(left));
+}
+RUCY_END
+
+static
+RUCY_DEF0(get_margin_left)
+{
+	CHECK;
+	return value(THIS->margin_left());
+}
+RUCY_END
+
+static
+RUCY_DEF1(set_margin_top, top)
+{
+	CHECK;
+	THIS->set_margin_top(to<Reflex::StyleLength>(top));
+}
+RUCY_END
+
+static
+RUCY_DEF0(get_margin_top)
+{
+	CHECK;
+	return value(THIS->margin_top());
+}
+RUCY_END
+
+static
+RUCY_DEF1(set_margin_right, right)
+{
+	CHECK;
+	THIS->set_margin_right(to<Reflex::StyleLength>(right));
+}
+RUCY_END
+
+static
+RUCY_DEF0(get_margin_right)
+{
+	CHECK;
+	return value(THIS->margin_right());
 }
 RUCY_END
 
 static
-RUCY_DEF1(set_margin, margin)
+RUCY_DEF1(set_margin_bottom, bottom)
 {
 	CHECK;
-	THIS->set_margin(to<Reflex::StyleLength4>(margin));
+	THIS->set_margin_bottom(to<Reflex::StyleLength>(bottom));
+}
+RUCY_END
+
+static
+RUCY_DEF0(get_margin_bottom)
+{
+	CHECK;
+	return value(THIS->margin_bottom());
+}
+RUCY_END
+
+static
+RUCY_DEF4(set_margin, left, top, right, bottom)
+{
+	CHECK;
+	set_margin_left  (self, left);
+	set_margin_top   (self, top);
+	set_margin_right (self, right);
+	set_margin_bottom(self, bottom);
 }
 RUCY_END
 
@@ -162,15 +421,86 @@ static
 RUCY_DEF0(get_margin)
 {
 	CHECK;
-	return value(THIS->margin());
+	return array(
+		get_margin_left(self),
+		get_margin_top(self),
+		get_margin_right(self),
+		get_margin_bottom(self));
 }
 RUCY_END
 
 static
-RUCY_DEF1(set_padding, padding)
+RUCY_DEF1(set_padding_left, left)
 {
 	CHECK;
-	THIS->set_padding(to<Reflex::StyleLength4>(padding));
+	THIS->set_padding_left(to<Reflex::StyleLength>(left));
+}
+RUCY_END
+
+static
+RUCY_DEF0(get_padding_left)
+{
+	CHECK;
+	return value(THIS->padding_left());
+}
+RUCY_END
+
+static
+RUCY_DEF1(set_padding_top, top)
+{
+	CHECK;
+	THIS->set_padding_top(to<Reflex::StyleLength>(top));
+}
+RUCY_END
+
+static
+RUCY_DEF0(get_padding_top)
+{
+	CHECK;
+	return value(THIS->padding_top());
+}
+RUCY_END
+
+static
+RUCY_DEF1(set_padding_right, right)
+{
+	CHECK;
+	THIS->set_padding_right(to<Reflex::StyleLength>(right));
+}
+RUCY_END
+
+static
+RUCY_DEF0(get_padding_right)
+{
+	CHECK;
+	return value(THIS->padding_right());
+}
+RUCY_END
+
+static
+RUCY_DEF1(set_padding_bottom, bottom)
+{
+	CHECK;
+	THIS->set_padding_bottom(to<Reflex::StyleLength>(bottom));
+}
+RUCY_END
+
+static
+RUCY_DEF0(get_padding_bottom)
+{
+	CHECK;
+	return value(THIS->padding_bottom());
+}
+RUCY_END
+
+static
+RUCY_DEF4(set_padding, left, top, right, bottom)
+{
+	CHECK;
+	set_padding_left  (self, left);
+	set_padding_top   (self, top);
+	set_padding_right (self, right);
+	set_padding_bottom(self, bottom);
 }
 RUCY_END
 
@@ -178,39 +508,59 @@ static
 RUCY_DEF0(get_padding)
 {
 	CHECK;
-	return value(THIS->padding());
+	return array(
+		get_padding_left(self),
+		get_padding_top(self),
+		get_padding_right(self),
+		get_padding_bottom(self));
+}
+RUCY_END
+
+static
+RUCY_DEF1(set_fill, color)
+{
+	CHECK;
+	THIS->set_fill(to<Reflex::Color&>(color));
 }
 RUCY_END
 
 static
-RUCY_DEF1(set_background_color, color)
+RUCY_DEF0(get_fill)
 {
 	CHECK;
-	THIS->set_background_color(to<Reflex::Color&>(color));
+	return value(THIS->fill());
 }
 RUCY_END
 
 static
-RUCY_DEF0(get_background_color)
+RUCY_DEF1(set_stroke, color)
 {
 	CHECK;
-	return value(THIS->background_color());
+	THIS->set_stroke(to<Reflex::Color&>(color));
 }
 RUCY_END
 
 static
-RUCY_DEF1(set_background_image, image)
+RUCY_DEF0(get_stroke)
 {
 	CHECK;
-	THIS->set_background_image(to<Reflex::Image&>(image));
+	return value(THIS->stroke());
 }
 RUCY_END
 
 static
-RUCY_DEF0(get_background_image)
+RUCY_DEF1(set_image, image)
 {
 	CHECK;
-	return THIS->background_image() ? value(THIS->background_image()) : nil();
+	THIS->set_image(to<Reflex::Image&>(image));
+}
+RUCY_END
+
+static
+RUCY_DEF0(get_image)
+{
+	CHECK;
+	return THIS->image() ? value(THIS->image()) : nil();
 }
 RUCY_END
 
@@ -233,6 +583,7 @@ Init_style ()
 	cStyle = mReflex.define_class("Style");
 	cStyle.define_alloc_func(alloc);
 	cStyle.define_private_method("initialize_copy", initialize_copy);
+
 	cStyle.define_method("name=", set_name);
 	cStyle.define_method("name",  get_name);
 	cStyle.define_method("add_tag",    add_tag);
@@ -240,20 +591,69 @@ Init_style ()
 	cStyle.define_method("each_tag", each_tag);
 	cStyle.define_method("selector=", set_selector);
 	cStyle.define_method("selector", get_selector);
+
 	cStyle.define_method("set_flow", set_flow);
 	cStyle.define_method("get_flow", get_flow);
-	cStyle.define_method("size=", set_size);
-	cStyle.define_method("size",  get_size);
+
+	cStyle.define_method("width=",  set_width);
+	cStyle.define_method("width",   get_width);
+	cStyle.define_method("height=", set_height);
+	cStyle.define_method("height",  get_height);
+	cStyle.define_method("size=",   set_size);
+	cStyle.define_method("size",    get_size);
+
+	cStyle.define_method("left=",     set_left);
+	cStyle.define_method("left",      get_left);
+	cStyle.define_method("top=",      set_top);
+	cStyle.define_method("top",       get_top);
+	cStyle.define_method("right=",    set_right);
+	cStyle.define_method("right",     get_right);
+	cStyle.define_method("bottom=",   set_bottom);
+	cStyle.define_method("bottom",    get_bottom);
 	cStyle.define_method("position=", set_position);
 	cStyle.define_method("position",  get_position);
-	cStyle.define_method("margin=", set_margin);
-	cStyle.define_method("margin",  get_margin);
-	cStyle.define_method("padding=", set_padding);
-	cStyle.define_method("padding",  get_padding);
-	cStyle.define_method("background_color=", set_background_color);
-	cStyle.define_method("background_color",  get_background_color);
-	cStyle.define_method("background_image=", set_background_image);
-	cStyle.define_method("background_image",  get_background_image);
+
+	cStyle.define_method("offset_left=",   set_offset_left);
+	cStyle.define_method("offset_left",    get_offset_left);
+	cStyle.define_method("offset_top=",    set_offset_top);
+	cStyle.define_method("offset_top",     get_offset_top);
+	cStyle.define_method("offset_right=",  set_offset_right);
+	cStyle.define_method("offset_right",   get_offset_right);
+	cStyle.define_method("offset_bottom=", set_offset_bottom);
+	cStyle.define_method("offset_bottom",  get_offset_bottom);
+	cStyle.define_method("offset=",        set_offset);
+	cStyle.define_method("offset",         get_offset);
+
+	cStyle.define_method("margin_left=",   set_margin_left);
+	cStyle.define_method("margin_left",    get_margin_left);
+	cStyle.define_method("margin_top=",    set_margin_top);
+	cStyle.define_method("margin_top",     get_margin_top);
+	cStyle.define_method("margin_right=",  set_margin_right);
+	cStyle.define_method("margin_right",   get_margin_right);
+	cStyle.define_method("margin_bottom=", set_margin_bottom);
+	cStyle.define_method("margin_bottom",  get_margin_bottom);
+	cStyle.define_method("margin=",        set_margin);
+	cStyle.define_method("margin",         get_margin);
+
+	cStyle.define_method("padding_left=",   set_padding_left);
+	cStyle.define_method("padding_left",    get_padding_left);
+	cStyle.define_method("padding_top=",    set_padding_top);
+	cStyle.define_method("padding_top",     get_padding_top);
+	cStyle.define_method("padding_right=",  set_padding_right);
+	cStyle.define_method("padding_right",   get_padding_right);
+	cStyle.define_method("padding_bottom=", set_padding_bottom);
+	cStyle.define_method("padding_bottom",  get_padding_bottom);
+	cStyle.define_method("padding=",        set_padding);
+	cStyle.define_method("padding",         get_padding);
+
+	cStyle.define_method("fill=",   set_fill);
+	cStyle.define_method("fill",    get_fill);
+	cStyle.define_method("stroke=", set_stroke);
+	cStyle.define_method("stroke",  get_stroke);
+
+	cStyle.define_method("image=", set_image);
+	cStyle.define_method("image",  get_image);
+
 	cStyle.define_method("==", equal);
 	cStyle.define_const("FLOW_NONE",  Reflex::Style::FLOW_NONE);
 	cStyle.define_const("FLOW_DOWN",  Reflex::Style::FLOW_DOWN);