rays 0.1.19 → 0.1.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 14424275a96e7500294e649629b7dfc654c1fa8a0c0f97ad89a8280481d40e31
-  data.tar.gz: db50e1840c88b5a73039c268f55051a892f31d85692b99b699bada329e24efb4
+  metadata.gz: 040c0f759c8eb840cb1404ef8d4b784a2e8c65a0b4c45069dfc710ce4d82ea11
+  data.tar.gz: 5d23a768599e7f41c56e626077cc194e6160c9e9ce4d29755e52a7ed9125ab2a
 SHA512:
-  metadata.gz: ce029251dbb42520c043ce038c6e906763451899da9198c089a78ec558995cc110edb201a42d115af9158898210444d71feba4849e7dd65f09d7c54040aa7db8
-  data.tar.gz: 7f5d5c0d4dc84f0ec3298eeebd9fb17b7244f7f6f799c29d2cabc4eb7663a8999dc0d0e95d083e6b877797190a729071b9b2163fc158bd27d917153c1fade75a
+  metadata.gz: 3a073787bd50fa263eb8ea3a773a28a82bc4e5169f61957ac1497529b6a7ce7c31a18b2b65b4914c4f210e97290de286fb4a7293e52ce2aa8a89d14807f8e4a0
+  data.tar.gz: 4d3635baaa03a28cbc06461a0af483a757a117fe2d7cd0e56efd30070f215966ebd80242b97de661dcdf7615ebbfbdb66b5d14158f9808ad9485ae7077f0ec5f

data/.doc/ext/rays/color_space.cpp

@@ -87,7 +87,7 @@ VALUE initialize_copy(VALUE self, VALUE obj)
 }
 
 static
