reflexion 0.1.14 → 0.1.20

data/samples/shapes.rb

@@ -47,6 +47,22 @@ Reflex::Window.new do
         translate 100, 0
         ellipse                       x, y,  w, h, hole: 10, from: 200, to: 300
         polygon Rays::Polygon.ellipse x, y2, w, h, hole: 10, from: 200, to: 300
+
+        translate 100, 0
+        curve                       x, y,  x + w, y,  x + w, y  + h, x, y  + h
+        polygon Rays::Polygon.curve x, y2, x + w, y2, x + w, y2 + h, x, y2 + h
+
+        translate 100, 0
+        curve                       x, y,  x + w, y,  x + w, y  + h, x, y  + h, loop: true
+        polygon Rays::Polygon.curve x, y2, x + w, y2, x + w, y2 + h, x, y2 + h, loop: true
+
+        translate 100, 0
+        bezier                       x, y,  x + w, y,  x + w, y  + h, x, y  + h
+        polygon Rays::Polygon.bezier x, y2, x + w, y2, x + w, y2 + h, x, y2 + h
+
+        translate 100, 0
+        bezier                       x, y,  x + w, y,  x + w, y  + h, x, y  + h, loop: true
+        polygon Rays::Polygon.bezier x, y2, x + w, y2, x + w, y2 + h, x, y2 + h, loop: true
       end
 
       translate 0, 200

data/src/event.cpp

@@ -28,12 +28,6 @@ namespace Reflex
 	}
 
 
-	MotionEvent::MotionEvent (const Point& gravity)
-	:	gravity(gravity)
-	{
-	}
-
-
 	UpdateEvent::UpdateEvent (double now, float dt)
 	:	now(now), dt(dt)
 	{
@@ -170,7 +164,7 @@ namespace Reflex
 		if (positions_)
 		{
 			for (size_t i = 0; i < size; ++i)
-				positions[i] = *(Rays::Coord3*) &positions_[i];
+				positions[i] = *(Coord3*) &positions_[i];
 		}
 	}
 
@@ -302,4 +296,10 @@ namespace Reflex
 	}
 
 
+	MotionEvent::MotionEvent (const Point& gravity)
+	:	gravity(gravity)
+	{
+	}
+
+
 }// Reflex

data/src/ios/view_controller.h

@@ -13,6 +13,10 @@
 
 	- (ReflexView*) createReflexView;
 
+	- (void) startTimer;
+
+	- (void) stopTimer;
+
 	- (void) viewDidResize;
 
 @end// ReflexViewController

data/src/ios/view_controller.mm

@@ -144,11 +144,15 @@ ReflexViewController_get_show_fun ()
 	}
 
 	- (void) dealloc
+	{
+		[self cleanup];
+		[super dealloc];
+	}
+
+	- (void) cleanup
 	{
 		[self cleanupReflexView];
 		[self unbind];
-
-		[super dealloc];
 	}
 
 	- (void) bind: (Reflex::Window*) window
@@ -160,7 +164,8 @@ ReflexViewController_get_show_fun ()
 		if (data.view_controller)
 			Reflex::invalid_state_error(__FILE__, __LINE__);
 
-		data.view_controller = [self retain];
+		// ruby value references view controller weakly.
+		data.view_controller = self;
 
 		// Reflex::Window is not constructed completely,
 		// so can not call ClassWrapper::retain().
@@ -180,8 +185,6 @@ ReflexViewController_get_show_fun ()
 			ptr_for_rebind->Xot::template RefCountable<>::release();
 			ptr_for_rebind = NULL;
 		}
-
-		assert(pwindow && !ptr_for_rebind);
 	}
 
 	- (void) unbind
@@ -189,12 +192,7 @@ ReflexViewController_get_show_fun ()
 		[self rebind];
 		if (!pwindow) return;
 
-		Reflex::WindowData& data = Window_get_data(pwindow);
-		if (data.view_controller)
-		{
-			[data.view_controller release];
-			data.view_controller = nil;
-		}
+		Window_get_data(pwindow).view_controller = nil;
 
 		pwindow->release();
 		pwindow = NULL;
@@ -211,7 +209,7 @@ ReflexViewController_get_show_fun ()
 		[super didReceiveMemoryWarning];
 
 		if ([self isViewLoaded] && !self.view.window)
-			[self cleanupReflexView];
+			[self cleanup];
 	}
 
 	- (void) viewDidLoad
@@ -262,7 +260,7 @@ ReflexViewController_get_show_fun ()
 
 		EAGLContext* context = view.context;
 		if (context && context == [EAGLContext currentContext])
-			[EAGLContext setCurrentContext: nil];
+			[EAGLContext setCurrentContext: (EAGLContext*) Rays::get_offscreen_context()];
 
 		[view removeFromSuperview];
 
@@ -272,7 +270,7 @@ ReflexViewController_get_show_fun ()
 	- (void) viewDidAppear: (BOOL) animated
 	{
 		[super viewDidAppear: animated];
-		[self startTimer: 60];
+		[self startTimer];
 	}
 
 	- (void) viewDidDisappear: (BOOL) animated
@@ -281,6 +279,11 @@ ReflexViewController_get_show_fun ()
 		[super viewDidDisappear: animated];
 	}
 
+	- (void) startTimer
+	{
+		[self startTimer: 60];
+	}
+
 	- (void) startTimer: (int) fps
 	{
 		[self stopTimer];
@@ -344,22 +347,7 @@ ReflexViewController_get_show_fun ()
 		win->self->prev_fps       = fps;
 
 		Reflex::DrawEvent e(dt, fps);
-
-		e.painter = win->painter();
-		if (!e.painter)
-			Xot::invalid_state_error(__FILE__, __LINE__);
-
-		Rays::Bounds frame = win->frame();
-		e.bounds.reset(0, 0, frame.width, frame.height);
-
-		e.painter->begin();
-		e.painter->clear();
-
-		win->on_draw(&e);
-		if (!e.is_blocked())
-			Reflex::View_draw_tree(win->root(), e, 0, frame.move_to(0));
-
-		e.painter->end();
+		Window_call_draw_event(win, &e);
 	}
 
 	- (void) viewDidResize
@@ -399,7 +387,7 @@ ReflexViewController_get_show_fun ()
 		if (!win) return;
 
 		Reflex::NativePointerEvent e(
-			touches, event, self.view, Reflex::PointerEvent::DOWN);
+			touches, event, self.reflexView, Reflex::PointerEvent::DOWN);
 		win->on_pointer(&e);
 	}
 
@@ -409,7 +397,7 @@ ReflexViewController_get_show_fun ()
 		if (!win) return;
 
 		Reflex::NativePointerEvent e(
-			touches, event, self.view, Reflex::PointerEvent::UP);
+			touches, event, self.reflexView, Reflex::PointerEvent::UP);
 		win->on_pointer(&e);
 	}
 
@@ -419,7 +407,7 @@ ReflexViewController_get_show_fun ()
 		if (!win) return;
 
 		Reflex::NativePointerEvent e(
-			touches, event, self.view, Reflex::PointerEvent::UP);
+			touches, event, self.reflexView, Reflex::PointerEvent::UP);
 		win->on_pointer(&e);
 	}
 
@@ -429,7 +417,7 @@ ReflexViewController_get_show_fun ()
 		if (!win) return;
 
 		Reflex::NativePointerEvent e(
-			touches, event, self.view, Reflex::PointerEvent::MOVE);
+			touches, event, self.reflexView, Reflex::PointerEvent::MOVE);
 		win->on_pointer(&e);
 	}
 

data/src/osx/native_window.mm

@@ -43,7 +43,7 @@ static const NSUInteger WINDOW_STYLE_MASK =
 
 		[self setDelegate: self];
 		[self setupContentView];
-		[self startTimer: 60];
+		[self startTimer];
 
 		return self;
 	}
@@ -66,7 +66,8 @@ static const NSUInteger WINDOW_STYLE_MASK =
 		if (data.native)
 			Reflex::invalid_state_error(__FILE__, __LINE__);
 
-		data.native = [self retain];
+		// ruby value references native window weakly.
+		data.native = self;
 
 		// Reflex::Window is not constructed completely,
 		// so can not call ClassWrapper::retain().
@@ -86,8 +87,6 @@ static const NSUInteger WINDOW_STYLE_MASK =
 			ptr_for_rebind->Xot::template RefCountable<>::release();
 			ptr_for_rebind = NULL;
 		}
-
-		assert(pwindow && !ptr_for_rebind);
 	}
 
 	- (void) unbind
