reflexion 0.1.32 → 0.1.33

data/include/reflex/shape.h

@@ -61,23 +61,17 @@ namespace Reflex
 
 			virtual bool  is_sensor () const;
 
-			virtual void set_category_bits (uint bits);
-
-			virtual uint     category_bits () const;
-
-			virtual void set_collision_mask (uint mask);
-
-			virtual uint     collision_mask () const;
-
 			virtual void on_draw   (DrawEvent* e);
 
 			virtual void on_resize (FrameEvent* e);
 
-			virtual void on_contact       (ContactEvent* e);
+			virtual bool will_contact (Shape* s);
+
+			virtual void   on_contact       (ContactEvent* e);
 
-			virtual void on_contact_begin (ContactEvent* e);
+			virtual void   on_contact_begin (ContactEvent* e);
 
-			virtual void on_contact_end   (ContactEvent* e);
+			virtual void   on_contact_end   (ContactEvent* e);
 
 			struct Data;
 

data/include/reflex/view.h

@@ -284,14 +284,6 @@ namespace Reflex
 
 			virtual bool  is_sensor () const;
 
-			virtual void set_category_bits (uint bits);
-
-			virtual uint     category_bits () const;
-
-			virtual void set_collision_mask (uint mask);
-
-			virtual uint     collision_mask () const;
-
 			virtual void set_linear_velocity (coord x, coord y);
 
 			virtual void set_linear_velocity (const Point& velocity);
@@ -380,11 +372,13 @@ namespace Reflex
 
 			virtual void on_timer (TimerEvent* e);
 
-			virtual void on_contact       (ContactEvent* e);
+			virtual bool will_contact (View* v);
+
+			virtual void   on_contact       (ContactEvent* e);
 
-			virtual void on_contact_begin (ContactEvent* e);
+			virtual void   on_contact_begin (ContactEvent* e);
 
-			virtual void on_contact_end   (ContactEvent* e);
+			virtual void   on_contact_end   (ContactEvent* e);
 
 			virtual operator bool () const;
 

data/lib/reflex/fixture.rb

@@ -12,8 +12,7 @@ module Reflex
 
     include Xot::Setter
 
-    universal_accessor :density, :friction, :restitution,
-      :sensor, :category, :collision
+    universal_accessor :density, :friction, :restitution, :sensor
 
   end# Fixture
 

data/lib/reflex/shape.rb

@@ -18,11 +18,11 @@ module Reflex
     include HasFrame
     include HasTags
 
+    alias view    owner
     alias sensor? sensor
 
     universal_accessor :name, :selector,
-      :density, :friction, :restitution, :sensor,
-      :category_bits, :collision_mask
+      :density, :friction, :restitution, :sensor
 
     def initialize(options = nil, &block)
       super()

data/lib/reflex/view.rb

@@ -100,26 +100,6 @@ module Reflex
       to_enum :each_shape
     end
 
-    def categories()
-      @categories ||= Xot::BitFlag.new(auto: true, all: 1)
-    end
-
-    def category=(*symbols)
-      set_category_bits parent_categories.symbols2bits(*symbols)
-    end
-
-    def category()
-      parent_categories.bits2symbols get_category_bits
-    end
-
-    def collision=(*categories)
-      set_collision_mask parent_categories.symbols2bits(*categories)
-    end
-
-    def collision()
-      parent_categories.bits2symbols get_collision_mask
-    end
-
     def capturing?(*args)
       cap = capture
       args.all? {|type| cap.include? type}
@@ -135,7 +115,7 @@ module Reflex
     end
 
     universal_accessor :shape, :name, :selector, :frame, :angle, :zoom, :capture,
-      :density, :friction, :restitution, :category, :collision,
+      :density, :friction, :restitution,
       :linear_velocity, :angular_velocity, :gravity_scale,
       :gravity, :time_scale,
       clip:          {reader: :clip?},
@@ -161,13 +141,6 @@ module Reflex
       include ModelView
     end
 
-    protected
-
-      def parent_categories()
-        raise InvalidStateError unless parent
-        parent.categories
-      end
-
     private
 
       def on_contact!(*args)

data/reflex.gemspec

@@ -28,10 +28,10 @@ Gem::Specification.new do |s|
   s.platform              = Gem::Platform::RUBY
   s.required_ruby_version = '>= 2.7.0'
 
