reflexion 0.1.3 → 0.1.4

data/Rakefile

@@ -1,12 +1,8 @@
 # -*- mode: ruby; coding: utf-8 -*-
 
 
-%w[. ../xot ../rucy ../rays].map {|s| "#{s}/lib"}.each do |path|
-  $: << File.expand_path(File.join File.dirname(__FILE__), *path.split('/'))
-end
-
-require 'rubygems'
-require 'xot/rake/helpers'
+require 'bundler/setup'
+require 'xot/rake'
 require 'xot/module'
 require 'rucy/module'
 require 'rays/module'
@@ -15,36 +11,15 @@ require 'reflex/module'
 include Xot::Rake
 
 
-MODULE  = Reflex
-GEMNAME = 'reflexion'
-INCDIRS = [Reflex, Rays, Rucy].map {|m| m.include_dirs}.flatten
+MODULE      = Reflex
+GEMNAME     = 'reflexion'
+INCDIRS     = [Reflex, Rays, Rucy, Xot].map {|m| m.include_dirs}.flatten
+TESTS_ALONE = ['test/test_reflex.rb']
 
 
 task :default => :build
 
 task :build => :ext
 
-task :rebuild => [:clean, :build]
-
-task :lib => 'lib:build'
-
-task :ext => 'ext:build'
-
-task :doc => 'ext:doc'
-
-task :gem => 'gem:build'
-
-task :install => 'gem:install'
-
-task :uninstall => 'gem:uninstall'
-
-task :clean => ['lib:clean', 'ext:clean', 'gem:clean']
-
-task :test => :ext do
-  Dir['test/**/test_*.rb'].each do |rb|
-    sh %( ruby #{rb} )
-  end
-end
-
 
 [Xot, Rucy, Rays, Reflex].each {|m| m.load_tasks}

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/examples/hello/.gitignore

@@ -0,0 +1,2 @@
+hello
+hello.exe

data/examples/ruby/app.rb

@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 
 
-%w[rays reflex].product(%w[ext lib]).each do |paths|
+%w[xot rays reflex].product(%w[ext lib]).each do |paths|
   $: << File.expand_path(
-    File.join File.dirname(__FILE__), "..", "..", "..", *paths)
+    File.join File.dirname(__FILE__), *%w[.. .. ..], *paths)
 end
 
 require 'reflex'

data/examples/ruby/checker.rb

@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 
 
-%w[rays reflex].product(%w[ext lib]).each do |paths|
+%w[xot rays reflex].product(%w[ext lib]).each do |paths|
   $: << File.expand_path(
-    File.join File.dirname(__FILE__), "..", "..", "..", *paths)
+    File.join File.dirname(__FILE__), *%w[.. .. ..], *paths)
 end
 
 require 'rubygems'
@@ -17,7 +17,7 @@ class CheckerWindow < Reflex::Window
     set :title,  "Hello Reflex!"
     set :bounds, 100, 100, 320, 240
     painter.font = Rays::Font.new nil, 32
-    painter.clear = 1
+    painter.background = 1
   end
 
   def draw ()

data/examples/ruby/fps.rb

@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 
 
-%w[rays reflex].product(%w[ext lib]).each do |paths|
+%w[xot rays reflex].product(%w[ext lib]).each do |paths|
   $: << File.expand_path(
-    File.join File.dirname(__FILE__), "..", "..", "..", *paths)
+    File.join File.dirname(__FILE__), *%w[.. .. ..], *paths)
 end
 
 require 'reflex'
@@ -11,19 +11,19 @@ require 'reflex'
 
 x = 0
 y = 0
-font = Rays::Font.new("Osaka", 32)
+font = Rays::Font.new "Osaka", 32
 prev = Time.now
 fps = 0
 
