reflexion 0.2.1 → 0.3.1

data/ext/reflex/polygon_shape.cpp

@@ -5,7 +5,7 @@
 #include "defs.h"
 
 
-RUCY_DEFINE_WRAPPER_VALUE_FROM_TO(Reflex::PolygonShape)
+RUCY_DEFINE_WRAPPER_VALUE_FROM_TO(REFLEX_EXPORT, Reflex::PolygonShape)
 
 #define THIS      to<Reflex::PolygonShape*>(self)
 

data/ext/reflex/rect_shape.cpp

@@ -4,7 +4,7 @@
 #include "defs.h"
 
 
-RUCY_DEFINE_WRAPPER_VALUE_FROM_TO(Reflex::RectShape)
+RUCY_DEFINE_WRAPPER_VALUE_FROM_TO(REFLEX_EXPORT, Reflex::RectShape)
 
 #define THIS      to<Reflex::RectShape*>(self)
 

data/ext/reflex/reflex.cpp

@@ -115,7 +115,7 @@ Init_reflex ()
 	DEFINE_CONST(KEY_TAB);
 	DEFINE_CONST(KEY_DELETE);
 	DEFINE_CONST(KEY_BACKSPACE);
-	//DEFINE_CONST(KEY_INSERT);
+	DEFINE_CONST(KEY_INSERT);
 	DEFINE_CONST(KEY_ESCAPE);
 
 	DEFINE_CONST(KEY_LEFT);
@@ -133,10 +133,11 @@ Init_reflex ()
 	DEFINE_CONST(KEY_CONTROL);
 	DEFINE_CONST(KEY_LCONTROL);
 	DEFINE_CONST(KEY_RCONTROL);
-	//DEFINE_CONST(KEY_LALT);
-	//DEFINE_CONST(KEY_RALT);
-	//DEFINE_CONST(KEY_LWIN);
-	//DEFINE_CONST(KEY_RWIN);
+	DEFINE_CONST(KEY_ALT);
+	DEFINE_CONST(KEY_LALT);
+	DEFINE_CONST(KEY_RALT);
+	DEFINE_CONST(KEY_LWIN);
+	DEFINE_CONST(KEY_RWIN);
 	DEFINE_CONST(KEY_COMMAND);
 	DEFINE_CONST(KEY_LCOMMAND);
 	DEFINE_CONST(KEY_RCOMMAND);
@@ -165,10 +166,10 @@ Init_reflex ()
 	DEFINE_CONST(KEY_F18);
 	DEFINE_CONST(KEY_F19);
 	DEFINE_CONST(KEY_F20);
-	//DEFINE_CONST(KEY_F21);
-	//DEFINE_CONST(KEY_F22);
-	//DEFINE_CONST(KEY_F23);
-	//DEFINE_CONST(KEY_F24);
+	DEFINE_CONST(KEY_F21);
+	DEFINE_CONST(KEY_F22);
+	DEFINE_CONST(KEY_F23);
+	DEFINE_CONST(KEY_F24);
 
 	DEFINE_CONST(KEY_NUM_0);
 	DEFINE_CONST(KEY_NUM_1);
@@ -192,56 +193,63 @@ Init_reflex ()
 	DEFINE_CONST(KEY_NUM_ENTER);
 
 	DEFINE_CONST(KEY_CAPSLOCK);
-	//DEFINE_CONST(KEY_NUMLOCK);
-	//DEFINE_CONST(KEY_SCROLLLOCK);
+	DEFINE_CONST(KEY_NUMLOCK);
+	DEFINE_CONST(KEY_SCROLLLOCK);
 
-	//DEFINE_CONST(KEY_PRINTSCREEN);
-	//DEFINE_CONST(KEY_PAUSE);
-	//DEFINE_CONST(KEY_BREAK);
+	DEFINE_CONST(KEY_PRINTSCREEN);
+	DEFINE_CONST(KEY_PAUSE);
+	DEFINE_CONST(KEY_BREAK);
 	DEFINE_CONST(KEY_SECTION);
 	DEFINE_CONST(KEY_HELP);
 
