reflexion 0.1.8 → 0.1.9

data/src/world.cpp

@@ -7,6 +7,9 @@
 #include <Box2D/Common/b2Draw.h>
 #include "xot/util.h"
 #include "reflex/body.h"
+#include "reflex/view.h"
+#include "reflex/event.h"
+#include "reflex/exception.h"
 
 
 namespace Reflex
@@ -18,10 +21,15 @@ namespace Reflex
 
 		public:
 
-			DebugDraw (float scale)
-			:	scale(scale), painter(NULL)
+			DebugDraw (float ppm)
+			:	ppm(ppm), painter(NULL)
 			{
-				SetFlags(e_shapeBit);
+				SetFlags(
+					e_shapeBit |
+					e_jointBit |
+					//e_aabbBit  |
+					e_pairBit  |
+					e_centerOfMassBit);
 			}
 
 			void begin (Painter* painter)
@@ -46,7 +54,7 @@ namespace Reflex
 
 				boost::scoped_array<Coord2> points(new Coord2[vertexCount]);
 				for (int i = 0; i < vertexCount; ++i)
-					points[i] = to_coord2(vertices[i], scale);
+					points[i] = to_coord2(vertices[i], ppm);
 
 				painter->polygon(&points[0], vertexCount);
 			}
@@ -61,7 +69,7 @@ namespace Reflex
 
 				boost::scoped_array<Coord2> points(new Coord2[vertexCount]);
 				for (int i = 0; i < vertexCount; ++i)
-					points[i] = to_coord2(vertices[i], scale);
+					points[i] = to_coord2(vertices[i], ppm);
 
 				painter->polygon(&points[0], vertexCount);
 			}
@@ -73,7 +81,7 @@ namespace Reflex
 
 				painter->no_fill();
 				painter->set_stroke(color.r, color.g, color.b, color.a * 0.5);
-				painter->ellipse(Point(center.x * scale, center.y * scale), radius * scale);
+				painter->ellipse(to_point(center, ppm), to_coord(radius, ppm));
 			}
 
 			void DrawSolidCircle (
@@ -83,7 +91,7 @@ namespace Reflex
 
 				painter->set_fill(color.r, color.g, color.b, color.a * 0.5);
 				painter->no_stroke();
-				painter->ellipse(Point(center.x * scale, center.y * scale), radius * scale);
+				painter->ellipse(to_point(center, ppm), to_coord(radius, ppm));
 			}
 
 			void DrawSegment (
@@ -93,7 +101,7 @@ namespace Reflex
 
 				painter->no_fill();
 				painter->set_stroke(color.r, color.g, color.b, color.a * 0.5);
-				painter->line(p1.x * scale, p1.y * scale, p2.x * scale, p2.y * scale);
+				painter->line(to_point(p1, ppm), to_point(p2, ppm));
 			}
 
 			void DrawTransform (const b2Transform& transform)
@@ -103,17 +111,19 @@ namespace Reflex
 
 		private:
 
-			float scale;
+			float ppm;
 
 			Painter* painter;
 
 	};// DebugDraw
 
 
-	World::World (float scale)
-	:	world(b2Vec2(0, 0)), scale(scale), wall(NULL), debug_draw(NULL)
+	World::World (View* owner, float pixels_per_meter)
+	:	world(b2Vec2(0, 0)), ppm(pixels_per_meter), last_step(0), wall_(NULL),
+		debug_draw(NULL)
 	{
-		wall = create_body();
+		world.SetContactListener(this);
+		wall_ = create_body(owner);
 	}
 
 	World::~World ()
@@ -124,38 +134,58 @@ namespace Reflex
 	void
 	World::step (float dt)
 	{
-		world.Step(dt, 6, 2);
+		static const double DT = 1. / 60.;
+
+		dt       += last_step;
+		last_step = fmod(dt, DT);
+
+		int count = (int) (dt / DT);
+		for (int i = 0; i < count; ++i)
+			world.Step(DT, 8, 4);
 	}
 
 	Body*
