reflexion 0.1.11 → 0.1.16

data/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)
@@ -26,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);
 }
@@ -104,22 +97,6 @@ RUCY_DEF0(modifiers)
 }
 RUCY_END
 
-static
-RUCY_DEF0(delta)
-{
-	CHECK;
-	return value(Rays::Point(THIS->dx, THIS->dy, THIS->dz));
-}
-RUCY_END
-
-static
-RUCY_DEF0(position)
-{
-	CHECK;
-	return value(Rays::Point(THIS->x, THIS->y, THIS->z));
-}
-RUCY_END
-
 
 static Class cWheelEvent;
 
@@ -130,7 +107,7 @@ Init_wheel_event ()
 
 	cWheelEvent = mReflex.define_class("WheelEvent", Reflex::event_class());
 	cWheelEvent.define_alloc_func(alloc);
-	cWheelEvent.define_private_method("initialize", initialize);
+	cWheelEvent.define_private_method("initialize",      initialize);
 	cWheelEvent.define_private_method("initialize_copy", initialize_copy);
 	cWheelEvent.define_method("dx", dx);
 	cWheelEvent.define_method("dy", dy);
@@ -139,8 +116,6 @@ Init_wheel_event ()
 	cWheelEvent.define_method("y", y);
 	cWheelEvent.define_method("z", z);
 	cWheelEvent.define_method("modifiers", modifiers);
-	cWheelEvent.define_method("delta", delta);
-	cWheelEvent.define_method("position", position);
 }
 
 

data/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
@@ -82,10 +77,11 @@ RUCY_DEF0(get_title)
 RUCY_END
 
 static
-RUCY_DEF1(set_frame, arg)
+RUCY_DEFN(set_frame)
 {
 	CHECK;
-	THIS->set_frame(to<Rays::Bounds>(arg));
+	THIS->set_frame(to<Rays::Bounds>(argc, argv));
+	return value(THIS->frame());
 }
 RUCY_END
 
@@ -253,9 +249,6 @@ RUCY_DEF1(on_wheel, event)
 }
 RUCY_END
 
-static
-RUCY_DEF_clear_override_flags(cof, Reflex::Window);
-
 
 static Class cWindow;
 
@@ -272,8 +265,8 @@ Init_window ()
 	cWindow.define_method("redraw", redraw);
 	cWindow.define_method("title=", set_title);
 	cWindow.define_method("title", get_title);
-	cWindow.define_private_method("set_frame", set_frame);
-	cWindow.define_private_method("get_frame", get_frame);
+	cWindow.define_method("frame=", set_frame);
+	cWindow.define_method("frame",  get_frame);
 	cWindow.define_method("hidden", hidden);
 	cWindow.define_method("root", root);
 	cWindow.define_method("focus", focus);
@@ -293,7 +286,6 @@ Init_window ()
 	cWindow.define_method("on_pointer_up",   on_pointer_up);
 	cWindow.define_method("on_pointer_move", on_pointer_move);
 	cWindow.define_method("on_wheel", on_wheel);
-	cWindow.define_clear_override_flags(cof);
 }
 
 

data/include/reflex.h

@@ -7,18 +7,19 @@
 #include <reflex/defs.h>
 #include <reflex/reflex.h>
 #include <reflex/exception.h>
+#include <reflex/debug.h>
 
 #include <reflex/selector.h>
-#include <reflex/style.h>
 #include <reflex/event.h>
+#include <reflex/style.h>
+#include <reflex/timer.h>
+#include <reflex/shape.h>
+#include <reflex/filter.h>
 
 #include <reflex/application.h>
 #include <reflex/window.h>
 #include <reflex/view.h>
 
-#include <reflex/body.h>
-#include <reflex/fixture.h>
-
 #include <reflex/image_view.h>
 
 

data/include/reflex/application.h

@@ -37,6 +37,8 @@ namespace Reflex
 
 			virtual void on_quit (Event* e);
 
+			virtual void on_motion (MotionEvent* e);
+
 			virtual void on_preference (Event* e);
 
 			virtual void on_about (Event* e);

data/include/reflex/debug.h

@@ -0,0 +1,22 @@
+// -*- c++ -*-
+#pragma once
+#ifndef __REFLEX_DEBUG_H__
+#define __REFLEX_DEBUG_H__
+
+
+#include <xot/debug.h>
+
+
+namespace Reflex
+{
+
+
+	using Xot::dout;
+
+	using Xot::doutln;
+
+
+}// Reflex
+
+
+#endif//EOH

data/include/reflex/defs.h

@@ -7,6 +7,32 @@
 #include <rays/defs.h>
 
 
