reflexion 0.1.13 → 0.1.19

data/ext/reflex/key_event.cpp

@@ -19,16 +19,15 @@ RUCY_DEF_ALLOC(alloc, klass)
 RUCY_END
 
 static
-RUCY_DEFN(initialize)
+RUCY_DEF5(initialize, type, chars, code, repeat, modifiers)
 {
 	CHECK;
-	check_arg_count(__FILE__, __LINE__, "KeyEvent#initialize", argc, 0, 1, 2, 3, 4, 5);
 
-	THIS->type      = (argc >= 1) ? (Reflex::KeyEvent::Type) to<int>(argv[0]) : Reflex::KeyEvent::NONE;
-	THIS->chars     = (argc >= 2) ? argv[1].c_str()   : NULL;
-	THIS->code      = (argc >= 3) ? to<int>(argv[2])  : Reflex::KEY_NONE;
-	THIS->repeat    = (argc >= 4) ? to<int>(argv[3])  : 1;
-	THIS->modifiers = (argc >= 5) ? to<uint>(argv[4]) : (uint) Reflex::MOD_NONE;
+	THIS->type      = (Reflex::KeyEvent::Type) to<int>(type);
+	THIS->chars     = chars.c_str();
+	THIS->code      = to<int>(code);
+	THIS->repeat    = to<int>(repeat);
+	THIS->modifiers = to<uint>(modifiers);
 
 	return rb_call_super(0, NULL);
 }

data/ext/reflex/motion_event.cpp

@@ -20,13 +20,11 @@ RUCY_DEF_ALLOC(alloc, klass)
 RUCY_END
 
 static
-RUCY_DEFN(initialize)
+RUCY_DEF1(initialize, gravity)
 {
 	CHECK;
-	check_arg_count(__FILE__, __LINE__, "MotionEvent#initialize", argc, 0, 1);
 
-	if (argc >= 1)
-		THIS->gravity = to<Rays::Point>(argv[0]);
+	THIS->gravity = to<Rays::Point>(gravity);
 
 	return rb_call_super(0, NULL);
 }

data/ext/reflex/pointer_event.cpp

@@ -20,19 +20,23 @@ RUCY_DEF_ALLOC(alloc, klass)
 RUCY_END
 
 static
-RUCY_DEFN(initialize)
+RUCY_DEF6(initialize, type, pointer_type, modifiers, count, drag, positions)
 {
 	CHECK;
-	check_arg_count(__FILE__, __LINE__, "PointerEvent#initialize", argc, 0, 1, 2, 3, 4, 5, 6, 7);
 
-	THIS->type         = (argc >= 1) ? (Reflex::PointerEvent::Type) to<int>(argv[0]) : Reflex::PointerEvent::NONE;
-	THIS->pointer_type = (argc >= 2) ? to<uint>(argv[1])  : Reflex::POINTER_NONE;
-	THIS->x            = (argc >= 3) ? to<coord>(argv[2]) : 0;
-	THIS->y            = (argc >= 4) ? to<coord>(argv[3]) : 0;
-	THIS->size         = 1;
-	THIS->modifiers    = (argc >= 5) ? to<uint>(argv[4])  : (uint) Reflex::MOD_NONE;
-	THIS->count        = (argc >= 6) ? to<uint>(argv[5])  : 0;
-	THIS->drag         = (argc >= 7) ? to<bool>(argv[6])  : false;
+	int size = positions.size();
+	if (size <= 0 || Reflex::PointerEvent::MAX < size)
+		argument_error(__FILE__, __LINE__);
+
+	THIS->type         = (Reflex::PointerEvent::Type) to<int>(type);
+	THIS->pointer_type = to<uint>(pointer_type);
+	THIS->modifiers    = to<uint>(modifiers);
+	THIS->count        = to<uint>(count);
+	THIS->drag         = to<bool>(drag);
+	THIS->size         = (size_t) size;
+
+	for (int i = 0; i < size; ++i)
+		THIS->positions[i] = to<Rays::Point>(positions[i]);
 
 	return rb_call_super(0, NULL);
 }
@@ -131,10 +135,15 @@ RUCY_DEFN(position)
 RUCY_END
 
 static
-RUCY_DEF1(array_get, index)
+RUCY_DEF1(get_at, index)
 {
 	CHECK;
-	return value((*THIS)[to<int>(index)]);
+
+	int i = to<int>(index);
+	if (i < 0 || THIS->size <= (size_t) i)
+		index_error(__FILE__, __LINE__);
+
+	return value((*THIS)[i]);
 }
 RUCY_END
 
@@ -160,7 +169,7 @@ Init_pointer_event ()
 	cPointerEvent.define_method("x", x);
 	cPointerEvent.define_method("y", y);
 	cPointerEvent.define_method("position", position);
-	cPointerEvent.define_method("[]", array_get);
+	cPointerEvent.define_method("[]", get_at);
 	cPointerEvent.define_const("TYPE_NONE", Reflex::PointerEvent::NONE);
 	cPointerEvent.define_const("TYPE_DOWN", Reflex::PointerEvent::DOWN);
 	cPointerEvent.define_const("TYPE_UP",   Reflex::PointerEvent::UP);