-	World::create_body (const Point& position, float degree)
+	World::create_body (View* owner, const Point& position, float degree)
 	{
+		if (!owner)
+			argument_error(__FILE__, __LINE__);
+
+		if (world.IsLocked())
+			invalid_state_error(__FILE__, __LINE__);
+
 		b2BodyDef def;
-		def.position = to_box2d(position, scale);
+		def.position = to_b2vec2(position, ppm);
 		def.angle    = Xot::deg2rad(degree);
-		return new Body(world.CreateBody(&def), scale);
+		b2Body* body = world.CreateBody(&def);
+		body->SetUserData(owner);
+		return new Body(body, ppm);
 	}
 
 	void
 	World::destroy_body (Body* body)
 	{
-		world.DestroyBody((b2Body*) body->handle);
+		if (!body)
+			argument_error(__FILE__, __LINE__);
+
+		b2Body* b = (b2Body*) body->handle;
+		if (!b || world.IsLocked())
+			invalid_state_error(__FILE__, __LINE__);
+
+		world.DestroyBody(b);
 	}
 
 	void
 	World::resize (coord width, coord height)
 	{
-		wall->clear_fixtures();
+		wall_->clear_fixtures();
 
-		coord w = width  / scale;
-		coord h = height / scale;
 		const Point points[] = {
-			Point(0, 0),
-			Point(0, h),
-			Point(w, h),
-			Point(w, 0),
+			Point(0,     0),
+			Point(0,     height),
+			Point(width, height),
+			Point(width, 0),
 		};
-		wall->add_edge(points, 4, true);
+		wall_->add_edge(points, 4, true);
 	}
 
 	void
@@ -168,25 +198,43 @@ namespace Reflex
 		debug_draw->end();
 	}
 
+	float
+	World::meter2pixel (float meter) const
+	{
+		return meter * ppm;
+	}
+
 	void
 	World::set_gravity (const Point& gravity)
 	{
-		world.SetGravity(to_box2d(gravity, scale));
+		world.SetGravity(to_b2vec2(gravity, ppm));
 	}
 
 	Point
 	World::gravity () const
 	{
-		return to_point(world.GetGravity(), scale);
+		return to_point(world.GetGravity(), ppm);
+	}
+
+	Body*
+	World::wall ()
+	{
+		return wall_;
+	}
+
+	const Body*
+	World::wall () const
+	{
+		return const_cast<World*>(this)->wall();
 	}
 
 	void
 	World::set_debug (bool state)
 	{
-		if (state == is_debug()) return;
+		if (state == debugging()) return;
 
 		if (!debug_draw)
-			debug_draw = new DebugDraw(scale);
+			debug_draw = new DebugDraw(ppm);
 		else
 		{
 			delete debug_draw;
@@ -197,10 +245,42 @@ namespace Reflex
 	}
 
 	bool
-	World::is_debug () const
+	World::debugging () const
 	{
 		return debug_draw;
 	}
 
+	void
+	World::BeginContact (b2Contact* contact)
+	{
+		View* v1 = (View*) contact->GetFixtureA()->GetBody()->GetUserData();
+		if (!v1) return;
+
+		View* v2 = (View*) contact->GetFixtureB()->GetBody()->GetUserData();
+		if (!v2) return;
+
+		ContactEvent e1(ContactEvent::BEGIN, v2);
+		v1->on_contact(&e1);
+
+		ContactEvent e2(ContactEvent::BEGIN, v1);
+		v2->on_contact(&e2);
+	}
+
+	void
+	World::EndContact (b2Contact* contact)
+	{
+		View* v1 = (View*) contact->GetFixtureA()->GetBody()->GetUserData();
+		if (!v1) return;
+
+		View* v2 = (View*) contact->GetFixtureB()->GetBody()->GetUserData();
+		if (!v2) return;
+
+		ContactEvent e1(ContactEvent::END, v2);
+		v1->on_contact(&e1);
+
+		ContactEvent e2(ContactEvent::END, v1);
+		v2->on_contact(&e2);
+	}
+
 
 }// Reflex

data/src/world.h

@@ -6,6 +6,8 @@
 
 #include <boost/noncopyable.hpp>
 #include <Box2D/Dynamics/b2World.h>