-	DEFINE_CONST(KEY_IME_EISU);
-	DEFINE_CONST(KEY_IME_KANA);
-	//DEFINE_CONST(KEY_IME_KANJI);
-	//DEFINE_CONST(KEY_IME_JUNJA);
-	//DEFINE_CONST(KEY_IME_PROCESS);
-	//DEFINE_CONST(KEY_IME_ACCEPT);
-	//DEFINE_CONST(KEY_IME_FINAL);
-	//DEFINE_CONST(KEY_IME_CONVERT);
-	//DEFINE_CONST(KEY_IME_NONCONVERT);
-	//DEFINE_CONST(KEY_IME_MODECHANGE);
+	DEFINE_CONST(KEY_EISU);
+	DEFINE_CONST(KEY_KANA);
+	DEFINE_CONST(KEY_KANJI);
+	DEFINE_CONST(KEY_IME_ON);
+	DEFINE_CONST(KEY_IME_OFF);
+	DEFINE_CONST(KEY_IME_MODECHANGE);
+	DEFINE_CONST(KEY_CONVERT);
+	DEFINE_CONST(KEY_NONCONVERT);
+	DEFINE_CONST(KEY_ACCEPT);
+	DEFINE_CONST(KEY_PROCESS);
 
 	DEFINE_CONST(KEY_VOLUME_UP);
 	DEFINE_CONST(KEY_VOLUME_DOWN);
 	DEFINE_CONST(KEY_MUTE);
 
-	//DEFINE_CONST(KEY_SLEEP);
-	//DEFINE_CONST(KEY_EXEC);
-	//DEFINE_CONST(KEY_PRINT);
-	//DEFINE_CONST(KEY_APPS);
-	//DEFINE_CONST(KEY_SELECT);
-	//DEFINE_CONST(KEY_CLEAR);
-	//DEFINE_CONST(KEY_PLAY);
-	//DEFINE_CONST(KEY_ZOOM);
-
-	//DEFINE_CONST(KEY_BROWSER_BACK);
-	//DEFINE_CONST(KEY_BROWSER_FORWARD);
-	//DEFINE_CONST(KEY_BROWSER_REFRESH);
-	//DEFINE_CONST(KEY_BROWSER_STOP);
-	//DEFINE_CONST(KEY_BROWSER_SEARCH);
-	//DEFINE_CONST(KEY_BROWSER_FAVORITES);
-	//DEFINE_CONST(KEY_BROWSER_HOME);
-
-	//DEFINE_CONST(KEY_MEDIA_NEXT_TRACK);
-	//DEFINE_CONST(KEY_MEDIA_PREV_TRACK);
-	//DEFINE_CONST(KEY_MEDIA_STOP);
-	//DEFINE_CONST(KEY_MEDIA_PLAY_PAUSE);
-
-	//DEFINE_CONST(KEY_LAUNCH_MAIL);
-	//DEFINE_CONST(KEY_LAUNCH_MEDIA_SELECT);
-	//DEFINE_CONST(KEY_LAUNCH_APP1);
-	//DEFINE_CONST(KEY_LAUNCH_APP2);
+	DEFINE_CONST(KEY_SLEEP);
+	DEFINE_CONST(KEY_EXEC);
+	DEFINE_CONST(KEY_PRINT);
+	DEFINE_CONST(KEY_APPS);
+	DEFINE_CONST(KEY_SELECT);
+	DEFINE_CONST(KEY_CLEAR);
+
+	DEFINE_CONST(KEY_NAVIGATION_VIEW);
+	DEFINE_CONST(KEY_NAVIGATION_MENU);
+	DEFINE_CONST(KEY_NAVIGATION_UP);
+	DEFINE_CONST(KEY_NAVIGATION_DOWN);
+	DEFINE_CONST(KEY_NAVIGATION_LEFT);
+	DEFINE_CONST(KEY_NAVIGATION_RIGHT);
+	DEFINE_CONST(KEY_NAVIGATION_ACCEPT);
+	DEFINE_CONST(KEY_NAVIGATION_CANCEL);
+
+	DEFINE_CONST(KEY_BROWSER_BACK);
+	DEFINE_CONST(KEY_BROWSER_FORWARD);
+	DEFINE_CONST(KEY_BROWSER_REFRESH);
+	DEFINE_CONST(KEY_BROWSER_STOP);
+	DEFINE_CONST(KEY_BROWSER_SEARCH);
+	DEFINE_CONST(KEY_BROWSER_FAVORITES);
+	DEFINE_CONST(KEY_BROWSER_HOME);
+
+	DEFINE_CONST(KEY_MEDIA_PREV_TRACK);
+	DEFINE_CONST(KEY_MEDIA_NEXT_TRACK);
+	DEFINE_CONST(KEY_MEDIA_PLAY_PAUSE);
+	DEFINE_CONST(KEY_MEDIA_STOP);
+
+	DEFINE_CONST(KEY_LAUNCH_MAIL);
+	DEFINE_CONST(KEY_LAUNCH_MEDIA_SELECT);
+	DEFINE_CONST(KEY_LAUNCH_APP1);
+	DEFINE_CONST(KEY_LAUNCH_APP2);
 
 	DEFINE_CONST(MOD_SHIFT);
 	DEFINE_CONST(MOD_CONTROL);

