reflexion 0.1.37 → 0.1.38

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa12d8b132c62006c16eab1851fac10ae90acd6b44b4a6b68d5e97ec6a9d4b15
-  data.tar.gz: 815b5ffd1975710a8450be94fa8bd7cc4b7e60a24363c2328299948751631999
+  metadata.gz: 5cd000da9cadc8587ea27cf2ef0d55c617aedd61e00e0fa84f0575215d81060f
+  data.tar.gz: 66a9040b3b5d9233afe96b8869c981449403ddff9dd62a9a590d37f99ff14530
 SHA512:
-  metadata.gz: 5f5fac1346a1522814bb160d60a72e38777795124c7fff0294b89ce1dd3a61927ef1d7c793790e0a700f42804bbe9cecb8c7fa1ef81a4e754c2144180cc9aa20
-  data.tar.gz: 9a0d167eb350c43e8a424c95686f5a1772ddd1021c522fbb43a1de96b14cbfd538ea2265b5e3ca81be9573866ce13a0d542ab03509ff14cb8b61c18991171126
+  metadata.gz: e2d19b6fd82f8f0d81bb6a774d6a829bf84a92e61cb5c5305c9815d76b39118a22f513f7b776f3fd039d65c41a1bf8b3dafc4a094db64adb7cbc42e7dd517503
+  data.tar.gz: 51c91ee902178f44c5b1f100d511179e47bc023f46411255ac4e72da03db07b0db3346e9283ff0ba2e0651d0fc9348fb93d7cf6bc761e29f311d1d3cf29d3bc8

data/.doc/ext/reflex/view.cpp

@@ -405,10 +405,32 @@ VALUE get_angle(VALUE self)
 }
 
 static
-VALUE set_pivot(VALUE self, VALUE x, VALUE y, VALUE z)
+VALUE set_pivot(VALUE self)
 {
 	CHECK;
-	THIS->set_pivot(to<float>(x), to<float>(y), to<float>(z));
+
+	if (argv[0].is_kind_of(Rays::point_class()))
+	{
+		check_arg_count(__FILE__, __LINE__, "View#pivot=(Point)", argc, 1);
+
+		THIS->set_pivot(to<Rays::Point&>(argv[0]));
+	}
+	else
+	{
+		if (argv[0].is_array())
+		{
+			argc = argv[0].size();
+			argv = &argv[0][0];
+		}
+		check_arg_count(__FILE__, __LINE__, "View#pivot=(Numeric, ...)", argc, 2, 3);
+
+		const Rays::Point& p = THIS->pivot();
+		float x =                          to<float>(argv[0]);
+		float y =                          to<float>(argv[1]);
+		float z = (argc >= 3 && argv[2]) ? to<float>(argv[2]) : p.z;
+		THIS->set_pivot(x, y, z);
+	}
+
 	return value(THIS->pivot());
 }
 
