reflexion 0.1.12 → 0.1.13

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

@@ -1,16 +1,10 @@
 #include "reflex/ruby/event.h"
 
 
-#include <rucy.h>
 #include "rays/ruby/point.h"
 #include "defs.h"
 
 
-using namespace Rucy;
-
-using Reflex::coord;
-
-
 RUCY_DEFINE_VALUE_FROM_TO(Reflex::WheelEvent)
 
 #define THIS  to<Reflex::WheelEvent*>(self)
@@ -94,20 +88,6 @@ VALUE modifiers(VALUE self)
 	return value(THIS->modifiers);
 }
 
-static
-VALUE delta(VALUE self)
-{
-	CHECK;
-	return value(Rays::Point(THIS->dx, THIS->dy, THIS->dz));
-}
-
-static
-VALUE position(VALUE self)
-{
-	CHECK;
-	return value(Rays::Point(THIS->x, THIS->y, THIS->z));
-}
-
 
 static Class cWheelEvent;
 
@@ -127,8 +107,6 @@ Init_wheel_event ()
 	rb_define_method(cWheelEvent, "y", RUBY_METHOD_FUNC(y), 0);
 	rb_define_method(cWheelEvent, "z", RUBY_METHOD_FUNC(z), 0);
 	rb_define_method(cWheelEvent, "modifiers", RUBY_METHOD_FUNC(modifiers), 0);
-	rb_define_method(cWheelEvent, "delta", RUBY_METHOD_FUNC(delta), 0);
-	rb_define_method(cWheelEvent, "position", RUBY_METHOD_FUNC(position), 0);
 }
 
 

data/.doc/ext/reflex/window.cpp

@@ -1,15 +1,10 @@
 #include "reflex/ruby/window.h"
 
 
-#include <rucy.h>
 #include <rays/ruby/bounds.h>
 #include <rays/ruby/painter.h>
 #include "reflex/ruby/view.h"
-
-
-using namespace Rucy;
-
-using Reflex::coord;
+#include "defs.h"
 
 
 RUCY_DEFINE_WRAPPER_VALUE_FROM_TO(Reflex::Window)
@@ -18,7 +13,7 @@ RUCY_DEFINE_WRAPPER_VALUE_FROM_TO(Reflex::Window)
 
 #define CHECK     RUCY_CHECK_OBJECT(Reflex::Window, self)
 
-#define CALL(fun) RUCY_WRAPPER_CALL(Reflex::Window, THIS, fun)
+#define CALL(fun) RUCY_CALL_SUPER(THIS, fun)
 
 
 static
@@ -75,10 +70,11 @@ VALUE get_title(VALUE self)
 }
 
 static
-VALUE set_frame(VALUE self, VALUE arg)
+VALUE set_frame(VALUE self)
 {
 	CHECK;
-	THIS->set_frame(to<Rays::Bounds>(arg));
+	THIS->set_frame(to<Rays::Bounds>(argc, argv));
+	return value(THIS->frame());
 }
 
 static
@@ -225,9 +221,6 @@ VALUE on_wheel(VALUE self, VALUE event)
 	CALL(on_wheel(to<Reflex::WheelEvent*>(event)));
 }
 
-static
-RUCY_DEF_clear_override_flags(cof, Reflex::Window);
-
 
 static Class cWindow;
 
@@ -244,8 +237,8 @@ Init_window ()
 	rb_define_method(cWindow, "redraw", RUBY_METHOD_FUNC(redraw), 0);
 	rb_define_method(cWindow, "title=", RUBY_METHOD_FUNC(set_title), 1);
 	rb_define_method(cWindow, "title", RUBY_METHOD_FUNC(get_title), 0);
