reflexion 0.1.8 → 0.1.9

data/include/reflex/shape_view.h

@@ -0,0 +1,146 @@
+// -*- c++ -*-
+#pragma once
+#ifndef __REFLEX_SHAPE_VIEW_H__
+#define __REFLEX_SHAPE_VIEW_H__
+
+
+#include <xot/pimpl.h>
+#include <reflex/view.h>
+
+
+namespace Reflex
+{
+
+
+	class ShapeView : public View
+	{
+
+		typedef View Super;
+
+		public:
+
+			ShapeView (const char* name = NULL);
+
+			virtual ~ShapeView ();
+
+			virtual void     set_fill (float red, float green, float blue, float alpha = 1);
+
+			virtual void     set_fill (const Color& color);
+
+			virtual void      no_fill ();
+
+			virtual const Color& fill () const;
+
+			virtual void     set_stroke (float red, float green, float blue, float alpha = 1);
+
+			virtual void     set_stroke (const Color& color);
+
+			virtual void      no_stroke ();
+
+			virtual const Color& stroke () const;
+
+			virtual Point content_size () const;
+
+			virtual void on_draw       (DrawEvent* e);
+
+			virtual void on_draw_shape (DrawEvent* e);
+
+			struct Data;
+
+			Xot::PImpl<Data> self;
+
+	};// ShapeView
+
+
+	class RectShape : public ShapeView
+	{
+
+		typedef ShapeView Super;
+
+		public:
+
+			RectShape (const char* name = NULL);
+
+			virtual ~RectShape ();
+
+			virtual void     set_round (coord round);
+
+			virtual void     set_round (coord width, coord height);
+
+			virtual void     set_round (const Point& round);
+
+			virtual const Point& round () const;
+
+			virtual void on_draw_shape (DrawEvent* e);
+
+			struct Data;
+
+			Xot::PImpl<Data> self;
+
+	};// RectShape
+
+
+	class EllipseShape : public ShapeView
+	{
+
+		typedef ShapeView Super;
+
+		public:
+
+			EllipseShape (const char* name = NULL);
+
+			virtual ~EllipseShape ();
+
+			virtual void set_radius_min (coord radius);
+
+			virtual coord    radius_min () const;
+
+			virtual void set_nsegment (uint num_of_segments);
+
+			virtual uint     nsegment() const;
+
+			virtual void make_body ();
+
+			virtual void on_draw_shape (DrawEvent* e);
+
+			struct Data;
+
+			Xot::PImpl<Data> self;
+
+	};// EllipseShape
+
+
+	class ArcShape : public EllipseShape
+	{
+
+		typedef EllipseShape Super;
+
+		public:
+
+			ArcShape (const char* name = NULL);
+
+			virtual ~ArcShape ();
+
+			virtual void set_angle_from (float degree);
+
+			virtual float    angle_from () const;
+
+			virtual void set_angle_to (float degree);
+
+			virtual float    angle_to () const;
+
+			virtual void make_body ();
+
+			virtual void on_draw_shape (DrawEvent* e);
+
+			struct Data;
+
+			Xot::PImpl<Data> self;
+
+	};// ArcShape
+
+
+}// Reflex
+
+
+#endif//EOH

data/include/reflex/view.h

@@ -154,6 +154,8 @@ namespace Reflex
 
 			virtual const Bounds& frame () const;
 
+			virtual float angle () const;
+
 			virtual void         scroll_to (coord x, coord y, coord z = 0);
 
 			virtual void         scroll_to (const Point& scroll);
@@ -180,11 +182,9 @@ namespace Reflex
 
 			virtual const Body* body () const;
 
-			virtual void set_density (float density);
-
-			virtual void set_friction (float friction);
+			virtual float meter2pixel (float meter = 1, bool create_world = true);
 
-			virtual void set_restitution (float restitution);
+			virtual float meter2pixel (float meter = 1) const;
 
 			virtual void set_gravity (coord x, coord y);
 
@@ -192,9 +192,13 @@ namespace Reflex
 
 			virtual Point    gravity () const;
 