@@ -95,12 +94,7 @@ static const NSUInteger WINDOW_STYLE_MASK =
 		[self rebind];
 		if (!pwindow) return;
 
-		Reflex::WindowData& data = Window_get_data(pwindow);
-		if (data.native)
-		{
-			[data.native release];
-			data.native = nil;
-		}
+		Window_get_data(pwindow).native = nil;
 
 		pwindow->release();
 		pwindow = NULL;
@@ -120,6 +114,11 @@ static const NSUInteger WINDOW_STYLE_MASK =
 		[self setContentView: view];
 	}
 
+	- (void) startTimer
+	{
+		[self startTimer: 60];
+	}
+
 	- (void) startTimer: (int) fps
 	{
 		[self stopTimer];
@@ -183,22 +182,7 @@ static const NSUInteger WINDOW_STYLE_MASK =
 		win->self->prev_fps       = fps;
 
 		Reflex::DrawEvent e(dt, fps);
-
-		e.painter = win->painter();
-		if (!e.painter)
-			Xot::invalid_state_error(__FILE__, __LINE__);
-
-		Rays::Bounds frame = win->frame();
-		e.bounds.reset(0, 0, frame.width, frame.height);
-
-		e.painter->begin();
-		e.painter->clear();
-
-		win->on_draw(&e);
-		if (!e.is_blocked())
-			Reflex::View_draw_tree(win->root(), e, 0, frame.move_to(0));
-
-		e.painter->end();
+		Window_call_draw_event(win, &e);
 	}
 
 	- (BOOL) windowShouldClose: (id) sender

data/src/shape.cpp

@@ -52,8 +52,8 @@ namespace Reflex
 		if (!style) return NULL;
 
 		return is_default_shape(shape)
-			? &style->background_fill()
-			: &style->foreground_fill();
+			?	&style->background_fill()
+			:	&style->foreground_fill();
 	}
 
 	static coord
@@ -65,8 +65,8 @@ namespace Reflex
 		if (!style) return 0;
 
 		return is_default_shape(shape)
-			? style->background_stroke_width()
-			: style->foreground_stroke_width();
+			?	style->background_stroke_width()
+			:	style->foreground_stroke_width();
 	}
 
 	static bool

data/src/style.cpp

