reflexion 0.1.32 → 0.1.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6978ef77180312c159f086e6f6264077b652dc2fb4831df39d9d0d65e8db7f7a
-  data.tar.gz: a91ecc01f7e467e6939f3e9d88d9b741b08cfff6952da46bd4b292d156250eeb
+  metadata.gz: 6719c2a7257d31b194a2a60d66df3e650a9dd459f8e30ce6ffb2e918b9a910a4
+  data.tar.gz: 2bdbaf02fe6edfb2c2bdca7bf66b8973f8fb972ddc4e22415afdf8980168f0ab
 SHA512:
-  metadata.gz: a7ef46c647f619c3b610992978307994878c295323101631df12cbbd568f01e57ea2cc0fe9c7f74a8c4cf3f9bb60a13f89399baf2ca83ab54aeccae63ede4578
-  data.tar.gz: 78c616ca288d7a1e2c6df7cde725b505b3b7122f71e222060c3de8eac8b11458e77b1242fba45abd95f1f3828fdc09a401dd2e760aa4aa71780fe057fa3448f4
+  metadata.gz: 65a6906a681fadbc037b8e7b354eed8308aed9d63a4c7d34eb02bd5f0a670b6b34bf197e3d5e1efabf9e9540e691a01e7079a9a040b3bbfbcea7ec4bfa706945
+  data.tar.gz: 1bb8b01012aab97efeb8d3196f6d9362fbc31be5f1bc2db9f790ed31de8813ebca0f1d8923e527eabe7f5ada0e404b688382d96909fb649880f532db4049bfd7

data/.doc/ext/reflex/shape.cpp

@@ -106,40 +106,17 @@ VALUE is_sensor(VALUE self)
 }
 
 static
-VALUE set_category_bits(VALUE self, VALUE bits)
-{
-	CHECK;
-	THIS->set_category_bits(to<uint>(bits));
-	return bits;
-}
-
-static
-VALUE get_category_bits(VALUE self)
-{
-	CHECK;
-	return value(THIS->category_bits());
-}
-
-static
-VALUE set_collision_mask(VALUE self, VALUE mask)
-{
-	CHECK;
-	THIS->set_collision_mask(to<uint>(mask));
-	return mask;
-}
-
-static
-VALUE get_collision_mask(VALUE self)
+VALUE on_draw(VALUE self, VALUE event)
 {
 	CHECK;
-	return value(THIS->collision_mask());
+	CALL(on_draw(to<Reflex::DrawEvent*>(event)));
 }
 
 static
-VALUE on_draw(VALUE self, VALUE event)
+VALUE will_contact(VALUE self, VALUE shape)
 {
 	CHECK;
-	CALL(on_draw(to<Reflex::DrawEvent*>(event)));
+	return value(CALL(will_contact(to<Reflex::Shape*>(shape))));
 }
 
 static
@@ -184,11 +161,8 @@ Init_reflex_shape ()
 	rb_define_method(cShape, "restitution", RUBY_METHOD_FUNC(get_restitution), 0);
 	rb_define_method(cShape, "sensor=", RUBY_METHOD_FUNC(set_sensor), 1);
 	rb_define_method(cShape, "sensor", RUBY_METHOD_FUNC(is_sensor), 0);
-	rb_define_method(cShape, "category_bits=", RUBY_METHOD_FUNC(set_category_bits), 1);
-	rb_define_method(cShape, "category_bits", RUBY_METHOD_FUNC(get_category_bits), 0);
-	rb_define_method(cShape, "collision_mask=", RUBY_METHOD_FUNC(set_collision_mask), 1);
-	rb_define_method(cShape, "collision_mask", RUBY_METHOD_FUNC(get_collision_mask), 0);
 	rb_define_method(cShape, "on_draw", RUBY_METHOD_FUNC(on_draw), 1);
+	cShape.define_method(        "will_contact?",     will_contact);
 	cShape.define_private_method("call_contact!",       on_contact);
 	cShape.define_private_method("call_contact_begin!", on_contact_begin);
 	cShape.define_private_method("call_contact_end!",   on_contact_end);

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

@@ -696,36 +696,6 @@ VALUE is_sensor(VALUE self)
 	return value(THIS->is_sensor());
 }
 