-  s.add_runtime_dependency 'xot',   '~> 0.1.32'
-  s.add_runtime_dependency 'rucy',  '~> 0.1.32'
-  s.add_runtime_dependency 'beeps', '~> 0.1.32'
-  s.add_runtime_dependency 'rays',  '~> 0.1.32'
+  s.add_runtime_dependency 'xot',   '~> 0.1.33'
+  s.add_runtime_dependency 'rucy',  '~> 0.1.33'
+  s.add_runtime_dependency 'beeps', '~> 0.1.33'
+  s.add_runtime_dependency 'rays',  '~> 0.1.33'
 
   s.add_development_dependency 'rake'
   s.add_development_dependency 'test-unit'

data/samples/reflexion/breakout.rb

@@ -8,7 +8,7 @@
 require 'reflexion/include'
 
 
-$hit, $bang = [880, 440].map {|n| Sound.new SineWave.new(freq: n), 0.1}
+$hit, $bang = [880, 440].map {|n| Sound.new Oscillator.new(freq: n), 0.1}
 
 def add_shape (klass: RectShape, frame: [0, 0, 100, 100], color: :white, type: :static)
   window.add View.new {

data/src/body.cpp

@@ -2,8 +2,8 @@
 
 
 #include <assert.h>
-#include <Box2D/Dynamics/b2Body.h>
-#include <Box2D/Dynamics/b2World.h>
+#include <box2d/b2_body.h>
+#include <box2d/b2_world.h>
 #include <xot/util.h>
 #include "reflex/exception.h"
 #include "world.h"

data/src/fixture.cpp

@@ -2,8 +2,8 @@
 
 
 #include <assert.h>
-#include <Box2D/Dynamics/b2Fixture.h>
-#include <Box2D/Collision/Shapes/b2CircleShape.h>
+#include <box2d/b2_fixture.h>
+#include <box2d/b2_circle_shape.h>
 #include "reflex/exception.h"
 #include "reflex/debug.h"
 #include "view.h"
@@ -27,12 +27,12 @@ namespace Reflex
 		if (!b2fixture)
 			system_error(__FILE__, __LINE__);
 
-		b2fixture->SetUserData(userdata);
+		b2fixture->GetUserData().pointer = (uintptr_t) userdata;
 	}
 
 	Fixture::~Fixture ()
 	{
-		b2fixture->SetUserData(NULL);
+		b2fixture->GetUserData().pointer = (uintptr_t) NULL;
 		b2fixture->GetBody()->DestroyFixture(b2fixture);
 	}
 
@@ -102,58 +102,6 @@ namespace Reflex
 		return b2fixture->IsSensor();
 	}
 
-	void
-	Fixture::set_category_bits (uint bits)
-	{
-		if (bits > USHRT_MAX)
-		{
-			argument_error(
-				__FILE__, __LINE__, "category_bits must be less then USHRT_MAX.");
-		}
-
-		if (bits == category_bits())
-			return;
-
-		for (Fixture* p = this; p; p = p->pnext.get())
-		{
-			b2Filter f = p->b2fixture->GetFilterData();
-			f.categoryBits = bits;
-			p->b2fixture->SetFilterData(f);
-		}
-	}
-
-	uint
-	Fixture::category_bits () const
-	{
-		return b2fixture->GetFilterData().categoryBits;
-	}
-
-	void
-	Fixture::set_collision_mask (uint mask)
-	{
-		if (mask > USHRT_MAX)
-		{
-			argument_error(
-				__FILE__, __LINE__, "collision_mask must be less then USHRT_MAX.");
-		}
-
-		if (mask == collision_mask())
-			return;
-
-		for (Fixture* p = this; p; p = p->pnext.get())
-		{
-			b2Filter f = b2fixture->GetFilterData();
-			f.maskBits = mask;
-			b2fixture->SetFilterData(f);
-		}
-	}
-
-	uint
-	Fixture::collision_mask () const
-	{
-		return b2fixture->GetFilterData().maskBits;
-	}
-
 	b2Fixture*
 	Fixture::b2ptr ()
 	{
@@ -194,12 +142,10 @@ namespace Reflex
 		if (!to)
 			return;
 
-		to->set_density(       from.density());
-		to->set_friction(      from.friction());
-		to->set_restitution(   from.restitution());
-		to->set_sensor(        from.is_sensor());
-		to->set_category_bits( from.category_bits());
-		to->set_collision_mask(from.collision_mask());
+		to->set_density(    from.density());
+		to->set_friction(   from.friction());
+		to->set_restitution(from.restitution());
+		to->set_sensor(     from.is_sensor());
 	}
 
 	static Body*

data/src/fixture.h

@@ -45,14 +45,6 @@ namespace Reflex
 
 			bool  is_sensor () const;
 
-			void set_category_bits (uint bits);
-
-			uint     category_bits () const;
-
-			void set_collision_mask (uint mask);
-
-			uint     collision_mask () const;
-
 			      b2Fixture* b2ptr ();
 
 			const b2Fixture* b2ptr () const;

