reflexion 0.1.7 → 0.1.8

data/samples/physics.rb

@@ -0,0 +1,37 @@
+# -*- coding: utf-8 -*-
+
+
+%w[xot rays reflex]
+  .map  {|s| File.expand_path "../../../#{s}/lib", __FILE__}
+  .each {|s| $:.unshift s if !$:.include?(s) && File.directory?(s)}
+
+require 'reflex'
+
+
+Reflex.start name: "Physics" do |app|
+  Reflex::Window.show title: app.name, frame: [100, 100, 500, 500] do
+    root.set gravity: Reflex::Point.new(0, 9.8), debug: true
+
+    image = Reflex::Image.new(32, 32).paint do |p, img|
+      p.fill :green
+      p.ellipse img.bounds
+    end
+
+    add Reflex::RectShape.new {
+      set color: :blue, frame: [5, 300, 300, 10]
+      body.set static: true
+    }
+
+    10.times do |n|
+      add Reflex::ImageView.new {
+        set image: image, size: image.size, pos: [40 * n, 20 * n]
+        body.set dynamic: true, density: 1
+      }
+    end
+
+    after :draw do |e|
+      e.painter.fill :white
+      e.painter.text "#{e.fps.to_i} FPS", 10, 10
+    end
+  end
+end

data/samples/repl.rb

@@ -65,5 +65,6 @@ class PrimaryWindow < Reflex::Window
 end# PrimaryWindow
 
 
-$window = PrimaryWindow.new.show
-Reflex.start
+Reflex.start do
+  $window = PrimaryWindow.new.show
+end

data/samples/shader.rb

@@ -8,7 +8,7 @@
 require 'reflex'
 
 
-Reflex::Window.new do
+win = Reflex::Window.new do
   set :title, "Shader Sample"
   set :frame, 100, 100, 300, 300
 
@@ -33,9 +33,9 @@ Reflex::Window.new do
   on :update do
     redraw
   end
-
-  show
 end
 
 
-Reflex.start name: "Shader Sample"
+Reflex.start name: "Shader Sample" do
+  win.show
+end

data/samples/shapes.rb

@@ -10,7 +10,7 @@ require 'reflex'
 include Reflex
 
 
-Window.new do
+win = Window.new do
   set title: 'Shape Sample', frame: [100, 100, 500, 400]
 
   p = painter
@@ -22,9 +22,9 @@ Window.new do
       set frame: [32 + 64 * i, 32, 50, 50], color: :gray, border: :white
     }
   end
-
-  show
 end
 
 
-Reflex.start
+Reflex.start do
+  win.show
+end

data/samples/text.rb

@@ -11,10 +11,10 @@ require 'reflex'
 lines = File.readlines(__FILE__)
 
 
-Reflex::Window.new do
+win = Reflex::Window.new do
   set title: "Rays/Reflex Text Test", frame: [100, 100, 600, 400]
   painter.background 0.1
-  painter.font Rays::Font.new 'Menlo', 12
+  painter.font Reflex::Font.new 'Menlo', 12
   on :draw do |e|
     e.painter.push do
       linenum       = "%5d "
@@ -31,7 +31,9 @@ Reflex::Window.new do
       end
     end
   end
-  show
 end
 
-Reflex.start
+
+Reflex.start do
+  win.show
+end

data/samples/tree.rb

@@ -64,8 +64,9 @@ def setup (parent, level)
   end
 end
 
-w = W.new
-setup w, 5
-w.show
 
-Reflex.start
+Reflex.start do
+  w = W.new
+  setup w, 5
+  w.show
+end

data/samples/views.rb

@@ -34,8 +34,9 @@ win = Window.new do
   end
 
   set title: 'Many View Sample', frame: [100, 100, 500, 400]
-  show
 end
 
 
-Reflex.start
+Reflex.start do
+  win.show
+end

data/samples/visuals.rb

@@ -17,6 +17,5 @@ Reflex::Application.start name: 'Visuals' do |app|
         win.add v
       end
     end
-    win.show
-  end
+  end.show
 end

data/src/body.cpp