@@ -423,12 +445,22 @@ static
 VALUE scroll_to(VALUE self)
 {
 	CHECK;
-	check_arg_count(__FILE__, __LINE__, "View#scroll_to", argc, 1, 2, 3);
 
 	if (argv[0].is_kind_of(Rays::point_class()))
+	{
+		check_arg_count(__FILE__, __LINE__, "View#scroll_to(Point)", argc, 1);
+
 		THIS->scroll_to(to<Rays::Point&>(argv[0]));
+	}
 	else
 	{
+		if (argv[0].is_array())
+		{
+			argc = argv[0].size();
+			argv = &argv[0][0];
+		}
+		check_arg_count(__FILE__, __LINE__, "View#scroll_to(Numeric, ...)", argc, 2, 3);
+
 		const Rays::Point& p = THIS->scroll();
 		coord x = (argc >= 1 && argv[0]) ? to<coord>(argv[0]) : p.x;
 		coord y = (argc >= 2 && argv[1]) ? to<coord>(argv[1]) : p.y;
@@ -443,12 +475,22 @@ static
 VALUE scroll_by(VALUE self)
 {
 	CHECK;
-	check_arg_count(__FILE__, __LINE__, "View#scroll_by", argc, 1, 2, 3);
 
 	if (argv[0].is_kind_of(Rays::point_class()))
+	{
+		check_arg_count(__FILE__, __LINE__, "View#scroll_by", argc, 1);
+
 		THIS->scroll_by(to<Rays::Point&>(argv[0]));
+	}
 	else
 	{
+		if (argv[0].is_array())
+		{
+			argc = argv[0].size();
+			argv = &argv[0][0];
+		}
+		check_arg_count(__FILE__, __LINE__, "View#scroll_by(Numeric, ...)", argc, 2, 3);
+
 		coord x = (argc >= 1 && argv[0]) ? to<coord>(argv[0]) : 0;
 		coord y = (argc >= 2 && argv[1]) ? to<coord>(argv[1]) : 0;
 		coord z = (argc >= 3 && argv[2]) ? to<coord>(argv[2]) : 0;
@@ -1075,7 +1117,7 @@ Init_reflex_view ()
 	rb_define_method(cView, "fit_to_content", RUBY_METHOD_FUNC(fit_to_content), 0);
 	rb_define_method(cView, "angle=", RUBY_METHOD_FUNC(set_angle), 1);
 	rb_define_method(cView, "angle", RUBY_METHOD_FUNC(get_angle), 0);
-	cView.define_private_method("set_pivot!", set_pivot);
+	rb_define_method(cView, "pivot=", RUBY_METHOD_FUNC(set_pivot), -1);
 	rb_define_method(cView, "pivot", RUBY_METHOD_FUNC(get_pivot), 0);
 	rb_define_method(cView, "scroll_to", RUBY_METHOD_FUNC(scroll_to), -1);
 	rb_define_method(cView, "scroll_by", RUBY_METHOD_FUNC(scroll_by), -1);

data/ChangeLog.md

@@ -1,6 +1,11 @@
 # reflex ChangeLog
 
 
+## [v0.1.38] - 2023-05-13
+
+- View: Reimplemented from_parent(), to_parent(), from_window(), to_window(), from_screen(), and to_screen() to account for rotation, zoom, and scrolling during coordinate transformation
+
+
 ## [v0.1.37] - 2023-05-11
 
 - Update dependencies

data/VERSION

@@ -1 +1 @@
-0.1.37
+0.1.38

data/ext/reflex/view.cpp

@@ -446,10 +446,32 @@ RUCY_DEF0(get_angle)
 RUCY_END
 
 static
-RUCY_DEF3(set_pivot, x, y, z)
+RUCY_DEFN(set_pivot)
 {
 	CHECK;
-	THIS->set_pivot(to<float>(x), to<float>(y), to<float>(z));
+
+	if (argv[0].is_kind_of(Rays::point_class()))
+	{
+		check_arg_count(__FILE__, __LINE__, "View#pivot=(Point)", argc, 1);
+
+		THIS->set_pivot(to<Rays::Point&>(argv[0]));
+	}
+	else
+	{
+		if (argv[0].is_array())
+		{
+			argc = argv[0].size();
+			argv = &argv[0][0];
+		}
+		check_arg_count(__FILE__, __LINE__, "View#pivot=(Numeric, ...)", argc, 2, 3);
+
+		const Rays::Point& p = THIS->pivot();
+		float x =                          to<float>(argv[0]);
+		float y =                          to<float>(argv[1]);
+		float z = (argc >= 3 && argv[2]) ? to<float>(argv[2]) : p.z;
+		THIS->set_pivot(x, y, z);
+	}
+
 	return value(THIS->pivot());
 }
 RUCY_END
@@ -466,12 +488,22 @@ static
 RUCY_DEFN(scroll_to)
 {
 	CHECK;
-	check_arg_count(__FILE__, __LINE__, "View#scroll_to", argc, 1, 2, 3);
 
 	if (argv[0].is_kind_of(Rays::point_class()))
+	{
+		check_arg_count(__FILE__, __LINE__, "View#scroll_to(Point)", argc, 1);
+
 		THIS->scroll_to(to<Rays::Point&>(argv[0]));
+	}
 	else
 	{
+		if (argv[0].is_array())
+		{
+			argc = argv[0].size();
+			argv = &argv[0][0];
+		}
+		check_arg_count(__FILE__, __LINE__, "View#scroll_to(Numeric, ...)", argc, 2, 3);
+
 		const Rays::Point& p = THIS->scroll();
 		coord x = (argc >= 1 && argv[0]) ? to<coord>(argv[0]) : p.x;
 		coord y = (argc >= 2 && argv[1]) ? to<coord>(argv[1]) : p.y;
@@ -487,12 +519,22 @@ static
 RUCY_DEFN(scroll_by)
 {
 	CHECK;
-	check_arg_count(__FILE__, __LINE__, "View#scroll_by", argc, 1, 2, 3);
 
 	if (argv[0].is_kind_of(Rays::point_class()))
+	{
+		check_arg_count(__FILE__, __LINE__, "View#scroll_by", argc, 1);
+
 		THIS->scroll_by(to<Rays::Point&>(argv[0]));
+	}
 	else
 	{
+		if (argv[0].is_array())
+		{
+			argc = argv[0].size();
+			argv = &argv[0][0];
+		}
+		check_arg_count(__FILE__, __LINE__, "View#scroll_by(Numeric, ...)", argc, 2, 3);
+
 		coord x = (argc >= 1 && argv[0]) ? to<coord>(argv[0]) : 0;
 		coord y = (argc >= 2 && argv[1]) ? to<coord>(argv[1]) : 0;
 		coord z = (argc >= 3 && argv[2]) ? to<coord>(argv[2]) : 0;
@@ -1193,8 +1235,8 @@ Init_reflex_view ()
 	cView.define_method("fit_to_content", fit_to_content);
 	cView.define_method("angle=", set_angle);
 	cView.define_method("angle",  get_angle);
-	cView.define_private_method("set_pivot!", set_pivot);
-	cView.define_method(            "pivot",  get_pivot);
+	cView.define_method("pivot=", set_pivot);
+	cView.define_method("pivot",  get_pivot);
 	cView.define_method("scroll_to", scroll_to);
 	cView.define_method("scroll_by", scroll_by);
 	cView.define_method("scroll", get_scroll);

data/lib/reflex/view.rb

@@ -97,14 +97,6 @@ module Reflex
       to_enum :each_shape
     end
 
-    def pivot=(arg)
-      case arg
-      when Point then set_pivot! arg.x, arg.y, arg.z
-      when Array then set_pivot! arg[0], arg[1], arg[2] || 0
-      else raise ArgumentError
-      end
-    end
-
     def capturing?(*args)
       cap = capture
       args.all? {|type| cap.include? type}

data/lib/reflex/window.rb

@@ -20,28 +20,42 @@ module Reflex
     extend Forwardable
 
     def_delegators :root,
+      :add_child,    :add,
+      :remove_child, :remove,
+      :children, :find_children, :find_child, :find,
+      :scroll_to, :scroll_by, :scroll,
+      :style, :styles,
       :timeout, :delay, :interval,
-      :add_child,     :add,
-      :remove_child,  :remove,
-      :children, :find_child, :find, :find_children,
-      :style, :styles, :scroll_to, :scroll_by, :scroll,
       :meter2pixel, :meter, :wall,
-      :zoom=,              :zoom,
-      :clip=,              :clip,  :clip?,
-      :cache=,             :cache, :cache?,
-      :flow=,              :flow,
-      :fill=,              :fill,
-      :stroke=,            :stroke,
-      :foreground=,        :foreground,
-      :background=,        :background,
-      :foreground_fill=,   :foreground_fill,
-      :foreground_stroke=, :foreground_stroke,
-      :background_fill=,   :background_fill,
-      :background_stroke=, :background_stroke,
-      :image=,             :image,
-      :gravity=,           :gravity,
-      :time_scale=,        :time_scale,
-      :debug=,             :debug, :debug?
+      :zoom=,       :zoom,
+      :clip=,       :clip,  :clip?,
+      :cache=,      :cache, :cache?,
+      :gravity=,    :gravity,
+      :time_scale=, :time_scale,
+      :debug=,      :debug, :debug?
+
+    def_delegators :style,
+      :flow=,                    :flow,
+      :foreground_fill=,         :foreground_fill,
+      :foreground_stroke=,       :foreground_stroke,
+      :foreground_stroke_width=, :foreground_stroke_width,
+      :background_fill=,         :background_fill,
+      :background_stroke=,       :background_stroke,
+      :background_stroke_width=, :background_stroke_width,
+      :foreground=,              :foreground,
+      :background=,              :background,
+      :fore_fill=,               :fore_fill,
+      :fore_stroke=,             :fore_stroke,
+      :fore_stroke_width=,       :fore_stroke_width,
+      :back_fill=,               :back_fill,
+      :back_stroke=,             :back_stroke,
+      :back_stroke_width=,       :back_stroke_width,
+      :fore=,                    :fore,
+      :back=,                    :back,
+      :fill=,                    :fill,
+      :stroke=,                  :stroke,
+      :stroke_width=,            :stroke_width,
+      :image=,                   :image
 
     def_delegators :wall,
       :friction=,    :friction,

data/src/event.cpp

@@ -634,38 +634,14 @@ namespace Reflex
 		pthis->self->captured = captured;
 	}
 
-	static void
-	scroll_and_zoom_pointer_positions (
-		PointerEvent* event, const Point& scroll, float zoom)
-	{
-		assert(event);
-
-		if (zoom == 0)
-			argument_error(__FILE__, __LINE__);
-
-		if (scroll == 0 && zoom == 1)
-			return;
-
-		for (auto& pointer : event->self->pointers)
-		{
-			Pointer_update_positions(&pointer, [=](Point* pos)
-			{
-				*pos -= scroll;
-				*pos /= zoom;
-			});
-		}
-	}
-
 	void
-	PointerEvent_update_for_child_view (PointerEvent* pthis, const View* view)
+	PointerEvent_update_for_child_view (PointerEvent* pthis, const View* child)
 	{
-		if (!pthis || !view)
+		if (!pthis || !child)
 			argument_error(__FILE__, __LINE__);
 
-		const Bounds& frame = view->frame();
-		const Point& offset = frame.position();
+		const Bounds& frame = child->frame();
 		Bounds bounds       = frame.dup().move_to(0, 0);
-		float angle         = view->angle();
 
 		std::vector<Pointer> pointers;
 		for (const auto& pointer : pthis->self->pointers)
@@ -673,16 +649,13 @@ namespace Reflex
 			pointers.emplace_back(pointer);
 			Pointer_update_positions(&pointers.back(), [&](Point* pos)
 			{
-				*pos -= offset;
-				pos->rotate(-angle);
+				*pos = child->from_parent(*pos);
 			});
 
 			if (!bounds.is_include(pointers.back().position()))
 				pointers.pop_back();
 		}
 		pthis->self->pointers = pointers;
-
-		scroll_and_zoom_pointer_positions(pthis, view->scroll(), view->zoom());
 	}
 
 	void
@@ -691,18 +664,13 @@ 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);
 			});
 		}
-
-		scroll_and_zoom_pointer_positions(pthis, view->scroll(), view->zoom());
 	}
 
 

data/src/view.cpp

@@ -105,12 +105,22 @@ namespace Reflex
 			return *ppivot;
 		}
 