data/src/shape.cpp

@@ -1,12 +1,12 @@
 #include "shape.h"
 
 
-#include <Box2D/Dynamics/b2Body.h>
-#include <Box2D/Dynamics/b2Fixture.h>
-#include <Box2D/Collision/Shapes/b2CircleShape.h>
-#include <Box2D/Collision/Shapes/b2EdgeShape.h>
-#include <Box2D/Collision/Shapes/b2ChainShape.h>
-#include <Box2D/Collision/Shapes/b2PolygonShape.h>
+#include <box2d/b2_body.h>
+#include <box2d/b2_fixture.h>
+#include <box2d/b2_circle_shape.h>
+#include <box2d/b2_edge_shape.h>
+#include <box2d/b2_chain_shape.h>
+#include <box2d/b2_polygon_shape.h>
 #include <rays/polygon.h>
 #include "reflex/exception.h"
 #include "reflex/debug.h"
@@ -209,9 +209,15 @@ namespace Reflex
 
 		b2ChainShape b2shape;
 		if (polyline.loop())
-			b2shape.CreateLoop( &(*buffer)[0], (int32) buffer->size());
+			b2shape.CreateLoop(&(*buffer)[0], (int32) buffer->size());
 		else
-			b2shape.CreateChain(&(*buffer)[0], (int32) buffer->size());
+		{
+			b2shape.CreateChain(
+				&(*buffer)[0],
+				(int32) buffer->size(),
+				(*buffer)[0],
+				(*buffer)[buffer->size() - 1]);
+		}
 
 		builder->add(&b2shape);
 	}
@@ -239,7 +245,7 @@ namespace Reflex
 
 			UPDATE_POLYGON = Xot::bit(0),
 
-			DEFAULT_FLAGS  = 0
+			DEFAULT_FLAGS  = UPDATE_POLYGON
 
 		};// Flags
 
@@ -269,7 +275,7 @@ namespace Reflex
 			else
 				pframe.reset(new Bounds(frame));
 
-			update_polygon_on_next_update();
+			update_polygon_later();
 		}
 
 		virtual Bounds get_frame () const
@@ -287,7 +293,7 @@ namespace Reflex
 			return (bool) pframe;
 		}
 
-		void update_polygon_on_next_update ()
+		void update_polygon_later ()
 		{
 			if (!owner) return;
 
@@ -299,6 +305,9 @@ namespace Reflex
 		{
 			assert(shape);
 
+			bool update = Xot::check_and_remove_flag(&flags, UPDATE_POLYGON);
+			if (!update && !force) return;
+
 			if (!owner || !View_is_active(*owner))
 				polygon = Polygon();
 			else
@@ -364,6 +373,10 @@ namespace Reflex
 			if (!owner)
 				invalid_state_error(__FILE__, __LINE__);
 
+			// if the view has been added to the window but on_update() has not yet
+			// been called, update_polygon() has also never been called.
+			update_polygon(shape);
+
 			Polygon polygon = get_polygon_for_fixtures();
 			if (!polygon || polygon.empty())
 				return NULL;
@@ -424,11 +437,7 @@ namespace Reflex
 		if (!shape)
 			argument_error(__FILE__, __LINE__);
 
-		bool update = Xot::check_and_remove_flag(
-			&shape->self->flags, Shape::Data::UPDATE_POLYGON);
-
-		if (update || force)
-			shape->self->update_polygon(shape, force);
+		shape->self->update_polygon(shape, force);
 	}
 
 	void
@@ -552,36 +561,6 @@ namespace Reflex
 		return f ? f->is_sensor() : false;
 	}
 
