reflexion 0.1.32 → 0.1.33

data/src/world.cpp

@@ -3,9 +3,9 @@
 
 #include <assert.h>
 #include <memory>
-#include <Box2D/Common/b2Draw.h>
-#include <Box2D/Dynamics/b2World.h>
-#include <Box2D/Dynamics/Contacts/b2Contact.h>
+#include <box2d/b2_draw.h>
+#include <box2d/b2_world.h>
+#include <box2d/b2_contact.h>
 #include "reflex/event.h"
 #include "reflex/exception.h"
 #include "shape.h"
@@ -80,7 +80,7 @@ namespace Reflex
 			}
 
 			void DrawCircle (
-				const b2Vec2& center, float32 radius, const b2Color& color)
+				const b2Vec2& center, float radius, const b2Color& color)
 			{
 				assert(painter);
 
@@ -90,7 +90,7 @@ namespace Reflex
 			}
 
 			void DrawSolidCircle (
-				const b2Vec2& center, float32 radius, const b2Vec2& axis, const b2Color& color)
+				const b2Vec2& center, float radius, const b2Vec2& axis, const b2Color& color)
 			{
 				assert(painter);
 
@@ -109,6 +109,15 @@ namespace Reflex
 				painter->line(to_point(p1, ppm), to_point(p2, ppm));
 			}
 
+			void DrawPoint (const b2Vec2& center, float size, const b2Color& color)
+			{
+				assert(painter);
+
+				painter->set_fill(color.r, color.g, color.b, color.a * 0.5);
+				painter->no_stroke();
+				painter->ellipse(to_point(center, ppm), to_coord(size / 2, ppm));
+			}
+
 			void DrawTransform (const b2Transform& transform)
 			{
 				assert(painter);
@@ -147,11 +156,13 @@ namespace Reflex
 		self->ppm = pixels_per_meter;
 
 		self->b2world.SetContactListener(this);
+		self->b2world.SetContactFilter(this);
 	}
 
 	World::~World ()
 	{
 		self->b2world.SetContactListener(NULL);
+		self->b2world.SetContactFilter(NULL);
 	}
 
 	void
@@ -235,17 +246,37 @@ namespace Reflex
 		if (!self->debug_draw) return;
 
 		self->debug_draw->begin(painter);
-		self->b2world.DrawDebugData();
+		self->b2world.DebugDraw();
 		self->debug_draw->end();
 	}
 