+			virtual       Body* wall ();
+
+			virtual const Body* wall () const;
+
 			virtual void set_debug (bool state);
 
-			virtual bool  is_debug () const;
+			virtual bool     debugging () const;
 
 			virtual Point from_parent (const Point& point) const;
 
@@ -224,6 +228,8 @@ namespace Reflex
 
 			virtual void on_resize (FrameEvent* e);
 
+			virtual void on_rotate (FrameEvent* e);
+
 			virtual void on_scroll (ScrollEvent* e);
 
 			virtual void on_focus (FocusEvent* e);
@@ -248,6 +254,12 @@ namespace Reflex
 
 			virtual void on_capture (CaptureEvent* e);
 
+			virtual void on_contact       (ContactEvent* e);
+
+			virtual void on_contact_begin (ContactEvent* e);
+
+			virtual void on_contact_end   (ContactEvent* e);
+
 			virtual operator bool () const;
 
 			virtual bool operator ! () const;

data/lib/reflex/application.rb

@@ -18,21 +18,21 @@ module Reflex
     def initialize (opts = {}, &block)
       super()
       set opts
-      @on_start = block if block
-    end
-
-    def on_start (e)
-      if @on_start
-        Xot::BlockUtil.instance_eval_or_block_call self, &@on_start
-        @on_start = nil
-      end
-      on_start! e
+      @start_block = block if block
     end
 
     def self.start (*args, &block)
       self.new(*args, &block).start
     end
 
+    private
+
+      def call_start_block ()
+        return unless @start_block
+        Xot::BlockUtil.instance_eval_or_block_call self, &@start_block
+        @start_block = nil
+      end
+
   end# Application
 
 

data/lib/reflex/body.rb

@@ -11,6 +11,8 @@ module Reflex
 
     include Xot::Setter
 
+    alias meter meter2pixel
+
   end# Body
 
 

data/lib/reflex/contact_event.rb

@@ -0,0 +1,38 @@
+# -*- coding: utf-8 -*-
+
+
+require 'reflex/ext'
+
+
+module Reflex
+
+
+  class ContactEvent
+
+    def type ()
+      TYPE2SYM[get_type] || :none
+    end
+
+    def begin? ()
+      get_type == TYPE_BEGIN
+    end
+
+    def end? ()
+      get_type == TYPE_END
+    end
+
+    def inspect ()
+      "#<Reflex::ContactEvent type:#{type} view:#{view}>"
+    end
+
+    private
+
+      TYPE2SYM = {
+        TYPE_BEGIN => :begin,
+        TYPE_END   => :end,
+      }
+
+  end# ContactEvent
+
+
+end# Reflex

data/lib/reflex/image_view.rb

@@ -7,7 +7,7 @@ require 'reflex/view'
 module Reflex
 
 
-  class ImageView < View
+  class ImageView
 
     has_model
 

data/lib/reflex/shape_view.rb

@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+
+
+require 'reflex/view'
+
+
+module Reflex
+
+
+  class ShapeView
+
+    def fill= (*args)
+      set_fill Color.color *args
+      fill
+    end
+
+    def stroke= (*args)
+      set_stroke Color.color *args
+      stroke
+    end
+
+  end# ShapeView
+
+
+end# Reflex

data/lib/reflex/view.rb

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 
 
+require 'forwardable'
 require 'xot/setter'
 require 'xot/block_util'
 require 'reflex/ext'
@@ -19,14 +20,23 @@ module Reflex
     include HasFrame
     include HasTags
 
+    extend Forwardable
+
+    def_delegators :body,
+      :static=, :static?, :dynamic=, :dynamic?,
+      :linear_velocity=,  :linear_velocity,
+      :angular_velocity=, :angular_velocity,
+      :density=, :density, :friction=, :friction, :restitution=, :restitution
+
     alias add    add_child
     alias remove remove_child
     alias find   find_children
+    alias meter meter2pixel
 
     def initialize (opts = {}, &block)
       super()
       set opts
-      @on_attach = block if block
+      @attach_block = block if block
     end
 
     def children ()
@@ -64,18 +74,18 @@ module Reflex
       end
     end
 