-static
-VALUE set_category_bits(VALUE self, VALUE bits)
-{
-	CHECK;
-	THIS->set_category_bits(to<uint>(bits));
-	return bits;
-}
-
-static
-VALUE get_category_bits(VALUE self)
-{
-	CHECK;
-	return value(THIS->category_bits());
-}
-
-static
-VALUE set_collision_mask(VALUE self, VALUE mask)
-{
-	CHECK;
-	THIS->set_collision_mask(to<uint>(mask));
-	return mask;
-}
-
-static
-VALUE get_collision_mask(VALUE self)
-{
-	CHECK;
-	return value(THIS->collision_mask());
-}
-
 static
 VALUE set_linear_velocity(VALUE self)
 {
@@ -999,6 +969,13 @@ VALUE on_timer(VALUE self, VALUE event)
 	CALL(on_timer(to<Reflex::TimerEvent*>(event)));
 }
 
+static
+VALUE will_contact(VALUE self, VALUE view)
+{
+	CHECK;
+	return value(CALL(will_contact(to<Reflex::View*>(view))));
+}
+
 static
 VALUE on_contact(VALUE self, VALUE event)
 {
@@ -1110,10 +1087,6 @@ Init_reflex_view ()
 	rb_define_method(cView, "restitution", RUBY_METHOD_FUNC(get_restitution), 0);
 	rb_define_method(cView, "sensor=", RUBY_METHOD_FUNC(set_sensor), 1);
 	cView.define_method("sensor?",       is_sensor);
-	rb_define_private_method(cView, "set_category_bits", RUBY_METHOD_FUNC(set_category_bits), 1);
-	rb_define_private_method(cView, "get_category_bits", RUBY_METHOD_FUNC(get_category_bits), 0);
-	rb_define_private_method(cView, "set_collision_mask", RUBY_METHOD_FUNC(set_collision_mask), 1);
-	rb_define_private_method(cView, "get_collision_mask", RUBY_METHOD_FUNC(get_collision_mask), 0);
 	rb_define_method(cView, "linear_velocity=", RUBY_METHOD_FUNC(set_linear_velocity), -1);
 	rb_define_method(cView, "linear_velocity", RUBY_METHOD_FUNC(get_linear_velocity), 0);
 	rb_define_method(cView, "angular_velocity=", RUBY_METHOD_FUNC(set_angular_velocity), 1);
@@ -1153,6 +1126,7 @@ Init_reflex_view ()
 	rb_define_method(cView, "on_wheel", RUBY_METHOD_FUNC(on_wheel), 1);
 	rb_define_method(cView, "on_capture", RUBY_METHOD_FUNC(on_capture), 1);
 	rb_define_method(cView, "on_timer", RUBY_METHOD_FUNC(on_timer), 1);
+	cView.define_method(        "will_contact?",     will_contact);
 	cView.define_private_method("call_contact!",       on_contact);
 	cView.define_private_method("call_contact_begin!", on_contact_begin);
 	cView.define_private_method("call_contact_end!",   on_contact_end);

data/.github/workflows/release-gem.yml

@@ -20,8 +20,11 @@ jobs:
       - name: setup dependencies
         run: "ruby -I.github/workflows -rutils -e 'setup_dependencies'"
 
+      - name: install gems
+        run: gem install yard
+
       - name: test
-        run: rake test
+        run: rake quiet test
 
       - name: create gem
         id: gem

data/ChangeLog.md

@@ -1,6 +1,13 @@
 # reflex ChangeLog
 
 
+## [v0.1.33] - 2023-04-22
+
+- Add will_contact?()
+- Delete category_bits and collision_mask
+- Update Box2D to 2.4.1
+
+
 ## [v0.1.32] - 2023-03-01
 
 - fix bugs

data/Rakefile

@@ -15,12 +15,12 @@ require 'reflex/extension'
 
 EXTENSIONS  = [Xot, Rucy, Rays, Reflex]
 GEMNAME     = 'reflexion'
-TESTS_ALONE = ['test/test_reflex.rb']
+TESTS_ALONE = ['test/test_reflex_init.rb']
 
-use_external_library 'https://github.com/erincatto/Box2D',
-  tag:    'v2.3.1',
-  incdir: 'Box2D',
-  srcdir: 'Box2D/Box2D'
+use_external_library 'https://github.com/erincatto/box2d',
+  tag:    'v2.4.1',
+  incdirs: %w[include src],
+  srcdirs: 'src'
 
 default_tasks :ext
 build_native_library

data/VERSION

@@ -1 +1 @@
-0.1.32
+0.1.33

data/ext/reflex/extconf.rb

@@ -16,7 +16,6 @@ require 'reflex/extension'
 Xot::ExtConf.new Xot, Rucy, Rays, Reflex do
   setup do
     headers    << 'ruby.h'
-    local_libs << 'rucy'
     libs.unshift 'gdi21', 'opengl32' if win32?
     frameworks << 'Cocoa' if osx?
     $LDFLAGS   << ' -Wl,--out-implib=native.dll.a' if cygwin?

data/ext/reflex/shape.cpp

@@ -118,44 +118,18 @@ RUCY_DEF0(is_sensor)
 RUCY_END
 
 static
-RUCY_DEF1(set_category_bits, bits)
-{
-	CHECK;
-	THIS->set_category_bits(to<uint>(bits));
-	return bits;
-}
-RUCY_END
-
-static
-RUCY_DEF0(get_category_bits)
-{
-	CHECK;
-	return value(THIS->category_bits());
-}
-RUCY_END
-
-static
-RUCY_DEF1(set_collision_mask, mask)
-{
-	CHECK;
-	THIS->set_collision_mask(to<uint>(mask));
-	return mask;
-}
-RUCY_END
-
-static
-RUCY_DEF0(get_collision_mask)
+RUCY_DEF1(on_draw, event)
 {
 	CHECK;
-	return value(THIS->collision_mask());
+	CALL(on_draw(to<Reflex::DrawEvent*>(event)));
 }
 RUCY_END
 
 static
-RUCY_DEF1(on_draw, event)
+RUCY_DEF1(will_contact, shape)
 {
 	CHECK;
-	CALL(on_draw(to<Reflex::DrawEvent*>(event)));
+	return value(CALL(will_contact(to<Reflex::Shape*>(shape))));
 }
 RUCY_END
 
@@ -204,11 +178,8 @@ Init_reflex_shape ()
 	cShape.define_method("restitution",  get_restitution);
 	cShape.define_method("sensor=",      set_sensor);
 	cShape.define_method("sensor",        is_sensor);
-	cShape.define_method("category_bits=",  set_category_bits);
-	cShape.define_method("category_bits",   get_category_bits);
-	cShape.define_method("collision_mask=", set_collision_mask);
-	cShape.define_method("collision_mask",  get_collision_mask);
-	cShape.define_method("on_draw",          on_draw);
+	cShape.define_method("on_draw", on_draw);
+	cShape.define_method(        "will_contact?",     will_contact);
 	cShape.define_private_method("call_contact!",       on_contact);
 	cShape.define_private_method("call_contact_begin!", on_contact_begin);
 	cShape.define_private_method("call_contact_end!",   on_contact_end);

data/ext/reflex/view.cpp

@@ -770,40 +770,6 @@ RUCY_DEF0(is_sensor)
 }
 RUCY_END
 