@@ -171,7 +180,6 @@ Init_pointer_event ()
 	cPointerEvent.define_const("POINTER_MOUSE_MIDDLE", Reflex::POINTER_MOUSE_MIDDLE);
 	cPointerEvent.define_const("POINTER_TOUCH",        Reflex::POINTER_TOUCH);
 	cPointerEvent.define_const("POINTER_PEN",          Reflex::POINTER_PEN);
-	cPointerEvent.define_const("POINTER_TYPE_LAST",    Reflex::POINTER_TYPE_LAST);
 }
 
 

data/ext/reflex/reflex.cpp

@@ -1,4 +1,6 @@
-#include "reflex/reflex.h"
+#include "reflex/ruby/reflex.h"
+
+
 #include "reflex/ruby/view.h"
 #include "reflex/ruby/timer.h"
 #include "../../src/window.h"

data/ext/reflex/scroll_event.cpp

@@ -20,17 +20,16 @@ RUCY_DEF_ALLOC(alloc, klass)
 RUCY_END
 
 static
-RUCY_DEFN(initialize)
+RUCY_DEF6(initialize, x, y, z, dx, dy, dz)
 {
 	CHECK;
-	check_arg_count(__FILE__, __LINE__, "ScrollEvent#initialize", argc, 0, 1, 2, 3, 4, 5, 6);
-
-	THIS->x       = (argc >= 1) ? to<coord>(argv[0]) : 0;
-	THIS->y       = (argc >= 2) ? to<coord>(argv[1]) : 0;
-	THIS->z       = (argc >= 3) ? to<coord>(argv[2]) : 0;
-	THIS->dx      = (argc >= 4) ? to<coord>(argv[3]) : 0;
-	THIS->dy      = (argc >= 5) ? to<coord>(argv[4]) : 0;
-	THIS->dz      = (argc >= 6) ? to<coord>(argv[5]) : 0;
+
+	THIS->x  = to<coord>(x);
+	THIS->y  = to<coord>(y);
+	THIS->z  = to<coord>(z);
+	THIS->dx = to<coord>(dx);
+	THIS->dy = to<coord>(dy);
+	THIS->dz = to<coord>(dz);
 
 	return rb_call_super(0, NULL);
 }

data/ext/reflex/update_event.cpp

@@ -19,13 +19,12 @@ RUCY_DEF_ALLOC(alloc, klass)
 RUCY_END
 
 static
-RUCY_DEFN(initialize)
+RUCY_DEF2(initialize, now, dt)
 {
 	CHECK;
-	check_arg_count(__FILE__, __LINE__, "UpdateEvent#initialize", argc, 0, 1, 2);
 
-	THIS->now = (argc >= 1) ? to<double>(argv[0]) : 0;
-	THIS->dt  = (argc >= 2) ? to<float>(argv[1])  : 0;
+	THIS->now = to<double>(now);
+	THIS->dt  = to<float>(dt);
 
 	return rb_call_super(0, NULL);
 }

data/ext/reflex/wheel_event.cpp

@@ -20,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);
 }

data/include/reflex/defs.h

@@ -215,8 +215,6 @@ namespace Reflex
 
 		POINTER_PEN          = 0x1 << 4,
 
-		POINTER_TYPE_LAST    = POINTER_PEN,
-
 	};// PointType
 
 

data/include/reflex/event.h

@@ -37,16 +37,6 @@ namespace Reflex
 	};// Event
 
 
-	struct MotionEvent : public Event
-	{
-
-		Point gravity;
-
-		MotionEvent (const Point& gravity = Point(0, 9.8));
-
-	};// MotionEvent
-
-
 	struct UpdateEvent : public Event
 	{
 
@@ -115,14 +105,14 @@ namespace Reflex
 		{
 			struct {coord x, y, z;};
 
-			Rays::Coord3 scroll_;
+			Coord3 scroll_;
 		};
 
 		union
 		{
 			struct {coord dx, dy, dz;};
 
-			Rays::Coord3 delta_;
+			Coord3 delta_;
 		};
 
 		ScrollEvent ();
@@ -203,7 +193,7 @@ namespace Reflex
 		{
 			struct {coord x, y, z;};
 
-			Rays::Coord3 positions[MAX];
+			Coord3 positions[MAX];
 		};
 
 		PointerEvent ();
@@ -234,14 +224,14 @@ namespace Reflex
 		{
 			struct {coord dx, dy, dz;};
 
-			Rays::Coord3 delta_;
+			Coord3 delta_;
 		};
 
 		union
 		{
 			struct {coord x, y, z;};
 
-			Rays::Coord3 position_;
+			Coord3 position_;
 		};
 
 		uint modifiers;
@@ -315,6 +305,16 @@ namespace Reflex
 	};// ContactEvent
 
 
+	struct MotionEvent : public Event
+	{
+
+		Point gravity;
+
+		MotionEvent (const Point& gravity = Point(0, 9.8));
+
+	};// MotionEvent
+
+
 }// Reflex
 
 

data/include/reflex/exception.h