-    def on_attach (e)
-      on_attach! e
-      if @on_attach
-        Xot::BlockUtil.instance_eval_or_block_call self, &@on_attach
-        @on_attach = nil
-      end
-    end
-
     def self.has_model ()
       include ModelView
     end
 
+    private
+
+      def call_attach_block ()
+        return unless @attach_block
+        Xot::BlockUtil.instance_eval_or_block_call self, &@attach_block
+        @attach_block = nil
+      end
+
   end# View
 
 

data/lib/reflex/window.rb

@@ -20,7 +20,8 @@ module Reflex
     extend Forwardable
 
     def_delegators :root,
-      :add_child, :remove_child, :find_children, :style
+      :add_child, :remove_child, :find_children, :style, :meter2pixel, :meter,
+      :gravity=, :gravity, :wall, :debug=, :debug?
 
     alias add    add_child
     alias remove remove_child
@@ -29,25 +30,25 @@ module Reflex
     def initialize (opts = {}, &block)
       super()
       set opts
-      @on_show = block if block
+      @show_block = block if block
     end
 
     def paint (&block)
       painter.begin &block
     end
 
-    def on_show (e)
-      if @on_show
-        Xot::BlockUtil.instance_eval_or_block_call self, &@on_show
-        @on_show = nil
-      end
-      on_show! e
-    end
-
     def self.show (*args, &block)
       new(*args, &block).show
     end
 
+    private
+
+      def call_show_block ()
+        return unless @show_block
+        Xot::BlockUtil.instance_eval_or_block_call self, &@show_block
+        @show_block = nil
+      end
+
   end# Window
 
 

data/lib/reflex.rb

@@ -17,24 +17,13 @@ require 'reflex/painter'
 
 require 'reflex/reflex'
 require 'reflex/helper'
-require 'reflex/application'
-require 'reflex/window'
-require 'reflex/view'
-require 'reflex/body'
-require 'reflex/fixture'
-require 'reflex/selector'
-require 'reflex/shape'
-require 'reflex/line_shape'
-require 'reflex/rect_shape'
-require 'reflex/ellipse_shape'
-require 'reflex/arc_shape'
-require 'reflex/model'
-require 'reflex/model_owner'
+
 require 'reflex/selector'
 require 'reflex/style'
 require 'reflex/style_length'
 require 'reflex/style_length2'
 require 'reflex/style_length4'
+
 require 'reflex/update_event'
 require 'reflex/draw_event'
 require 'reflex/frame_event'
@@ -44,7 +33,20 @@ require 'reflex/key_event'
 require 'reflex/pointer_event'
 require 'reflex/wheel_event'
 require 'reflex/capture_event'
+require 'reflex/contact_event'
+
+require 'reflex/body'
+require 'reflex/fixture'
+
+require 'reflex/model'
+require 'reflex/model_owner'
+
+require 'reflex/application'
+require 'reflex/window'
+require 'reflex/view'
 
 require 'reflex/button'
 require 'reflex/text_view'
 require 'reflex/image_view'
+
+require 'reflex/shape_view'

data/lib/reflexion.rb

@@ -17,80 +17,87 @@ module Reflexion
   }
 
 
-  class Screen < Window
+  class MainWindow < Window
 
     attr_accessor :update, :draw, :key, :pointer
 
     attr_reader :setup
 
+    attr_reader :event
+
     def setup= (block)
       @setup = block
-      call_block self, &@setup
+      call_event nil, self, &@setup
     end
 
     def on_update (e)
       super
       redraw
-      call_block e, &@update
+      call_event e, e, &@update
     end
 
     def on_draw (e)
       super
-      call_block e, &@draw
+      call_event e, e.painter, &@draw
     end
 
     def on_key (e)
       super
-      call_block e, &@key
+      call_event e, e, &@key
     end
 
     def on_pointer (e)
       super
-      call_block e, &@pointer
+      call_event e, e, &@pointer
     end
 
-    def call_block (*args, &block)
+    def call_event (event, *args, &block)
+      @event = event
       Xot::BlockUtil.instance_eval_or_block_call *args, &block if block
     end
 