-w = Reflex::Window.
-  new(:title => "Reflex on Ruby", :bounds => [100, 100, 600, 400]).
-  before(:close) {|o| o.hide; sleep 1; o.show; sleep 1}.
-  on(:moved) {|o, x, y| p [x, y]}.
-  on(:resized) {|o, w, h| p [w, h]}.
-  on(:update) {|o| o.redraw}.
-  on(:draw) do |o|
-    b = o.bounds 0
-    o.paint do |p|
+w = Reflex::Window
+  .new(:title => "Reflex on Ruby", :bounds => [100, 100, 600, 400])
+  .before(:close) {w.hide; sleep 1; w.show; sleep 1}
+  .on(:moved) {|x, y| p [x, y]}
+  .on(:resized) {|w, h| p [w, h]}
+  .on(:update) {w.redraw}
+  .on(:draw) do
+    b = w.bounds 0
+    w.paint do |p|
       p.fill = 1, 0.5, 0.5, 0.05
       #p.stroke = 0.5, 0.5, 1
       100.times do
@@ -43,7 +43,7 @@ w = Reflex::Window.
       p.text "#{fps.to_i} FPS", 0, b.bottom - font.height, font
       prev = now
     end
-  end.
-  show
+  end
 
+w.show
 Reflex.run

data/examples/ruby/grid.rb

@@ -0,0 +1,65 @@
+# -*- coding: utf-8 -*-
+
+
+%w[xot rays reflex].product(%w[ext lib]).each do |paths|
+  $: << File.expand_path(
+    File.join File.dirname(__FILE__), *%w[.. .. ..], *paths)
+end
+
+require 'rubygems'
+require 'reflex'
+
+
+Reflex::Window.new do
+  set title: "Grid Test", bounds: [100, 100, 50, 50]
+  painter.background 0
+
+  on :draw do
+    paint do |p|
+      p.push_matrix
+      p.push_attrs
+
+      w, h = bounds.size.to_a
+
+      p.fill 1, 0, 0
+
+      p.rect 1, 1, 5, 5
+
+      p.stroke 0.3, 0.4
+      (0..bounds.width) .step(2).each {|x| p.line x, 0, x, h}
+      (0..bounds.height).step(2).each {|y| p.line 0, y, w, y}
+      p.stroke 0.5, 0.4
+      (0..bounds.width) .step(10).each {|x| p.line x, 0, x, h}
+      (0..bounds.height).step(10).each {|y| p.line 0, y, w, y}
+
+      p.translate 3, 10, 0
+      p.fill nil
+      p.stroke 1
+
+      p.line 0, 0, 5, 0
+
+      p.translate 0, 10, 0
+
+      p.rect 0, 0, 5, 5
+
+      p.translate 0, 10, 0
+      p.fill 0.5, 0.5, 1
+      p.stroke nil
+
+      p.rect 0, 0, 5, 5
+
+      p.translate 0, 10, 0
+      p.fill 0.5, 0.5, 1
+      p.stroke 0.5, 1, 0.5
+
+      p.rect 0, 0, 5, 5
+
+      p.pop_attrs
+      p.pop_matrix
+    end
+  end
+
+  show
+end
+
+Reflex.run

data/examples/ruby/hello.rb

@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 
 
-%w[rays reflex].product(%w[ext lib]).each do |paths|
+%w[xot rays reflex].product(%w[ext lib]).each do |paths|
   $: << File.expand_path(
-    File.join File.dirname(__FILE__), "..", "..", "..", *paths)
+    File.join File.dirname(__FILE__), *%w[.. .. ..], *paths)
 end
 
 require 'rubygems'
@@ -16,21 +16,33 @@ class HelloWindow < Reflex::Window
     super
     set :title,  "Hello Reflex!"
     set :bounds, 100, 100, 320, 240
-    painter.font = Rays::Font.new nil, 32
+    p = painter
+    p.font Rays::Font.new "Menlo", 32
+    p.background 0
+    p.fill 1
   end
 
   def draw ()
     paint do |p|
-      p.fill = 1
-      p.text "hello world!", 100, 100
+      draw_grid p
+      p.text "hello world!", 5, 5
     end
   end
 
-  def update ()
-    #painter.clear = rand, rand, rand
+  def update_ (dt)
+    painter.background = rand, rand, rand
     redraw
   end
 