-	rb_define_private_method(cWindow, "set_frame", RUBY_METHOD_FUNC(set_frame), 1);
-	rb_define_private_method(cWindow, "get_frame", RUBY_METHOD_FUNC(get_frame), 0);
+	rb_define_method(cWindow, "frame=", RUBY_METHOD_FUNC(set_frame), -1);
+	rb_define_method(cWindow, "frame", RUBY_METHOD_FUNC(get_frame), 0);
 	rb_define_method(cWindow, "hidden", RUBY_METHOD_FUNC(hidden), 0);
 	rb_define_method(cWindow, "root", RUBY_METHOD_FUNC(root), 0);
 	rb_define_method(cWindow, "focus", RUBY_METHOD_FUNC(focus), 0);
@@ -265,7 +258,6 @@ Init_window ()
 	rb_define_method(cWindow, "on_pointer_up", RUBY_METHOD_FUNC(on_pointer_up), 1);
 	rb_define_method(cWindow, "on_pointer_move", RUBY_METHOD_FUNC(on_pointer_move), 1);
 	rb_define_method(cWindow, "on_wheel", RUBY_METHOD_FUNC(on_wheel), 1);
-	
 }
 
 

data/README.md

@@ -1,4 +1,4 @@
 
 # Reflex - A Graphical User Interface Tool Kit for Ruby.
 
- by snori@xord.org
+ by xordog@gmail.com

data/Rakefile

@@ -2,28 +2,30 @@
 
 
 %w[../xot ../rucy ../rays .]
-  .map  {|s| File.expand_path "../#{s}/lib", __FILE__}
+  .map  {|s| File.expand_path "#{s}/lib", __dir__}
   .each {|s| $:.unshift s if !$:.include?(s) && File.directory?(s)}
 
-require 'xot/rake'
+require 'rucy/rake'
+
 require 'xot/module'
 require 'rucy/module'
 require 'rays/module'
 require 'reflex/module'
 
-include Xot::Rake
-
 
-MODULES     = [Xot, Rucy, Rays, Reflex].map {|m| m.const_get :Module}
-MODULE      = MODULES.last
+MODULES     = [Xot, Rucy, Rays, Reflex]
 GEMNAME     = 'reflexion'
-INCDIRS     = ['src/physics']
 TESTS_ALONE = ['test/test_reflex.rb']
 
+use_external_library 'https://github.com/erincatto/Box2D',
+  tag:    'v2.3.1',
+  incdir: 'Box2D',
+  srcdir: 'Box2D/Box2D'
 
-task :default => :build
-
-task :build => :ext
-
+build_native_library
+build_ruby_extension
+test_ruby_extension
+generate_documents
+build_ruby_gem
 
-MODULES.each {|m| m.load_tasks :lib, :ext, :test, :doc, :gem, :box2d}
+task :default => :test

data/VERSION

@@ -1 +1 @@
-0.1.12
+0.1.13

data/ext/reflex/application.cpp

@@ -1,13 +1,9 @@
 #include "reflex/ruby/application.h"
 
 
-#include <rucy.h>
 #include "defs.h"
 
 
-using namespace Rucy;
-
-
 RUCY_DEFINE_WRAPPER_VALUE_FROM_TO(Reflex::Application)
 
 #define THIS      to<Reflex::Application*>(self)
@@ -15,7 +11,7 @@ RUCY_DEFINE_WRAPPER_VALUE_FROM_TO(Reflex::Application)
 #define CHECK_OBJ RUCY_CHECK_OBJ(   Reflex::Application, self)
 #define CHECK     RUCY_CHECK_OBJECT(Reflex::Application, self)
 
-#define CALL(fun) RUCY_WRAPPER_CALL(Reflex::Application, THIS, fun)
+#define CALL(fun) RUCY_CALL_SUPER(THIS, fun)
 
 
 static
@@ -80,6 +76,14 @@ RUCY_DEF1(on_quit, event)
 }
 RUCY_END
 