+		bool has_pivot () const
+		{
+			return ppivot && *ppivot != ZERO;
+		}
+
 		Point& scroll ()
 		{
 			if (!pscroll) pscroll.reset(new Point);
 			return *pscroll;
 		}
 
+		bool has_scroll () const
+		{
+			return pscroll && *pscroll != ZERO;
+		}
+
 		Selector& selector ()
 		{
 			if (!pselector) pselector.reset(new Selector);
@@ -1246,9 +1256,9 @@ namespace Reflex
 		if (self->angle != 0)
 		{
 			const Point* pivot = self->ppivot.get();
-			if (pivot) p->translate( pivot->x * bounds.width,  pivot->y * bounds.height);
+			if (pivot) p->translate( pivot->x * bounds.w,  pivot->y * bounds.h);
 			p->rotate(self->angle);
-			if (pivot) p->translate(-pivot->x * bounds.width, -pivot->y * bounds.height);
+			if (pivot) p->translate(-pivot->x * bounds.w, -pivot->y * bounds.h);
 		}
 
 		float zoom = self->zoom;
@@ -1571,22 +1581,76 @@ namespace Reflex
 		redraw();
 	}
 
+	static void
+	get_from_parent_matrix (Matrix* m, const View* view)
+	{
+		assert(m && view);
+		View::Data* self = view->self.get();
+
+		const auto& frame  = self->frame;
+		const auto* scroll = self->has_scroll() ? self->pscroll.get() : NULL;
+		auto angle         = self->angle;
+		auto zoom          = self->zoom;
+
+		if (zoom != 1 && zoom > 0) m->scale(1 / zoom, 1 / zoom);
+		if (angle != 0)
+		{
+			const auto* pivot = self->has_pivot() ? self->ppivot.get() : NULL;
+			if (pivot) m->translate( pivot->x * frame.w,  pivot->y * frame.h);
+			m->rotate(-angle);
+			if (pivot) m->translate(-pivot->x * frame.w, -pivot->y * frame.h);
+		}
+		m->translate(-frame.position());
+		if (scroll) m->translate(-*scroll);
+	}
+
+	static void
+	get_to_parent_matrix (Matrix* m, const View* view)
+	{
+		assert(m && view);
+		View::Data* self = view->self.get();
+
+		const auto& frame  = self->frame;
+		const auto* scroll = self->has_scroll() ? self->pscroll.get() : NULL;
+		auto angle         = self->angle;
+		auto zoom          = self->zoom;
+
+		if (scroll) m->translate(*scroll);
+		m->translate(frame.position());
+		if (angle != 0)
+		{
+			const auto* pivot = self->has_pivot() ? self->ppivot.get() : NULL;
+			if (pivot) m->translate( pivot->x * frame.w,  pivot->y * frame.h);
+			m->rotate(angle);
+			if (pivot) m->translate(-pivot->x * frame.w, -pivot->y * frame.h);
+		}
+		if (zoom != 1 && zoom > 0) m->scale(zoom, zoom);
+	}
+
 	Point
 	View::from_parent (const Point& point) const
 	{
-		if (!parent())
-			invalid_state_error(__FILE__, __LINE__);
-
-		return point - frame().position();
+		if (self->zoom == 1 && self->angle == 0 && !self->has_scroll())
+			return point - self->frame.position();
+		else
+		{
+			Matrix m(1);
+			get_from_parent_matrix(&m, this);
+			return m * point;
+		}
 	}
 
 	Point
 	View::to_parent (const Point& point) const
 	{
-		if (!parent())
-			invalid_state_error(__FILE__, __LINE__);
-
-		return point + frame().position();
+		if (self->zoom == 1 && self->angle == 0 && !self->has_scroll())
+			return point + self->frame.position();
+		else
+		{
+			Matrix m(1);
+			get_to_parent_matrix(&m, this);
+			return m * point;
+		}
 	}
 
 	Point