@@ -0,0 +1,244 @@
+#include "reflex/body.h"
+
+
+#include <assert.h>
+#include <vector>
+#include <Box2D/Common/b2Math.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 "reflex/exception.h"
+#include "world.h"
+
+
+#define PTR ((b2Body*) handle)
+
+
+namespace Reflex
+{
+
+
+	Body::Body (Handle h, float scale)
+	:	handle(h), scale(scale)
+	{
+		assert(h);
+	}
+
+	Fixture
+	Body::add_box (float width, float height)
+	{
+		assert(PTR);
+
+		b2Vec2 size(width / scale / 2, height / scale / 2);
+
+		b2PolygonShape shape;
+		shape.SetAsBox(size.x, size.y);
+		for (int i = 0; i < 4; ++i)
+			shape.m_vertices[i] += size;
+
+		b2FixtureDef fixture;
+		fixture.shape = &shape;
+
+		return PTR->CreateFixture(&fixture);
+	}
+
+	Fixture
+	Body::add_circle (float size)
+	{
+		assert(PTR);
+
+		float radius = size / scale / 2.f;
+
+		b2CircleShape shape;
+		shape.m_radius = radius;
+		shape.m_p.Set(radius, radius);
+
+		b2FixtureDef fixture;
+		fixture.shape = &shape;
+
+		return PTR->CreateFixture(&fixture);
+	}
+
+	Fixture
+	Body::add_edge (const Point& begin, const Point& end)
+	{
+		assert(PTR);
+
+		b2EdgeShape shape;
+		shape.Set(to_box2d(begin, scale), to_box2d(end, scale));
+
+		b2FixtureDef fixture;
+		fixture.shape = &shape;
+
+		return PTR->CreateFixture(&fixture);
+	}
+
+	Fixture
+	Body::add_edge (const Point* points, size_t size, bool loop)
+	{
+		assert(PTR);
+
+		if (size == 2)
+			return add_edge(points[0], points[1]);
+
+		std::vector<b2Vec2> vecs;
+		vecs.reserve(size);
+		for (size_t i = 0; i < size; ++i)
+			vecs.push_back(to_box2d(points[i], scale));
+
+		b2ChainShape shape;
+		if (loop)
+			shape.CreateLoop(&vecs[0], (int32) size);
+		else
+			shape.CreateChain(&vecs[0], (int32) size);
+
+		b2FixtureDef fixture;
+		fixture.shape = &shape;
+
+		return PTR->CreateFixture(&fixture);
+	}
+
+	Fixture
+	Body::add_polygon (const Point* points, size_t size)
+	{
+		assert(PTR);
+
+		std::vector<b2Vec2> vecs;
+		vecs.reserve(size);
+		for (size_t i = 0; i < size; ++i)
+			vecs.push_back(to_box2d(points[i], scale));
+
+		b2PolygonShape shape;
+		shape.Set(&vecs[0], (int32) size);
+
+		b2FixtureDef fixture;
+		fixture.shape = &shape;
+
+		return PTR->CreateFixture(&fixture);
+	}
+
+	void
+	Body::clear_fixtures ()
+	{
+		assert(PTR);
+
+		b2Fixture* f;
+		while (f = PTR->GetFixtureList())
+			PTR->DestroyFixture(f);
+	}
+
+	Point
+	Body::position () const
+	{
+		assert(PTR);
+
+		return to_point(PTR->GetPosition(), scale);
+	}
+
+	float
+	Body::angle () const
+	{
+		assert(PTR);
+
+		return PTR->GetAngle();
+	}
+
+	void
+	Body::set_static (bool state)
+	{
+		assert(PTR);
+
+		PTR->SetType(state ? b2_staticBody : b2_dynamicBody);
+	}
+
+	bool
+	Body::is_static () const
+	{
+		assert(PTR);
+
+		return PTR->GetType() == b2_staticBody;
+	}
+
+	void
+	Body::set_dynamic (bool state)
+	{
+		assert(PTR);
+
+		PTR->SetType(state ? b2_dynamicBody : b2_staticBody);
+	}
+
+	bool
+	Body::is_dynamic () const
+	{
+		assert(PTR);
+
+		return PTR->GetType() == b2_dynamicBody;
+	}
+
+	void
+	Body::set_density (float density)
+	{
+		iterator first = begin();
+		if (!first)
+			invalid_state_error(__FILE__, __LINE__, "no fixture");
+
+		first->set_density(density);
+	}
+
+	void
+	Body::set_friction (float friction)
+	{
+		iterator first = begin();
+		if (!first)
+			invalid_state_error(__FILE__, __LINE__, "no fixture");
+
+		first->set_friction(friction);
+	}
+
+	void
+	Body::set_restitution (float restitution)
+	{
+		iterator first = begin();
+		if (!first)
+			invalid_state_error(__FILE__, __LINE__, "no fixture");
+
+		first->set_restitution(restitution);
+	}
+
+	Body::iterator
+	Body::begin ()
+	{
+		assert(PTR);
+
+		return Fixture(PTR->GetFixtureList());
+	}
+
+	Body::const_iterator
+	Body::begin () const
+	{
+		assert(PTR);
+
+		return Fixture(PTR->GetFixtureList());
+	}
+
+	Body::iterator
+	Body::end ()
+	{
+		assert(PTR);
+
+		return Fixture(NULL);
+	}
+
+	Body::const_iterator
+	Body::end () const
+	{
+		assert(PTR);
+
+		return Fixture(NULL);
+	}
+
+
+}// Reflex