data/ext/reflex/screen.cpp

@@ -5,7 +5,7 @@
 #include "defs.h"
 
 
-RUCY_DEFINE_VALUE_FROM_TO(Reflex::Screen)
+RUCY_DEFINE_VALUE_FROM_TO(REFLEX_EXPORT, Reflex::Screen)
 
 #define THIS  to<Reflex::Screen*>(self)
 

data/ext/reflex/scroll_event.cpp

@@ -5,7 +5,7 @@
 #include "defs.h"
 
 
-RUCY_DEFINE_VALUE_FROM_TO(Reflex::ScrollEvent)
+RUCY_DEFINE_VALUE_FROM_TO(REFLEX_EXPORT, Reflex::ScrollEvent)
 
 #define THIS  to<Reflex::ScrollEvent*>(self)
 

data/ext/reflex/selector.cpp

@@ -5,7 +5,7 @@
 #include "defs.h"
 
 
-RUCY_DEFINE_VALUE_OR_ARRAY_FROM_TO(Reflex::Selector)
+RUCY_DEFINE_VALUE_OR_ARRAY_FROM_TO(REFLEX_EXPORT, Reflex::Selector)
 
 #define   THIS to<      Reflex::Selector*>(self)
 #define C_THIS to<const Reflex::Selector*>(self)