@@ -38,11 +38,17 @@ namespace Reflex
 
 		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, ...);
 
-		void layout_error (const char* file, int line, const char* format = NULL, ...);
+		[[noreturn]]
+		void layout_error (
+			const char* file, int line, const char* format = NULL, ...);
 
-		void physics_error (const char* file, int line, const char* format = NULL, ...);
+		[[noreturn]]
+		void physics_error (
+			const char* file, int line, const char* format = NULL, ...);
 
 	}// ErrorFunctions
 

data/include/reflex/ruby/event.h

@@ -17,9 +17,6 @@ namespace Reflex
 	Rucy::Class event_class ();
 	// class Reflex::Event
 
-	Rucy::Class motion_event_class ();
-	// class Reflex::MotionEvent
-
 	Rucy::Class update_event_class ();
 	// class Reflex::UpdateEvent
 
@@ -53,14 +50,15 @@ namespace Reflex
 	Rucy::Class contact_event_class ();
 	// class Reflex::ContactEvent
 
+	Rucy::Class motion_event_class ();
+	// class Reflex::MotionEvent
+
 
 }// Reflex
 
 
 RUCY_DECLARE_VALUE_FROM_TO(Reflex::Event)
 
-RUCY_DECLARE_VALUE_FROM_TO(Reflex::MotionEvent)
-
 RUCY_DECLARE_VALUE_FROM_TO(Reflex::UpdateEvent)
 
 RUCY_DECLARE_VALUE_FROM_TO(Reflex::DrawEvent)
@@ -83,6 +81,8 @@ RUCY_DECLARE_VALUE_FROM_TO(Reflex::TimerEvent)
 
 RUCY_DECLARE_VALUE_FROM_TO(Reflex::ContactEvent)
 
+RUCY_DECLARE_VALUE_FROM_TO(Reflex::MotionEvent)
+
 
 namespace Rucy
 {
@@ -94,12 +94,6 @@ namespace Rucy
 		return Reflex::event_class();
 	}
 
-	template <> inline Class
-	get_ruby_class<Reflex::MotionEvent> ()
-	{
-		return Reflex::motion_event_class();
-	}
-
 	template <> inline Class
 	get_ruby_class<Reflex::UpdateEvent> ()
 	{
@@ -166,6 +160,12 @@ namespace Rucy
 		return Reflex::contact_event_class();
 	}
 
+	template <> inline Class
+	get_ruby_class<Reflex::MotionEvent> ()
+	{
+		return Reflex::motion_event_class();
+	}
+
 
 }// Rucy
 

data/include/reflex/ruby/reflex.h

@@ -5,6 +5,7 @@
 
 
 #include <rucy/module.h>
+#include <reflex/reflex.h>
 
 
 namespace Reflex

data/include/reflex/style.h

@@ -24,7 +24,22 @@ namespace Reflex
 
 			typedef coord Value;
 
-			enum Type {NONE = 0, PIXEL, PERCENT, FILL, FIT, TYPE_LAST};
+			enum Type
+			{
+
+				NONE = 0,
+
+				PIXEL,
+
+				PERCENT,
+
+				FILL,
+
+				FIT,
+
+				TYPE_MAX
+
+			};// Type
 
 			StyleLength (Type type = NONE, Value value = 0);
 
@@ -60,9 +75,20 @@ namespace Reflex
 
 			enum Flow
 			{
-				FLOW_NONE = 0, FLOW_RIGHT, FLOW_DOWN, FLOW_LEFT, FLOW_UP,
-				FLOW_LAST
-			};
+
+				FLOW_NONE = 0,
+
+				FLOW_RIGHT,
+
+				FLOW_DOWN,
+
+				FLOW_LEFT,
+
+				FLOW_UP,
+
+				FLOW_MAX
+
+			};// Flow
 
 			Style (const char* name = NULL);
 

data/lib/reflex.rb

@@ -9,13 +9,14 @@ require 'reflex/bounds'
 require 'reflex/color'
 require 'reflex/color_space'
 require 'reflex/matrix'
+require 'reflex/painter'
 require 'reflex/polyline'
 require 'reflex/polygon'
 require 'reflex/bitmap'
 require 'reflex/image'
 require 'reflex/font'
 require 'reflex/shader'
-require 'reflex/painter'
+require 'reflex/camera'
 
 require 'reflex/reflex'
 require 'reflex/helper'

data/lib/reflex/camera.rb

@@ -0,0 +1,13 @@
+# -*- coding: utf-8 -*-
+
+
+require 'rays/camera'
+
+
+module Reflex
+
+
+  Camera = Rays::Camera
+
+
+end# Reflex

data/lib/reflex/pointer_event.rb

@@ -64,6 +64,10 @@ module Reflex
       (get_pointer_type & POINTER_PEN) != 0
     end
 
+    def positions ()
+      size.times.map {|i| position i}
+    end
+
     def inspect ()
       "#<Reflex::PointerEvent type:#{type}/#{pointer_type} x:#{x} y:#{y} size:#{size} mod:#{modifiers} count:#{count} drag:#{drag?}>"
     end