data/src/event.cpp

@@ -66,25 +66,25 @@ namespace Reflex
 	{
 	}
 
-	Rays::Point&
+	Point&
 	ScrollEvent::scroll ()
 	{
-		return *(Rays::Point*) &scroll_;
+		return *(Point*) &scroll_;
 	}
 
-	const Rays::Point&
+	const Point&
 	ScrollEvent::scroll () const
 	{
 		return const_cast<ScrollEvent*>(this)->scroll();
 	}
 
-	Rays::Point&
+	Point&
 	ScrollEvent::delta ()
 	{
-		return *(Rays::Point*) &delta_;
+		return *(Point*) &delta_;
 	}
 
-	const Rays::Point&
+	const Point&
 	ScrollEvent::delta () const
 	{
 		return const_cast<ScrollEvent*>(this)->delta();
@@ -130,7 +130,7 @@ namespace Reflex
 	}
 
 	PointerEvent::PointerEvent (
-		Type type, uint pointer_type, const Rays::Point* positions_, size_t size,
+		Type type, uint pointer_type, const Point* positions_, size_t size,
 		uint modifiers, uint count, bool drag)
 	:	type(type), pointer_type(pointer_type),
 		size(size), modifiers(modifiers), count(count), drag(drag), capture(false)
@@ -147,28 +147,28 @@ namespace Reflex
 		}
 	}
 
-	Rays::Point&
+	Point&
 	PointerEvent::position (size_t i)
 	{
 		if (i >= size)
 			index_error(__FILE__, __LINE__);
 
-		return *(Rays::Point*) &positions[i];
+		return *(Point*) &positions[i];
 	}
 
-	const Rays::Point&
+	const Point&
 	PointerEvent::position (size_t i) const
 	{
 		return const_cast<PointerEvent*>(this)->position(i);
 	}
 
-	Rays::Point&
+	Point&
 	PointerEvent::operator [] (size_t i)
 	{
 		return position(i);
 	}
 