@@ -1595,10 +1659,8 @@ namespace Reflex
 		if (!window())
 			invalid_state_error(__FILE__, __LINE__);
 
-		Point p = point;
-		for (const View* v = this; v; v = v->parent())
-			p -= v->frame().position();
-		return p;
+		const auto* parent = self->parent;
+		return from_parent(parent ? parent->from_window(point) : point);
 	}
 
 	Point
@@ -1607,10 +1669,8 @@ namespace Reflex
 		if (!window())
 			invalid_state_error(__FILE__, __LINE__);
 
-		Point p = point;
-		for (const View* v = this; v; v = v->parent())
-			p += v->frame().position();
-		return p;
+		const auto* parent = self->parent;
+		return parent ? parent->to_window(to_parent(point)) : to_parent(point);
 	}
 
 	Point

data/test/test_view.rb

@@ -50,8 +50,8 @@ class TestView < Test::Unit::TestCase
     v1 = view   x: 10,  y: 20
     v2 = view   x: 1,   y: 2
 
-    assert_raise(Rucy::NativeError) {v2.from_parent 0}
-    assert_raise(Rucy::NativeError) {v2.  to_parent 0}
+    assert_nothing_raised           {v2.from_parent 0}
+    assert_nothing_raised           {v2.  to_parent 0}
     assert_raise(Rucy::NativeError) {v2.from_window 0}
     assert_raise(Rucy::NativeError) {v2.  to_window 0}
     assert_raise(Rucy::NativeError) {v2.from_screen 0}
