reflexion 0.2.1 → 0.3.1

data/include/reflex/ruby/selector.h

@@ -9,14 +9,14 @@
 #include <reflex/selector.h>
 
 
-RUCY_DECLARE_VALUE_OR_ARRAY_FROM_TO(Reflex::Selector)
+RUCY_DECLARE_VALUE_OR_ARRAY_FROM_TO(REFLEX_EXPORT, Reflex::Selector)
 
 
 namespace Reflex
 {
 
 
-	Rucy::Class selector_class ();
+	REFLEX_EXPORT Rucy::Class selector_class ();
 	// class Reflex::Selector
 
 

data/include/reflex/ruby/shape.h

@@ -10,34 +10,34 @@
 #include <reflex/ruby/event.h>
 
 
-RUCY_DECLARE_WRAPPER_VALUE_FROM_TO(Reflex::Shape)
+RUCY_DECLARE_WRAPPER_VALUE_FROM_TO(REFLEX_EXPORT, Reflex::Shape)
 
-RUCY_DECLARE_WRAPPER_VALUE_FROM_TO(Reflex::PolygonShape)
+RUCY_DECLARE_WRAPPER_VALUE_FROM_TO(REFLEX_EXPORT, Reflex::PolygonShape)
 
-RUCY_DECLARE_WRAPPER_VALUE_FROM_TO(Reflex::LineShape)
+RUCY_DECLARE_WRAPPER_VALUE_FROM_TO(REFLEX_EXPORT, Reflex::LineShape)
 
-RUCY_DECLARE_WRAPPER_VALUE_FROM_TO(Reflex::RectShape)
+RUCY_DECLARE_WRAPPER_VALUE_FROM_TO(REFLEX_EXPORT, Reflex::RectShape)
 
-RUCY_DECLARE_WRAPPER_VALUE_FROM_TO(Reflex::EllipseShape)
+RUCY_DECLARE_WRAPPER_VALUE_FROM_TO(REFLEX_EXPORT, Reflex::EllipseShape)
 
 
 namespace Reflex
 {
 
 
-	Rucy::Class shape_class ();
+	REFLEX_EXPORT Rucy::Class shape_class ();
 	// class Reflex::Shape
 
-	Rucy::Class polygon_shape_class ();
+	REFLEX_EXPORT Rucy::Class polygon_shape_class ();
 	// class Reflex::PolygonShape
 
-	Rucy::Class line_shape_class ();
+	REFLEX_EXPORT Rucy::Class line_shape_class ();
 	// class Reflex::LineShape
 
-	Rucy::Class rect_shape_class ();
+	REFLEX_EXPORT Rucy::Class rect_shape_class ();
 	// class Reflex::RectShape
 
-	Rucy::Class ellipse_shape_class ();
+	REFLEX_EXPORT Rucy::Class ellipse_shape_class ();
 	// class Reflex::EllipseShape
 
 

data/include/reflex/ruby/style.h

@@ -9,19 +9,19 @@
 #include <reflex/style.h>
 
 
-RUCY_DECLARE_VALUE_OR_ARRAY_FROM_TO(Reflex::StyleLength)
+RUCY_DECLARE_VALUE_OR_ARRAY_FROM_TO(REFLEX_EXPORT, Reflex::StyleLength)
 
-RUCY_DECLARE_VALUE_FROM_TO(Reflex::Style)
+RUCY_DECLARE_VALUE_FROM_TO(REFLEX_EXPORT, Reflex::Style)
 
 
 namespace Reflex
 {
 
 
-	Rucy::Class style_length_class ();
+	REFLEX_EXPORT Rucy::Class style_length_class ();
 	// class Reflex::StyleLength
 
-	Rucy::Class style_class ();
+	REFLEX_EXPORT Rucy::Class style_class ();
 	// class Reflex::Style
 
 

data/include/reflex/ruby/timer.h

@@ -9,14 +9,14 @@
 #include <reflex/timer.h>
 
 
-RUCY_DECLARE_WRAPPER_VALUE_FROM_TO(Reflex::Timer)
+RUCY_DECLARE_WRAPPER_VALUE_FROM_TO(REFLEX_EXPORT, Reflex::Timer)
 
 
 namespace Reflex
 {
 
 
-	Rucy::Class timer_class ();
+	REFLEX_EXPORT Rucy::Class timer_class ();
 	// class Reflex::Timer
 
 
@@ -30,7 +30,7 @@ namespace Reflex
 
 			virtual void fire ()
 			{
-				if (this->value.is_kind_of(timer_class()))
+				if (this->value.is_a(timer_class()))
 				{
 					RUCY_SYM(call_timer_block);
 					this->value.call(call_timer_block);

data/include/reflex/ruby/view.h

@@ -10,14 +10,14 @@
 #include <reflex/ruby/event.h>
 
 
-RUCY_DECLARE_WRAPPER_VALUE_FROM_TO(Reflex::View)
+RUCY_DECLARE_WRAPPER_VALUE_FROM_TO(REFLEX_EXPORT, Reflex::View)
 
 
 namespace Reflex
 {
 
 
-	Rucy::Class view_class ();
+	REFLEX_EXPORT Rucy::Class view_class ();
 	// class Reflex::View
 
 

data/include/reflex/ruby/window.h

@@ -10,14 +10,14 @@
 #include <reflex/ruby/event.h>
 
 
-RUCY_DECLARE_WRAPPER_VALUE_FROM_TO(Reflex::Window)
+RUCY_DECLARE_WRAPPER_VALUE_FROM_TO(REFLEX_EXPORT, Reflex::Window)
 
 
 namespace Reflex
 {
 
 
-	Rucy::Class window_class ();
+	REFLEX_EXPORT Rucy::Class window_class ();
 	// class Reflex::Window
 
 

data/include/reflex/view.h

@@ -309,7 +309,9 @@ namespace Reflex
 			//
 			// for physics child world
 			//
-			virtual void update_physics (float duration = 0);
+			virtual void create_world (float pixels_per_meter);
+
+			virtual void update_world (float duration = 0);
 
 			virtual float meter2pixel (float meter = 1, bool create_world = true);
 

data/lib/reflex/extension.rb

@@ -25,6 +25,10 @@ module Reflex
       root_dir 'lib'
     end
 
+    def ext_dir()
+      root_dir 'ext'
+    end
+
   end# Extension
 
 

data/lib/reflex/pointer.rb

@@ -95,7 +95,7 @@ module Reflex
     end
 
     def inspect()
-      "#<Reflex::Pointer id:#{id} #{types} #{action} (#{x.round 2}, #{y.round 2}) mod:#{modifiers} drag:#{drag?} click:#{click_count} view:#{view_index} time:#{time.round 2}>"
+      "#<Reflex::Pointer id:#{id} #{types} #{action} (#{x.round 2}, #{y.round 2}) mod:#{modifiers} click:#{click_count} drag:#{drag?} time:#{time.round 2}>"
     end
 
   end# Pointer

data/lib/reflex/pointer_event.rb

@@ -16,7 +16,7 @@ module Reflex
       :types, :mouse?, :touch?, :pen?,
       :mouse_left?, :left?, :mouse_right?, :right?, :mouse_middle?, :middle?,
       :action, :down?, :up?, :move?, :cancel?, :stay?,
-      :position, :pos, :x, :y, :modifiers, :drag?, :click_count, :view_index,
+      :position, :pos, :x, :y, :modifiers, :click_count, :drag?,
       :time, :prev, :down
 
     def pointers()
@@ -24,7 +24,7 @@ module Reflex
     end
 
     def inspect()
-      "#<Reflex::PointerEvent id:#{id} #{types} #{action} (#{x.round 2}, #{y.round 2}) mod:#{modifiers} drag:#{drag?} click:#{click_count} view:#{view_index} time:#{time.round 2}>"
+      "#<Reflex::PointerEvent id:#{id} #{types} #{action} (#{x.round 2}, #{y.round 2}) mod:#{modifiers} click:#{click_count} drag:#{drag?} time:#{time.round 2}>"
     end
 
   end# PointerEvent

data/reflex.gemspec

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

data/src/body.cpp

@@ -284,24 +284,30 @@ namespace Reflex
 	void
 	Body_copy_attributes (Body* to, const Body& from)
 	{
-		if (!to)
-			return;
-
-		if (to->self->ppm != from.self->ppm)
-			physics_error(__FILE__, __LINE__);
+		if (!to) return;
 
 		      b2Body* b2to   = Body_get_b2ptr(to);
 		const b2Body* b2from = Body_get_b2ptr(&from);
 		assert(b2to && b2from);
 
 		b2to->SetType(           b2from->GetType());
-		b2to->SetTransform(      b2from->GetPosition(), b2from->GetAngle());
 		b2to->SetLinearVelocity( b2from->GetLinearVelocity());
 		b2to->SetAngularVelocity(b2from->GetAngularVelocity());
 		b2to->SetLinearDamping(  b2from->GetLinearDamping());
 		b2to->SetAngularDamping( b2from->GetAngularDamping());
 		b2to->SetGravityScale(   b2from->GetGravityScale());
 		b2to->SetBullet(         b2from->IsBullet());
+
+		float ppm_to   = to->self->ppm;
+		float ppm_from = from.self->ppm;
+		if (ppm_to == ppm_from)
+			b2to->SetTransform(b2from->GetPosition(), b2from->GetAngle());
+		else
+		{
+			auto pos = b2from->GetPosition();
+			pos *= ppm_from / ppm_to;
+			b2to->SetTransform(pos, b2from->GetAngle());
+		}
 	}
 
 	Body*

data/src/event.cpp

@@ -1,6 +1,7 @@
 #include "event.h"
 
 
+#include <algorithm>
 #include "reflex/timer.h"
 #include "reflex/shape.h"
 #include "reflex/exception.h"
@@ -506,11 +507,14 @@ namespace Reflex
 
 
 	void
-	KeyEvent_set_captured (KeyEvent* pthis, bool captured)
+	KeyEvent_set_chars (KeyEvent* pthis, const char* chars)
 	{
-		if (!pthis)
-			argument_error(__FILE__, __LINE__);
+		pthis->self->chars = chars ? chars : "";
+	}
 
+	void
+	KeyEvent_set_captured (KeyEvent* pthis, bool captured)
+	{
 		pthis->self->captured = captured;
 	}
 
@@ -588,28 +592,16 @@ namespace Reflex
 		{
 		}
 
-		void increment_view_indices ()
-		{
-			for (auto& pointer : pointers)
-				Pointer_set_view_index(&pointer, pointer.view_index() + 1);
-
-			if (parent) parent->increment_view_indices();
-		}
-
 	};// PointerEvent::Data
 
 
 	void
-	PointerEvent_add_pointer (
-		PointerEvent* pthis, const Pointer& pointer,
-		std::function<void(Pointer*)> fun)
+	PointerEvent_add_pointer (PointerEvent* pthis, const Pointer& pointer)
 	{
 		if (!pthis)
 			argument_error(__FILE__, __LINE__);
 
 		pthis->self->pointers.emplace_back(pointer);
-
-		if (fun) fun(&pthis->self->pointers.back());
 	}
 
 	void
@@ -655,15 +647,6 @@ namespace Reflex
 			fun(pointer);
 	}
 
-	void
-	PointerEvent_increment_view_indices (PointerEvent* pthis)
-	{
-		if (!pthis)
-			argument_error(__FILE__, __LINE__);
-
-		pthis->self->increment_view_indices();
-	}
-
 	void
 	PointerEvent_set_captured (PointerEvent* pthis, bool captured)
 	{
@@ -676,23 +659,24 @@ namespace Reflex
 	void
 	PointerEvent_update_for_child_view (PointerEvent* pthis, const View* child)
 	{
-		if (!pthis || !child)
+		if (!pthis)
+			argument_error(__FILE__, __LINE__);
+		if (!child)
 			argument_error(__FILE__, __LINE__);
 
 		const Bounds& frame = child->frame();
-		Bounds bounds       = frame.dup().move_to(0, 0);
 
 		std::vector<Pointer> pointers;
 		for (const auto& pointer : pthis->self->pointers)
 		{
+			if (!frame.is_include(pointer.position()))
+				continue;
+
 			pointers.emplace_back(pointer);
 			Pointer_update_positions(&pointers.back(), [&](Point* pos)
 			{
 				*pos = child->from_parent(*pos);
 			});
-
-			if (!bounds.is_include(pointers.back().position()))
-				pointers.pop_back();
 		}
 		pthis->self->pointers = pointers;
 	}
@@ -700,7 +684,9 @@ namespace Reflex
 	void
 	PointerEvent_update_for_capturing_view (PointerEvent* pthis, const View* view)
 	{
-		if (!pthis || !view)
+		if (!pthis)
+			argument_error(__FILE__, __LINE__);
+		if (!view)
 			argument_error(__FILE__, __LINE__);
 
 		for (auto& pointer : pthis->self->pointers)

data/src/event.h

@@ -19,12 +19,12 @@ namespace Reflex
 	void DrawEvent_set_bounds  (DrawEvent* pthis, const Bounds& bounds);
 
 
+	void KeyEvent_set_chars (KeyEvent* pthis, const char* chars);
+
 	void KeyEvent_set_captured (KeyEvent* pthis, bool captured);
 
 
-	void PointerEvent_add_pointer (
-		PointerEvent* pthis, const Pointer& pointer,
-		std::function<void(Pointer*)> fun = NULL);
+	void PointerEvent_add_pointer (PointerEvent* pthis, const Pointer& pointer);
 
 	void PointerEvent_erase_pointer (PointerEvent* pthis, Pointer::ID id);
 

data/src/filter.cpp

@@ -36,7 +36,9 @@ namespace Reflex
 		if (!self->shader)
 			return;
 
-		if (!painter || !image)
+		if (!painter)
+			argument_error(__FILE__, __LINE__);
+		if (!image)
 			argument_error(__FILE__, __LINE__);
 
 		painter->set_shader(self->shader);

data/src/ios/event.mm

@@ -69,38 +69,31 @@ namespace Reflex
 			(flags & UIKeyModifierNumericPad) ? MOD_NUMPAD  : 0;
 	}
 
-	static Pointer
-	create_pointer (UITouch* touch, UIEvent* event, UIView* view)
-	{
-		Pointer::Action action = get_action(touch);
-
-		Pointer pointer(
-			0,
-			get_type(touch),
-			action,
-			to_point([touch locationInView: view]),
-			get_modifiers(event),
-			action == Pointer::MOVE,
-			(uint) touch.tapCount,
-			0,
-			touch.timestamp);
-
-		if (touch.phase != UITouchPhaseBegan)
-		{
-			Pointer_set_prev_position(
-				&pointer, to_point([touch previousLocationInView: view]));
-		}
-
-		return pointer;
-	}
-
 	NativePointerEvent::NativePointerEvent (
 		NSSet* touches, UIEvent* event, UIView* view)
 	{
 		for (UITouch* touch in touches)
 		{
-			Pointer pointer = create_pointer(touch, event, view);
-			if (pointer) PointerEvent_add_pointer(this, pointer);
+			Pointer::Action action = get_action(touch);
+
+			Pointer pointer(
+				0,
+				get_type(touch),
+				action,
+				to_point([touch locationInView: view]),
+				get_modifiers(event),
+				(uint) touch.tapCount,
+				action == Pointer::MOVE,
+				touch.timestamp);
+
+			if (pointer.action() != Pointer::DOWN)
+			{
+				Pointer_set_prev_position(
+					&pointer, to_point([touch previousLocationInView: view]));
+			}
+
+			if (pointer)
+				PointerEvent_add_pointer(this, pointer);
 		}
 	}
 

data/src/osx/application.mm

@@ -4,6 +4,7 @@
 
 #import <AppKit/NSApplication.h>
 #include "reflex/exception.h"
+#include "reflex/debug.h"
 #import "app_delegate.h"
 
 
@@ -42,11 +43,11 @@ namespace Reflex
 	static ReflexAppDelegate*
 	setup_app_delegate (NSApplication* app)
 	{
-		id<NSApplicationDelegate> delegate = [app delegate];
+		id<NSApplicationDelegate> delegate = app.delegate;
 		if (!delegate)
 		{
-			delegate = [[[ReflexAppDelegate alloc] init] autorelease];
-			[app setDelegate: delegate];
+			delegate     = [[[ReflexAppDelegate alloc] init] autorelease];
+			app.delegate = delegate;
 		}
 
 		if (![delegate isKindOfClass: ReflexAppDelegate.class])
@@ -58,11 +59,11 @@ namespace Reflex
 	void
 	Application::start ()
 	{
-		NSApplication* app          = [NSApplication sharedApplication];
+		NSApplication* app          = NSApplication.sharedApplication;
 		ReflexAppDelegate* delegate = setup_app_delegate(app);
 		[delegate bind: this];
 
-		if (![app isRunning])
+		if (!app.isRunning)
 			[app run];
 		else
 			[delegate callOnStart];

data/src/osx/event.mm

@@ -148,9 +148,8 @@ namespace Reflex
 			action,
 			get_pointer_position(event, view),
 			get_modifiers(event),
-			dragging,
 			action == Pointer::MOVE && !dragging ? 0 : (uint) event.clickCount,
-			0,
+			dragging,
 			time()));
 	}
 

data/src/pointer.cpp

@@ -1,7 +1,6 @@
 #include "pointer.h"
 
 
-#include <limits.h>
 #include <xot/time.h>
 #include "reflex/exception.h"
 
@@ -48,9 +47,7 @@ namespace Reflex
 
 		Point position, prev_position;
 
-		uint modifiers, flags;
-
-		ushort click_count, view_index;
+		uint modifiers, click_count, flags;
 
 		double time;
 
@@ -58,16 +55,14 @@ namespace Reflex
 
 		Data (
 			ID id = -1, uint types = TYPE_NONE, Action action = ACTION_NONE,
-			const Point& position = 0, uint modifiers = 0,
+			const Point& position = 0, uint modifiers = 0, uint click_count = 0,
 			bool drag = false, bool enter = false, bool exit = false,
-			uint click_count = 0, uint view_index = 0, double time = 0)
+			double time = 0)
 		:	id(id), types(types), action(action),
-			position(position), modifiers(modifiers),
+			position(position), modifiers(modifiers), click_count(click_count),
 			flags(make_flags(drag, enter, exit)),
-			click_count(click_count), view_index(view_index), time(time)
+			time(time)
 		{
-			if (view_index >= USHRT_MAX)
-				argument_error(__FILE__, __LINE__);
 		}
 
 		uint make_flags (bool drag, bool enter, bool exit)
@@ -101,15 +96,6 @@ namespace Reflex
 		it->self->id = id;
 	}
 
-	void
-	Pointer_set_view_index (Pointer* it, uint view_index)
-	{
-		if (view_index >= USHRT_MAX)
-			argument_error(__FILE__, __LINE__);
-
-		it->self->view_index = view_index;
-	}
-
 	void
 	Pointer_add_flag (Pointer* it, uint flag)
 	{
@@ -177,12 +163,12 @@ namespace Reflex
 
 	Pointer::Pointer (
 		ID id, uint types, Action action,
-		const Point& position, uint modifiers, bool drag,
-		uint click_count, uint view_index, double time)
+		const Point& position, uint modifiers, uint click_count, bool drag,
+		double time)
 	:	self(new Data(
 			id, types, action,
-			position, modifiers, drag, false, false,
-			click_count, view_index, time))
+			position, modifiers, click_count, drag, false, false,
+			time))
 	{
 	}
 
@@ -232,22 +218,16 @@ namespace Reflex
 		return self->modifiers;
 	}
 
-	bool
-	Pointer::is_drag () const
-	{
-		return Xot::has_flag(self->flags, Data::DRAG);
-	}
-
 	uint
 	Pointer::click_count () const
 	{
 		return self->click_count;
 	}
 
-	uint
-	Pointer::view_index () const
+	bool
+	Pointer::is_drag () const
 	{
-		return self->view_index;
+		return Xot::has_flag(self->flags, Data::DRAG);
 	}
 
 	double

data/src/pointer.h

@@ -16,8 +16,6 @@ namespace Reflex
 
 	void Pointer_set_id (Pointer* it, Pointer::ID id);
 
-	void Pointer_set_view_index (Pointer* it, uint view_index);
-
 	void Pointer_add_flag (Pointer* it, uint flag);
 
 	void Pointer_remove_flag (Pointer* it, uint flag);

data/src/selector.cpp

@@ -76,7 +76,9 @@ namespace Reflex
 	void
 	Selector::add_tag (const char* tag)
 	{
-		if (!tag || *tag == '\0')
+		if (!tag)
+			argument_error(__FILE__, __LINE__);
+		if (*tag == '\0')
 			argument_error(__FILE__, __LINE__);
 
 		iterator it = self->tags.find(tag);

data/src/shape.cpp

@@ -444,7 +444,9 @@ namespace Reflex
 	void
 	Shape_call_contact_event (Shape* shape, ContactEvent* event)
 	{
-		if (!shape || !event)
+		if (!shape)
+			argument_error(__FILE__, __LINE__);
+		if (!event)
 			argument_error(__FILE__, __LINE__);
 
 		shape->on_contact(event);
@@ -1024,8 +1026,8 @@ namespace Reflex
 		bool has_angle () const
 		{
 			return
-				angle_from != DEFAULT_ANGLE_FROM ||
-				angle_to   != DEFAULT_ANGLE_TO;
+				angle_from != (float) DEFAULT_ANGLE_FROM ||
+				angle_to   != (float) DEFAULT_ANGLE_TO;
 		}
 
 		Fixture* create_fixtures (Shape* shape) override

data/src/style.cpp

@@ -202,7 +202,9 @@ namespace Reflex
 	void
 	StyleLength::reset (Type type, Value value)
 	{
-		if (type < NONE || TYPE_MAX <= type)
+		if (type < NONE)
+			argument_error(__FILE__, __LINE__);
+		if (type >= TYPE_MAX)
 			argument_error(__FILE__, __LINE__);
 
 		if (type == FIT && value != 1)
@@ -615,14 +617,18 @@ namespace Reflex
 	void
 	Style::set_flow (Flow main, Flow sub)
 	{
-		if (
-			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))
-		{
+		if (main <  FLOW_NONE)
+			argument_error(__FILE__, __LINE__);
+		if (main >= FLOW_MAX)
+			argument_error(__FILE__, __LINE__);
+		if (sub  <  FLOW_NONE)
+			argument_error(__FILE__, __LINE__);
+		if (sub  >= FLOW_MAX)
+			argument_error(__FILE__, __LINE__);
+		if (main != FLOW_NONE && (get_flow_dir(main) == get_flow_dir(sub)))
+			argument_error(__FILE__, __LINE__);
+		if (main == FLOW_NONE && sub != FLOW_NONE)
 			argument_error(__FILE__, __LINE__);
-		}
 
 		self->set_flow(main, sub);