@@ -143,7 +143,7 @@ namespace Rucy
 {
 
 
-	template <> Reflex::Selector
+	template <> REFLEX_EXPORT Reflex::Selector
 	value_to<Reflex::Selector> (int argc, const Value* argv, bool convert)
 	{
 		if (argc == 1 && argv->is_array())

data/ext/reflex/shape.cpp

@@ -8,7 +8,7 @@
 #include "selector.h"
 
 
-RUCY_DEFINE_WRAPPER_VALUE_FROM_TO(Reflex::Shape)
+RUCY_DEFINE_WRAPPER_VALUE_FROM_TO(REFLEX_EXPORT, Reflex::Shape)
 
 #define THIS      to<Reflex::Shape*>(self)
 

data/ext/reflex/style.cpp

@@ -8,7 +8,7 @@
 #include "selector.h"
 
 
-RUCY_DEFINE_VALUE_FROM_TO(Reflex::Style)
+RUCY_DEFINE_VALUE_FROM_TO(REFLEX_EXPORT, Reflex::Style)
 
 #define   THIS to<      Reflex::Style*>(self)
 #define C_THIS to<const Reflex::Style*>(self)

data/ext/reflex/style_length.cpp

@@ -5,7 +5,7 @@
 #include "defs.h"
 
 
-RUCY_DEFINE_VALUE_OR_ARRAY_FROM_TO(Reflex::StyleLength)
+RUCY_DEFINE_VALUE_OR_ARRAY_FROM_TO(REFLEX_EXPORT, Reflex::StyleLength)
 
 #define THIS  to<Reflex::StyleLength*>(self)
 
@@ -72,7 +72,9 @@ scan_type_and_value (
 {
 	assert(type && value);
 
-	if (!str || *str == '\0')
+	if (!str)
+		argument_error(__FILE__, __LINE__);
+	if (*str == '\0')
 		argument_error(__FILE__, __LINE__);
 
 	char buf[101];
@@ -214,7 +216,7 @@ namespace Rucy
 {
 
 
-	template <> Reflex::StyleLength
+	template <> REFLEX_EXPORT Reflex::StyleLength
 	value_to<Reflex::StyleLength> (int argc, const Value* argv, bool convert)
 	{
 		if (argc == 1 && argv->is_array())

data/ext/reflex/timer.cpp

@@ -8,7 +8,7 @@
 #include "selector.h"
 
 
-RUCY_DEFINE_WRAPPER_VALUE_FROM_TO(Reflex::Timer)
+RUCY_DEFINE_WRAPPER_VALUE_FROM_TO(REFLEX_EXPORT, Reflex::Timer)
 
 #define THIS      to<Reflex::Timer*>(self)
 

data/ext/reflex/timer_event.cpp

@@ -6,7 +6,7 @@
 #include "defs.h"
 
 
-RUCY_DEFINE_VALUE_FROM_TO(Reflex::TimerEvent)
+RUCY_DEFINE_VALUE_FROM_TO(REFLEX_EXPORT, Reflex::TimerEvent)
 
 #define THIS  to<Reflex::TimerEvent*>(self)
 

data/ext/reflex/update_event.cpp

@@ -4,7 +4,7 @@
 #include "defs.h"
 
 
-RUCY_DEFINE_VALUE_FROM_TO(Reflex::UpdateEvent)
+RUCY_DEFINE_VALUE_FROM_TO(REFLEX_EXPORT, Reflex::UpdateEvent)
 
 #define THIS  to<Reflex::UpdateEvent*>(self)
 

data/ext/reflex/view.cpp

@@ -15,7 +15,7 @@
 #include "selector.h"
 
 
-RUCY_DEFINE_WRAPPER_VALUE_FROM_TO(Reflex::View)
+RUCY_DEFINE_WRAPPER_VALUE_FROM_TO(REFLEX_EXPORT, Reflex::View)
 
 #define   THIS    to<      Reflex::View*>(self)
 #define C_THIS    to<const Reflex::View*>(self)
@@ -298,7 +298,7 @@ to_shape (Value value)
 	if (value.is_nil())
 		return NULL;
 
-	if (value.is_kind_of(Rays::polygon_class()))
+	if (value.is_a(Rays::polygon_class()))
 	{
 		Reflex::PolygonShape* shape = new Reflex::PolygonShape();
 		shape->set_polygon(to<Rays::Polygon&>(value));
@@ -450,7 +450,7 @@ RUCY_DEFN(set_pivot)
 {
 	CHECK;
 
-	if (argv[0].is_kind_of(Rays::point_class()))
+	if (argv[0].is_a(Rays::point_class()))
 	{
 		check_arg_count(__FILE__, __LINE__, "View#pivot=(Point)", argc, 1);
 
@@ -489,7 +489,7 @@ RUCY_DEFN(scroll_to)
 {
 	CHECK;
 
-	if (argv[0].is_kind_of(Rays::point_class()))
+	if (argv[0].is_a(Rays::point_class()))
 	{
 		check_arg_count(__FILE__, __LINE__, "View#scroll_to(Point)", argc, 1);
 
@@ -520,7 +520,7 @@ RUCY_DEFN(scroll_by)
 {
 	CHECK;
 
-	if (argv[0].is_kind_of(Rays::point_class()))
+	if (argv[0].is_a(Rays::point_class()))
 	{
 		check_arg_count(__FILE__, __LINE__, "View#scroll_by", argc, 1);
 
@@ -903,13 +903,21 @@ RUCY_DEF0(get_gravity_scale)
 RUCY_END
 
 static
-RUCY_DEFN(update_physics)
+RUCY_DEF1(create_world, pixels_per_meter)
 {
 	CHECK;
-	check_arg_count(__FILE__, __LINE__, "View#update_physics", argc, 0, 1);
+	THIS->create_world(to<float>(pixels_per_meter));
+}
+RUCY_END
+
+static
+RUCY_DEFN(update_world)
+{
+	CHECK;
+	check_arg_count(__FILE__, __LINE__, "View#update_world", argc, 0, 1);
 
 	float duration = argc >= 1 ? to<float>(argv[0]) : 0;
-	THIS->update_physics(duration);
+	THIS->update_world(duration);
 	return self;
 }
 RUCY_END
@@ -1302,7 +1310,8 @@ Init_reflex_view ()
 	cView.define_method("gravity_scale=", set_gravity_scale);
 	cView.define_method("gravity_scale",  get_gravity_scale);
 
-	cView.define_method("update_physics", update_physics);
+	cView.define_method("create_world", create_world);
+	cView.define_method("update_world", update_world);
 	cView.define_method("meter2pixel", meter2pixel);
 	cView.define_method("gravity=", set_gravity);
 	cView.define_method("gravity",  get_gravity);

data/ext/reflex/wheel_event.cpp

@@ -5,7 +5,7 @@
 #include "defs.h"
 
 
-RUCY_DEFINE_VALUE_FROM_TO(Reflex::WheelEvent)
+RUCY_DEFINE_VALUE_FROM_TO(REFLEX_EXPORT, Reflex::WheelEvent)
 
 #define THIS  to<Reflex::WheelEvent*>(self)
 

data/ext/reflex/window.cpp

@@ -8,7 +8,7 @@
 #include "defs.h"
 
 
-RUCY_DEFINE_WRAPPER_VALUE_FROM_TO(Reflex::Window)
+RUCY_DEFINE_WRAPPER_VALUE_FROM_TO(REFLEX_EXPORT, Reflex::Window)
 
 #define THIS      to<Reflex::Window*>(self)