-static
-RUCY_DEF1(set_category_bits, bits)
-{
-	CHECK;
-	THIS->set_category_bits(to<uint>(bits));
-	return bits;
-}
-RUCY_END
-
-static
-RUCY_DEF0(get_category_bits)
-{
-	CHECK;
-	return value(THIS->category_bits());
-}
-RUCY_END
-
-static
-RUCY_DEF1(set_collision_mask, mask)
-{
-	CHECK;
-	THIS->set_collision_mask(to<uint>(mask));
-	return mask;
-}
-RUCY_END
-
-static
-RUCY_DEF0(get_collision_mask)
-{
-	CHECK;
-	return value(THIS->collision_mask());
-}
-RUCY_END
-
 static
 RUCY_DEFN(set_linear_velocity)
 {
@@ -1114,6 +1080,14 @@ RUCY_DEF1(on_timer, event)
 }
 RUCY_END
 
+static
+RUCY_DEF1(will_contact, view)
+{
+	CHECK;
+	return value(CALL(will_contact(to<Reflex::View*>(view))));
+}
+RUCY_END
+
 static
 RUCY_DEF1(on_contact, event)
 {
@@ -1228,10 +1202,6 @@ Init_reflex_view ()
 	cView.define_method("restitution",  get_restitution);
 	cView.define_method("sensor=",      set_sensor);
 	cView.define_method("sensor?",       is_sensor);
-	cView.define_private_method("set_category_bits",  set_category_bits);
-	cView.define_private_method("get_category_bits",  get_category_bits);
-	cView.define_private_method("set_collision_mask", set_collision_mask);
-	cView.define_private_method("get_collision_mask", get_collision_mask);
 	cView.define_method("linear_velocity=",  set_linear_velocity);
 	cView.define_method("linear_velocity",   get_linear_velocity);
 	cView.define_method("angular_velocity=", set_angular_velocity);
@@ -1251,26 +1221,27 @@ Init_reflex_view ()
 
 	cView.define_method("on_attach", on_attach);
 	cView.define_method("on_detach", on_detach);
-	cView.define_method("on_show", on_show);
-	cView.define_method("on_hide", on_hide);
+	cView.define_method("on_show",   on_show);
+	cView.define_method("on_hide",   on_hide);
 	cView.define_method("on_update", on_update);
 	cView.define_method("on_draw",   on_draw);
 	cView.define_method("on_move",   on_move);
 	cView.define_method("on_resize", on_resize);
 	cView.define_method("on_rotate", on_rotate);
 	cView.define_method("on_scroll", on_scroll);
-	cView.define_method("on_focus", on_focus);
+	cView.define_method("on_focus",  on_focus);
 	cView.define_method("on_key",      on_key);
 	cView.define_method("on_key_down", on_key_down);
 	cView.define_method("on_key_up",   on_key_up);
-	cView.define_method("on_pointer",      on_pointer);
+	cView.define_method("on_pointer",        on_pointer);
 	cView.define_method("on_pointer_down",   on_pointer_down);
 	cView.define_method("on_pointer_up",     on_pointer_up);
 	cView.define_method("on_pointer_move",   on_pointer_move);
 	cView.define_method("on_pointer_cancel", on_pointer_cancel);
-	cView.define_method("on_wheel", on_wheel);
+	cView.define_method("on_wheel",   on_wheel);
 	cView.define_method("on_capture", on_capture);
-	cView.define_method("on_timer", on_timer);
+	cView.define_method("on_timer",   on_timer);
+	cView.define_method(        "will_contact?",     will_contact);
 	cView.define_private_method("call_contact!",       on_contact);
 	cView.define_private_method("call_contact_begin!", on_contact_begin);
 	cView.define_private_method("call_contact_end!",   on_contact_end);

data/include/reflex/ruby/application.h

@@ -10,6 +10,9 @@
 #include <reflex/ruby/event.h>
 
 
+RUCY_DECLARE_WRAPPER_VALUE_FROM_TO(Reflex::Application)
+
+
 namespace Reflex
 {
 
@@ -95,9 +98,6 @@ namespace Reflex
 }// Reflex
 
 
-RUCY_DECLARE_WRAPPER_VALUE_FROM_TO(Reflex::Application)
-
-
 namespace Rucy
 {
 

data/include/reflex/ruby/event.h

@@ -9,6 +9,33 @@
 #include <reflex/event.h>
 
 
+RUCY_DECLARE_VALUE_FROM_TO(Reflex::Event)
+
+RUCY_DECLARE_VALUE_FROM_TO(Reflex::UpdateEvent)
+
+RUCY_DECLARE_VALUE_FROM_TO(Reflex::DrawEvent)
+
+RUCY_DECLARE_VALUE_FROM_TO(Reflex::FrameEvent)
+
+RUCY_DECLARE_VALUE_FROM_TO(Reflex::ScrollEvent)
+
+RUCY_DECLARE_VALUE_FROM_TO(Reflex::FocusEvent)
+
+RUCY_DECLARE_VALUE_FROM_TO(Reflex::KeyEvent)
+
+RUCY_DECLARE_VALUE_FROM_TO(Reflex::PointerEvent)
+
+RUCY_DECLARE_VALUE_FROM_TO(Reflex::WheelEvent)
+
+RUCY_DECLARE_VALUE_FROM_TO(Reflex::CaptureEvent)
+
+RUCY_DECLARE_VALUE_FROM_TO(Reflex::TimerEvent)
+
+RUCY_DECLARE_VALUE_FROM_TO(Reflex::ContactEvent)
+
+RUCY_DECLARE_VALUE_FROM_TO(Reflex::MotionEvent)
+
+
 namespace Reflex
 {
 
@@ -56,33 +83,6 @@ namespace Reflex
 }// Reflex
 
 
-RUCY_DECLARE_VALUE_FROM_TO(Reflex::Event)
-
-RUCY_DECLARE_VALUE_FROM_TO(Reflex::UpdateEvent)
-
-RUCY_DECLARE_VALUE_FROM_TO(Reflex::DrawEvent)
-
-RUCY_DECLARE_VALUE_FROM_TO(Reflex::FrameEvent)
-
-RUCY_DECLARE_VALUE_FROM_TO(Reflex::ScrollEvent)
-
-RUCY_DECLARE_VALUE_FROM_TO(Reflex::FocusEvent)
-
-RUCY_DECLARE_VALUE_FROM_TO(Reflex::KeyEvent)
-
-RUCY_DECLARE_VALUE_FROM_TO(Reflex::PointerEvent)
-
-RUCY_DECLARE_VALUE_FROM_TO(Reflex::WheelEvent)
-
-RUCY_DECLARE_VALUE_FROM_TO(Reflex::CaptureEvent)
-
-RUCY_DECLARE_VALUE_FROM_TO(Reflex::TimerEvent)
-
-RUCY_DECLARE_VALUE_FROM_TO(Reflex::ContactEvent)
-
-RUCY_DECLARE_VALUE_FROM_TO(Reflex::MotionEvent)
-
-
 namespace Rucy
 {
 

data/include/reflex/ruby/filter.h

@@ -11,6 +11,9 @@
 #include <reflex/filter.h>
 
 
+RUCY_DECLARE_WRAPPER_VALUE_FROM_TO(Reflex::Filter)
+
+
 namespace Reflex
 {
 
@@ -42,9 +45,6 @@ namespace Reflex
 }// Reflex
 
 
-RUCY_DECLARE_WRAPPER_VALUE_FROM_TO(Reflex::Filter)
-
-
 namespace Rucy
 {
 

data/include/reflex/ruby/image_view.h

@@ -8,6 +8,9 @@
 #include <reflex/ruby/view.h>
 
 
+RUCY_DECLARE_WRAPPER_VALUE_FROM_TO(Reflex::ImageView)
+
+
 namespace Reflex
 {
 
@@ -19,9 +22,6 @@ namespace Reflex
 }// Reflex
 
 
-RUCY_DECLARE_WRAPPER_VALUE_FROM_TO(Reflex::ImageView)
-
-
 namespace Rucy
 {
 

data/include/reflex/ruby/pointer.h

@@ -9,6 +9,9 @@
 #include <reflex/pointer.h>
 
 
+RUCY_DECLARE_VALUE_FROM_TO(Reflex::Pointer)
+
+
 namespace Reflex
 {
 
@@ -20,9 +23,6 @@ namespace Reflex
 }// Reflex
 
 
-RUCY_DECLARE_VALUE_FROM_TO(Reflex::Pointer)
-
-
 namespace Rucy
 {
 

data/include/reflex/ruby/selector.h

@@ -9,6 +9,9 @@
 #include <reflex/selector.h>
 
 
+RUCY_DECLARE_VALUE_OR_ARRAY_FROM_TO(Reflex::Selector)
+
+
 namespace Reflex
 {
 
@@ -20,9 +23,6 @@ namespace Reflex
 }// Reflex
 
 
-RUCY_DECLARE_VALUE_OR_ARRAY_FROM_TO(Reflex::Selector)
-
-
 namespace Rucy
 {
 

data/include/reflex/ruby/shape.h

@@ -10,6 +10,17 @@
 #include <reflex/ruby/event.h>
 
 
+RUCY_DECLARE_WRAPPER_VALUE_FROM_TO(Reflex::Shape)
+
+RUCY_DECLARE_WRAPPER_VALUE_FROM_TO(Reflex::PolygonShape)
+
+RUCY_DECLARE_WRAPPER_VALUE_FROM_TO(Reflex::LineShape)
+
+RUCY_DECLARE_WRAPPER_VALUE_FROM_TO(Reflex::RectShape)
+
+RUCY_DECLARE_WRAPPER_VALUE_FROM_TO(Reflex::EllipseShape)
+
+
 namespace Reflex
 {
 
@@ -47,6 +58,15 @@ namespace Reflex
 					Super::on_draw(e);
 			}
 
+			virtual bool will_contact (Shape* s)
+			{
+				RUCY_SYM_Q(will_contact);
+				if (this->is_overridable())
+					return this->value.call(will_contact, Rucy::value(s));
+				else
+					return Super::will_contact(s);
+			}
+
 			virtual void on_contact (ContactEvent* e)
 			{
 				RUCY_SYM_B(on_contact);
@@ -80,17 +100,6 @@ namespace Reflex
 }// Reflex
 
 
-RUCY_DECLARE_WRAPPER_VALUE_FROM_TO(Reflex::Shape)
-
-RUCY_DECLARE_WRAPPER_VALUE_FROM_TO(Reflex::PolygonShape)
-
-RUCY_DECLARE_WRAPPER_VALUE_FROM_TO(Reflex::LineShape)
-
-RUCY_DECLARE_WRAPPER_VALUE_FROM_TO(Reflex::RectShape)
-
-RUCY_DECLARE_WRAPPER_VALUE_FROM_TO(Reflex::EllipseShape)
-
-
 namespace Rucy
 {
 

data/include/reflex/ruby/style.h

@@ -9,6 +9,11 @@
 #include <reflex/style.h>
 
 
+RUCY_DECLARE_VALUE_OR_ARRAY_FROM_TO(Reflex::StyleLength)
+
+RUCY_DECLARE_VALUE_FROM_TO(Reflex::Style)
+
+
 namespace Reflex
 {
 
@@ -23,11 +28,6 @@ namespace Reflex
 }// Reflex
 
 
-RUCY_DECLARE_VALUE_OR_ARRAY_FROM_TO(Reflex::StyleLength)
-
-RUCY_DECLARE_VALUE_FROM_TO(Reflex::Style)
-
-
 namespace Rucy
 {
 

data/include/reflex/ruby/timer.h

@@ -9,6 +9,9 @@
 #include <reflex/timer.h>
 
 
+RUCY_DECLARE_WRAPPER_VALUE_FROM_TO(Reflex::Timer)
+
+
 namespace Reflex
 {
 
@@ -42,9 +45,6 @@ namespace Reflex
 }// Reflex
 
 
-RUCY_DECLARE_WRAPPER_VALUE_FROM_TO(Reflex::Timer)
-
-
 namespace Rucy
 {
 

data/include/reflex/ruby/view.h

@@ -10,6 +10,9 @@
 #include <reflex/ruby/event.h>
 
 
+RUCY_DECLARE_WRAPPER_VALUE_FROM_TO(Reflex::View)
+
+
 namespace Reflex
 {
 
@@ -236,6 +239,15 @@ namespace Reflex
 					Super::on_timer(e);
 			}
 
+			virtual bool will_contact (View* v)
+			{
+				RUCY_SYM_Q(will_contact);
+				if (this->is_overridable())
+					return this->value.call(will_contact, Rucy::value(v));
+				else
+					return Super::will_contact(v);
+			}
+
 			virtual void on_contact (ContactEvent* e)
 			{
 				RUCY_SYM_B(on_contact);
@@ -269,9 +281,6 @@ namespace Reflex
 }// Reflex
 
 
-RUCY_DECLARE_WRAPPER_VALUE_FROM_TO(Reflex::View)
-
-
 namespace Rucy
 {
 

data/include/reflex/ruby/window.h

@@ -10,6 +10,9 @@
 #include <reflex/ruby/event.h>
 
 
+RUCY_DECLARE_WRAPPER_VALUE_FROM_TO(Reflex::Window)
+
+
 namespace Reflex
 {
 
@@ -176,9 +179,6 @@ namespace Reflex
 }// Reflex
 
 
-RUCY_DECLARE_WRAPPER_VALUE_FROM_TO(Reflex::Window)
-
-
 namespace Rucy
 {