@@ -201,7 +201,7 @@ namespace Reflex
 	void
 	StyleLength::reset (Type type, Value value)
 	{
-		if (type < NONE || TYPE_LAST <= type)
+		if (type < NONE || TYPE_MAX <= type)
 			argument_error(__FILE__, __LINE__);
 
 		if (type == FIT && value != 1)
@@ -225,7 +225,7 @@ namespace Reflex
 
 	StyleLength::operator bool () const
 	{
-		return NONE < self->type && self->type < TYPE_LAST;
+		return NONE < self->type && self->type < TYPE_MAX;
 	}
 
 	bool
@@ -615,8 +615,8 @@ namespace Reflex
 	Style::set_flow (Flow main, Flow sub)
 	{
 		if (
-			main <  FLOW_NONE || FLOW_LAST <= main ||
-			sub  <  FLOW_NONE || FLOW_LAST <= sub  ||
+			main <  FLOW_NONE || FLOW_MAX <= main ||
+			sub  <  FLOW_NONE || FLOW_MAX <= sub  ||
 			(main != FLOW_NONE && (get_flow_dir(main) == get_flow_dir(sub))) ||
 			(main == FLOW_NONE && sub != FLOW_NONE))
 		{

data/src/timer.cpp

@@ -162,8 +162,7 @@ namespace Reflex
 	{
 		assert(timer && *timer);
 
-		List::iterator end = timers.end();
-		for (List::iterator it = timers.begin(); it != end; ++it)
+		for (auto it = timers.begin(), end = timers.end(); it != end; ++it)
 		{
 			if (timer->self->next_time < (*it)->self->next_time)
 			{
@@ -219,8 +218,7 @@ namespace Reflex
 		if (!timer)
 			argument_error(__FILE__, __LINE__);
 
-		List::iterator end = timers.end();
-		for (List::iterator it = timers.begin(); it != end; ++it)
+		for (auto it = timers.begin(), end = timers.end(); it != end; ++it)
 		{
 			if (timer->id() == (*it)->id())
 				timers.erase(it);
@@ -261,8 +259,7 @@ namespace Reflex
 	void
 	Timers::fire (double now)
 	{
-		List::iterator end = timers.end();
-		for (List::iterator it = timers.begin(); it != end; ++it)
+		for (auto it = timers.begin(), end = timers.end(); it != end; ++it)
 		{
 			Timer* timer = it->get();
 			if (!is_time_to_fire(timer, now))

data/src/view.cpp

@@ -189,8 +189,8 @@ namespace Reflex
 			{
 				World* world = parent_world();
 				Body* b      = world
-					? new Body(world, frame.position(), angle)
-					: Body_create_temporary();
+					?	new Body(world, frame.position(), angle)
+					:	Body_create_temporary();
 				assert(b);
 
 				pbody.reset(b);

data/src/window.cpp

@@ -36,6 +36,33 @@ namespace Reflex
 		}
 	}
 
+	void
+	Window_call_draw_event (Window* window, DrawEvent* event)
+	{
+		if (!window || !event)
+			argument_error(__FILE__, __LINE__);
+
+		Painter* painter = window->painter();
+		if (!painter)
+			Xot::invalid_state_error(__FILE__, __LINE__);
+
+		Rays::Bounds frame = window->frame();
+
+		event->painter = painter;
+		event->bounds.reset(0, 0, frame.width, frame.height);
+
+		painter->begin();
+		painter->push_state();
+		painter->clear();
+
+		window->on_draw(event);
+		if (!event->is_blocked())
+			Reflex::View_draw_tree(window->root(), *event, 0, frame.move_to(0));
+
+		painter->pop_state();
+		painter->end();
+	}
+
 	namespace global
 	{
 

data/src/window.h

@@ -80,6 +80,8 @@ namespace Reflex
 
 	void Window_set_focus (Window* window, View* view);
 
+	void Window_call_draw_event (Window* window, DrawEvent* event);
+
 
 	typedef View* (*Window_CreateRootViewFun) ();
 

data/test/test_pointer_event.rb

@@ -6,80 +6,125 @@ require_relative 'helper'
 
 class TestPointerEvent < Test::Unit::TestCase
 
+  E = Reflex::PointerEvent
   T = true
   F = false
 
-  def event (*args)
-    Reflex::PointerEvent.new *args
+  TYPE_NONE = E::TYPE_NONE
+  DOWN      = E::TYPE_DOWN
+  UP        = E::TYPE_UP
+  MOVE      = E::TYPE_MOVE
+
+  POINTER_NONE = E::POINTER_NONE
+  LEFT         = E::POINTER_MOUSE_LEFT
+  RIGHT        = E::POINTER_MOUSE_RIGHT
+  MIDDLE       = E::POINTER_MOUSE_MIDDLE
+  TOUCH        = E::POINTER_TOUCH
+  PEN          = E::POINTER_PEN
+
+  def event (
+    type = TYPE_NONE, pointer_type = POINTER_NONE,
+    modifiers = 0, count = 0, drag = false,
+    positions: [0])
+
+    Reflex::PointerEvent.new type, pointer_type, modifiers, count, drag, positions
   end
 
-  def type (arg)
-    event(arg).tap do |o|
-      def o.test ()
-        [type, down?, up?, move?]
-      end
-    end
+  def test_initialize ()
+    assert_nothing_raised       {event positions: 10.times.to_a}
+    assert_raise(ArgumentError) {event positions: 11.times.to_a}
+    assert_raise(ArgumentError) {event positions: []}
   end
 
   def test_type ()
-    o = type Reflex::PointerEvent::TYPE_NONE
+    def type (arg)
+      event(arg).tap do |o|
+        def o.test ()
+          [type, down?, up?, move?]
+        end
+      end
+    end
+
+    o = type TYPE_NONE
     assert_equal [:none, F, F, F], o.test
 
-    o = type Reflex::PointerEvent::TYPE_DOWN
+    o = type DOWN
     assert_equal [:down, T, F, F], o.test
 
-    o = type Reflex::PointerEvent::TYPE_UP
+    o = type UP
     assert_equal [:up,   F, T, F], o.test
 
-    o = type Reflex::PointerEvent::TYPE_MOVE
+    o = type MOVE
     assert_equal [:move, F, F, T], o.test
   end
 
-  def pointer_type (arg)
-    event(Reflex::PointerEvent::TYPE_NONE, arg).tap do |o|
-      def o.test ()
-        [pointer_type, left?, right?, middle?, touch?, pen?]
+  def test_pointer_type ()
+    def pointer_type (arg)
+      event(TYPE_NONE, arg).tap do |o|
+        def o.test ()
+          [pointer_type, left?, right?, middle?, touch?, pen?]
+        end
       end
     end
-  end
 
-  def test_pointer_type ()
-    o = pointer_type Reflex::PointerEvent::POINTER_NONE
+    o = pointer_type POINTER_NONE
     assert_equal [[],              F, F, F, F, F], o.test
 
-    o = pointer_type Reflex::PointerEvent::POINTER_MOUSE_LEFT
+    o = pointer_type LEFT
     assert_equal [[:mouse_left],   T, F, F, F, F], o.test
 
-    o = pointer_type Reflex::PointerEvent::POINTER_MOUSE_RIGHT
+    o = pointer_type RIGHT
     assert_equal [[:mouse_right],  F, T, F, F, F], o.test
 
-    o = pointer_type Reflex::PointerEvent::POINTER_MOUSE_MIDDLE
+    o = pointer_type MIDDLE
     assert_equal [[:mouse_middle], F, F, T, F, F], o.test
 
-    o = pointer_type Reflex::PointerEvent::POINTER_TOUCH
+    o = pointer_type TOUCH
     assert_equal [[:touch],        F, F, F, T, F], o.test
 
-    o = pointer_type Reflex::PointerEvent::POINTER_PEN
+    o = pointer_type PEN
     assert_equal [[:pen],          F, F, F, F, T], o.test
 
-    o = pointer_type Reflex::PointerEvent::POINTER_MOUSE_LEFT |
-      Reflex::PointerEvent::POINTER_MOUSE_RIGHT
+    o = pointer_type LEFT | RIGHT
     types = [:mouse_left, :mouse_right]
     assert_equal [types, T, T, F, F, F], o.test
 
-    o = pointer_type Reflex::PointerEvent::POINTER_MOUSE_LEFT |
-      Reflex::PointerEvent::POINTER_MOUSE_RIGHT |
-      Reflex::PointerEvent::POINTER_MOUSE_MIDDLE
+    o = pointer_type LEFT | RIGHT | MIDDLE
     types = [:mouse_left, :mouse_right, :mouse_middle]
     assert_equal [types, T, T, T, F, F], o.test
 
-    o = pointer_type Reflex::PointerEvent::POINTER_MOUSE_LEFT |
-      Reflex::PointerEvent::POINTER_MOUSE_RIGHT |
-      Reflex::PointerEvent::POINTER_MOUSE_MIDDLE |
-      Reflex::PointerEvent::POINTER_TOUCH |
-      Reflex::PointerEvent::POINTER_PEN
+    o = pointer_type LEFT | RIGHT | MIDDLE | TOUCH | PEN
     types = [:mouse_left, :mouse_right, :mouse_middle, :touch, :pen]
     assert_equal [types, T, T, T, T, T], o.test
   end
 
+  def test_size ()
+    assert_equal 1, event(positions: [0]   ).size
+    assert_equal 2, event(positions: [0, 1]).size
+  end
+
+  def test_xy ()
+    assert_equal 0, event(positions: [[0, 1], [2, 3]]).x
+    assert_equal 1, event(positions: [[0, 1], [2, 3]]).y
+  end
+
+  def test_position ()
+    assert_equal [0, 1], event(positions: [[0, 1], [2, 3]]).position.to_a
+  end
+
+  def test_positions ()
+    assert_equal [[0, 0]],         event(positions: [0]   ).positions.map(&:to_a)
+    assert_equal [[0, 0], [1, 1]], event(positions: [0, 1]).positions.map(&:to_a)
+
+    assert_equal [[0, 1]],         event(positions: [[0, 1]]        ).positions.map(&:to_a)
+    assert_equal [[0, 1], [2, 3]], event(positions: [[0, 1], [2, 3]]).positions.map(&:to_a)
+  end
+
+  def test_at ()
+    assert_equal [0, 1], event(positions: [[0, 1], [2, 3]])[0].to_a
+    assert_equal [2, 3], event(positions: [[0, 1], [2, 3]])[1].to_a
+    assert_raise(IndexError) {event(positions: [[0, 1], [2, 3]])[-1]}
+    assert_raise(IndexError) {event(positions: [[0, 1], [2, 3]])[2]}
+  end
+
 end# TestPointerEvent