-	void
-	Shape::set_category_bits (uint bits)
-	{
-		if (bits == category_bits()) return;
-
-		self->fixtures(this).set_category_bits(bits);
-	}
-
-	uint
-	Shape::category_bits () const
-	{
-		const Fixture* f = self->pfixtures.get();
-		return f ? f->category_bits() : 0x1;
-	}
-
-	void
-	Shape::set_collision_mask (uint mask)
-	{
-		if (mask == collision_mask()) return;
-
-		self->fixtures(this).set_collision_mask(mask);
-	}
-
-	uint
-	Shape::collision_mask () const
-	{
-		const Fixture* f = self->pfixtures.get();
-		return f ? f->collision_mask() : 0xffff;
-	}
-
 	void
 	Shape::on_draw (DrawEvent* e)
 	{
@@ -594,7 +573,13 @@ namespace Reflex
 	Shape::on_resize (FrameEvent* e)
 	{
 		if (!self->has_frame())
-			self->update_polygon_on_next_update();
+			self->update_polygon_later();
+	}
+
+	bool
+	Shape::will_contact (Shape* s)
+	{
+		return true;
 	}
 
 	void
@@ -695,7 +680,7 @@ namespace Reflex
 	{
 		get_data(*this).polygon = polygon;
 
-		self->update_polygon_on_next_update();
+		self->update_polygon_later();
 	}
 
 	const Polygon&
@@ -771,7 +756,7 @@ namespace Reflex
 	{
 		get_data(*this).points.emplace_back(point);
 
-		self->update_polygon_on_next_update();
+		self->update_polygon_later();
 	}
 
 	void
@@ -780,7 +765,7 @@ namespace Reflex
 		auto& array = get_data(*this).points;
 		array.insert(array.end(), points, points + size);
 
-		self->update_polygon_on_next_update();
+		self->update_polygon_later();
 	}
 
 	void
@@ -875,7 +860,7 @@ namespace Reflex
 		data.round_left_bottom  = left_bottom;
 		data.round_right_bottom = right_bottom;
 
-		self->update_polygon_on_next_update();
+		self->update_polygon_later();
 	}
 
 	void
@@ -883,7 +868,7 @@ namespace Reflex
 	{
 		get_data(*this).round_left_top = round;
 
-		self->update_polygon_on_next_update();
+		self->update_polygon_later();
 	}
 
 	coord
@@ -897,7 +882,7 @@ namespace Reflex
 	{
 		get_data(*this).round_right_top = round;
 
-		self->update_polygon_on_next_update();
+		self->update_polygon_later();
 	}
 
 	coord
@@ -911,7 +896,7 @@ namespace Reflex
 	{
 		get_data(*this).round_left_bottom = round;
 
-		self->update_polygon_on_next_update();
+		self->update_polygon_later();
 	}
 
 	coord
@@ -925,7 +910,7 @@ namespace Reflex
 	{
 		get_data(*this).round_right_bottom = round;
 
-		self->update_polygon_on_next_update();
+		self->update_polygon_later();
 	}
 
 	coord
@@ -939,7 +924,7 @@ namespace Reflex
 	{
 		get_data(*this).nsegment = nsegment;
 
-		self->update_polygon_on_next_update();
+		self->update_polygon_later();
 	}
 
 	uint
@@ -1054,7 +1039,7 @@ namespace Reflex
 	{
 		get_data(*this).hole_size.reset(width, height);
 
-		self->update_polygon_on_next_update();
+		self->update_polygon_later();
 	}
 
 	void
@@ -1074,7 +1059,7 @@ namespace Reflex
 	{
 		get_data(*this).angle_from = degree;
 
-		self->update_polygon_on_next_update();
+		self->update_polygon_later();
 	}
 
 	float
@@ -1088,7 +1073,7 @@ namespace Reflex
 	{
 		get_data(*this).angle_to = degree;
 
-		self->update_polygon_on_next_update();
+		self->update_polygon_later();
 	}
 
 	float
@@ -1102,7 +1087,7 @@ namespace Reflex
 	{
 		get_data(*this).nsegment = num_of_segments;
 
-		self->update_polygon_on_next_update();
+		self->update_polygon_later();
 	}
 
 	uint

data/src/view.cpp

@@ -2322,40 +2322,6 @@ namespace Reflex
 		return s ? s->is_sensor() : false;
 	}
 
-	void
-	View::set_category_bits (uint bits)
-	{
-		Shape* s = shape();
-		if (!s)
-			invalid_state_error(__FILE__, __LINE__, "view has no shape.");
-
-		s->set_category_bits(bits);
-	}
-
-	uint
-	View::category_bits () const
-	{
-		const Shape* s = self->pshape.get();
-		return s ? s->category_bits() : 0x1;
-	}
-
-	void
-	View::set_collision_mask (uint mask)
-	{
-		Shape* s = shape();
-		if (!s)
-			invalid_state_error(__FILE__, __LINE__, "view has no shape.");
-
-		s->set_collision_mask(mask);
-	}
-
-	uint
-	View::collision_mask () const
-	{
-		const Shape* s = self->pshape.get();
-		return s ? s->collision_mask() : 0xffff;
-	}
-
 	void
 	View::set_linear_velocity (coord x, coord y)
 	{
@@ -2613,6 +2579,12 @@ namespace Reflex
 	{
 	}
 
+	bool
+	View::will_contact (View* v)
+	{
+		return true;
+	}
+
 	void
 	View::on_contact (ContactEvent* e)
 	{