+static
+RUCY_DEF1(on_motion, event)
+{
+	CHECK;
+	CALL(on_motion(to<Reflex::MotionEvent*>(event)));
+}
+RUCY_END
+
 static
 RUCY_DEF1(on_preference, event)
 {
@@ -119,6 +123,7 @@ Init_application ()
 	cApplication.define_method("name",  get_name);
 	cApplication.define_method("on_start", on_start);
 	cApplication.define_method("on_quit",  on_quit);
+	cApplication.define_method("on_motion", on_motion);
 	cApplication.define_method("on_preference", on_preference);
 	cApplication.define_method("on_about",      on_about);
 	cApplication.define_singleton_method("instance", instance);

data/ext/reflex/capture_event.cpp

@@ -1,14 +1,10 @@
 #include "reflex/ruby/event.h"
 
 
-#include <rucy.h>
 #include "rays/ruby/point.h"
 #include "defs.h"
 
 
-using namespace Rucy;
-
-
 RUCY_DEFINE_VALUE_FROM_TO(Reflex::CaptureEvent)
 
 #define THIS  to<Reflex::CaptureEvent*>(self)
@@ -71,7 +67,7 @@ Init_capture_event ()
 
 	cCaptureEvent = mReflex.define_class("CaptureEvent", Reflex::event_class());
 	cCaptureEvent.define_alloc_func(alloc);
-	cCaptureEvent.define_private_method("initialize", initialize);
+	cCaptureEvent.define_private_method("initialize",      initialize);
 	cCaptureEvent.define_private_method("initialize_copy", initialize_copy);
 	cCaptureEvent.define_private_method("get_begin", begin);
 	cCaptureEvent.define_private_method("get_end",   end);

data/ext/reflex/contact_event.cpp

@@ -1,14 +1,11 @@
 #include "reflex/ruby/event.h"
 
 
-#include <rucy.h>
+#include "reflex/ruby/shape.h"
 #include "reflex/ruby/view.h"
 #include "defs.h"
 
 
-using namespace Rucy;
-
-
 RUCY_DEFINE_VALUE_FROM_TO(Reflex::ContactEvent)
 
 #define THIS  to<Reflex::ContactEvent*>(self)
@@ -29,8 +26,10 @@ RUCY_DEFN(initialize)
 	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->view = (argc >= 2) ? to<Reflex::View*>(argv[1]) : NULL;
+	THIS->type  = (argc >= 1)
+		? (Reflex::ContactEvent::Type) to<int>(argv[0])
+		: Reflex::ContactEvent::NONE;
+	THIS->shape = (argc >= 2) ? to<Reflex::Shape*>(argv[1]) : NULL;
 
 	return rb_call_super(0, NULL);
 }
@@ -46,7 +45,7 @@ RUCY_DEF1(initialize_copy, obj)
 RUCY_END
 
 static
