reflexion 0.1.35 → 0.1.36

data/samples/camera.rb

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-
-
 %w[xot rays reflex]
   .map  {|s| File.expand_path "../../#{s}/lib", __dir__}
   .each {|s| $:.unshift s if !$:.include?(s) && File.directory?(s)}

data/samples/checker.rb

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-
-
 %w[xot rays reflex]
   .map  {|s| File.expand_path "../../#{s}/lib", __dir__}
   .each {|s| $:.unshift s if !$:.include?(s) && File.directory?(s)}

data/samples/fans.rb

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-
-
 %w[xot rays reflex]
   .map  {|s| File.expand_path "../../#{s}/lib", __dir__}
   .each {|s| $:.unshift s if !$:.include?(s) && File.directory?(s)}

data/samples/fps.rb

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-
-
 %w[xot rays reflex]
   .map  {|s| File.expand_path "../../#{s}/lib", __dir__}
   .each {|s| $:.unshift s if !$:.include?(s) && File.directory?(s)}

data/samples/grid.rb

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-
-
 %w[xot rays reflex]
   .map  {|s| File.expand_path "../../#{s}/lib", __dir__}
   .each {|s| $:.unshift s if !$:.include?(s) && File.directory?(s)}

data/samples/hello.rb

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-
-
 %w[xot rays reflex]
   .map  {|s| File.expand_path "../../#{s}/lib", __dir__}
   .each {|s| $:.unshift s if !$:.include?(s) && File.directory?(s)}

data/samples/image.rb

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-
-
 %w[xot rays reflex]
   .map  {|s| File.expand_path "../../#{s}/lib", __dir__}
   .each {|s| $:.unshift s if !$:.include?(s) && File.directory?(s)}

data/samples/key.rb

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-
-
 %w[xot rays reflex]
   .map  {|s| File.expand_path "../../#{s}/lib", __dir__}
   .each {|s| $:.unshift s if !$:.include?(s) && File.directory?(s)}

data/samples/layout.rb

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-
-
 %w[xot rays reflex]
   .map  {|s| File.expand_path "../../#{s}/lib", __dir__}
   .each {|s| $:.unshift s if !$:.include?(s) && File.directory?(s)}

data/samples/model.rb

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-
-
 %w[xot rays reflex]
   .map  {|s| File.expand_path "../../#{s}/lib", __dir__}
   .each {|s| $:.unshift s if !$:.include?(s) && File.directory?(s)}

data/samples/physics.rb

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-
-
 %w[xot rays reflex]
   .map  {|s| File.expand_path "../../#{s}/lib", __dir__}
   .each {|s| $:.unshift s if !$:.include?(s) && File.directory?(s)}

data/samples/reflexion/breakout.rb

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-
-
 %w[xot beeps rays reflex]
   .map  {|s| File.expand_path "../../../#{s}/lib", __dir__}
   .each {|s| $:.unshift s if !$:.include?(s) && File.directory?(s)}

data/samples/reflexion/hello.rb

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-
-
 %w[xot beeps rays reflex]
   .map  {|s| File.expand_path "../../../#{s}/lib", __dir__}
   .each {|s| $:.unshift s if !$:.include?(s) && File.directory?(s)}

data/samples/reflexion/jump_action.rb

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-
-
 %w[xot beeps rays reflex]
   .map  {|s| File.expand_path "../../../#{s}/lib", __dir__}
   .each {|s| $:.unshift s if !$:.include?(s) && File.directory?(s)}

data/samples/reflexion/noise.rb

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-
-
 %w[xot beeps rays reflex]
   .map  {|s| File.expand_path "../../../#{s}/lib", __dir__}
   .each {|s| $:.unshift s if !$:.include?(s) && File.directory?(s)}

data/samples/reflexion/paint.rb

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-
-
 %w[xot beeps rays reflex]
   .map  {|s| File.expand_path "../../../#{s}/lib", __dir__}
   .each {|s| $:.unshift s if !$:.include?(s) && File.directory?(s)}

data/samples/reflexion/physics.rb

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-
-
 %w[xot beeps rays reflex]
   .map  {|s| File.expand_path "../../../#{s}/lib", __dir__}
   .each {|s| $:.unshift s if !$:.include?(s) && File.directory?(s)}

data/samples/reflexion/pulse.rb

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-
-
 %w[xot beeps rays reflex]
   .map  {|s| File.expand_path "../../../#{s}/lib", __dir__}
   .each {|s| $:.unshift s if !$:.include?(s) && File.directory?(s)}

data/samples/repl.rb

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-
-
 %w[xot rays reflex]
   .map  {|s| File.expand_path "../../#{s}/lib", __dir__}
   .each {|s| $:.unshift s if !$:.include?(s) && File.directory?(s)}

data/samples/shader.rb

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-
-
 %w[xot rays reflex]
   .map  {|s| File.expand_path "../../#{s}/lib", __dir__}
   .each {|s| $:.unshift s if !$:.include?(s) && File.directory?(s)}

data/samples/shapes.rb

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-
-
 %w[xot rays reflex]
   .map  {|s| File.expand_path "../../#{s}/lib", __dir__}
   .each {|s| $:.unshift s if !$:.include?(s) && File.directory?(s)}

data/samples/text.rb

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-
-
 %w[xot rays reflex]
   .map  {|s| File.expand_path "../../#{s}/lib", __dir__}
   .each {|s| $:.unshift s if !$:.include?(s) && File.directory?(s)}

data/samples/tree.rb

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-
-
 %w[xot rays reflex]
   .map  {|s| File.expand_path "../../#{s}/lib", __dir__}
   .each {|s| $:.unshift s if !$:.include?(s) && File.directory?(s)}

data/samples/views.rb

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-
-
 %w[xot rays reflex]
   .map  {|s| File.expand_path "../../#{s}/lib", __dir__}
   .each {|s| $:.unshift s if !$:.include?(s) && File.directory?(s)}

data/samples/visuals.rb

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-
-
 %w[xot rays reflex]
   .map  {|s| File.expand_path "../../#{s}/lib", __dir__}
   .each {|s| $:.unshift s if !$:.include?(s) && File.directory?(s)}

data/src/body.cpp

@@ -126,6 +126,14 @@ namespace Reflex
 		self->b2body->ApplyAngularImpulse(impulse, true);
 	}
 
+	void
+	Body::awake ()
+	{
+		validate(this);
+
+		self->b2body->SetAwake(true);
+	}
+
 	float
 	Body::meter2pixel (float meter) const
 	{
@@ -141,6 +149,12 @@ namespace Reflex
 			to_b2vec2(x, y, self->ppm), Xot::deg2rad(degree));
 	}
 
+	void
+	Body::set_transform (const Point& position, float degree)
+	{
+		set_transform(position.x, position.y, degree);
+	}
+
 	Point
 	Body::position () const
 	{

data/src/body.h

@@ -41,10 +41,14 @@ namespace Reflex
 
 			void apply_angular_impulse (float impulse);
 
+			void awake ();
+
 			float meter2pixel (float meter = 1) const;
 
 			void set_transform (coord x, coord y, float degree);
 
+			void set_transform (const Point& position, float degree);
+
 			Point position () const;
 
 			float angle () const;

data/src/event.cpp

@@ -26,10 +26,10 @@ namespace Reflex
 		{
 		}
 
-		void block ()
+		void block (bool parent)
 		{
 			blocked = true;
-			if (parent) parent->block();
+			if (parent && this->parent) this->parent->block(true);
 		}
 
 	};// Event::Data
@@ -50,9 +50,9 @@ namespace Reflex
 	}
 
 	void
-	Event::block ()
+	Event::block (bool parent)
 	{
-		self->block();
+		self->block(parent);
 	}
 
 	bool
@@ -634,29 +634,6 @@ namespace Reflex
 		pthis->self->captured = captured;
 	}
 
-	static void
-	filter_and_offset_pointer_positions (PointerEvent* event, const Bounds& frame)
-	{
-		assert(event);
-
-		const Point& offset = frame.position();
-
-		std::vector<Pointer> pointers;
-		for (const auto& pointer : event->self->pointers)
-		{
-			if (!frame.is_include(pointer.position()))
-				continue;
-
-			pointers.emplace_back(pointer);
-			Pointer_update_positions(&pointers.back(), [&](Point* pos)
-			{
-				*pos -= offset;
-			});
-		}
-
-		event->self->pointers = pointers;
-	}
-
 	static void
 	scroll_and_zoom_pointer_positions (
 		PointerEvent* event, const Point& scroll, float zoom)
@@ -685,7 +662,26 @@ namespace Reflex
 		if (!pthis || !view)
 			argument_error(__FILE__, __LINE__);
 
-		filter_and_offset_pointer_positions(pthis, view->frame());
+		const Bounds& frame = view->frame();
+		const Point& offset = frame.position();
+		Bounds bounds       = frame.dup().move_to(0, 0);
+		float angle         = view->angle();
+
+		std::vector<Pointer> pointers;
+		for (const auto& pointer : pthis->self->pointers)
+		{
+			pointers.emplace_back(pointer);
+			Pointer_update_positions(&pointers.back(), [&](Point* pos)
+			{
+				*pos -= offset;
+				pos->rotate(-angle);
+			});
+
+			if (!bounds.is_include(pointers.back().position()))
+				pointers.pop_back();
+		}
+		pthis->self->pointers = pointers;
+
 		scroll_and_zoom_pointer_positions(pthis, view->scroll(), view->zoom());
 	}
 