-  end# Screen
+  end# MainWindow
 
 
   module_function
 
-  @@screen = Screen.new DEFAULTS
+  @@window = MainWindow.new DEFAULTS
+
+  def window ()
+    @@window
+  end
 
-  def screen ()
-    @@screen
+  def event ()
+    window.event
   end
 
   def setup (&block)
-    screen.setup = block
+    window.setup = block
   end
 
   def update (&block)
-    screen.update = block
+    window.update = block
   end
 
   def draw (&block)
-    screen.draw = block
+    window.draw = block
   end
 
   def key (&block)
-    screen.key = block
+    window.key = block
   end
 
   def pointer (&block)
-    screen.pointer = block
+    window.pointer = block
   end
 
   def start ()
-    screen.show
+    window.show
     Reflex.start
   end
 
   def quit ()
-    screen.close
+    window.close
   end
 
 

data/samples/osx/hello/hello/main.cpp

@@ -40,6 +40,7 @@ class App : public Application
 			win->show();
 
 			win->root()->set_gravity(0, 9.8);
+			win->root()->set_debug(true);
 
 			Image image(32, 32);
 			Painter painter = image.painter();
@@ -67,6 +68,11 @@ class App : public Application
 				view->body()->set_dynamic(true);
 				view->body()->set_density(1);
 			}
+
+			View* ground = new View();
+			ground->set_frame(10, 400, 300, 10);
+			win->root()->add_child(ground);
+			ground->body()->set_static(true);
 		}
 
 };// App

data/samples/physics.rb

@@ -12,26 +12,36 @@ 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
+    add_dynamic = -> size = 50, x = rand(10..400), y = rand(10..100) do
+      add Reflex::EllipseShape.new {
+        set :fill, [:red, :green, :blue, :yellow, :cyan, :magenta, :gray].sample
+        set :pos, [x, y]
+        set :size, [rand(5..size)] * 2
+        body.set dynamic: true, density: 1
+      }
     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
+    add_static = -> size = 50 do
+      add Reflex::RectShape.new {
+        set :fill, :white
+        set :pos, [rand(10..400), rand(200..400)]
+        set :size, [rand(5..(size * 2)), rand(5..size)]
+        body.set static: true
       }
     end
 
+    50.times {|n| add_dynamic.call}
+    5.times {|n| add_static.call}
+
     after :draw do |e|
       e.painter.fill :white
       e.painter.text "#{e.fps.to_i} FPS", 10, 10
     end
+
+    on :pointer do |e|
+      if e.down? || e.drag?
+        add_dynamic.call 50, *e.pos.to_a
+      end
+    end
   end
 end

data/samples/reflexion/breakout.rb

@@ -0,0 +1,52 @@
+# -*- 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 'reflexion/include'
+
+
+$garbages = []
+
+class View
+  def setup (frame: [0, 0, 100, 100], color: :white, type: :static)
+    set frame: frame, fill: color, density: 1, friction: 0, restitution: 1, type => true
+  end
+end
+
+setup do
+  set size: [600, 400]
+  wall.set friction: 0
+  5.times do |y|
+    10.times do |x|
+      add RectShape.new {
+        setup frame: [(x + 1) * 50, (y + 1) * 20, 30, 10], color: [:white, :red, :green, :blue, :yellow][y]
+        on(:contact) {$garbages << self}
+      }
+    end
+  end
+  $bar = add RectShape.new {
+    setup frame: [0, 350, 100, 20], color: :blue
+  }
+end
+
+update do
+  $garbages.uniq.each {|o| o.parent.remove o}
+  $garbages.clear
+end
+
+draw do
+  text "#{event.fps.to_i} FPS", 10, 10
+end
+
+pointer do |e|
+  $bar.x = e.x - $bar.w / 2
+  if e.down?
+    window.add [EllipseShape, RectShape].sample.new {
+      setup frame: [e.x, $bar.y - 20, 20, 20], type: :dynamic
+      set :linear_velocity, Point.new(rand(-1.0..1.0), -1).normal * 500
+    }
+  end
+end