rays 0.1.38 → 0.1.40

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d8008c8c0fe9414db2333e20971b633342c24bbf52d6108a4199cd9c92c5d00
-  data.tar.gz: 243f04b1d915583c8c0f8d2826bf1c8a38779ffd0ceaa10a714bb3e201af850f
+  metadata.gz: f28cc1bd39b3a7b5a6e801693d0642fbd3e3a4af7871a800c8d7378f5ef9427d
+  data.tar.gz: ad0decfd29260689a65b38c12ca6fc4897730a79660865ab9fcf15d0458305ef
 SHA512:
-  metadata.gz: 953fa337b45367938f609476c4d5ea68c4aeb3fc4bd67c8041f5c9518ac58a065188992f1c0c374652d4d39a1df84fb800f648e80a6d5fabfbb994e0c1ad8de6
-  data.tar.gz: 8d36ccf2bf66bf4d1014d73935eb792972c3a479e12ccb5b65d027a34fccddbf688cb4c5e7d5828ebaf69698f0d0d0f2eeb553e0028ec33eb9873af6ba565b93
+  metadata.gz: f2412027656abd1d92fc21acd7197a7c3c4469248806e174f4b76bd9befe5cf5247f09a6539a2aababe72ff556700c93047dc46344f2a06d079137f07949de7c
+  data.tar.gz: b0355b91a402279278b4c892df9bd2c6312f46f3f536974e076c89bea940096d48ad9d14f6ee9fd37dfe274293e6d8c4fc3f1bfb9221abfafce03d7cc3a44015

data/.doc/ext/rays/bitmap.cpp

@@ -67,17 +67,17 @@ VALUE color_space(VALUE self)
 }
 
 static
-VALUE set_at(VALUE self)
+VALUE set_at(VALUE self, VALUE x, VALUE y, VALUE color)
 {
 	CHECK;
-	check_arg_count(__FILE__, __LINE__, "Bitmap#set_at", argc, 3, 4, 5, 6);
 
-	int x = to<int>(argv[0]);
-	int y = to<int>(argv[1]);
-	Rays::Color color = to<Rays::Color>(argc - 2, argv + 2);
+	bool is_array     = color.is_array();
+	size_t argc       = is_array ? color.size()     : 1;
+	const Value* argv = is_array ? color.as_array() : &color;
+	to<Rays::Color>(argc, argv)
+		.get(THIS->at<void>(to<int>(x), to<int>(y)), THIS->color_space());
 
-	color.get(THIS->at<void>(x, y), THIS->color_space());
-	return value(color);
+	return color;
 }
 
 static

data/.doc/ext/rays/painter.cpp

@@ -106,6 +106,13 @@ VALUE end_paint(VALUE self)
 	return self;
 }
 
+static
+VALUE is_painting(VALUE self)
+{
+	CHECK;
+	return value(THIS->painting());
+}
+
 static
 VALUE clear(VALUE self)
 {
@@ -615,6 +622,7 @@ Init_rays_painter ()
 
 	rb_define_private_method(cPainter, "begin_paint", RUBY_METHOD_FUNC(begin_paint), 0);
 	rb_define_private_method(cPainter, "end_paint", RUBY_METHOD_FUNC(end_paint), 0);
+	cPainter.define_method(              "painting?", is_painting);
 	rb_define_method(cPainter, "clear", RUBY_METHOD_FUNC(clear), 0);
 	rb_define_method(cPainter, "polygon", RUBY_METHOD_FUNC(polygon), 1);
 	rb_define_private_method(cPainter, "draw_line", RUBY_METHOD_FUNC(line), 2);

data/ChangeLog.md

@@ -1,6 +1,16 @@
 # rays ChangeLog
 
 
+## [v0.1.40] - 2023-06-07
+
+- Redesign parameters for Bitmap#[]=
+
+
+## [v0.1.39] - 2023-05-29
+
+- Add Painter#painting?
+
+
 ## [v0.1.38] - 2023-05-27
 
 - required_ruby_version >= 3.0.0

data/VERSION

@@ -1 +1 @@
-0.1.38
+0.1.40

data/ext/rays/bitmap.cpp

@@ -73,17 +73,17 @@ RUCY_DEF0(color_space)
 RUCY_END
 
 static
-RUCY_DEFN(set_at)
+RUCY_DEF3(set_at, x, y, color)
 {
 	CHECK;
-	check_arg_count(__FILE__, __LINE__, "Bitmap#set_at", argc, 3, 4, 5, 6);
 
-	int x = to<int>(argv[0]);
-	int y = to<int>(argv[1]);
-	Rays::Color color = to<Rays::Color>(argc - 2, argv + 2);
+	bool is_array     = color.is_array();
+	size_t argc       = is_array ? color.size()     : 1;
+	const Value* argv = is_array ? color.as_array() : &color;
+	to<Rays::Color>(argc, argv)
+		.get(THIS->at<void>(to<int>(x), to<int>(y)), THIS->color_space());
 
-	color.get(THIS->at<void>(x, y), THIS->color_space());
-	return value(color);
+	return color;
 }
 RUCY_END
 

data/ext/rays/painter.cpp

@@ -112,6 +112,14 @@ RUCY_DEF0(end_paint)
 }
 RUCY_END
 