+#include <Box2D/Dynamics/b2WorldCallbacks.h>
+#include <Box2D/Dynamics/Contacts/b2Contact.h>
 #include <reflex/defs.h>
 #include <reflex/point.h>
 #include <reflex/painter.h>
@@ -15,23 +17,25 @@ namespace Reflex
 {
 
 
+	class View;
+
 	class Body;
 
 	class DebugDraw;
 
 
-	class World : public boost::noncopyable
+	class World : public boost::noncopyable, private b2ContactListener
 	{
 
 		public:
 
-			World (float scale = 100);
+			World (View* owner, float pixels_per_meter = 100);
 
 			~World ();
 
 			void step (float dt);
 
-			Body* create_body (const Point& position = 0, float degree = 0);
+			Body* create_body (View* owner, const Point& position = 0, float degree = 0);
 
 			void destroy_body (Body* body);
 
@@ -39,21 +43,33 @@ namespace Reflex
 
 			void draw (Painter* painter);
 
+			float meter2pixel (float meter = 1) const;
+
 			void set_gravity (const Point& gravity);
 
 			Point    gravity () const;
 
 			void set_debug (bool state = true);
 
-			bool  is_debug () const;
+			bool     debugging () const;
+
+			      Body* wall ();
+
+			const Body* wall () const;
+
+		protected:
+
+			void BeginContact (b2Contact* contact);
+
+			void EndContact   (b2Contact* contact);
 
 		private:
 
 			b2World world;
 
-			float scale;
+			float ppm, last_step;
 
-			Body* wall;
+			Body* wall_;
 
 			DebugDraw* debug_draw;
 
@@ -61,32 +77,63 @@ namespace Reflex
 
 
 	template <typename T>
+	inline float32
+	to_b2coord (T t, float scale)
+	{
+		return t / scale;
+	}
+
+	template <typename T>
+	inline b2Vec2
+	to_b2vec2 (T x, T y, float scale)
+	{
+		return b2Vec2(
+			to_b2coord(x, scale),
+			to_b2coord(y, scale));
+	}
+
+	template <typename VEC>
 	inline b2Vec2
-	to_box2d (const T& t, float scale)
+	to_b2vec2 (const VEC& v, float scale)
+	{
+		return b2Vec2(
+			to_b2coord(v.x, scale),
+			to_b2coord(v.y, scale));
+	}
+
+
+	inline coord
+	to_coord (float32 t, float scale)
 	{
-		return b2Vec2(t.x / scale, t.y / scale);
+		return t * scale;
 	}
 
 	inline Coord2
-	to_coord2 (const b2Vec2& vec, float scale)
+	to_coord2 (const b2Vec2& v, float scale)
 	{
 		Coord2 c;
-		c.reset(vec.x * scale, vec.y * scale);
+		c.reset(
+			to_coord(v.x, scale),
+			to_coord(v.y, scale));
 		return c;
 	}
 
 	inline Coord3
-	to_coord3 (const b2Vec2& vec, float scale)
+	to_coord3 (const b2Vec2& v, float scale)
 	{
 		Coord3 c;
-		c.reset(vec.x * scale, vec.y * scale);
+		c.reset(
+			to_coord(v.x, scale),
+			to_coord(v.y, scale));
 		return c;
 	}
 
 	inline Point
-	to_point (const b2Vec2& vec, float scale)
+	to_point (const b2Vec2& v, float scale)
 	{
-		return Point(vec.x * scale, vec.y * scale);
+		return Point(
+			to_coord(v.x, scale),
+			to_coord(v.y, scale));
 	}
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reflexion
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - snori
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-24 00:00:00.000000000 Z
+date: 2014-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -87,9 +87,12 @@ extensions:
 - Rakefile
 extra_rdoc_files:
 - ".doc/ext/reflex/application.cpp"
+- ".doc/ext/reflex/arc_shape.cpp"
 - ".doc/ext/reflex/body.cpp"
 - ".doc/ext/reflex/capture_event.cpp"
+- ".doc/ext/reflex/contact_event.cpp"
 - ".doc/ext/reflex/draw_event.cpp"
+- ".doc/ext/reflex/ellipse_shape.cpp"
 - ".doc/ext/reflex/event.cpp"
 - ".doc/ext/reflex/fixture.cpp"
 - ".doc/ext/reflex/focus_event.cpp"
@@ -98,9 +101,11 @@ extra_rdoc_files:
 - ".doc/ext/reflex/key_event.cpp"
 - ".doc/ext/reflex/native.cpp"
 - ".doc/ext/reflex/pointer_event.cpp"
+- ".doc/ext/reflex/rect_shape.cpp"
 - ".doc/ext/reflex/reflex.cpp"
 - ".doc/ext/reflex/scroll_event.cpp"
 - ".doc/ext/reflex/selector.cpp"
+- ".doc/ext/reflex/shape_view.cpp"
 - ".doc/ext/reflex/style.cpp"
 - ".doc/ext/reflex/style_length.cpp"
 - ".doc/ext/reflex/style_length2.cpp"
@@ -114,10 +119,13 @@ files:
 - Rakefile
 - VERSION
 - ext/reflex/application.cpp
+- ext/reflex/arc_shape.cpp
 - ext/reflex/body.cpp
 - ext/reflex/capture_event.cpp
+- ext/reflex/contact_event.cpp
 - ext/reflex/defs.h
 - ext/reflex/draw_event.cpp
+- ext/reflex/ellipse_shape.cpp
 - ext/reflex/event.cpp
 - ext/reflex/extconf.rb
 - ext/reflex/fixture.cpp
@@ -127,9 +135,11 @@ files:
 - ext/reflex/key_event.cpp
 - ext/reflex/native.cpp
 - ext/reflex/pointer_event.cpp
+- ext/reflex/rect_shape.cpp
 - ext/reflex/reflex.cpp
 - ext/reflex/scroll_event.cpp
 - ext/reflex/selector.cpp
+- ext/reflex/shape_view.cpp
 - ext/reflex/style.cpp
 - ext/reflex/style_length.cpp
 - ext/reflex/style_length2.cpp
@@ -164,12 +174,14 @@ files:
 - include/reflex/ruby/image_view.h
 - include/reflex/ruby/reflex.h
 - include/reflex/ruby/selector.h
+- include/reflex/ruby/shape_view.h
 - include/reflex/ruby/style.h
 - include/reflex/ruby/style_length.h
 - include/reflex/ruby/view.h
 - include/reflex/ruby/window.h
 - include/reflex/selector.h
 - include/reflex/shader.h
+- include/reflex/shape_view.h
 - include/reflex/style.h
 - include/reflex/style_length.h
 - include/reflex/texture.h
@@ -177,7 +189,6 @@ files:
 - include/reflex/window.h
 - lib/reflex.rb
 - lib/reflex/application.rb
-- lib/reflex/arc_shape.rb
 - lib/reflex/autoinit.rb
 - lib/reflex/bitmap.rb
 - lib/reflex/body.rb
@@ -186,8 +197,8 @@ files:
 - lib/reflex/capture_event.rb
 - lib/reflex/color.rb
 - lib/reflex/color_space.rb
+- lib/reflex/contact_event.rb
 - lib/reflex/draw_event.rb
-- lib/reflex/ellipse_shape.rb
 - lib/reflex/ext.rb
 - lib/reflex/fixture.rb
 - lib/reflex/flags.rb
@@ -198,7 +209,6 @@ files:
 - lib/reflex/image.rb
 - lib/reflex/image_view.rb
 - lib/reflex/key_event.rb
-- lib/reflex/line_shape.rb
 - lib/reflex/list_view.rb
 - lib/reflex/model.rb
 - lib/reflex/model_owner.rb
@@ -207,12 +217,11 @@ files:
 - lib/reflex/painter.rb
 - lib/reflex/point.rb
 - lib/reflex/pointer_event.rb
-- lib/reflex/rect_shape.rb
 - lib/reflex/reflex.rb
 - lib/reflex/scroll_event.rb
 - lib/reflex/selector.rb
 - lib/reflex/shader.rb
-- lib/reflex/shape.rb
+- lib/reflex/shape_view.rb
 - lib/reflex/style.rb
 - lib/reflex/style_length.rb
 - lib/reflex/style_length2.rb
@@ -252,8 +261,10 @@ files:
 - samples/osx/hello/hello/hello-Prefix.pch
 - samples/osx/hello/hello/main.cpp
 - samples/physics.rb
+- samples/reflexion/breakout.rb
 - samples/reflexion/hello.rb
 - samples/reflexion/paint.rb
+- samples/reflexion/physics.rb
 - samples/reflexion/pulse.rb
 - samples/repl.rb
 - samples/shader.rb
@@ -387,6 +398,7 @@ files:
 - src/physics/Box2D/Rope/b2Rope.cpp
 - src/physics/Box2D/Rope/b2Rope.h
 - src/selector.cpp
+- src/shape_view.cpp
 - src/style.cpp
 - src/style_length.cpp
 - src/view.cpp
@@ -417,9 +429,12 @@ files:
 - test/test_view.rb
 - test/test_window.rb
 - ".doc/ext/reflex/application.cpp"
+- ".doc/ext/reflex/arc_shape.cpp"
 - ".doc/ext/reflex/body.cpp"
 - ".doc/ext/reflex/capture_event.cpp"
+- ".doc/ext/reflex/contact_event.cpp"
 - ".doc/ext/reflex/draw_event.cpp"
+- ".doc/ext/reflex/ellipse_shape.cpp"
 - ".doc/ext/reflex/event.cpp"
 - ".doc/ext/reflex/fixture.cpp"
 - ".doc/ext/reflex/focus_event.cpp"
@@ -428,9 +443,11 @@ files:
 - ".doc/ext/reflex/key_event.cpp"
 - ".doc/ext/reflex/native.cpp"
 - ".doc/ext/reflex/pointer_event.cpp"
+- ".doc/ext/reflex/rect_shape.cpp"
 - ".doc/ext/reflex/reflex.cpp"
 - ".doc/ext/reflex/scroll_event.cpp"
 - ".doc/ext/reflex/selector.cpp"
+- ".doc/ext/reflex/shape_view.cpp"
 - ".doc/ext/reflex/style.cpp"
 - ".doc/ext/reflex/style_length.cpp"
 - ".doc/ext/reflex/style_length2.cpp"

data/lib/reflex/arc_shape.rb

@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-
-
-require 'reflex/shape'
-
-
-module Reflex
-
-
-  class ArcShape < Shape
-
-    def on_draw (e)
-      p, b = e.painter, e.bounds
-      attach_color_and_border(p) {p.arc b}
-    end
-
-  end# ArcShape
-
-
-end# Reflex

data/lib/reflex/ellipse_shape.rb

@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-
-
-require 'reflex/shape'
-
-
-module Reflex
-
-
-  class EllipseShape < Shape
-
-    def on_draw (e)
-      p, b = e.painter, e.bounds
-      attach_color_and_border(p) {p.ellipse b}
-    end
-
-  end# EllipseShape
-
-
-end# Reflex

data/lib/reflex/line_shape.rb

@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-
-
-require 'reflex/shape'
-
-
-module Reflex
-
-
-  class LineShape < Shape
-
-    def on_draw (e)
-      p, b = e.painter, e.bounds
-      attach_color_and_border(p) {p.line b.lt, b.rb}
-    end
-
-  end# LineShape
-
-
-end# Reflex

data/lib/reflex/rect_shape.rb

@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-
-
-require 'reflex/shape'
-
-
-module Reflex
-
-
-  class RectShape < Shape
-
-    def on_draw (e)
-      p, b = e.painter, e.bounds
-      attach_color_and_border(p) {p.rect b}
-    end
-
-  end# RectShape
-
-
-end# Reflex

data/lib/reflex/shape.rb

@@ -1,34 +0,0 @@
-# -*- coding: utf-8 -*-
-
-
-require 'reflex/view'
-
-
-module Reflex
-
-
-  class Shape < View
-
-    attr_accessor :color, :border
-
-    def initialize (*args, &block)
-      @color  = :white
-      @border = :none
-      super
-    end
-
-    private
-
-      def attach_color_and_border (painter, &block)
-        fill, stroke = painter.color @color, @border
-        if block
-          block.call
-          painter.color fill, stroke
-        end
-        return fill, stroke
-      end
-
-  end# Shape
-
-
-end# Reflex