-RUCY_DEF0(get_type)
+RUCY_DEF0(type)
 {
 	CHECK;
 	return value(THIS->type);
@@ -54,7 +53,15 @@ RUCY_DEF0(get_type)
 RUCY_END
 
 static
-RUCY_DEF0(get_view)
+RUCY_DEF0(shape)
+{
+	CHECK;
+	return value(THIS->shape);
+}
+RUCY_END
+
+static
+RUCY_DEF0(view)
 {
 	CHECK;
 	return value(THIS->view);
@@ -71,10 +78,11 @@ Init_contact_event ()
 
 	cContactEvent = mReflex.define_class("ContactEvent", Reflex::event_class());
 	cContactEvent.define_alloc_func(alloc);
-	cContactEvent.define_private_method("initialize", initialize);
+	cContactEvent.define_private_method("initialize",      initialize);
 	cContactEvent.define_private_method("initialize_copy", initialize_copy);
-	cContactEvent.define_method("get_type", get_type);
-	cContactEvent.define_method("view",     get_view);
+	cContactEvent.define_method("type",  type);
+	cContactEvent.define_method("shape", shape);
+	cContactEvent.define_method("view",  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);

data/ext/reflex/defs.h

@@ -4,10 +4,13 @@
 #define __REFLEX_EXT_DEFS_H__
 
 
-#include <reflex/exception.h>
+#include <rucy.h>
+#include <reflex/defs.h>
 
 
-using Reflex::reflex_error;
+using namespace Rucy;
+
+using Reflex::coord;
 
 
 #endif//EOH

data/ext/reflex/draw_event.cpp

@@ -1,15 +1,11 @@
 #include "reflex/ruby/event.h"
 
 
-#include <rucy.h>
 #include <rays/ruby/painter.h>
 #include <rays/ruby/bounds.h>
 #include "defs.h"
 
 
-using namespace Rucy;
-
-
 RUCY_DEFINE_VALUE_FROM_TO(Reflex::DrawEvent)
 
 #define THIS  to<Reflex::DrawEvent*>(self)
@@ -30,7 +26,7 @@ RUCY_DEFN(initialize)
 	CHECK;
 	check_arg_count(__FILE__, __LINE__, "DrawEvent#initialize", argc, 0, 1);
 
-	THIS->dt = (argc >= 1) ? argv[0].as_f() : 0;
+	THIS->dt = (argc >= 1) ? to<float>(argv[0]) : 0;
 
 	return rb_call_super(0, NULL);
 }
@@ -87,7 +83,7 @@ Init_draw_event ()
 
 	cDrawEvent = mReflex.define_class("DrawEvent", Reflex::event_class());
 	cDrawEvent.define_alloc_func(alloc);
-	cDrawEvent.define_private_method("initialize", initialize);
+	cDrawEvent.define_private_method("initialize",      initialize);
 	cDrawEvent.define_private_method("initialize_copy", initialize_copy);
 	cDrawEvent.define_method("painter", painter);
 	cDrawEvent.define_method("bounds", bounds);

data/ext/reflex/ellipse_shape.cpp

@@ -1,44 +1,75 @@
-#include "reflex/ruby/shape_view.h"
+#include "reflex/ruby/shape.h"
 
 
-#include <rucy.h>
-
-
-using namespace Rucy;
-
-using Reflex::coord;
+#include "defs.h"
 
 
 RUCY_DEFINE_WRAPPER_VALUE_FROM_TO(Reflex::EllipseShape)
 
 #define THIS      to<Reflex::EllipseShape*>(self)
 
-#define CHECK     RUCY_CHECK_OBJECT(Reflex::EllipseShape, self)
+#define CHECK     RUCY_CHECK_OBJ(Reflex::EllipseShape, self)
 
-#define CALL(fun) RUCY_WRAPPER_CALL(Reflex::EllipseShape, THIS, fun)
+#define CALL(fun) RUCY_CALL_SUPER(THIS, fun)
 
 
 static
 RUCY_DEF_ALLOC(alloc, klass)
 {
-	return value(new Reflex::RubyShapeView<Reflex::EllipseShape>, klass);
+	return value(new Reflex::RubyShape<Reflex::EllipseShape>, klass);
+}
+RUCY_END
+
+static
+RUCY_DEF1(set_angle_from, degree)
+{
+	CHECK;
+	THIS->set_angle_from(to<float>(degree));
+	return self;
+}
+RUCY_END
+
+static
+RUCY_DEF0(get_angle_from)
+{
+	CHECK;
+	return value(THIS->angle_from());
+}
+RUCY_END
+
+static
+RUCY_DEF1(set_angle_to, degree)
+{
+	CHECK;
+	THIS->set_angle_to(to<float>(degree));
+	return self;
 }
 RUCY_END
 
 static
-RUCY_DEF1(set_radius_min, radius)
+RUCY_DEF0(get_angle_to)
 {
 	CHECK;
-	THIS->set_radius_min(radius.as_f(true));
-	return radius;
+	return value(THIS->angle_to());
 }
 RUCY_END
 
 static
-RUCY_DEF0(get_radius_min)
+RUCY_DEFN(set_hole_size)
 {
 	CHECK;
-	return value(THIS->radius_min());
+	check_arg_count(__FILE__, __LINE__, "EllipseShape#set_hole_size", argc, 1, 2, 3);
+
+	THIS->set_hole_size(to<Rays::Point>(argc, argv));
+	return value(THIS->hole_size());
+}
+RUCY_END
+
+static
+RUCY_DEF0(get_hole_size)
+{
+	CHECK;
+	return value(THIS->hole_size());
 }
 RUCY_END
 
@@ -46,7 +77,7 @@ static
 RUCY_DEF1(set_nsegment, nsegment)
 {
 	CHECK;
-	THIS->set_nsegment(nsegment.as_i(true));
+	THIS->set_nsegment(to<uint>(nsegment));
 	return nsegment;
 }
 RUCY_END
@@ -59,9 +90,6 @@ RUCY_DEF0(get_nsegment)
 }
 RUCY_END
 