+  def draw_grid (p)
+    p.push do
+      w, h = bounds.size.to_a
+      p.stroke 0.5, 0.4
+      (0..w).step(5).each {|x| p.line x, 0, x, h}
+      (0..h).step(5).each {|y| p.line 0, y, w, y}
+    end
+  end
+
 end# HelloWindow
 
 

data/examples/ruby/key.rb

@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 
 
-%w[rays reflex].product(%w[ext lib]).each do |paths|
+%w[xot rays reflex].product(%w[ext lib]).each do |paths|
   $: << File.expand_path(
-    File.join File.dirname(__FILE__), "..", "..", "..", *paths)
+    File.join File.dirname(__FILE__), *%w[.. .. ..], *paths)
 end
 
 require 'rubygems'
@@ -26,7 +26,7 @@ w.on :draw do
   end
 end
 
-w.on :key_down do |obj, key|
+w.on :key_down do |key|
   w.close if key.code == 53
   $text += key.chars
   $text = $text[-10..-1] if $text.size > 10
@@ -34,7 +34,7 @@ w.on :key_down do |obj, key|
   w.redraw
 end
 
-w.on :points_moved do |obj, points|
+w.on :points_moved do |points|
   $pos = "#{points.x}, #{points.y}"
   p [points.type, points.x, points.y, points.size, points.modifiers, points.count, points.drag]
   w.redraw

data/examples/ruby/shapes.rb

@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 
 
-%w[rays reflex].product(%w[ext lib]).each do |paths|
+%w[xot rays reflex].product(%w[ext lib]).each do |paths|
   $: << File.expand_path(
-    File.join File.dirname(__FILE__), "..", "..", "..", *paths)
+    File.join File.dirname(__FILE__), *%w[.. .. ..], *paths)
 end
 
 require 'rubygems'
@@ -57,7 +57,7 @@ class Ring
     fin p, 270, w
   end
 
-  def update ()
+  def update (dt)
     @angle = (@angle + @rot) % 360
   end
 
@@ -78,7 +78,7 @@ class ShapesWindow < Reflex::Window
     super
     set :title,  "Shapes Sample"
     set :bounds, 100, 400, 640, 240
-    painter.clear = 1
+    painter.background = 1
     @rings = []
     setup
   end
@@ -101,8 +101,8 @@ class ShapesWindow < Reflex::Window
     end
   end
 
-  def update ()
-    each {|o| o.update}
+  def update (dt)
+    each {|o| o.update dt}
     redraw
     @count ||= 0
     fps_ = fps

data/examples/ruby/text.rb

@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 
 
-%w[rays reflex].product(%w[ext lib]).each do |paths|
+%w[xot rays reflex].product(%w[ext lib]).each do |paths|
   $: << File.expand_path(
-    File.join File.dirname(__FILE__), "..", "..", "..", *paths)
+    File.join File.dirname(__FILE__), *%w[.. .. ..], *paths)
 end
 
 require 'reflex'
@@ -12,24 +12,27 @@ require 'reflex'
 lines = File.readlines(__FILE__)
 
 
-win = Reflex::Window.
-  new do
-    set :title,  "Rays/Reflex Text Test"
-    set :bounds, 100, 100, 600, 400
-    paint do |p|
-      p.clear = 1
-      p.font = Rays::Font.new 'Courier', 12
-    end
-  end.
-#  on(:update) {|o| o.redraw}.
-  on(:draw) do |o|
-    o.paint do |p|
-      p.fill = 0 #rand, rand, rand, 1
+Reflex::Window.new do
+  set title: "Rays/Reflex Text Test", bounds: [100, 100, 600, 400]
+  painter.background 0.1
+  painter.font Rays::Font.new 'Menlo', 12
+  on :draw do
+    paint do
+      linenum       = "%5d "
+      linenum_width = font.width(linenum % 0).ceil
+      line_height   = (font.height * 1.0).ceil
+
+      fill 0.3
+      rect 0, 0, linenum_width, 10000
+
+      fill 1 #rand, rand, rand, 1
       lines.each.with_index do |line, i|
