reflexion 0.1.14 → 0.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 720f804cad8f1348d221caee8b90c063419da65d955885a69301eeb01874bebe
-  data.tar.gz: e37f6f9b3741722a328a6e63f637045ad79a7cb1bcf9c60ad75f17d29df7db70
+  metadata.gz: 5161374ea08be1889e5cc2efe3e1428e8d9d620f8bac6073e5b010bd10bedebe
+  data.tar.gz: 2ba43dca1df02955b05cf58f6a9046f21941a605f8c9d8c1bdc744fb8d808ab2
 SHA512:
-  metadata.gz: af1ba3a6bdb955c33942ec891aa23243bfb9231fb31e45f6fe71f60ab86700e1eeba7f64328a5687277d6ba06e57eea725adc235e21c7b1fc7c9d1d6fb409549
-  data.tar.gz: d159177ac4e9835d6b7443d957250f6c67c696d589608cb4047fa7fadac9a72ec5d87a65c80b806653f7ba2795f16f0c69413a73e1a33f85ed2ab8496d6bbce8
+  metadata.gz: 4e237f277deb2ca92edee8663023891f3bba4cc8d2ac8e54ed7317f1dee8907c159afb3e20a7b6c5d798e0d0979b8bec709cf19a18decba5578d782e36c1e8d8
+  data.tar.gz: 61430437a4717c0547f3fb8432e0faa0532391e1bee56fa46083986e4f1c68d7aa194d261264144c1f7416f4c1926e6f7ca4e32a0ca371835337e9a57b5abb65

data/.doc/ext/reflex/contact_event.cpp

@@ -26,8 +26,8 @@ VALUE initialize(VALUE self)
 	check_arg_count(__FILE__, __LINE__, "ContactEvent#initialize", argc, 0, 2);
 
 	THIS->type  = (argc >= 1)
-		? (Reflex::ContactEvent::Type) to<int>(argv[0])
-		: Reflex::ContactEvent::NONE;
+		?	(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);

data/.doc/ext/reflex/pointer_event.cpp

@@ -157,7 +157,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/.doc/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/VERSION

@@ -1 +1 @@
-0.1.14
+0.1.15

data/ext/reflex/contact_event.cpp

@@ -27,8 +27,8 @@ RUCY_DEFN(initialize)
 	check_arg_count(__FILE__, __LINE__, "ContactEvent#initialize", argc, 0, 2);
 
 	THIS->type  = (argc >= 1)
-		? (Reflex::ContactEvent::Type) to<int>(argv[0])
-		: Reflex::ContactEvent::NONE;
+		?	(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);

data/ext/reflex/pointer_event.cpp

@@ -171,7 +171,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/include/reflex/defs.h

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

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/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/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/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) ();
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reflexion
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.15
 platform: ruby
 authors:
 - xordog
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-23 00:00:00.000000000 Z
+date: 2020-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xot