reflexion 0.1.13 → 0.1.19

data/reflex.gemspec

@@ -28,10 +28,10 @@ Gem::Specification.new do |s|
   s.platform              = Gem::Platform::RUBY
   s.required_ruby_version = '~> 2'
 
-  s.add_runtime_dependency 'xot',   '~> 0.1'
-  s.add_runtime_dependency 'rucy',  '~> 0.1'
-  s.add_runtime_dependency 'beeps', '~> 0.1'
-  s.add_runtime_dependency 'rays',  '~> 0.1'
+  s.add_runtime_dependency 'xot',   '~> 0.1.19'
+  s.add_runtime_dependency 'rucy',  '~> 0.1.18'
+  s.add_runtime_dependency 'beeps', '~> 0.1.18'
+  s.add_runtime_dependency 'rays',  '~> 0.1.19'
 
   s.files            = `git ls-files`.split $/
   s.executables      = s.files.grep(%r{^bin/}) {|f| File.basename f}

data/samples/camera.rb

@@ -0,0 +1,45 @@
+# -*- coding: utf-8 -*-
+
+
+%w[xot rays reflex]
+  .map  {|s| File.expand_path "../../../#{s}/lib", __FILE__}
+  .each {|s| $:.unshift s if !$:.include?(s) && File.directory?(s)}
+
+require 'reflex'
+
+
+class Win < Reflex::Window
+  def initialize ()
+    super title: "Camera Example", frame: [100, 100, 800, 600]
+
+    @w = 100
+    @h = 200
+    @resize_crop = Rays::Camera.new(@w, @h, resize: true,  crop: true)  {start}
+    @crop        = Rays::Camera.new(@w, @h, resize: false, crop: true)  {start}
+    @resize      = Rays::Camera.new(@w, @h, resize: true,  crop: false) {start}
+    @original    = Rays::Camera.new(@w, @h, resize: false, crop: false) {start}
+  end
+
+  def on_draw (e)
+    p = e.painter
+
+    p.image @resize_crop.image, @w * 0, 0 if @resize_crop.image
+    p.image @crop.image,        @w * 1, 0 if @crop.image
+    p.image @resize.image,      @w * 2, 0 if @resize.image
+    p.image @original.image,    0,     @h if @original.image
+
+    p.text "#{e.fps.to_i} FPS", 10, 10
+
+    p.fill nil
+    p.stroke 1
+    p.rect 0, 0, @w, @h
+  end
+
+  def on_update (e)
+    redraw
+  end
+end
+
+Reflex.start do
+  Win.new.show
+end

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
 	{