-static
-RUCY_DEF_clear_override_flags(cof, Reflex::EllipseShape);
-
 
 static Class cEllipseShape;
 
@@ -70,13 +98,16 @@ Init_ellipse_shape ()
 {
 	Module mReflex = define_module("Reflex");
 
-	cEllipseShape = mReflex.define_class("EllipseShape", Reflex::shape_view_class());
+	cEllipseShape = mReflex.define_class("EllipseShape", Reflex::shape_class());
 	cEllipseShape.define_alloc_func(alloc);
-	cEllipseShape.define_private_method("radius_min=", set_radius_min);
-	cEllipseShape.define_method(        "radius_min",  get_radius_min);
-	cEllipseShape.define_private_method("nsegment=", set_nsegment);
-	cEllipseShape.define_method(        "nsegment",  get_nsegment);
-	cEllipseShape.define_clear_override_flags(cof);
+	cEllipseShape.define_method("angle_from=", set_angle_from);
+	cEllipseShape.define_method("angle_from",  get_angle_from);
+	cEllipseShape.define_method("angle_to=",   set_angle_to);
+	cEllipseShape.define_method("angle_to",    get_angle_to);
+	cEllipseShape.define_method("hole_size=", set_hole_size);
+	cEllipseShape.define_method("hole_size",  get_hole_size);
+	cEllipseShape.define_method("nsegment=", set_nsegment);
+	cEllipseShape.define_method("nsegment",  get_nsegment);
 }
 
 

data/ext/reflex/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::Event)
 
 #define THIS  to<Reflex::Event*>(self)

data/ext/reflex/extconf.rb

@@ -15,7 +15,7 @@ require 'reflex/module'
 
 Xot::ExtConf.new Xot, Rucy, Rays, Reflex do
   setup do
-    headers    << 'boost/scoped_array.hpp' << 'boost/shared_ptr.hpp' << 'ruby.h'
+    headers    << 'ruby.h'
     local_libs << 'rucy'
     libs.unshift 'gdi21', 'opengl32' if win32?
     frameworks << 'Cocoa' if osx?
@@ -27,6 +27,5 @@ Xot::ExtConf.new Xot, Rucy, Rays, Reflex do
     end
   end
 
-  dir_config 'boost'
   create_makefile 'reflex/native'
 end

data/ext/reflex/filter.cpp