+namespace Rays
+{
+
+
+	struct Coord2;
+	struct Coord3;
+	struct Coord4;
+	struct Point;
+	struct Bounds;
+	struct Color;
+	struct Matrix;
+
+	class ColorSpace;
+	class Polyline;
+	class Polygon;
+	class Bitmap;
+	class Image;
+	class Font;
+	class Shader;
+
+	class Painter;
+
+
+}// Rays
+
+
 namespace Reflex
 {
 
@@ -15,8 +41,27 @@ namespace Reflex
 
 	using Rays::String;
 
+
 	using Rays::coord;
 
+	using Rays::Coord2;
+	using Rays::Coord3;
+	using Rays::Coord4;
+	using Rays::Point;
+	using Rays::Bounds;
+	using Rays::Color;
+	using Rays::Matrix;
+
+	using Rays::ColorSpace;
+	using Rays::Polyline;
+	using Rays::Polygon;
+	using Rays::Bitmap;
+	using Rays::Image;
+	using Rays::Font;
+	using Rays::Shader;
+
+	using Rays::Painter;
+
 
 	enum KeyCode
 	{
@@ -170,8 +215,6 @@ namespace Reflex
 
 		POINTER_PEN          = 0x1 << 4,
 
-		POINTER_TYPE_LAST    = POINTER_PEN,
-
 	};// PointType
 
 

data/include/reflex/event.h

@@ -4,16 +4,18 @@
 #define __REFLEX_EVENT_H__
 
 
+#include <rays/point.h>
+#include <rays/bounds.h>
+#include <rays/painter.h>
 #include <reflex/defs.h>
-#include <reflex/point.h>
-#include <reflex/bounds.h>
-#include <reflex/painter.h>
+#include <reflex/timer.h>
 
 
 namespace Reflex
 {
 
 
+	class Shape;
 	class View;
 
 
@@ -38,9 +40,11 @@ namespace Reflex
 	struct UpdateEvent : public Event
 	{
 
+		double now;
+
 		float dt;
 
-		UpdateEvent (float dt = 0);
+		UpdateEvent (double now = 0, float dt = 0);
 
 	};// UpdateEvent
 
@@ -71,6 +75,7 @@ namespace Reflex
 		union
 		{
 			struct {coord dwidth, dheight;};
+
 			struct {coord dw,     dh;};
 		};
 
@@ -99,12 +104,14 @@ namespace Reflex
 		union
 		{
 			struct {coord x, y, z;};
+
 			Coord3 scroll_;
 		};
 
 		union
 		{
 			struct {coord dx, dy, dz;};
+
 			Coord3 delta_;
 		};
 
@@ -130,11 +137,11 @@ namespace Reflex
 
 		Type type;
 
-		View *focus, *last;
+		View *current, *last;
 
 		FocusEvent ();
 
-		FocusEvent (Type type, View* focus, View* last);
+		FocusEvent (Type type, View* current, View* last);
 
 	};// FocusEvent
 
@@ -185,6 +192,7 @@ namespace Reflex
 		union
 		{
 			struct {coord x, y, z;};
+
 			Coord3 positions[MAX];
 		};
 
@@ -215,12 +223,14 @@ namespace Reflex
 		union
 		{
 			struct {coord dx, dy, dz;};
+
 			Coord3 delta_;
 		};
 
 		union
 		{
 			struct {coord x, y, z;};
+
 			Coord3 position_;
 		};
 
@@ -232,14 +242,14 @@ namespace Reflex
 			coord dx, coord dy, coord dz, coord x = 0, coord y = 0, coord z = 0,
 			uint modifiers = 0);
 
-		      Point& delta ();
-
-		const Point& delta () const;
-
 		      Point& position ();
 
 		const Point& position () const;
 
+		      Point& delta ();
+
+		const Point& delta () const;
+
 	};// WheelEvent
 
 
@@ -255,6 +265,28 @@ namespace Reflex
 	};// CaptureEvent
 
 
+	struct TimerEvent : public Event
+	{
+
+		Timer::Ref timer;
+
+		TimerEvent (Timer* timer = NULL);
+
+		View* owner () const;
+
+		int id () const;
+
+		float interval () const;
+
+		void set_count (int count);
+
+		int      count () const;
+
+		bool is_finished () const;
+
+	};// TimerEvent
+
+
 	struct ContactEvent : public Event
 	{
 
@@ -262,15 +294,27 @@ namespace Reflex
 
 		Type type;
 
+		Shape* shape;
+
 		View* view;
 
 		ContactEvent ();
 
-		ContactEvent (Type type, View* view);
+		ContactEvent (Type type, Shape* shape);
 
 	};// ContactEvent
 
 
+	struct MotionEvent : public Event
+	{
+
+		Point gravity;
+
+		MotionEvent (const Point& gravity = Point(0, 9.8));
+
+	};// MotionEvent
+
+
 }// Reflex
 
 

data/include/reflex/exception.h

@@ -26,14 +26,29 @@ namespace Reflex
 	};
 
 
+	class PhysicsError : public ReflexError
+	{
+		typedef ReflexError Super;
+		public: PhysicsError (const char* str = NULL);
+	};
+
+
 	namespace ErrorFunctions
 	{
 
 		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, ...);
+
+		[[noreturn]]
+		void layout_error (
+			const char* file, int line, const char* format = NULL, ...);
 
-		void layout_error (const char* file, int line, const char* format = NULL, ...);
+		[[noreturn]]
+		void physics_error (
+			const char* file, int line, const char* format = NULL, ...);
 
 	}// ErrorFunctions