-        p.text line.chomp, 0, p.font.height * i
+        text "#{linenum % i} #{line.chomp}"
+        translate 0, line_height
       end
     end
-  end.
+  end
   show
+end
 
 Reflex.run

data/examples/ruby/views.rb

@@ -0,0 +1,88 @@
+# -*- coding: utf-8 -*-
+
+
+%w[xot rays reflex].product(%w[ext lib]).each do |paths|
+  $: << File.expand_path(
+    File.join File.dirname(__FILE__), *%w[.. .. ..], *paths)
+end
+
+require 'rubygems'
+require 'reflex'
+
+
+def View (&block)
+  Reflex::View.new &block
+end
+
+
+Reflex::Window.new do
+  set :title, "Views Sample"
+  set :bounds, 100, 100, 300, 300
+  @count = 0
+
+  def count ()
+    @count
+  end
+
+  def spawn (x, y)
+    @count += 1
+    add View {
+      c = [rand, rand, rand]
+      size = 16
+      set :bounds, x - size, y - size, size * 2, size * 2
+      @angle = 0
+      @speed = (rand * 2 - 1) * 30
+
+      on :update do
+        move_by rand(5) - 2, rand(5) - 2
+        @angle += @speed
+        @angle %= 360
+        redraw
+      end
+
+      on :draw do |p, b|
+        p.fill *c
+        #p.rect *b.to_a
+        p.arc *b.to_a, @angle, @angle + 90
+        p.arc *b.to_a, @angle + 180, @angle + 270
+      end
+    }
+  end
+
+  on :key_down do |key|
+    p [key.chars, key.code, key.repeat, key.modifiers]
+    close if key.code == 53
+  end
+
+  on :points_down do |ps|
+    spawn ps.x, ps.y
+    @spawning = true
+  end
+
+  on :points_up do |ps|
+    @spawning = false
+  end
+
+  on :points_moved do |ps|
+    spawn ps.x, ps.y if @spawning
+  end
+
+  add View {
+    on :draw do |p, b|
+      set :bounds, window.bounds.move_to(0)
+      p.fill 1
+      p.text "count: #{window.count}", 10, 10
+    end
+  }
+
+  root.on :draw do |p, b|
+    p.fill 1
+    p.text "draw on root view.", 10, 30
+  end
+
+  #100.times {spawn *bounds.move_to(0).center.to_a}
+  show
+end
+
+
+Reflex.run "Views"

data/examples/ruby/visuals.rb

@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+
+
+%w[xot rays reflex].product(%w[ext lib]).each do |paths|
+  $: << File.expand_path(
+    File.join File.dirname(__FILE__), *%w[.. .. ..], *paths)
+end
+
+require 'rubygems'
+require 'reflex'
+
+
+Reflex::Application.new :name => 'Visuals' do |app|
+  Reflex::Window.new :title => app.name do |win|
+    win.bounds = 100, 100, 600, 500
+    win.painter.background = 0.8
+    10.times do |i|
+      Reflex::Visuals::String.new :name => 'hello' do |v|
+        v.data = 'HELLO WORLD!'
+        v.move_to *([i * 5] * 2)
+        win.add v
+      end
+    end
+    win.show
+  end
+  app.run
+end

data/ext/reflex/application.cpp

@@ -8,12 +8,13 @@
 using namespace Rucy;
 
 