@@ -0,0 +1,86 @@
+#include "reflex/ruby/filter.h"
+
+
+#include <rays/ruby/painter.h>
+#include <rays/ruby/image.h>
+#include "defs.h"
+
+
+RUCY_DEFINE_WRAPPER_VALUE_FROM_TO(Reflex::Filter)
+
+#define THIS      to<Reflex::Filter*>(self)
+
+#define CHECK     RUCY_CHECK_OBJ(Reflex::Filter, self)
+
+#define CALL(fun) RUCY_CALL_SUPER(THIS, fun)
+
+
+static
+RUCY_DEF_ALLOC(alloc, klass)
+{
+	return value(new Reflex::RubyFilter<Reflex::Filter>, klass);
+}
+RUCY_END
+
+static
+RUCY_DEF1(initialize, arg)
+{
+	CHECK;
+
+	THIS->set_shader(to<Rays::Shader>(arg));
+}
+RUCY_END
+
+static
+RUCY_DEF2(apply, painter, image)
+{
+	CHECK;
+	CALL(apply(to<Rays::Painter*>(painter), to<const Rays::Image&>(image)));
+}
+RUCY_END
+
+static
+RUCY_DEF1(set_shader, shader)
+{
+	CHECK;
+	THIS->set_shader(to<Rays::Shader>(shader));
+}
+RUCY_END
+
+static
+RUCY_DEF0(get_shader)
+{
+	CHECK;
+	return value(THIS->shader());
+}
+RUCY_END
+
+
+static Class cFilter;
+
+void
+Init_filter ()
+{
+	Module mReflex = define_module("Reflex");
+
+	cFilter = mReflex.define_class("Filter");
+	cFilter.define_alloc_func(alloc);
+	cFilter.define_private_method("initialize", initialize);
+	cFilter.define_method("apply", apply);
+	cFilter.define_method("shader=", set_shader);
+	cFilter.define_method("shader",  get_shader);
+}
+
+
+namespace Reflex
+{
+
+
+	Class
+	filter_class ()
+	{
+		return cFilter;
+	}
+
+
+}// Reflex

data/ext/reflex/focus_event.cpp

@@ -1,14 +1,10 @@
 #include "reflex/ruby/event.h"
 
 
-#include <rucy.h>
 #include "reflex/ruby/view.h"
 #include "defs.h"
 
 
-using namespace Rucy;
-
-
 RUCY_DEFINE_VALUE_FROM_TO(Reflex::FocusEvent)
 
 #define THIS  to<Reflex::FocusEvent*>(self)
@@ -24,13 +20,13 @@ RUCY_DEF_ALLOC(alloc, klass)
 RUCY_END
 
 static
-RUCY_DEF3(initialize, type, focus, last)
+RUCY_DEF3(initialize, type, current, last)
 {
 	CHECK;
 
-	THIS->focus = to<Reflex::View*>(focus);
-	THIS->focus = to<Reflex::View*>(focus);
-	THIS->last  = to<Reflex::View*>(last);
+	THIS->type    = (Reflex::FocusEvent::Type) to<uint>(type);
+	THIS->current = to<Reflex::View*>(current);
+	THIS->last    = to<Reflex::View*>(last);
 
 	return rb_call_super(0, NULL);
 }
@@ -46,7 +42,7 @@ RUCY_DEF1(initialize_copy, obj)
 RUCY_END
 
 static
-RUCY_DEF0(get_type)
+RUCY_DEF0(type)
 {
 	CHECK;
 	return value(THIS->type);
@@ -54,10 +50,10 @@ RUCY_DEF0(get_type)
 RUCY_END
 
 static
-RUCY_DEF0(focus)
+RUCY_DEF0(current)
 {
 	CHECK;
-	return THIS->focus ? value(THIS->focus) : nil();
+	return THIS->current ? value(THIS->current) : nil();
 }
 RUCY_END
 
@@ -79,11 +75,11 @@ Init_focus_event ()
 
 	cFocusEvent = mReflex.define_class("FocusEvent", Reflex::event_class());
 	cFocusEvent.define_alloc_func(alloc);
-	cFocusEvent.define_private_method("initialize", initialize);
+	cFocusEvent.define_private_method("initialize",      initialize);
 	cFocusEvent.define_private_method("initialize_copy", initialize_copy);
-	cFocusEvent.define_method("get_type", get_type);
-	cFocusEvent.define_method("focus", focus);
-	cFocusEvent.define_method("last",  last);
+	cFocusEvent.define_method("type", type);
+	cFocusEvent.define_method("current", current);
+	cFocusEvent.define_method("last", 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);