@@ -68,6 +68,22 @@ class TestView < Test::Unit::TestCase
     assert_equal [611, 722], v2.  to_screen(500).to_a
   end
 
+  def test_complex_coord_conversion()
+    w  = window(x: 100, y: 200, size: 500, zoom: 2)                                {scroll_to 100, 200}
+    v1 = view(  x: 10,  y: 20,  size: 50,  zoom: 3, angle: 90,  pivot: [0.1, 0.2]) {scroll_to 10,  20}
+    v2 = view(  x: 1,   y: 2,   size: 5,   zoom: 4, angle: 180, pivot: [0.3, 0.4]) {scroll_to 1,   2}
+
+    w .add v1
+    v1.add v2
+
+    assert_each_in_epsilon [1,        1.75],    v2.from_parent(1)  .to_a
+    assert_each_in_epsilon [1,        4],       v2.  to_parent(1)  .to_a
+    assert_each_in_epsilon [4.583,    -0.5],    v2.from_window(10) .to_a
+    assert_each_in_epsilon [262,      -120],    v2.  to_window(10) .to_a
+    assert_each_in_epsilon [-99.1666, -196.75], v2.from_screen(100).to_a
+    assert_each_in_epsilon [2522,     -2080],   v2.  to_screen(100).to_a
+  end
+
   def test_add_child()
     assert_raise(ArgumentError) {view.add_child}
     assert_raise(TypeError) {view.add_child nil}
