rays 0.1.19 → 0.1.23

data/lib/rays/polygon.rb

@@ -12,43 +12,43 @@ module Rays
 
     include Enumerable
 
-    def initialize (*args, loop: true)
+    def initialize(*args, loop: true)
       setup args, loop
     end
 
-    def transform (matrix = nil, &block)
+    def transform(matrix = nil, &block)
       lines = to_a
       lines = lines.map {|line| line.transform matrix} if matrix
       lines = block.call lines if block
-      self.class.new *lines
+      self.class.new(*lines)
     end
 
-    def intersects (obj)
+    def intersects(obj)
       !(self & obj).empty?
     end
 
-    def self.line (*args, loop: false)
-      new *args, loop: loop
+    def self.line(*args, loop: false)
+      new(*args, loop: loop)
     end
 
-    def self.rect (
+    def self.rect(
       *args, round: nil, lt: nil, rt: nil, lb: nil, rb: nil, nsegment: nil)
 
       create_rect args, round, lt, rt, lb, rb, nsegment
     end
 
-    def self.ellipse (
+    def self.ellipse(
       *args, center: nil, radius: nil, hole: nil, from: nil, to: nil,
       nsegment: nil)
 
       create_ellipse args, center, radius, hole, from, to, nsegment
     end
 
-    def self.curve (*args, loop: false)
+    def self.curve(*args, loop: false)
       create_curve args, loop
     end
 
-    def self.bezier (*args, loop: false)
+    def self.bezier(*args, loop: false)
       create_bezier args, loop
     end
 

data/lib/rays/polygon_line.rb

@@ -12,18 +12,18 @@ module Rays
 
     class Line < Polyline
 
-      def initialize (*points, loop: true, hole: false)
+      def initialize(*points, loop: true, hole: false)
         setup points, loop, hole
       end
 
-      def transform (matrix = nil, loop: loop?, hole: hole?, &block)
+      def transform(matrix = nil, loop: loop?, hole: hole?, &block)
         points = to_a
         points = points.map {|point| matrix * point} if matrix
         points = block.call points if block
-        self.class.new *points, loop: loop, hole: hole
+        self.class.new(*points, loop: loop, hole: hole)
       end
 
-      def inspect ()
+      def inspect()
         "#<Rays::Polygon::Line #{to_a.join ', '}, loop: #{loop?}, hole: #{hole?}>"
       end
 

data/lib/rays/polyline.rb

@@ -11,18 +11,18 @@ module Rays
 
     include Enumerable
 
-    def initialize (*points, loop: false)
+    def initialize(*points, loop: false)
       setup points, loop
     end
 
-    def transform (matrix = nil, loop: loop?, &block)
+    def transform(matrix = nil, loop: loop?, &block)
       points = to_a
       points = points.map {|point| matrix * point} if matrix
       points = block.call points if block
-      self.class.new *points, loop: loop
+      self.class.new(*points, loop: loop)
     end
 
-    def inspect ()
+    def inspect()
       "#<Rays::Polyline #{to_a.join ', '}, loop: #{loop?}>"
     end
 

data/lib/rays/shader.rb

@@ -10,16 +10,16 @@ module Rays
 
   class Shader
 
-    def initialize (source = nil, **uniforms, &block)
+    def initialize(source = nil, **uniforms, &block)
       if source
         setup source
-        uniform **uniforms unless uniforms.empty?
+        uniform(**uniforms) unless uniforms.empty?
       end
 
       Xot::BlockUtil.instance_eval_or_block_call self, &block if block
     end
 
-    def uniform (name = nil, *args, **uniforms)
+    def uniform(name = nil, *args, **uniforms)
       set_uniform name, *args if name
       uniforms.each do |key, value|
         set_uniform key, value

data/rays.gemspec

@@ -26,10 +26,10 @@ Gem::Specification.new do |s|
   s.homepage = "https://github.com/xord/rays"
 
   s.platform              = Gem::Platform::RUBY
-  s.required_ruby_version = '~> 2'
+  s.required_ruby_version = '>= 2.6.0'
 
-  s.add_runtime_dependency 'xot',  '~> 0.1.19'
-  s.add_runtime_dependency 'rucy', '~> 0.1.18'
+  s.add_runtime_dependency 'xot',  '~> 0.1.23'
+  s.add_runtime_dependency 'rucy', '~> 0.1.23'
 
   s.files            = `git ls-files`.split $/
   s.executables      = s.files.grep(%r{^bin/}) {|f| File.basename f}

data/src/painter.cpp

@@ -129,7 +129,7 @@ namespace Rays
 		GLint scissor_box[4];
 
 		GLboolean blend;
-		GLint blend_src_factor, blend_dst_factor;
+		GLint blend_src_rgb, blend_src_alpha, blend_dst_rgb, blend_dst_alpha;
 
 		GLint framebuffer_binding;
 
@@ -143,8 +143,10 @@ namespace Rays
 			glGetIntegerv(GL_SCISSOR_BOX, scissor_box);
 
 			glGetBooleanv(GL_BLEND, &blend);
-			glGetIntegerv(GL_BLEND_SRC_ALPHA, &blend_src_factor);
-			glGetIntegerv(GL_BLEND_DST_ALPHA, &blend_dst_factor);
+			glGetIntegerv(GL_BLEND_SRC_RGB,   &blend_src_rgb);
+			glGetIntegerv(GL_BLEND_SRC_ALPHA, &blend_src_alpha);
+			glGetIntegerv(GL_BLEND_DST_RGB,   &blend_dst_rgb);
+			glGetIntegerv(GL_BLEND_DST_ALPHA, &blend_dst_alpha);
 
 			glGetIntegerv(GL_FRAMEBUFFER_BINDING, &framebuffer_binding);
 		}
@@ -160,7 +162,8 @@ namespace Rays
 			glScissor(scissor_box[0], scissor_box[1], scissor_box[2], scissor_box[3]);
 
 			enable(GL_BLEND, blend);
-			glBlendFunc(blend_src_factor, blend_dst_factor);
+			glBlendFuncSeparate(
+				blend_src_rgb, blend_dst_rgb, blend_src_alpha, blend_dst_alpha);
 
 			glBindFramebuffer(GL_FRAMEBUFFER, framebuffer_binding);
 		}
@@ -230,7 +233,7 @@ namespace Rays
 	}
 
 	static const Shader&
-	get_default_shader_for_color_texture ()
+	get_default_shader_for_texture ()
 	{
 		static const Shader SHADER(
 			"varying vec4 " VARYING_TEXCOORD ";"
@@ -244,21 +247,6 @@ namespace Rays
 		return SHADER;
 	}
 
-	static const Shader&
-	get_default_shader_for_alpha_texture ()
-	{
-		static const Shader SHADER(
-			"varying vec4 " VARYING_TEXCOORD ";"
-			"varying vec4 " VARYING_COLOR ";"
-			"vec4 sampleTexture(vec2);"
-			"void main ()"
-			"{"
-			"  vec4 color   = sampleTexture(" VARYING_TEXCOORD ".xy);"
-			"  gl_FragColor = vec4(v_Color.rgb, color.a);"
-			"}");
-		return SHADER;
-	}
-
 
 	struct Painter::Data
 	{
@@ -943,7 +931,7 @@ namespace Rays
 		TextureInfo texinfo(texture, src_x, src_y, src_x + src_w, src_y + src_h);
 
 		if (!shader)
-			shader = &get_default_shader_for_color_texture();
+			shader = &get_default_shader_for_texture();
 
 		draw_polygon(
 			painter, MODES, 0, 0, false, nostroke, points, 4, NULL, 0, texcoords,
@@ -1100,7 +1088,7 @@ namespace Rays
 		{
 			int bmp_w = std::max(texture.width(),  tex_w);
 			int bmp_h = std::max(texture.height(), tex_h);
-			self->text_image = Image(Bitmap(bmp_w, bmp_h, ALPHA), density);
+			self->text_image = Image(Bitmap(bmp_w, bmp_h), density);
 		}
 
 		if (!self->text_image)
@@ -1120,7 +1108,7 @@ namespace Rays
 			painter, self->text_image,
 			0, 0, str_w, str_h,
 			x, y, str_w, str_h,
-			true, &get_default_shader_for_alpha_texture());
+			true, &get_default_shader_for_texture());
 
 		debug_draw_text(painter, font, x, y, str_w / density, str_h / density);
 	}

data/test/helper.rb

@@ -12,6 +12,6 @@ require 'rays'
 include Xot::Test
 
 
-unless $RAYS_NOAUTOINIT
-  def Rays.fin! () end
+unless defined?($RAYS_NOAUTOINIT) && $RAYS_NOAUTOINIT
+  def Rays.fin!() end
 end

data/test/test_bitmap.rb

@@ -9,20 +9,20 @@ class TestBitmap < Test::Unit::TestCase
   W = 32
   H = 16
 
-  def bitmap (w = W, h = H)
+  def bitmap(w = W, h = H)
     Rays::Bitmap.new w, h
   end
 
-  def color (*args)
-    Rays::Color.new *args
+  def color(*args)
+    Rays::Color.new(*args)
   end
 
-  def test_initialize ()
+  def test_initialize()
     assert_equal W, bitmap.width
     assert_equal H, bitmap.height
   end
 
-  def test_dup ()
+  def test_dup()
     o          = bitmap
     assert_equal color(0, 0, 0, 0), o[0, 0]
     o[0, 0]    = color(1, 0, 0, 0)
@@ -34,14 +34,14 @@ class TestBitmap < Test::Unit::TestCase
     assert_equal color(1, 0, 0, 0), o[0, 0]
   end
 
-  def test_at ()
+  def test_at()
     o       = bitmap
     assert_equal color(0, 0, 0, 0), o[0, 0]
     o[0, 0] = 1
     assert_equal color(1, 1, 1, 1), o[0, 0]
   end
 
-  def test_to_a ()
+  def test_to_a()
     colors = %w[#f00 #0f0 #00f #ff0].map {|s| color s}
     bmp = bitmap 2, 2
     bmp[0, 0], bmp[1, 0], bmp[0, 1], bmp[1, 1] = colors

data/test/test_bounds.rb

@@ -6,15 +6,15 @@ require_relative 'helper'
 
 class TestBounds < Test::Unit::TestCase
 
-  def bounds (*args)
-    Rays::Bounds.new *args
+  def bounds(*args)
+    Rays::Bounds.new(*args)
   end
 
-  def point (*args)
-    Rays::Point.new *args
+  def point(*args)
+    Rays::Point.new(*args)
   end
 
-  def test_initialize ()
+  def test_initialize()
     assert_equal bounds(0, 0, 0, 0, 0, 0), bounds()
     assert_equal bounds(0, 0, 0, 1, 1, 0), bounds(1)
     assert_equal bounds(0, 0, 0, 1, 2, 0), bounds(1, 2)
@@ -25,7 +25,7 @@ class TestBounds < Test::Unit::TestCase
     assert_raise(ArgumentError) {bounds(1, 2, 3, 4, 5, 6, 7)}
   end
 
-  def test_dup ()
+  def test_dup()
     o   = bounds
     assert_equal bounds(0, 0, 0, 0, 0, 0), o
     o.x = 1
@@ -37,17 +37,17 @@ class TestBounds < Test::Unit::TestCase
     assert_equal bounds(1, 0, 0, 0, 0, 0), o
   end
 
-  def test_intersect? ()
+  def test_intersect?()
     assert     bounds(10, 20, 30, 100, 100, 100).intersect?(bounds 50, 60, 70, 100, 100, 100)
     assert_not bounds(10, 20, 30,  10,  10,  10).intersect?(bounds 50, 60, 70, 100, 100, 100)
   end
 
-  def test_include? ()
+  def test_include?()
     assert     bounds(10, 20, 30, 100, 100, 100).include?(point 50, 60)
     assert_not bounds(10, 20, 30,  10,  10,  10).include?(point 50, 60)
   end
 
-  def test_valid? ()
+  def test_valid?()
     assert     bounds(0, 0, 0,  0,  0,  0).valid?
     assert     bounds(0, 0, 0,  1,  0,  0).valid?
     assert     bounds(0, 0, 0,  0,  1,  0).valid?
@@ -57,7 +57,7 @@ class TestBounds < Test::Unit::TestCase
     assert_not bounds(0, 0, 0,  0,  0, -1).valid?
   end
 
-  def test_get_xyzwhd ()
+  def test_get_xyzwhd()
     o = bounds 1, 2, 3, 4, 5, 6
     assert_equal 1, o.x
     assert_equal 2, o.y
@@ -70,7 +70,7 @@ class TestBounds < Test::Unit::TestCase
     assert_equal 6, o.depth
   end
 
-  def test_set_xyzwhd ()
+  def test_set_xyzwhd()
     o = bounds
     o.x = 1
     assert_equal [1, 0, 0, 0, 0, 0], o.to_a(3)
@@ -92,7 +92,7 @@ class TestBounds < Test::Unit::TestCase
     assert_equal [1, 2, 3, 7, 8, 9], o.to_a(3)
   end
 
-  def test_get_ltbrbf ()
+  def test_get_ltbrbf()
     o = bounds 1, 2, 3, 4, 5, 6
     assert_equal 1, o.left
     assert_equal 2, o.top
@@ -106,7 +106,7 @@ class TestBounds < Test::Unit::TestCase
     assert_equal [4, 6], o.rb.to_a
   end
 
-  def test_set_ltbrbf ()
+  def test_set_ltbrbf()
     assert_equal [1, 0, 0, -1,  0,  0], bounds.tap {|o| o.left   = 1}.to_a(3)
     assert_equal [0, 2, 0,  0, -2,  0], bounds.tap {|o| o.top    = 2}.to_a(3)
     assert_equal [0, 0, 3,  0,  0, -3], bounds.tap {|o| o.back   = 3}.to_a(3)
@@ -132,7 +132,7 @@ class TestBounds < Test::Unit::TestCase
     assert_equal [10, 20, 0, 40, 50, 0], bounds(10, 20, 30, 40).tap {|o| o.rb += 10}.to_a(3)
   end
 
-  def test_position ()
+  def test_position()
     o = bounds 1, 2, 3, 4, 5, 6
     assert_equal [ 1,  2,  3], o.position.to_a(3)
     o.position = point 7, 8, 9
@@ -142,14 +142,14 @@ class TestBounds < Test::Unit::TestCase
     assert_equal [10, 11, 12], o.pos.to_a(3)
   end
 
-  def test_size ()
+  def test_size()
     o = bounds 1, 2, 3, 4, 5, 6
     assert_equal point(4, 5, 6), o.size
     o.size = point 7, 8, 9
     assert_equal point(7, 8, 9), o.size
   end
 
-  def test_move_to ()
+  def test_move_to()
     o = bounds 1, 2, 3, 4, 5, 6
     assert_equal bounds(7, 2, 3, 4, 5, 6), o.move_to(  7)
     assert_equal bounds(7, 8, 3, 4, 5, 6), o.move_to(  7,   8)
@@ -169,7 +169,7 @@ class TestBounds < Test::Unit::TestCase
     assert_equal bounds( 7,  8,  9, 4, 5, 6), o1
   end
 
-  def test_move_by ()
+  def test_move_by()
     o = bounds 1, 2, 3, 4, 5, 6
     assert_equal bounds( 8,  2,  3, 4, 5, 6), o.move_by(  7)
     assert_equal bounds( 8, 10,  3, 4, 5, 6), o.move_by(  7,   8)
@@ -192,7 +192,7 @@ class TestBounds < Test::Unit::TestCase
     assert_equal bounds( 8, 10, 12, 4, 5, 6), o1
   end
 
-  def test_resize_to ()
+  def test_resize_to()
     o = bounds 1, 2, 3, 4, 5, 6
     assert_equal bounds(1, 2, 3, 7, 5, 6), o.resize_to(  7)
     assert_equal bounds(1, 2, 3, 7, 8, 6), o.resize_to(  7,   8)
@@ -212,7 +212,7 @@ class TestBounds < Test::Unit::TestCase
     assert_equal bounds(1, 2, 3,  7,  8,  9), o1
   end
 
-  def test_resize_by ()
+  def test_resize_by()
     o = bounds 1, 2, 3, 4, 5, 6
     assert_equal bounds(1, 2, 3, 11,  5,  6), o.resize_by(  7)
     assert_equal bounds(1, 2, 3, 11, 13,  6), o.resize_by(  7,   8)
@@ -235,7 +235,7 @@ class TestBounds < Test::Unit::TestCase
     assert_equal bounds(1, 2, 3, 11, 13, 15), o1
   end
 
-  def test_inset_by ()
+  def test_inset_by()
     o = bounds 1, 2, 3, 20, 30, 40
     assert_equal bounds(8,  2,  3,  6, 30, 40), o.inset_by(  7)
     assert_equal bounds(8, 10,  3,  6, 14, 40), o.inset_by(  7,   8)
@@ -255,7 +255,7 @@ class TestBounds < Test::Unit::TestCase
     assert_equal bounds( 8, 10, 12, 6, 14, 22), o1
   end
 
-  def test_to_a ()
+  def test_to_a()
     o = bounds 1, 2, 3, 4, 5, 6
     assert_equal [1, 2, 4, 5],       o.to_a
     assert_equal [1, 4],             o.to_a(1)
@@ -266,7 +266,7 @@ class TestBounds < Test::Unit::TestCase
     assert_raise(ArgumentError) {o.to_a(4)}
   end
 
-  def test_index ()
+  def test_index()
     o = bounds 1, 2, 3, 4, 5, 6
     assert_equal point(1, 2, 3), o[0]
     assert_equal point(4, 5, 6), o[1]
@@ -274,7 +274,7 @@ class TestBounds < Test::Unit::TestCase
     assert_raise(IndexError) {o[2]}
   end
 
-  def test_index_assign ()
+  def test_index_assign()
     o = bounds 1, 2, 3, 4, 5, 6
     o[0] = point 7, 8, 9
     assert_equal bounds(7, 8, 9, 4, 5, 6), o
@@ -284,7 +284,7 @@ class TestBounds < Test::Unit::TestCase
     assert_raise(IndexError) {o[2]}
   end
 
-  def test_compare ()
+  def test_compare()
     o = bounds 1, 2, 3, 4, 5, 6
     assert     o == bounds(1, 2, 3, 4, 5, 6)
     assert_not o != bounds(1, 2, 3, 4, 5, 6)
@@ -304,7 +304,7 @@ class TestBounds < Test::Unit::TestCase
     assert o > bounds(1, 2, 3, 4, 5, 5)
   end
 
-  def test_operators ()
+  def test_operators()
     assert_equal bounds(50, 60, 70,  60,  60,  60), bounds(10, 20, 30, 100, 100, 100) & bounds(50, 60, 70, 100, 100, 100)
     assert_equal bounds(10, 20, 30, 140, 140, 140), bounds(10, 20, 30, 100, 100, 100) | bounds(50, 60, 70, 100, 100, 100)
     assert_equal bounds(10, 20, 30,  20,  20,  20), bounds(20, 30, 40, 10, 10, 10)    | point(10, 20, 30)
@@ -313,7 +313,7 @@ class TestBounds < Test::Unit::TestCase
     assert_equal point(0), (bounds(10, 20, 30, 10, 10, 10) & bounds(50, 60, 70, 10, 10, 10)).size
   end
 
-  def test_invalid ()
+  def test_invalid()
     o = Rays::Bounds.invalid
     assert_not o.valid?
 

data/test/test_color.rb

@@ -6,19 +6,19 @@ require_relative 'helper'
 
 class TestColor < Test::Unit::TestCase
 
-  def color (*args)
-    Rays::Color.new *args
+  def color(*args)
+    Rays::Color.new(*args)
   end
 
-  def color8 (r, g, b, a = 255, div = 255)
-    color *[r, g, b, a].map {|n| n / div.to_f}
+  def color8(r, g, b, a = 255, div = 255)
+    color(*[r, g, b, a].map {|n| n / div.to_f})
   end
 
-  def hsv (*args)
-    Rays::Color.hsv *args
+  def hsv(*args)
+    Rays::Color.hsv(*args)
   end
 
-  def test_initialize ()
+  def test_initialize()
     assert_equal color(0, 0, 0, 1), color()
     assert_equal color(1, 1, 1, 1), color(1)
     assert_equal color(1, 1, 1, 2), color(1, 2)
@@ -28,7 +28,7 @@ class TestColor < Test::Unit::TestCase
     assert_raise(ArgumentError) {color(1, 2, 3, 4, 5)}
   end
 
-  def test_initialize_with_string ()
+  def test_initialize_with_string()
     assert_equal color(0, 0, 0, 1), color('#000')
     assert_equal color(0, 0, 0, 1), color('#000000')
     assert_equal color(0, 0, 0, 0), color('#0000')
@@ -46,7 +46,7 @@ class TestColor < Test::Unit::TestCase
     assert_raise(ArgumentError) {color '#0000000'}
   end
 
-  def test_dup ()
+  def test_dup()
     o     = color
     assert_equal color(0, 0, 0), o
     o.red = 1
@@ -58,7 +58,7 @@ class TestColor < Test::Unit::TestCase
     assert_equal color(1, 0, 0), o
   end
 
-  def test_get_rgb ()
+  def test_get_rgb()
     o = color 1, 2, 3, 4
     assert_equal 1, o.red
     assert_equal 2, o.green
@@ -66,7 +66,7 @@ class TestColor < Test::Unit::TestCase
     assert_equal 4, o.alpha
   end
 
-  def test_set_rgb ()
+  def test_set_rgb()
     o = color
     assert_equal [0, 0, 0, 1], o.to_a
     o.red = 1
@@ -79,12 +79,12 @@ class TestColor < Test::Unit::TestCase
     assert_equal [1, 2, 3, 4], o.to_a
   end
 
-  def test_to_a ()
+  def test_to_a()
     o = color 1, 2, 3, 4
     assert_equal [1, 2, 3, 4], o.to_a
   end
 
-  def test_index ()
+  def test_index()
     o = color 1, 2, 3, 4
     assert_equal 1, o[0]
     assert_equal 2, o[1]
@@ -94,7 +94,7 @@ class TestColor < Test::Unit::TestCase
     assert_raise(IndexError) {color[4]}
   end
 
-  def test_index_assign ()
+  def test_index_assign()
     o = color 1, 2, 3, 4
     o[0] = 4
     assert_equal [4, 2, 3, 4], o.to_a
@@ -108,7 +108,7 @@ class TestColor < Test::Unit::TestCase
     assert_raise(IndexError) {color[ 4] = 8}
   end
 
-  def test_compare ()
+  def test_compare()
     o = color 1, 2, 3, 4
     assert     o == color(1, 2, 3, 4)
     assert_not o != color(1, 2, 3, 4)
@@ -124,7 +124,7 @@ class TestColor < Test::Unit::TestCase
     assert o > color(1, 2, 3, 3)
   end
 
-  def test_hsv_hue ()
+  def test_hsv_hue()
     assert_equal color(0.5, 0, 1), hsv(-0.25, 1, 1)
     assert_equal color(1,   0, 0), hsv( 0,    1, 1)
     assert_equal color(0.5, 1, 0), hsv( 0.25, 1, 1)
@@ -134,19 +134,19 @@ class TestColor < Test::Unit::TestCase
     assert_equal color(0.5, 1, 0), hsv( 1.25, 1, 1)
   end
 
-  def test_hsv_saturation ()
+  def test_hsv_saturation()
     assert_equal color(1, 1,   1),   hsv(1, 0,   1)
     assert_equal color(1, 0.5, 0.5), hsv(1, 0.5, 1)
     assert_equal color(1, 0,   0),   hsv(1, 1,   1)
   end
 
-  def test_hsv_value ()
+  def test_hsv_value()
     assert_equal color(0,   0,   0), hsv(1, 1, 0)
     assert_equal color(0.5, 0,   0), hsv(1, 1, 0.5)
     assert_equal color(1,   0,   0), hsv(1, 1, 1)
   end
 
-  def test_hsv_alpha ()
+  def test_hsv_alpha()
     assert_equal color(1, 0, 0, 0),   hsv(1, 1, 1, 0)
     assert_equal color(1, 0, 0, 0.5), hsv(1, 1, 1, 0.5)
     assert_equal color(1, 0, 0, 1),   hsv(1, 1, 1, 1)

data/test/test_color_space.rb

@@ -6,8 +6,8 @@ require_relative 'helper'
 
 class TestColorSpace < Test::Unit::TestCase
 
-  def cs (*args)
-    Rays::ColorSpace.new *args
+  def cs(*args)
+    Rays::ColorSpace.new(*args)
   end
 
   TYPES = %w[
@@ -35,7 +35,7 @@ class TestColorSpace < Test::Unit::TestCase
   alias  bgra_f  bgra_float
   alias abgr_f  abgr_float
 
-  def all ()
+  def all()
     [
       gray, alpha,
       rgb, bgr, rgba, bgra, rgbx, bgrx, argb, abgr, xrgb, xbgr,
@@ -43,49 +43,49 @@ class TestColorSpace < Test::Unit::TestCase
     ]
   end
 
-  def test_gray? ()
+  def test_gray?()
     grays  = [gray]
     others = all - grays
     grays .each {|t| assert_equal true,  t.gray?}
     others.each {|t| assert_equal false, t.gray?}
   end
 
-  def test_alpha? ()
+  def test_alpha?()
     alphas = [alpha]
     others = all - alphas
     alphas.each {|t| assert_equal true,  t.alpha?}
     others.each {|t| assert_equal false, t.alpha?}
   end
 
-  def test_rgb? ()
+  def test_rgb?()
     rgbs   = [rgb, rgba, rgbx, argb, xrgb, rgb_f, rgba_f, argb_f]
     others = all - rgbs
     rgbs  .each {|t| assert_equal true,  t.rgb?}
     others.each {|t| assert_equal false, t.rgb?}
   end
 
-  def test_bgr? ()
+  def test_bgr?()
     bgrs   = [bgr, bgra, bgrx, abgr, xbgr, bgr_f, bgra_f, abgr_f]
     others = all - bgrs
     bgrs  .each {|t| assert_equal true,  t.bgr?}
     others.each {|t| assert_equal false, t.bgr?}
   end
 
-  def test_float? ()
+  def test_float?()
     floats = [rgb_f, rgba_f, argb_f, bgr_f, bgra_f, abgr_f]
     others = all - floats
     floats.each {|t| assert_equal true,  t.float?}
     others.each {|t| assert_equal false, t.float?}
   end
 
-  def test_has_alpha? ()
+  def test_has_alpha?()
     alphas = [alpha, rgba, argb, bgra, abgr, rgba_f, argb_f, bgra_f, abgr_f]
     others = all - alphas
     alphas.each {|t| assert_equal true,  t.has_alpha?}
     others.each {|t| assert_equal false, t.has_alpha?}
   end
 
-  def test_has_skip? ()
+  def test_has_skip?()
     skips  = [rgbx, xrgb, bgrx, xbgr]
     others = all - skips
     skips.each  {|t| assert_equal true,  t.has_skip?}