-VALUE type(VALUE self)
+VALUE get_type(VALUE self)
 {
 	CHECK;
 
@@ -188,7 +188,7 @@ Init_color_space ()
 	rb_define_alloc_func(cColorSpace, alloc);
 	rb_define_private_method(cColorSpace, "initialize", RUBY_METHOD_FUNC(initialize), -1);
 	rb_define_private_method(cColorSpace, "initialize_copy", RUBY_METHOD_FUNC(initialize_copy), 1);
-	rb_define_method(cColorSpace, "type", RUBY_METHOD_FUNC(type), 0);
+	rb_define_method(cColorSpace, "type", RUBY_METHOD_FUNC(get_type), 0);
 	cColorSpace.define_method("gray?",    is_gray);
 	cColorSpace.define_method("alpha?",   is_alpha);
 	cColorSpace.define_method("rgb?",     is_rgb);

data/.doc/ext/rays/defs.cpp

@@ -127,9 +127,10 @@ void get_ellipse_args (
 	assert(x && y && w && h && hole_size && from && to_ && nseg && argv);
 
 	if (argc <= 0)
-		argument_error(__FILE__, __LINE__);
-
-	if (argv[0].is_kind_of(Rays::bounds_class()))
+	{
+		*x = *y = *w = *h = 0;
+	}
+	else if (argv[0].is_kind_of(Rays::bounds_class()))
 	{
 		const Rays::Bounds& b = to<Rays::Bounds&>(argv[0]);
 		*x = b.x;
@@ -162,13 +163,6 @@ void get_ellipse_args (
 		*h = argc >= 4 ? to<coord>(argv[3]) : *w;
 	}
 
-	if (center)
-	{
-		Rays::Point p = to<Rays::Point>(center);
-		*x = p.x;
-		*y = p.y;
-	}
-
 	if (radius)
 	{
 		Rays::Point p = to<Rays::Point>(radius);
@@ -176,6 +170,13 @@ void get_ellipse_args (
 		*h = p.y * 2;
 	}
 
+	if (center)
+	{
+		Rays::Point p = to<Rays::Point>(center);
+		*x = p.x - *w / 2;
+		*y = p.y - *h / 2;
+	}
+
 	*hole_size = hole       ? to<Rays::Point>(hole) : 0;
 	*from      = angle_from ? to<float>(angle_from) : 0;
 	*to_       = angle_to   ? to<float>(angle_to)   : 360;

data/.doc/ext/rays/point.cpp

@@ -231,13 +231,6 @@ VALUE get_at(VALUE self, VALUE index)
 	return value((*THIS)[i]);
 }
 
-static
-VALUE inspect(VALUE self)
-{
-	CHECK;
-	return value(Xot::stringf("#<Rays::Point %s>", THIS->inspect().c_str()));
-}
-
 static
 VALUE dot(VALUE self, VALUE p1, VALUE p2)
 {
@@ -282,7 +275,6 @@ Init_point ()
 	cPoint.define_method("/", div);
 	cPoint.define_method("[]=", set_at);
 	cPoint.define_method("[]",  get_at);
-	rb_define_method(cPoint, "inspect", RUBY_METHOD_FUNC(inspect), 0);
 	rb_define_module_function(cPoint, "dot", RUBY_METHOD_FUNC(dot), 2);
 	rb_define_module_function(cPoint, "cross", RUBY_METHOD_FUNC(cross), 2);
 }

data/VERSION

@@ -1 +1 @@
-0.1.19
+0.1.23

data/ext/rays/color_space.cpp

@@ -90,7 +90,7 @@ RUCY_DEF1(initialize_copy, obj)
 RUCY_END
 
 static
-RUCY_DEF0(type)
+RUCY_DEF0(get_type)
 {
 	CHECK;
 
@@ -201,7 +201,7 @@ Init_color_space ()
 	cColorSpace.define_alloc_func(alloc);
 	cColorSpace.define_private_method("initialize",      initialize);
 	cColorSpace.define_private_method("initialize_copy", initialize_copy);
-	cColorSpace.define_method("type", type);
+	cColorSpace.define_method("type", get_type);
 	cColorSpace.define_method("gray?",    is_gray);
 	cColorSpace.define_method("alpha?",   is_alpha);
 	cColorSpace.define_method("rgb?",     is_rgb);

data/ext/rays/defs.cpp

@@ -127,9 +127,10 @@ void get_ellipse_args (
 	assert(x && y && w && h && hole_size && from && to_ && nseg && argv);
 
 	if (argc <= 0)
-		argument_error(__FILE__, __LINE__);
-
-	if (argv[0].is_kind_of(Rays::bounds_class()))
+	{
+		*x = *y = *w = *h = 0;
+	}
+	else if (argv[0].is_kind_of(Rays::bounds_class()))
 	{
 		const Rays::Bounds& b = to<Rays::Bounds&>(argv[0]);
 		*x = b.x;
@@ -162,13 +163,6 @@ void get_ellipse_args (
 		*h = argc >= 4 ? to<coord>(argv[3]) : *w;
 	}
 
-	if (center)
-	{
-		Rays::Point p = to<Rays::Point>(center);
-		*x = p.x;
-		*y = p.y;
-	}
-
 	if (radius)
 	{
 		Rays::Point p = to<Rays::Point>(radius);
@@ -176,6 +170,13 @@ void get_ellipse_args (
 		*h = p.y * 2;
 	}
 
+	if (center)
+	{
+		Rays::Point p = to<Rays::Point>(center);
+		*x = p.x - *w / 2;
+		*y = p.y - *h / 2;
+	}
+
 	*hole_size = hole       ? to<Rays::Point>(hole) : 0;
 	*from      = angle_from ? to<float>(angle_from) : 0;
 	*to_       = angle_to   ? to<float>(angle_to)   : 360;

data/ext/rays/point.cpp

@@ -254,14 +254,6 @@ RUCY_DEF1(get_at, index)
 }
 RUCY_END
 
-static
-RUCY_DEF0(inspect)
-{
-	CHECK;
-	return value(Xot::stringf("#<Rays::Point %s>", THIS->inspect().c_str()));
-}
-RUCY_END
-
 static
 RUCY_DEF2(dot, p1, p2)
 {
@@ -308,7 +300,6 @@ Init_point ()
 	cPoint.define_method("/", div);
 	cPoint.define_method("[]=", set_at);
 	cPoint.define_method("[]",  get_at);
-	cPoint.define_method("inspect", inspect);
 	cPoint.define_module_function("dot",   dot);
 	cPoint.define_module_function("cross", cross);
 }

data/lib/rays/autoinit.rb

@@ -4,7 +4,7 @@
 require 'rays/ext'
 
 
-unless $RAYS_NOAUTOINIT
+unless defined?($RAYS_NOAUTOINIT) && $RAYS_NOAUTOINIT
   Rays.init!
   at_exit {Rays.fin!}
 end

data/lib/rays/bitmap.rb

@@ -11,7 +11,7 @@ module Rays
 
     include Enumerable
 
-    def each ()
+    def each()
       height.times do |y|
         width.times do |x|
           yield self[x, y], x, y
@@ -19,11 +19,11 @@ module Rays
       end
     end
 
-    def bounds ()
+    def bounds()
       Bounds.new 0, 0, width, height
     end
 
-    def to_a ()
+    def to_a()
       map {|o| o}
     end
 

data/lib/rays/bounds.rb

@@ -25,15 +25,15 @@ module Rays
     alias pos= position=
     alias pos  position
 
-    alias left_top        position
-    def  right_top    ()  position        .move_by w - 1,     0 end
-    def   left_bottom ()  position        .move_by     0, h - 1 end
-    def  right_bottom () (position + size).move_by!   -1,    -1 end
+    alias left_top       position
+    def  right_top()     position        .move_by(w - 1,     0) end
+    def   left_bottom()  position        .move_by(    0, h - 1) end
+    def  right_bottom() (position + size).move_by!(  -1,    -1) end
 
-    def  left_top=    (*args) p = Point.new *args; self.left,  self.top    = p.x, p.y;  left_top end
-    def right_top=    (*args) p = Point.new *args; self.right, self.top    = p.x, p.y; right_top end
-    def  left_bottom= (*args) p = Point.new *args; self.left,  self.bottom = p.x, p.y;  left_bottom end
-    def right_bottom= (*args) p = Point.new *args; self.right, self.bottom = p.x, p.y; right_bottom end
+    def  left_top=(*args)    p = Point.new(*args); self.left,  self.top    = p.x, p.y;  left_top end
+    def right_top=(*args)    p = Point.new(*args); self.right, self.top    = p.x, p.y; right_top end
+    def  left_bottom=(*args) p = Point.new(*args); self.left,  self.bottom = p.x, p.y;  left_bottom end
+    def right_bottom=(*args) p = Point.new(*args); self.right, self.bottom = p.x, p.y; right_bottom end
 
     alias lt   left_top
     alias lt=  left_top=
@@ -44,31 +44,31 @@ module Rays
     alias rb  right_bottom
     alias rb= right_bottom=
 
-    def move_to (*args)
-      dup.move_to! *args
+    def move_to(*args)
+      dup.move_to!(*args)
     end
 
-    def move_by (*args)
-      dup.move_by! *args
+    def move_by(*args)
+      dup.move_by!(*args)
     end
 
-    def resize_to (*args)
-      dup.resize_to! *args
+    def resize_to(*args)
+      dup.resize_to!(*args)
     end
 
-    def resize_by (*args)
-      dup.resize_by! *args
+    def resize_by(*args)
+      dup.resize_by!(*args)
     end
 
-    def inset_by (*args)
-      dup.inset_by! *args
+    def inset_by(*args)
+      dup.inset_by!(*args)
     end
 
-    def each (dimension = 2, &block)
-      to_a(dimension).each &block
+    def each(dimension = 2, &block)
+      to_a(dimension).each(&block)
     end
 
-    def to_a (dimension = 2)
+    def to_a(dimension = 2)
       # TODO: return [lt, rb]
       case dimension
       when 1 then [x, w]
@@ -78,7 +78,7 @@ module Rays
       end
     end
 
-    def <=> (o)
+    def <=>(o)
       ret = x <=> o.x; return ret if ret != 0
       ret = y <=> o.y; return ret if ret != 0
       ret = z <=> o.z; return ret if ret != 0

data/lib/rays/camera.rb

@@ -10,7 +10,7 @@ module Rays
 
   class Camera
 
-    def initialize (
+    def initialize(
       min_width = -1, min_height = -1,
       device_name: nil, resize: true, crop: true, &block)
 

data/lib/rays/color.rb

@@ -24,32 +24,32 @@ module Rays
     alias a= alpha=
     alias a  alpha
 
-    def opaque? ()
+    def opaque?()
       alpha >= 1
     end
 
-    def transparent? ()
+    def transparent?()
       alpha <= 0
     end
 
-    def translucent? ()
+    def translucent?()
       a = alpha
       0 < a && a < 1
     end
 
-    def each (&block)
-      to_a.each &block
+    def each(&block)
+      to_a.each(&block)
     end
 
-    def to_a ()
+    def to_a()
       [red, green, blue, alpha]
     end
 
-    def to_s ()
+    def to_s()
       to_a.to_s
     end
 
-    def [] (index)
+    def [](index)
       case index
       when 0 then red
       when 1 then green
@@ -59,7 +59,7 @@ module Rays
       end
     end
 
-    def []= (index, val)
+    def []=(index, val)
       case index
       when 0 then self.red   = val
       when 1 then self.green = val
@@ -69,22 +69,22 @@ module Rays
       end
     end
 
-    def <=> (o)
+    def <=>(o)
       ret = red   <=> o.red;   return ret if ret != 0
       ret = green <=> o.green; return ret if ret != 0
       ret = blue  <=> o.blue;  return ret if ret != 0
             alpha <=> o.alpha
     end
 
-    def hash ()
+    def hash()
       red.hash + green.hash + blue.hash + alpha.hash
     end
 
-    def eql? (o)
+    def eql?(o)
       self == o
     end
 
-    def inspect ()
+    def inspect()
       "#<#{self.class.name} #{to_s}>"
     end
 

data/lib/rays/color_space.rb

@@ -11,19 +11,19 @@ module Rays
 
     include Comparable
 
-    def <=> (o)
+    def <=>(o)
       type <=> o.type
     end
 
-    def hash ()
+    def hash()
       type.hash
     end
 
-    def eql? (o)
+    def eql?(o)
       self == o
     end
 
-    def inspect ()
+    def inspect()
       "#<#{self.class.name} #{to_s}>"
     end
 

data/lib/rays/font.rb

@@ -14,12 +14,12 @@ module Rays
     alias w width
     alias h height
 
-    def <=> (o)
+    def <=>(o)
       ret = name <=> o.name; return ret if ret != 0
             size <=> o.size
     end
 
-    def inspect ()
+    def inspect()
       "#<Rays::Font name=#{name}, size=#{size}>"
     end
 

data/lib/rays/image.rb

@@ -14,16 +14,16 @@ module Rays
 
     def_delegators :bitmap, :[], :[]=
 
-    def paint (&block)
+    def paint(&block)
       painter.paint self, &block
       self
     end
 
-    def size ()
+    def size()
       return width, height
     end
 
-    def bounds ()
+    def bounds()
       Bounds.new 0, 0, width, height
     end
 

data/lib/rays/matrix.rb

@@ -12,13 +12,13 @@ module Rays
     include Comparable
     include Enumerable
 
-    def each (&block)
-      to_a.each &block
+    def each(&block)
+      to_a.each(&block)
     end
 
     alias inspect_org inspect
 
-    def inspect ()
+    def inspect()
       inspect_org.gsub(/\.?0+([^\.\d]|$)/) {$1}
     end
 

data/lib/rays/module.rb

@@ -8,23 +8,23 @@ module Rays
 
     module_function
 
-    def name ()
+    def name()
       super.split('::')[-2]
     end
 
-    def version ()
+    def version()
       open(root_dir 'VERSION') {|f| f.readline.chomp}
     end
 
-    def root_dir (path = '')
+    def root_dir(path = '')
       File.expand_path "../../#{path}", __dir__
     end
 
-    def inc_dir ()
+    def inc_dir()
       root_dir 'include'
     end
 
-    def lib_dir ()
+    def lib_dir()
       root_dir 'lib'
     end
 

data/lib/rays/painter.rb

@@ -12,7 +12,7 @@ module Rays
 
   class Painter
 
-    def push (*types, **attributes, &block)
+    def push(*types, **attributes, &block)
       each_type types do |type|
         case type
         when :state  then push_state
@@ -36,11 +36,11 @@ module Rays
           __send__ key, *value
         end
 
-        pop *types
+        pop(*types)
       end
     end
 
-    def pop (*types)
+    def pop(*types)
       each_type types, reverse: true do |type|
         case type
         when :state  then pop_state
@@ -50,7 +50,7 @@ module Rays
       end
     end
 
-    def paint (*args, &block)
+    def paint(*args, &block)
       begin_paint
       Xot::BlockUtil.instance_eval_or_block_call self, *args, &block
       self
@@ -58,7 +58,7 @@ module Rays
       end_paint
     end
 
-    def line (*args, loop: false)
+    def line(*args, loop: false)
       if args.first.kind_of?(Polyline)
         draw_polyline args.first
       else
@@ -66,43 +66,43 @@ module Rays
       end
     end
 
-    def rect (*args, round: nil, lt: nil, rt: nil, lb: nil, rb: nil)
+    def rect(*args, round: nil, lt: nil, rt: nil, lb: nil, rb: nil)
       draw_rect args, round, lt, rt, lb, rb
     end
 
-    def ellipse (*args, center: nil, radius: nil, hole: nil, from: nil, to: nil)
+    def ellipse(*args, center: nil, radius: nil, hole: nil, from: nil, to: nil)
       draw_ellipse args, center, radius, hole, from, to
     end
 
-    def curve (*args, loop: false)
+    def curve(*args, loop: false)
       draw_curve args, loop
     end
 
-    def bezier (*args, loop: false)
+    def bezier(*args, loop: false)
       draw_bezier args, loop
     end
 
-    def color= (fill, stroke = nil)
+    def color=(fill, stroke = nil)
       self.fill   fill
       self.stroke stroke
     end
 
-    def color ()
+    def color()
       return fill, stroke
     end
 
-    def shader= (shader, **uniforms)
-      shader.uniform **uniforms if shader && !uniforms.empty?
+    def shader=(shader, **uniforms)
+      shader.uniform(**uniforms) if shader && !uniforms.empty?
       set_shader shader
     end
 
-    const_symbol_accessor :stroke_cap, {
+    const_symbol_accessor :stroke_cap, **{
       butt:   CAP_BUTT,
       round:  CAP_ROUND,
       square: CAP_SQUARE
     }
 
-    const_symbol_accessor :stroke_join, {
+    const_symbol_accessor :stroke_join, **{
       miter:  JOIN_MITER,
       round:  JOIN_ROUND,
       square: JOIN_SQUARE
@@ -114,10 +114,10 @@ module Rays
 
     private
 
-      def each_type (types, reverse: false, &block)
+      def each_type(types, reverse: false, &block)
         types = [:state, :matrix] if types.empty? || types.include?(:all)
         types = types.reverse if reverse
-        types.each &block
+        types.each(&block)
       end
 
   end# Painter

data/lib/rays/point.rb

@@ -12,23 +12,23 @@ module Rays
     include Comparable
     include Enumerable
 
-    def move_to (*args)
-      dup.move_to! *args
+    def move_to(*args)
+      dup.move_to!(*args)
     end
 
-    def move_by (*args)
-      dup.move_by! *args
+    def move_by(*args)
+      dup.move_by!(*args)
     end
 
-    def zero? ()
+    def zero?()
       length == 0
     end
 
-    def each (&block)
-      to_a.each &block
+    def each(&block)
+      to_a.each(&block)
     end
 
-    def to_a (dimension = 2)
+    def to_a(dimension = 2)
       case dimension
       when 1 then [x]
       when 2 then [x, y]
@@ -37,17 +37,17 @@ module Rays
       end
     end
 
-    def to_s (dimension = 2)
+    def to_s(dimension = 2)
       to_a(dimension).to_s
     end
 
-    def <=> (o)
+    def <=>(o)
       ret = x <=> o.x; return ret if ret != 0
       ret = y <=> o.y; return ret if ret != 0
             z <=> o.z
     end
 
-    def inspect ()
+    def inspect()
       "#<Rays::Point #{to_a(3).join ', '}>"
     end