+static
+RUCY_DEF0(is_painting)
+{
+	CHECK;
+	return value(THIS->painting());
+}
+RUCY_END
+
 static
 RUCY_DEF0(clear)
 {
@@ -667,8 +675,9 @@ Init_rays_painter ()
 	cPainter.define_method("bounds", bounds);
 	cPainter.define_method("pixel_density", pixel_density);
 
-	cPainter.define_private_method("begin_paint", begin_paint);
-	cPainter.define_private_method(  "end_paint",   end_paint);
+	cPainter.define_private_method("begin_paint",  begin_paint);
+	cPainter.define_private_method(  "end_paint",    end_paint);
+	cPainter.define_method(              "painting?", is_painting);
 	cPainter.define_method("clear",   clear);
 	cPainter.define_method("polygon", polygon);
 	cPainter.define_private_method("draw_line",     line);

data/include/rays/painter.h

@@ -61,6 +61,8 @@ namespace Rays
 
 			void end ();
 
+			bool painting () const;
+
 			void clear ();
 
 			void polygon (const Polygon& polygon);

data/rays.gemspec

@@ -1,10 +1,7 @@
 # -*- mode: ruby -*-
 
 
-File.expand_path('lib', __dir__)
-  .tap {|s| $:.unshift s if !$:.include?(s) && File.directory?(s)}
-
-require 'rays/extension'
+require_relative 'lib/rays/extension'
 
 
 Gem::Specification.new do |s|
@@ -28,8 +25,8 @@ Gem::Specification.new do |s|
   s.platform              = Gem::Platform::RUBY
   s.required_ruby_version = '>= 3.0.0'
 
-  s.add_runtime_dependency 'xot',  '~> 0.1.37'
-  s.add_runtime_dependency 'rucy', '~> 0.1.37'
+  s.add_runtime_dependency 'xot',  '~> 0.1.38'
+  s.add_runtime_dependency 'rucy', '~> 0.1.38'
 
   s.add_development_dependency 'rake'
   s.add_development_dependency 'test-unit'

data/src/painter.cpp

@@ -755,6 +755,12 @@ namespace Rays
 		}
 	}
 
+	bool
+	Painter::painting () const
+	{
+		return self->painting;
+	}
+
 	void
 	Painter::clear ()
 	{

data/test/test_bitmap.rb

@@ -34,8 +34,21 @@ class TestBitmap < Test::Unit::TestCase
   def test_at()
     o       = bitmap
     assert_equal color(0, 0, 0, 0), o[0, 0]
-    o[0, 0] = 1
+
+    o[0, 0] =          1
     assert_equal color(1, 1, 1, 1), o[0, 0]
+
+    o[0, 0] =         [0, 1, 0]
+    assert_equal color(0, 1, 0, 1), o[0, 0]
+
+    o[0, 0] =         [0, 1, 0, 0]
+    assert_equal color(0, 1, 0, 0), o[0, 0]
+
+    o[0, 0] =    color(0, 0, 1)
+    assert_equal color(0, 0, 1, 1), o[0, 0]
+
+    o[0, 0] =    color(0, 0, 1, 0)
+    assert_equal color(0, 0, 1, 0), o[0, 0]
   end
 
   def test_to_a()

data/test/test_painter.rb

@@ -41,6 +41,15 @@ class TestPainter < Test::Unit::TestCase
     Rays::Color.set_palette_color :rgb001, color(0, 0, 1)
   end
 
+  def test_painting?()
+    pa = image.painter
+    assert_false pa.painting?
+    pa.send :begin_paint
+    assert_true  pa.painting?
+    pa.send :end_paint
+    assert_false pa.painting?
+  end
+
   def test_background_accessor()
     pa = painter
     pa.background = 1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rays
 version: !ruby/object:Gem::Version
-  version: 0.1.38
+  version: 0.1.40
 platform: ruby
 authors:
 - xordog
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-27 00:00:00.000000000 Z
+date: 2023-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xot
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.37
+        version: 0.1.38
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.37
+        version: 0.1.38
 - !ruby/object:Gem::Dependency
   name: rucy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.37
+        version: 0.1.38
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.37
+        version: 0.1.38
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement