rays 0.1.6 → 0.1.7

data/test/test_image.rb

@@ -6,4 +6,67 @@ require_relative 'helper'
 
 class TestImage < Test::Unit::TestCase
 
+  W = 10
+  H = 10
+
+  def img (w = W, h = H, *args)
+    Rays::Image.new w, h, *args
+  end
+
+  def rgb (r = 0, g = 0, b = 0, a = 0)
+    Rays::Color.new r, g, b, a
+  end
+
+  def bounds (*args)
+    Rays::Bounds.new *args
+  end
+
+  def test_initialize ()
+    assert_equal W, img.width
+    assert_equal H, img.height
+  end
+
+  def test_bitmap ()
+    assert_equal W, img.bitmap.width
+    assert_equal H, img.bitmap.height
+  end
+
+  def test_texture ()
+    assert_equal W, img.texture.width
+    assert_equal H, img.texture.height
+  end
+
+  def test_painter ()
+    pa = img.painter
+    assert_equal rgb(0, 0, 0, 0), pa.background
+    assert_equal rgb(1, 1, 1, 1), pa.fill
+    assert_equal rgb(1, 1, 1, 0), pa.stroke
+    assert_equal bounds(0, 0, -1, -1), pa.clip
+    assert_equal Rays::Font.new, pa.font
+  end
+
+  def test_paint ()
+    def paint (&block)
+      Rays::Image.new(10, 10).paint &block
+    end
+    def fill (&block)
+      paint {|p| p.fill 1, 0, 0; p.stroke nil; block.call p}
+    end
+    def stroke (&block)
+      paint {|p| p.fill nil; p.stroke 1, 0, 0; block.call p}
+    end
+    def drawn (&block)
+      fill(&block).bitmap.to_a.reject {|o| o.transparent?}.uniq.size > 0
+    end
+
+    assert_equal rgb(0, 0, 0, 0), fill   {|p| p.rect 1, 1, 8, 8}[0, 0]
+    assert_equal rgb(1, 0, 0, 1), fill   {|p| p.rect 1, 1, 8, 8}[1, 1]
+    assert_equal rgb(1, 0, 0, 1), stroke {|p| p.line 0, 0, 1, 1}[0, 0]
+
+    assert drawn {|p| p.text "a"}
+  end
+
+  def test_dirty ()
+  end
+
 end# TestImage

data/test/test_painter.rb

@@ -6,4 +6,124 @@ require_relative 'helper'
 
 class TestPainter < Test::Unit::TestCase
 
+  def painter ()
+    Rays::Painter.new
+  end
+
+  def font (name = nil, size = nil)
+    Rays::Font.new name, size
+  end
+
+  def rgb (*args)
+    Rays::Color.new *args
+  end
+
+  def test_background_accessor ()
+    pa = painter
+    pa.background = 1
+    assert_equal rgb(1, 1, 1, 1), pa.background
+    pa.background = 0
+    assert_equal rgb(0, 0, 0, 1), pa.background
+    pa.background 1
+    assert_equal rgb(1, 1, 1, 1), pa.background
+    assert_equal rgb(1, 1, 1, 1), pa.background(0) {|_|
+      assert_equal rgb(0, 0, 0, 1), pa.background
+    }
+    assert_equal rgb(1, 1, 1, 1), pa.background
+  end
+
+  def test_fill_accessor ()
+    pa = painter
+    pa.fill = 1
+    assert_equal rgb(1, 1, 1, 1), pa.fill
+    pa.fill = 0
+    assert_equal rgb(0, 0, 0, 1), pa.fill
+    pa.fill 1
+    assert_equal rgb(1, 1, 1, 1), pa.fill
+    assert_equal rgb(1, 1, 1, 1), pa.fill(0) {|_|
+      assert_equal rgb(0, 0, 0, 1), pa.fill
+    }
+    assert_equal rgb(1, 1, 1, 1), pa.fill
+  end
+
+  def test_stroke_accessor ()
+    pa = painter
+    pa.stroke = 1
+    assert_equal rgb(1, 1, 1, 1), pa.stroke
+    pa.stroke = 0
+    assert_equal rgb(0, 0, 0, 1), pa.stroke
+    pa.stroke 1
+    assert_equal rgb(1, 1, 1, 1), pa.stroke
+    assert_equal rgb(1, 1, 1, 1), pa.stroke(0) {|_|
+      assert_equal rgb(0, 0, 0, 1), pa.stroke
+    }
+    assert_equal rgb(1, 1, 1, 1), pa.stroke
+  end
+
+  def test_clip_accessor ()
+    pa = painter
+    pa.clip = [1, 2, 3, 4]
+    assert_equal [1, 2, 3, 4], pa.clip.to_a
+    pa.clip = [5, 6, 7, 8]
+    assert_equal [5, 6, 7, 8], pa.clip.to_a
+    pa.clip 1, 2, 3, 4
+    assert_equal [1, 2, 3, 4], pa.clip.to_a
+    assert_equal [1, 2, 3, 4], pa.clip(5, 6, 7, 8) {|_|
+      assert_equal [5, 6, 7, 8], pa.clip.to_a
+    }.to_a
+    assert_equal [1, 2, 3, 4], pa.clip.to_a
+  end
+
+  def test_font_accessor ()
+    pa = painter
+    f10, f20 = font(nil, 10), font(nil, 20)
+    pa.font = f10
+    assert_equal f10, pa.font
+    pa.font = f20
+    assert_equal f20, pa.font
+    pa.font f10
+    assert_equal f10, pa.font
+    assert_equal f10, pa.font(f20) {|_|
+      assert_equal f20, pa.font
+    }
+    assert_equal f10, pa.font
+  end
+
+  def test_font_name_size ()
+    pa = painter
+    pa.font "Menlo", 10
+    assert_equal "Menlo Regular", pa.font.name
+    assert_equal 10, pa.font.size
+    pa.font nil
+    assert_not_equal "Menlo Regular", pa.font.name
+    pa.font nil, 20
+    assert_equal 20, pa.font.size
+  end
+
+  def test_color_accessor ()
+    pa = painter
+    f1, f2, s1, s2 = rgb(1, 0, 0), rgb(0, 1, 0), rgb(1, 0, 1), rgb(0, 1, 1)
+    pa.color f1, s1
+    assert_equal f1, pa.fill
+    assert_equal s1, pa.stroke
+    assert_equal [f1, s1], pa.color(f2, s2) {|_|
+      assert_equal f2, pa.fill
+      assert_equal s2, pa.stroke
+    }
+    assert_equal f1, pa.fill
+    assert_equal s1, pa.stroke
+  end
+
+  def test_color_by_name ()
+    pa = painter
+    pa.fill = [1, 0, 0]
+    assert_equal rgb(1, 0, 0), pa.fill
+    pa.fill = :red
+    assert_equal rgb(1, 0, 0), pa.fill
+    pa.fill = '#f00'
+    assert_equal rgb(1, 0, 0), pa.fill
+    pa.fill = '#ff0000'
+    assert_equal rgb(1, 0, 0), pa.fill
+  end
+
 end# TestPainter

data/test/test_point.rb

@@ -37,9 +37,12 @@ class TestPoint < Test::Unit::TestCase
 
   def test_move_to ()
     o = point 1, 2, 3
-    assert_equal point(4, 4, 3), o.move_to(4)
-    assert_equal point(4, 5, 3), o.move_to(4, 5)
-    assert_equal point(4, 5, 6), o.move_to(4, 5, 6)
+    assert_equal point(4, 2, 3), o.move_to(  4)
+    assert_equal point(4, 5, 3), o.move_to(  4,   5)
+    assert_equal point(1, 5, 3), o.move_to(nil,   5)
+    assert_equal point(4, 5, 6), o.move_to(  4,   5, 6)
+    assert_equal point(1, 5, 6), o.move_to(nil,   5, 6)
+    assert_equal point(1, 2, 6), o.move_to(nil, nil, 6)
     assert_raise(ArgumentError) {o.move_to()}
     assert_raise(ArgumentError) {o.move_to(4, 5, 6, 7)}
 
@@ -54,10 +57,13 @@ class TestPoint < Test::Unit::TestCase
 
   def test_move_by ()
     o = point 1, 2, 3
-    assert_equal point( 5,  6,  3), o.move_by(4)
-    assert_equal point( 5,  7,  3), o.move_by(4, 5)
-    assert_equal point( 5,  7,  9), o.move_by(4, 5, 6)
-    assert_equal point(-3, -2,  3), o.move_by(-4)
+    assert_equal point( 5,  2,  3), o.move_by(  4)
+    assert_equal point( 5,  7,  3), o.move_by(  4,   5)
+    assert_equal point( 1,  7,  3), o.move_by(nil,   5)
+    assert_equal point( 5,  7,  9), o.move_by(  4,   5, 6)
+    assert_equal point( 1,  7,  9), o.move_by(nil,   5, 6)
+    assert_equal point( 1,  2,  9), o.move_by(nil, nil, 6)
+    assert_equal point(-3,  2,  3), o.move_by(-4)
     assert_equal point(-3, -3,  3), o.move_by(-4, -5)
     assert_equal point(-3, -3, -3), o.move_by(-4, -5, -6)
     assert_raise(ArgumentError) {o.move_by()}
@@ -106,8 +112,8 @@ class TestPoint < Test::Unit::TestCase
 
   def test_compare ()
     o = point 1, 2, 3
-    assert o == point(1, 2, 3)
-    assert !(o != point(1, 2, 3))
+    assert     o == point(1, 2, 3)
+    assert_not o != point(1, 2, 3)
 
     assert o < point(2, 2, 3)
     assert o < point(1, 3, 3)
@@ -118,4 +124,19 @@ class TestPoint < Test::Unit::TestCase
     assert o > point(1, 2, 2)
   end
 
+  def test_arithmetic_operations ()
+    assert_equal point(11, 22, 33), point(10, 20, 30) + point(1, 2, 3)
+    assert_equal point( 9, 18, 27), point(10, 20, 30) - point(1, 2, 3)
+    assert_equal point(10, 40, 90), point(10, 20, 30) * point(1, 2, 3)
+    assert_equal point(10, 10, 10), point(10, 20, 30) / point(1, 2, 3)
+    assert_equal point(11, 22, 33), point(10, 20, 30) + [1, 2, 3]
+    assert_equal point( 9, 18, 27), point(10, 20, 30) - [1, 2, 3]
+    assert_equal point(10, 40, 90), point(10, 20, 30) * [1, 2, 3]
+    assert_equal point(10, 10, 10), point(10, 20, 30) / [1, 2, 3]
+    assert_equal point(12, 22, 32), point(10, 20, 30) + 2
+    assert_equal point( 8, 18, 28), point(10, 20, 30) - 2
+    assert_equal point(20, 40, 60), point(10, 20, 30) * 2
+    assert_equal point( 5, 10, 15), point(10, 20, 30) / 2
+  end
+
 end# TestPoint

data/test/test_shader.rb

@@ -0,0 +1,37 @@
+# -*- coding: utf-8 -*-
+
+
+require_relative 'helper'
+
+
+class TestShader < Test::Unit::TestCase
+
+  def sh (src)
+    Rays::Shader.new src
+  end
+
+  def img (w = 10, h = 10, &block)
+    Rays::Image.new w, h
+  end
+
+  def rgb (*args)
+    Rays::Color.new *args
+  end
+
+  def test_initialize ()
+    assert_raise(Rucy::NativeError) {sh "foo"}
+    assert_raise(ArgumentError) {sh}
+    assert_raise(ArgumentError) {sh nil}
+    assert sh("void main() {gl_FragColor = vec4(1, 0, 0, 1);}")
+  end
+
+  def test_fragment_shader ()
+    i = img.paint do
+      attach "void main () {gl_FragColor = vec4(1.0, 0.0, 0.0, 1.0);}"
+      fill 0, 1, 0, 1
+      rect *bounds.move_to(0, 0).to_a
+    end
+    assert_equal rgb(1, 0, 0, 1), i[0, 0]
+  end
+
+end# TestShader

data/test/test_texture.rb

@@ -6,4 +6,22 @@ require_relative 'helper'
 
 class TestTexture < Test::Unit::TestCase
 
+  W = 32
+  H = 16
+
+  def tex (w = W, h = H)
+    Rays::Texture.new w, h
+  end
+
+  def test_initialize ()
+    assert_equal W, tex.width
+    assert_equal H, tex.height
+  end
+
+  def test_to_bitmap ()
+    assert_equal Rays::Bitmap, tex.to_bitmap.class
+    assert_equal W, tex.to_bitmap.width
+    assert_equal H, tex.to_bitmap.height
+  end
+
 end# TestTexture

metadata

@@ -1,78 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: rays
 version: !ruby/object:Gem::Version
-  version: 0.1.6
-  prerelease: 
+  version: 0.1.7
 platform: ruby
 authors:
 - snori
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-06 00:00:00.000000000 Z
+date: 2014-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: xot
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rucy
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: gemcutter
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: This library helps you to develop graphics application with OpenGL.
@@ -81,27 +72,27 @@ executables: []
 extensions:
 - Rakefile
 extra_rdoc_files:
-- README
-- .doc/ext/rays/bitmap.cpp
-- .doc/ext/rays/bounds.cpp
-- .doc/ext/rays/color.cpp
-- .doc/ext/rays/font.cpp
-- .doc/ext/rays/image.cpp
-- .doc/ext/rays/matrix.cpp
-- .doc/ext/rays/native.cpp
-- .doc/ext/rays/painter.cpp
-- .doc/ext/rays/point.cpp
-- .doc/ext/rays/rays.cpp
-- .doc/ext/rays/texture.cpp
+- ".doc/ext/rays/bitmap.cpp"
+- ".doc/ext/rays/bounds.cpp"
+- ".doc/ext/rays/color.cpp"
+- ".doc/ext/rays/color_space.cpp"
+- ".doc/ext/rays/font.cpp"
+- ".doc/ext/rays/image.cpp"
+- ".doc/ext/rays/matrix.cpp"
+- ".doc/ext/rays/native.cpp"
+- ".doc/ext/rays/painter.cpp"
+- ".doc/ext/rays/point.cpp"
+- ".doc/ext/rays/rays.cpp"
+- ".doc/ext/rays/shader.cpp"
+- ".doc/ext/rays/texture.cpp"
 files:
-- .gitignore
-- ChangeLog
-- README
+- README.md
 - Rakefile
 - VERSION
 - ext/rays/bitmap.cpp
 - ext/rays/bounds.cpp
 - ext/rays/color.cpp
+- ext/rays/color_space.cpp
 - ext/rays/defs.h
 - ext/rays/extconf.rb
 - ext/rays/font.cpp
@@ -111,12 +102,13 @@ files:
 - ext/rays/painter.cpp
 - ext/rays/point.cpp
 - ext/rays/rays.cpp
+- ext/rays/shader.cpp
 - ext/rays/texture.cpp
 - include/rays.h
 - include/rays/bitmap.h
 - include/rays/bounds.h
 - include/rays/color.h
-- include/rays/colorspace.h
+- include/rays/color_space.h
 - include/rays/defs.h
 - include/rays/exception.h
 - include/rays/font.h
@@ -130,39 +122,61 @@ files:
 - include/rays/ruby/bitmap.h
 - include/rays/ruby/bounds.h
 - include/rays/ruby/color.h
+- include/rays/ruby/color_space.h
 - include/rays/ruby/font.h
 - include/rays/ruby/image.h
 - include/rays/ruby/matrix.h
 - include/rays/ruby/painter.h
 - include/rays/ruby/point.h
 - include/rays/ruby/rays.h
+- include/rays/ruby/shader.h
 - include/rays/ruby/texture.h
+- include/rays/shader.h
 - include/rays/texture.h
 - lib/rays.rb
 - lib/rays/autoinit.rb
 - lib/rays/bitmap.rb
 - lib/rays/bounds.rb
 - lib/rays/color.rb
+- lib/rays/color_space.rb
 - lib/rays/ext.rb
+- lib/rays/font.rb
 - lib/rays/image.rb
 - lib/rays/module.rb
 - lib/rays/painter.rb
 - lib/rays/point.rb
+- lib/rays/shader.rb
 - lib/rays/texture.rb
 - rays.gemspec
 - src/bounds.cpp
-- src/cocoa/bitmap.mm
-- src/cocoa/font.mm
-- src/cocoa/helper.h
-- src/cocoa/helper.mm
-- src/cocoa/rays.mm
 - src/color.cpp
-- src/colorspace.cpp
+- src/color_space.cpp
 - src/exception.cpp
+- src/frame_buffer.cpp
+- src/frame_buffer.h
 - src/image.cpp
+- src/ios/bitmap.mm
+- src/ios/font.mm
+- src/ios/helper.h
+- src/ios/helper.mm
+- src/ios/opengl.mm
+- src/ios/program.cpp
+- src/ios/rays.mm
 - src/matrix.cpp
+- src/opengl.cpp
+- src/osx/bitmap.mm
+- src/osx/font.mm
+- src/osx/helper.h
+- src/osx/helper.mm
+- src/osx/opengl.mm
+- src/osx/rays.mm
 - src/painter.cpp
 - src/point.cpp
+- src/program.cpp
+- src/program.h
+- src/render_buffer.cpp
+- src/render_buffer.h
+- src/shader.cpp
 - src/texture.cpp
 - src/win32/bitmap.cpp
 - src/win32/font.cpp
@@ -178,41 +192,43 @@ files:
 - test/test_painter.rb
 - test/test_point.rb
 - test/test_rays.rb
+- test/test_shader.rb
 - test/test_texture.rb
-- .doc/ext/rays/bitmap.cpp
-- .doc/ext/rays/bounds.cpp
-- .doc/ext/rays/color.cpp
-- .doc/ext/rays/font.cpp
-- .doc/ext/rays/image.cpp
-- .doc/ext/rays/matrix.cpp
-- .doc/ext/rays/native.cpp
-- .doc/ext/rays/painter.cpp
-- .doc/ext/rays/point.cpp
-- .doc/ext/rays/rays.cpp
-- .doc/ext/rays/texture.cpp
+- ".doc/ext/rays/bitmap.cpp"
+- ".doc/ext/rays/bounds.cpp"
+- ".doc/ext/rays/color.cpp"
+- ".doc/ext/rays/color_space.cpp"
+- ".doc/ext/rays/font.cpp"
+- ".doc/ext/rays/image.cpp"
+- ".doc/ext/rays/matrix.cpp"
+- ".doc/ext/rays/native.cpp"
+- ".doc/ext/rays/painter.cpp"
+- ".doc/ext/rays/point.cpp"
+- ".doc/ext/rays/rays.cpp"
+- ".doc/ext/rays/shader.cpp"
+- ".doc/ext/rays/texture.cpp"
 homepage: http://github.com/xord/rays/wiki
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.0
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A Drawing Engine using OpenGL.
 test_files:
 - test/helper.rb
@@ -224,4 +240,5 @@ test_files:
 - test/test_painter.rb
 - test/test_point.rb
 - test/test_rays.rb
+- test/test_shader.rb
 - test/test_texture.rb

data/.gitignore

@@ -1,14 +0,0 @@
-*.o
-*.so
-*.bundle
-*.dll.a
-*.gem
-*.log
-*.rdoc.cpp
-*~
-lib/*.a
-.doc
-.yardoc
-.DS_Store
-Makefile
-depend.mf

data/ChangeLog

@@ -1,8 +0,0 @@
-2011-08-28 snori <snori@xord.org>
-
-	* v0.1.1
-
-
-2011-06-03 snori <snori@xord.org>
-
-	* delete Gemfile.