+static Class cApplication;
+
+
 namespace Reflex
 {
 
 
-	static Class cApplication;
-
 	Class
 	application_class ()
 	{
@@ -24,66 +25,20 @@ namespace Reflex
 }// Reflex
 
 
-namespace Rucy
-{
-
-
-	Value
-	value (const Reflex::Application& application)
-	{
-		return new_type<Reflex::Application>(
-			Reflex::application_class(), new Reflex::Application(application));
-	}
-
-
-}// Rucy
-
-
-class RubyApplication : public Reflex::Application
-{
-
-	public:
-
-		typedef Reflex::Application Super;
-
-		Value self;
-
-		void mark ()
-		{
-			self.mark();
-		}
-
-		virtual bool run ()
-		{
-			SYM(run);
-			return self.call(run);
-		}
+typedef Reflex::RubyApplication<Reflex::Application> RubyApplication;
 
-		virtual bool quit ()
-		{
-			SYM(quit);
-			return self.call(quit);
-		}
 
-		virtual bool about ()
-		{
-			SYM(about);
-			return self.call(about);
-		}
+#define THIS      to<Reflex::Application*>(self)
 
-};// RubyApplication
+#define CHECK     RUCY_CHECK_OBJECT(self, Reflex::Application, cApplication)
 
-
-#define this ((RubyApplication*) to<Reflex::Application*>(self))
-
-#define CHECK CHECK_OBJECT(self, RubyApplication, Reflex::application_class())
+#define CALL(fun) RUCY_WRAPPER_CALL(RubyApplication, THIS, fun)
 
 
 static
 RUBY_DEF_ALLOC(alloc, klass)
 {
-	RubyApplication* app = new RubyApplication;
-	return app->self = new_type<RubyApplication>(klass, app, mark_type<RubyApplication>);
+	return value(new RubyApplication, klass);
 }
 RUBY_END
 
@@ -91,7 +46,7 @@ static
 RUBY_DEF0(run)
 {
 	CHECK;
-	if (!this->Super::run())
+	if (!CALL(run()))
 		system_error("failed to run application.");
 	return self;
 }
@@ -101,7 +56,7 @@ static
 RUBY_DEF0(quit)
 {
 	CHECK;
-	if (!this->Super::quit())
+	if (!CALL(quit()))
 		system_error("failed to quit application.");
 	return self;
 }
@@ -111,30 +66,36 @@ static
 RUBY_DEF0(about)
 {
 	CHECK;
-	if (!this->Super::about())
+	if (!CALL(about()))
 		system_error("failed to show about application.");
 	return self;
 }
 RUBY_END
 
 static
-RUBY_DEF0(get_name)
+RUBY_DEF1(set_name, name)
 {
 	CHECK;
-	String s;
-	if (!this->get_name(&s))
-		system_error("failed to get name of application.");
-	return Value(s.c_str());
+	if (!THIS->set_name(name.c_str()))
+		system_error("failed to set name of application.");
+	return name;
 }
 RUBY_END
 
 static
-RUBY_DEF1(set_name, name)
+RUBY_DEF0(get_name)
 {
 	CHECK;
-	if (!this->set_name(name.c_str()))
-		system_error("failed to set name of application.");
-	return name;
+	const char* s = THIS->name();
+	if (!s) system_error("failed to get name of application.");
+	return value(s);
+}
+RUBY_END
+
+static
+RUBY_DEF0(instance)
+{
+	return value(Reflex::app());
 }
 RUBY_END
 
@@ -142,15 +103,14 @@ RUBY_END
 void
 Init_application ()
 {
-	Module m = define_module("Reflex");
-
-	Class c = m.define_class("Application");
-	Reflex::cApplication = c;
-
-	c.define_alloc_func(alloc);
-	c.define_method("run", run);
-	c.define_method("quit", quit);
-	c.define_method("about", about);
-	c.define_method("name",  get_name);
-	c.define_method("name=", set_name);
+	Module mReflex = define_module("Reflex");
+
+	cApplication = mReflex.define_class("Application");
+	cApplication.define_alloc_func(alloc);
+	cApplication.define_method("run", run);
+	cApplication.define_method("quit", quit);
+	cApplication.define_method("about", about);
+	cApplication.define_method("name=", set_name);
+	cApplication.define_method("name",  get_name);
+	cApplication.define_singleton_method("instance", instance);
 }

data/ext/reflex/defs.cpp

@@ -0,0 +1,8 @@
+#include "defs.h"
+
+
+#include <rucy/value.h>
+#include <reflex/defs.h>
+
+
+using namespace Rucy;