@@ -261,19 +277,86 @@ class TestView < Test::Unit::TestCase
 
   def test_pivot()
     v = view
-    assert_equal point(0, 0, 0),       v.pivot
+    assert_each_in_epsilon [0, 0, 0],          v.pivot.to_a(3)
+
+    v.pivot = point         0.1, 0.2
+    assert_each_in_epsilon [0.1, 0.2, 0],      v.pivot.to_a(3)
+
+    v.pivot = point         0.3, 0.4, 0.5
+    assert_each_in_epsilon [0.3, 0.4, 0.5],    v.pivot.to_a(3)
+
+    v.pivot =              [0.6, 0.7]
+    assert_each_in_epsilon [0.6, 0.7, 0.5],    v.pivot.to_a(3)
+
+    v.pivot =              [0.8, 0.9, 1.0]
+    assert_each_in_epsilon [0.8, 0.9, 1.0],    v.pivot.to_a(3)
+
+    v.pivot                 1.1, 1.2
+    assert_each_in_epsilon [1.1, 1.2, 1.0],    v.pivot.to_a(3)
+
+    v.pivot                 1.3, 1.4, 1.5
+    assert_each_in_epsilon [1.3, 1.4, 1.5],    v.pivot.to_a(3)
+
+    v.pivot(                -1.6, -1.7, -1.8)
+    assert_each_in_epsilon [-1.6, -1.7, -1.8], v.pivot.to_a(3)
+
+    assert_raise(ArgumentError) {v.pivot 2.0}
+  end
+
+  def test_scroll_to()
+    v = view
+    assert_each_in_epsilon [0, 0, 0],       v.scroll.to_a(3)
+
+    v.scroll_to       point(1, 2)
+    assert_each_in_epsilon [1, 2, 0],       v.scroll.to_a(3)
+
+    v.scroll_to       point(3, 4, 5)
+    assert_each_in_epsilon [3, 4, 5],       v.scroll.to_a(3)
+
+    v.scroll_to            [6, 7]
+    assert_each_in_epsilon [6, 7, 5],       v.scroll.to_a(3)
+
+    v.scroll_to            [8, 9, 10]
+    assert_each_in_epsilon [8, 9, 10],      v.scroll.to_a(3)
+
+    v.scroll_to             11, 12
+    assert_each_in_epsilon [11, 12, 10],    v.scroll.to_a(3)
+
+    v.scroll_to             13, 14, 15
+    assert_each_in_epsilon [13, 14, 15],    v.scroll.to_a(3)
+
+    v.scroll_to(            -16, -17, -18)
+    assert_each_in_epsilon [-16, -17, -18], v.scroll.to_a(3)
+
+    assert_raise(ArgumentError) {v.scroll_to 100}
+  end
+
+  def test_scroll_by()
+    v = view
+    assert_each_in_epsilon [0, 0, 0],       v.scroll.to_a(3)
+
+    v.scroll_by       point(1, 2)
+    assert_each_in_epsilon [1, 2, 0],       v.scroll.to_a(3)
+
+    v.scroll_by       point(3, 4, 5)
+    assert_each_in_epsilon [4, 6, 5],       v.scroll.to_a(3)
+
+    v.scroll_by            [6,  7]
+    assert_each_in_epsilon [10, 13, 5],     v.scroll.to_a(3)
+
+    v.scroll_by            [8,  9,  10]
+    assert_each_in_epsilon [18, 22, 15],    v.scroll.to_a(3)
 
-    v.pivot =    point 0.1, 0.2
-    assert_equal point(0.1, 0.2, 0),   v.pivot
+    v.scroll_by             11, 12
+    assert_each_in_epsilon [29, 34, 15],    v.scroll.to_a(3)
 
-    v.pivot =    point 0.4, 0.5, 0.6
-    assert_equal point(0.4, 0.5, 0.6), v.pivot
+    v.scroll_by             13, 14, 15
+    assert_each_in_epsilon [42, 48, 30],    v.scroll.to_a(3)
 
-    v.pivot =         [0.7, 0.8]
-    assert_equal point(0.7, 0.8),      v.pivot
+    v.scroll_by(            -16, -17, -18)
+    assert_each_in_epsilon [ 26,  31,  12], v.scroll.to_a(3)
 
-    v.pivot =         [0.9, 1.0]
-    assert_equal point(0.9, 1.0),      v.pivot
+    assert_raise(ArgumentError) {v.scroll_by 100}
   end
 
   def test_parent()

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reflexion
 version: !ruby/object:Gem::Version
-  version: 0.1.37
+  version: 0.1.38
 platform: ruby
 authors:
 - xordog
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-11 00:00:00.000000000 Z
+date: 2023-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xot