+	bool
+	World::ShouldCollide (b2Fixture* f1, b2Fixture* f2)
+	{
+		Shape* s1 = (Shape*) f1->GetUserData().pointer;
+		Shape* s2 = (Shape*) f2->GetUserData().pointer;
+		if (!s1 || !s2)
+			return false;
+
+		View* v1 = s1->owner();
+		View* v2 = s2->owner();
+		if (!v1 || !v2 || !View_is_active(*v1) || !View_is_active(*v2))
+			return false;
+
+		return
+			s1->will_contact(s2) &&
+			s2->will_contact(s1) &&
+			v1->will_contact(v2) &&
+			v2->will_contact(v1);
+	}
+
 	void
 	World::BeginContact (b2Contact* contact)
 	{
-		Shape* s1 = (Shape*) contact->GetFixtureA()->GetUserData();
+		Shape* s1 = (Shape*) contact->GetFixtureA()->GetUserData().pointer;
 		if (!s1) return;
 
-		Shape* s2 = (Shape*) contact->GetFixtureB()->GetUserData();
+		Shape* s2 = (Shape*) contact->GetFixtureB()->GetUserData().pointer;
 		if (!s2) return;
 
 		if (!View_is_active(*s1->owner()) || !View_is_active(*s2->owner()))
@@ -259,10 +290,10 @@ namespace Reflex
 	void
 	World::EndContact (b2Contact* contact)
 	{
-		Shape* s1 = (Shape*) contact->GetFixtureA()->GetUserData();
+		Shape* s1 = (Shape*) contact->GetFixtureA()->GetUserData().pointer;
 		if (!s1) return;
 
-		Shape* s2 = (Shape*) contact->GetFixtureB()->GetUserData();
+		Shape* s2 = (Shape*) contact->GetFixtureB()->GetUserData().pointer;
 		if (!s2) return;
 
 		if (!View_is_active(*s1->owner()) || !View_is_active(*s2->owner()))

data/src/world.h

@@ -4,8 +4,8 @@
 #define __REFLEX_SRC_WORLD_H__
 
 
-#include <Box2D/Common/b2Math.h>
-#include <Box2D/Dynamics/b2WorldCallbacks.h>
+#include <box2d/b2_math.h>
+#include <box2d/b2_world_callbacks.h>
 #include <xot/noncopyable.h>
 #include <xot/pimpl.h>
 #include <rays/point.h>
@@ -24,7 +24,7 @@ namespace Reflex
 	class Body;
 
 
-	class World : public Xot::NonCopyable, private b2ContactListener
+	class World : public Xot::NonCopyable, private b2ContactFilter, b2ContactListener
 	{
 
 		public:
@@ -64,15 +64,17 @@ namespace Reflex
 
 		protected:
 
-			virtual void BeginContact (b2Contact* contact);
+			virtual bool ShouldCollide (b2Fixture* f1, b2Fixture* f2) override;
 
-			virtual void   EndContact (b2Contact* contact);
+			virtual void BeginContact (b2Contact* contact) override;
+
+			virtual void   EndContact (b2Contact* contact) override;
 
 	};// World
 
 
 	template <typename T>
-	inline float32
+	inline float
 	to_b2coord (T t, float scale)
 	{
 		return t / scale;
@@ -97,7 +99,7 @@ namespace Reflex
 	}
 
 	inline coord
-	to_coord (float32 t, float scale)
+	to_coord (float t, float scale)
 	{
 		return t * scale;
 	}

data/test/helper.rb

@@ -5,10 +5,11 @@
   .map  {|s| File.expand_path "../#{s}/lib", __dir__}
   .each {|s| $:.unshift s if !$:.include?(s) && File.directory?(s)}
 
-require 'test/unit'
 require 'xot/test'
 require 'reflex'
 
+require 'test/unit'
+
 include Xot::Test
 
 

data/test/{test_reflex.rb → test_reflex_init.rb}

@@ -7,13 +7,13 @@ $REFLEX_NOAUTOINIT = true
 require_relative 'helper'
 
 
-class TestReflex < Test::Unit::TestCase
+class TestReflexInit < Test::Unit::TestCase
 
-  def test_init()
+  def test_init!()
     assert_raise(Reflex::ReflexError) {Reflex.fin!}
     assert Reflex.init!
     assert_raise(Reflex::ReflexError) {Reflex.init!}
     assert Reflex.fin!
   end
 
-end# TestReflex
+end# TestReflexInit

data/test/test_shape.rb

@@ -46,26 +46,4 @@ class TestShape < Test::Unit::TestCase
     assert_equal false, s.sensor?
   end
 
-  def test_category()
-    s = shape
-    assert_equal 0b1,    s.category_bits
-    s.category_bits  =  0b1010
-    assert_equal 0b1010, s.category_bits
-    s.category_bits |=  0b100
-    assert_equal 0b1110, s.category_bits
-    s.category_bits &= ~0b10
-    assert_equal 0b1100, s.category_bits
-  end
-
-  def test_collision()
-    s = shape
-    assert_equal 0xffff, s.collision_mask
-    s.collision_mask  =  0b1010
-    assert_equal 0b1010, s.collision_mask
-    s.collision_mask |=  0b100
-    assert_equal 0b1110, s.collision_mask
-    s.collision_mask &= ~0b10
-    assert_equal 0b1100, s.collision_mask
-  end
-
 end# TestShape

data/test/test_view.rb

@@ -285,16 +285,4 @@ class TestView < Test::Unit::TestCase
     assert_equal false, v.sensor?
   end
 
-  def test_category()
-    p, v = view, view
-    p.add v
-    assert_equal [:all], v.category
-  end
-
-  def test_collision()
-    p, v = view, view
-    p.add v
-    #assert_equal [:all], v.collision
-  end
-
 end# TestView

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reflexion
 version: !ruby/object:Gem::Version
-  version: 0.1.32
+  version: 0.1.33
 platform: ruby
 authors:
 - xordog
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-01 00:00:00.000000000 Z
+date: 2023-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xot
@@ -16,56 +16,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.32
+        version: 0.1.33
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.32
+        version: 0.1.33
 - !ruby/object:Gem::Dependency
   name: rucy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.32
+        version: 0.1.33
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.32
+        version: 0.1.33
 - !ruby/object:Gem::Dependency
   name: beeps
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.32
+        version: 0.1.33
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.32
+        version: 0.1.33
 - !ruby/object:Gem::Dependency
   name: rays
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.32
+        version: 0.1.33
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.32
+        version: 0.1.33
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -404,7 +404,7 @@ files:
 - test/test_model_owner.rb
 - test/test_pointer.rb
 - test/test_pointer_event.rb
-- test/test_reflex.rb
+- test/test_reflex_init.rb
 - test/test_scroll_event.rb
 - test/test_selector.rb
 - test/test_shape.rb
@@ -433,7 +433,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.6
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: A Graphical User Interface Tool Kit.
@@ -452,7 +452,7 @@ test_files:
 - test/test_model_owner.rb
 - test/test_pointer.rb
 - test/test_pointer_event.rb
-- test/test_reflex.rb
+- test/test_reflex_init.rb
 - test/test_scroll_event.rb
 - test/test_selector.rb
 - test/test_shape.rb