-	const Rays::Point&
+	const Point&
 	PointerEvent::operator [] (size_t i) const
 	{
 		return position(i);
@@ -186,25 +186,25 @@ namespace Reflex
 	{
 	}
 
-	Rays::Point&
+	Point&
 	WheelEvent::delta ()
 	{
-		return *(Rays::Point*) &delta_;
+		return *(Point*) &delta_;
 	}
 
-	const Rays::Point&
+	const Point&
 	WheelEvent::delta () const
 	{
 		return const_cast<WheelEvent*>(this)->delta();
 	}
 
-	Rays::Point&
+	Point&
 	WheelEvent::position ()
 	{
-		return *(Rays::Point*) &position_;
+		return *(Point*) &position_;
 	}
 
-	const Rays::Point&
+	const Point&
 	WheelEvent::position () const
 	{
 		return const_cast<WheelEvent*>(this)->position();

data/src/fixture.cpp

@@ -0,0 +1,108 @@
+#include "reflex/fixture.h"
+
+
+#include <assert.h>
+#include <Box2D/Dynamics/b2Fixture.h>
+
+
+#define PTR ((b2Fixture*) handle)
+
+
+namespace Reflex
+{
+
+
+	Fixture::Fixture (Handle h)
+	:	handle(h)
+	{
+	}
+
+	Fixture&
+	Fixture::operator = (Handle h)
+	{
+		handle = h;
+		return *this;
+	}
+
+	void
+	Fixture::set_density (float density)
+	{
+		assert(PTR && PTR->GetBody());
+
+		PTR->SetDensity(density);
+		PTR->GetBody()->ResetMassData();
+	}
+
+	float
+	Fixture::density () const
+	{
+		assert(PTR);
+
+		return PTR->GetDensity();
+	}
+
+	void
+	Fixture::set_friction (float friction)
+	{
+		assert(PTR);
+
+		PTR->SetFriction(friction);
+	}
+
+	float
+	Fixture::friction () const
+	{
+		assert(PTR);
+
+		return PTR->GetFriction();
+	}
+
+	void
+	Fixture::set_restitution (float restitution)
+	{
+		assert(PTR);
+
+		PTR->SetRestitution(restitution);
+	}
+
+	float
+	Fixture::restitution () const
+	{
+		assert(PTR);
+
+		return PTR->GetRestitution();
+	}
+
+	Fixture::Handle
+	Fixture::next () const
+	{
+		assert(PTR);
+
+		return PTR->GetNext();
+	}
+
+	Fixture::operator bool () const
+	{
+		return PTR;
+	}
+
+	bool
+	Fixture::operator ! () const
+	{
+		return !operator bool();
+	}
+
+	bool
+	operator == (const Fixture& lhs, const Fixture& rhs)
+	{
+		return lhs.handle == rhs.handle;
+	}
+
+	bool
+	operator != (const Fixture& lhs, const Fixture& rhs)
+	{
+		return !(lhs == rhs);
+	}
+
+
+}// Reflex

data/src/image_view.cpp

@@ -39,7 +39,7 @@ namespace Reflex
 		return self->image;
 	}
 
-	Rays::Point
+	Point
 	ImageView::content_size () const
 	{
 		if (self->image)

data/src/ios/native_window.h

@@ -18,6 +18,8 @@
 
 	- (void) unbind: (Reflex::Window*) instance;
 
+	- (void) update;
+
 	- (void) draw;
 
 	- (void) keyDown: (UIEvent*) event;

data/src/ios/native_window.mm

@@ -3,7 +3,7 @@
 
 
 #include <assert.h>
-#include <rays/bounds.h>
+#include "reflex/bounds.h"
 #include "reflex/window.h"
 #include "reflex/exception.h"
 #include "event.h"
@@ -14,6 +14,16 @@
 #define REF (*pref)
 
 
+namespace Reflex
+{
+
+	void update_view_tree (View* v, const UpdateEvent& e);
+
+	void draw_view_tree (View* v, const DrawEvent& e, const Point& offset, const Bounds& clip);
+
+}// Reflex
+
+
 static CGRect device_frame ()
 {
 	return [[UIScreen mainScreen] applicationFrame];
@@ -87,6 +97,8 @@ static CGRect device_frame ()
 		REF->self->prev_time_update = now;
 
 		REF->on_update(&e);
+		if (!e.is_blocked())
+			Reflex::update_view_tree(REF->root(), e);
 	}
 
 	- (void) draw
@@ -115,7 +127,12 @@ static CGRect device_frame ()
 		e.bounds.reset(0, 0, b.width, b.height);
 
 		e.painter->begin();
+		e.painter->clear();
+
 		REF->on_draw(&e);
+		if (!e.is_blocked())
+			draw_view_tree(REF->root(), e, 0, REF->frame().dup().move_to(0));
+
 		e.painter->end();
 	}
 

data/src/ios/opengl_view.mm

@@ -69,6 +69,14 @@
 		}
 	}
 
+	- (void) update
+	{
+		NativeWindow* win = (NativeWindow*) self.view.window;
+		if (!win) return;
+
+		[win update];
+	}
+
 	- (void) glkView: (GLKView*) view drawInRect: (CGRect) rect
 	{
 		NativeWindow* win = (NativeWindow*) self.view.window;