@@ -695,11 +691,14 @@ namespace Reflex
 		if (!pthis || !view)
 			argument_error(__FILE__, __LINE__);
 
+		float angle = view->angle();
+
 		for (auto& pointer : pthis->self->pointers)
 		{
 			Pointer_update_positions(&pointer, [=](Point* pos)
 			{
 				*pos = view->from_window(*pos);
+				pos->rotate(-angle);
 			});
 		}
 

data/src/view.cpp

@@ -4,6 +4,7 @@
 #include <assert.h>
 #include <memory>
 #include <algorithm>
+#include <rays/matrix.h>
 #include "reflex/timer.h"
 #include "reflex/filter.h"
 #include "reflex/exception.h"
@@ -25,6 +26,8 @@ namespace Reflex
 
 	static const char* WALL_NAME = "__WALL__";
 
+	static const Point ZERO      = 0;
+
 
 	struct View::Data
 	{
@@ -68,6 +71,8 @@ namespace Reflex
 
 		uint flags = FLAG_CLIP | FLAG_RESIZE_TO_FIT | REDRAW | UPDATE_LAYOUT | UPDATE_STYLE;
 
+		std::unique_ptr<Point>       ppivot;
+
 		std::unique_ptr<Point>       pscroll;
 
 		SelectorPtr                  pselector;
@@ -94,6 +99,12 @@ namespace Reflex
 
 		std::unique_ptr<ChildList>   pchildren;
 
+		Point& pivot ()
+		{
+			if (!ppivot) ppivot.reset(new Point);
+			return *ppivot;
+		}
+
 		Point& scroll ()
 		{
 			if (!pscroll) pscroll.reset(new Point);
@@ -195,7 +206,40 @@ namespace Reflex
 		{
 			if (!pbody) return;
 
-			pbody->set_transform(frame.x, frame.y, angle);
+			auto* pivot = ppivot.get();
+			if (pivot && (pivot->x != 0 || pivot->y != 0) && angle != 0)
+			{
+				Matrix m;
+				get_view2body_matrix(&m);
+				pbody->set_transform(m * Point(0), angle);
+			}
+			else
+				pbody->set_transform(frame.x, frame.y, angle);
+		}
+
+		void
+		get_view2body_matrix (Matrix* m)
+		{
+			assert(m && *m == 1 && ppivot && *ppivot != 0);
+
+			Point pivot = *ppivot * frame.size();
+			m->translate(frame.position() + pivot)
+				.rotate(angle)
+				.translate(-pivot);
+		}
+
+		void
+		get_body2view_matrix (Matrix* m)
+		{
+			assert(m && *m == 1 && ppivot && *ppivot != 0 && pbody);
+
+			Point pivot = *ppivot * frame.size();
+			float angle = pbody->angle();
+			m->translate(pbody->position())
+				.rotate(angle)
+				.translate( pivot)
+				.rotate(-angle)
+				.translate(-pivot);
 		}
 
 		void update_body_and_shapes ()
@@ -797,12 +841,23 @@ namespace Reflex
 	update_view_body (View* view)
 	{
 		assert(view);
+		View::Data* self = view->self.get();
 
-		Body* body = view->self->pbody.get();
+		Body* body = self->pbody.get();
 		if (!body) return;
 
 		Bounds frame = view->frame();
-		frame.move_to(body->position());
+
+		auto* pivot = self->ppivot.get();
+		if (pivot && (pivot->x != 0 || pivot->y != 0) && self->angle != 0)
+		{
+			Matrix m;
+			self->get_body2view_matrix(&m);
+			frame.set_position(m * Point(0));
+		}
+		else
+			frame.set_position(body->position());
+
 		update_view_frame(view, frame, view->zoom(), body->angle(), false);
 	}
 
@@ -1083,7 +1138,7 @@ namespace Reflex
 
 		if (event->is_blocked()) return;
 
-		View::ChildList* pchildren = view->self->pchildren.get();
+		View::ChildList* pchildren = self->pchildren.get();
 		if (pchildren)
 		{
 			for (auto& pchild : *pchildren)
@@ -1093,7 +1148,7 @@ namespace Reflex
 			}
 		}
 
-		World* child_world = view->self->pchild_world.get();
+		World* child_world = self->pchild_world.get();
 		if (child_world)
 		{
 			p->push_state();
@@ -1177,7 +1232,7 @@ namespace Reflex
 		Point pos     = bounds.position();
 		Bounds clip2  = bounds.dup().move_by(offset) & clip;
 
-		bounds.move_to(0, 0, bounds.z);
+		bounds.set_position(0, 0, bounds.z);
 		if (self->pscroll)
 		{
 			bounds.move_by(-*self->pscroll);
@@ -1188,9 +1243,13 @@ namespace Reflex
 		p->push_matrix();
 		p->translate(pos);
 
-		float angle = self->angle;
-		if (angle != 0)
-			p->rotate(angle);
+		if (self->angle != 0)
+		{
+			const Point* pivot = self->ppivot.get();
+			if (pivot) p->translate( pivot->x * bounds.width,  pivot->y * bounds.height);
+			p->rotate(self->angle);
+			if (pivot) p->translate(-pivot->x * bounds.width, -pivot->y * bounds.height);
+		}
 
 		float zoom = self->zoom;
 		if (zoom != 1 && zoom > 0)
@@ -1285,6 +1344,9 @@ namespace Reflex
 	{
 		assert(view && event);
 
+		if (view->self->pbody)
+			view->self->pbody->awake();
+
 		view->on_pointer(event);
 
 		switch ((*event)[0].action())
@@ -2070,7 +2132,23 @@ namespace Reflex
 		return self->angle;
 	}
 
-	static const Point ZERO_SCROLL;
+	void
+	View::set_pivot (float x, float y, float z)
+	{
+		self->pivot().reset(x, y, z);
+	}
+
+	void
+	View::set_pivot (const Point& pivot)
+	{
+		set_pivot(pivot.x, pivot.y, pivot.z);
+	}
+
+	const Point&
+	View::pivot () const
+	{
+		return self->ppivot ? self->pivot() : ZERO;
+	}
 
 	void
 	View::scroll_to (coord x, coord y, coord z)
@@ -2110,10 +2188,7 @@ namespace Reflex
 	const Point&
 	View::scroll () const
 	{
-		if (self->pscroll)
-			return self->scroll();
-		else
-			return ZERO_SCROLL;
+		return self->pscroll ? self->scroll() : ZERO;
 	}
 
 	void

data/src/window.cpp

@@ -176,7 +176,7 @@ namespace Reflex
 
 		for (auto& [view, targets] : window->self->captures)
 		{
-			if (!is_capturing(view.get(), targets, View::CAPTURE_KEY))
+			if (!view->window() || !is_capturing(view.get(), targets, View::CAPTURE_KEY))
 				continue;
 
 			KeyEvent e = event->dup();
@@ -256,7 +256,7 @@ namespace Reflex
 
 		for (auto& [view, targets] : window->self->captures)
 		{
-			if (targets.empty()) continue;
+			if (!view->window() || targets.empty()) continue;
 
 			PointerEvent event;
 			PointerEvent_set_captured(&event, true);
@@ -300,6 +300,8 @@ namespace Reflex
 
 		for (auto& view : views_capturing_all)
 		{
+			if (!view->window()) continue;
+
 			PointerEvent e = event.dup();
 			PointerEvent_update_for_capturing_view(&e, view);
 			View_call_pointer_event(const_cast<View*>(view.get()), &e);

data/test/helper.rb

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-
-
 %w[../xot ../rucy ../rays .]
   .map  {|s| File.expand_path "../#{s}/lib", __dir__}
   .each {|s| $:.unshift s if !$:.include?(s) && File.directory?(s)}

data/test/test_application.rb

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-
-
 require_relative 'helper'
 
 
@@ -14,4 +11,8 @@ class TestApplication < Test::Unit::TestCase
     assert_equal 'AppName', @@app.name
   end
 
+  def test_inspect()
+    assert_match %r|#<Reflex::Application:0x\w{16}>|, @@app.inspect
+  end
+
 end# TestApplication

data/test/test_capture_event.rb

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-
-
 require_relative 'helper'
 
 

data/test/test_contact_event.rb

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-
-
 require_relative 'helper'
 
 

data/test/test_draw_event.rb

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-
-
 require_relative 'helper'
 
 

data/test/test_event.rb

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-
-
 require_relative 'helper'
 
 
@@ -27,7 +24,7 @@ class TestEvent < Test::Unit::TestCase
     assert_true  e.blocked?
   end
 
-  def test_block_propagation()
+  def _test_block_propagation()
     e1 = event
     e2 = e1.dup
     e3 = e2.dup

data/test/test_focus_event.rb

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-
-
 require_relative 'helper'
 
 

data/test/test_frame_event.rb

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-
-
 require_relative 'helper'
 
 

data/test/test_has_frame.rb

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-
-
 require_relative 'helper'
 
 

data/test/test_key_event.rb

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-
-
 require_relative 'helper'
 
 

data/test/test_model.rb

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-
-
 require_relative 'helper'
 
 

data/test/test_model_owner.rb

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-
-
 require_relative 'helper'