rays 0.1.27 → 0.1.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d8fe0c0eb8632278d900cfa9fdcee0616bcc5e1b82853d78fd5cc34863191bd
-  data.tar.gz: 1e201ddc102dcfdcead64b384c41e7df8da56f7b19c1f9557b5990762dbc84e1
+  metadata.gz: 38052c848aef75871de813ae9cc59a956672b1c6b8db25b55916f041ae0df976
+  data.tar.gz: d1f462fce0b73364a015fa1826eef17c3d1a4ac0b4378590f20438d87ce8e1cf
 SHA512:
-  metadata.gz: b200a686a6b9d60fbb8da6e94b2820a5837f883777bfed161928e5391f1da7a1deaccdabe0c8e662c18f043505f6728faa78dc192e9cdbf3cb1c31749ff80dfd
-  data.tar.gz: e01f6167b255a358f7cd84b211fb17e007c17439ee03334ce8449d99fb0d83b73eb405dfb103185de328dd091a115d88f091e50745f62dbb8dec4645892c9883
+  metadata.gz: 9e01828d4ac2ad4749a9d050d3890669be7e35dd057cc92b0dae23f645954b44bf7f3775d193ef36d9590d10879175a7937b28ceddf0bf9fd29a84723f0cfdbe
+  data.tar.gz: da8b670d9e704d4cc48070d5d252ec504e433f00222160a5c42ccf7a036eabc1a31580b6318da59672bc8576b0dddf84fce635ce9194f4a462eebfc8d4e03451

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

@@ -479,7 +479,10 @@ VALUE set_shader(VALUE self)
 	CHECK;
 	check_arg_count(__FILE__, __LINE__, "Painter#set_shader", argc, 1);
 
-	THIS->set_shader(to<Rays::Shader>(argc, argv));
+	if (argc >= 1 && !argv[0])
+		THIS->no_shader();
+	else
+		THIS->set_shader(to<Rays::Shader>(argc, argv));
 	return self;
 }
 
@@ -487,7 +490,9 @@ static
 VALUE get_shader(VALUE self)
 {
 	CHECK;
-	return value(THIS->shader());
+
+	const Rays::Shader& shader = THIS->shader();
+	return shader ? value(shader) : nil();
 }
 
 static

data/VERSION

@@ -1 +1 @@
-0.1.27
+0.1.28

data/ext/rays/painter.cpp

@@ -521,7 +521,10 @@ RUCY_DEFN(set_shader)
 	CHECK;
 	check_arg_count(__FILE__, __LINE__, "Painter#set_shader", argc, 1);
 
-	THIS->set_shader(to<Rays::Shader>(argc, argv));
+	if (argc >= 1 && !argv[0])
+		THIS->no_shader();
+	else
+		THIS->set_shader(to<Rays::Shader>(argc, argv));
 	return self;
 }
 RUCY_END
@@ -530,7 +533,9 @@ static
 RUCY_DEF0(get_shader)
 {
 	CHECK;
-	return value(THIS->shader());
+
+	const Rays::Shader& shader = THIS->shader();
+	return shader ? value(shader) : nil();
 }
 RUCY_END
 

data/rays.gemspec

@@ -28,8 +28,8 @@ Gem::Specification.new do |s|
   s.platform              = Gem::Platform::RUBY
   s.required_ruby_version = '>= 2.6.0'
 
-  s.add_runtime_dependency 'xot',  '~> 0.1.27'
-  s.add_runtime_dependency 'rucy', '~> 0.1.27'
+  s.add_runtime_dependency 'xot',  '~> 0.1.28'
+  s.add_runtime_dependency 'rucy', '~> 0.1.28'
 
   s.files            = `git ls-files`.split $/
   s.executables      = s.files.grep(%r{^bin/}) {|f| File.basename f}

data/src/ios/bitmap.mm

@@ -224,9 +224,26 @@ namespace Rays
 		return bitmap.self->modified;
 	}
 
+	static CFStringRef
+	get_bitmap_type (const char* path_)
+	{
+		String path = path_;
+		path = path.downcase();
+		if (path.ends_with(".png")) return kUTTypePNG;
+		if (path.ends_with(".gif")) return kUTTypeGIF;
+		if (path.ends_with(".bmp")) return kUTTypeBMP;
+		if (path.ends_with(".jpg") || path.ends_with(".jpeg")) return kUTTypeJPEG;
+		if (path.ends_with(".tif") || path.ends_with(".tiff")) return kUTTypeTIFF;
+		return nil;
+	}
+
 	void
 	Bitmap_save (const Bitmap& bmp, const char* path_)
 	{
+		const CFStringRef type = get_bitmap_type(path_);
+		if (!type)
+			argument_error(__FILE__, __LINE__, "unknown image file type");
+
 		std::shared_ptr<CGImage> img(bmp.self->get_image(), CGImageRelease);
 		if (!img)
 			rays_error(__FILE__, __LINE__, "getting CGImage failed.");
@@ -237,7 +254,7 @@ namespace Rays
 			rays_error(__FILE__, __LINE__, "creating NSURL failed.");
 
 		std::shared_ptr<CGImageDestination> dest(
-			CGImageDestinationCreateWithURL((CFURLRef) url, kUTTypePNG, 1, NULL),
+			CGImageDestinationCreateWithURL((CFURLRef) url, type, 1, NULL),
 			safe_cfrelease);
 		if (!dest)
 			rays_error(__FILE__, __LINE__, "CGImageDestinationCreateWithURL() failed.");

data/src/osx/bitmap.mm

@@ -223,9 +223,26 @@ namespace Rays
 		return bitmap.self->modified;
 	}
 
+	static CFStringRef
+	get_bitmap_type (const char* path_)
+	{
+		String path = path_;
+		path = path.downcase();
+		if (path.ends_with(".png")) return kUTTypePNG;
+		if (path.ends_with(".gif")) return kUTTypeGIF;
+		if (path.ends_with(".bmp")) return kUTTypeBMP;
+		if (path.ends_with(".jpg") || path.ends_with(".jpeg")) return kUTTypeJPEG;
+		if (path.ends_with(".tif") || path.ends_with(".tiff")) return kUTTypeTIFF;
+		return nil;
+	}
+
 	void
 	Bitmap_save (const Bitmap& bmp, const char* path_)
 	{
+		const CFStringRef type = get_bitmap_type(path_);
+		if (!type)
+			argument_error(__FILE__, __LINE__, "unknown image file type");
+
 		std::shared_ptr<CGImage> img(bmp.self->get_image(), CGImageRelease);
 		if (!img)
 			rays_error(__FILE__, __LINE__, "getting CGImage failed.");
@@ -236,7 +253,7 @@ namespace Rays
 			rays_error(__FILE__, __LINE__, "creating NSURL failed.");
 
 		std::shared_ptr<CGImageDestination> dest(
-			CGImageDestinationCreateWithURL((CFURLRef) url, kUTTypePNG, 1, NULL),
+			CGImageDestinationCreateWithURL((CFURLRef) url, type, 1, NULL),
 			safe_cfrelease);
 		if (!dest)
 			rays_error(__FILE__, __LINE__, "CGImageDestinationCreateWithURL() failed.");

data/test/test_image.rb

@@ -6,11 +6,12 @@ require_relative 'helper'
 
 class TestImage < Test::Unit::TestCase
 
-  W = 10
-  H = 10
+  def image(*args)
+    Rays::Image.new(*args)
+  end
 
-  def image(w = W, h = H, *args)
-    Rays::Image.new w, h, *args
+  def load(path)
+    Rays::Image.load path
   end
 
   def color(r = 0, g = 0, b = 0, a = 0)
@@ -22,12 +23,12 @@ class TestImage < Test::Unit::TestCase
   end
 
   def test_initialize()
-    assert_equal W, image.width
-    assert_equal H, image.height
+    assert_equal 10, image(10, 20).width
+    assert_equal 10, image(20, 10).height
   end
 
   def test_dup()
-    o          = image
+    o          = image 10, 10
     assert_equal color(0, 0, 0, 0), o[0, 0]
     o[0, 0]    = color(1, 0, 0, 0)
     assert_equal color(1, 0, 0, 0), o[0, 0]
@@ -39,12 +40,12 @@ class TestImage < Test::Unit::TestCase
   end
 
   def test_bitmap()
-    assert_equal W, image.bitmap.width
-    assert_equal H, image.bitmap.height
+    assert_equal 10, image(10, 20).bitmap.width
+    assert_equal 10, image(20, 10).bitmap.height
   end
 
   def test_painter()
-    pa = image.painter
+    pa = image(10, 10).painter
     assert_equal color(0, 0, 0, 0), pa.background
     assert_equal color(1, 1, 1, 1), pa.fill
     assert_equal color(1, 1, 1, 0), pa.stroke
@@ -73,4 +74,38 @@ class TestImage < Test::Unit::TestCase
     assert drawn {|p| p.text "a"}
   end
 
+  def test_save_load()
+    def get_image_type(filename)
+      `file #{filename}`.match(/#{filename}: ([^,]+),/)[1]
+    end
+
+    img    = image(10, 10).paint {fill 1, 0, 0; ellipse 0, 0, 10}
+    pixels = img.bitmap.to_a
+    paths  = %w[png jpg jpeg gif bmp tif tiff].map {|ext| "#{__dir__}/testimage.#{ext}"}
+
+    png, jpg, jpeg, gif, bmp, tif, tiff = paths
+
+    paths.each {|path| img.save path}
+
+    assert_equal 'PNG image data',  get_image_type(png)
+    assert_equal 'JPEG image data', get_image_type(jpg)
+    assert_equal 'JPEG image data', get_image_type(jpeg)
+    assert_equal 'GIF image data',  get_image_type(gif)
+    assert_equal 'PC bitmap',       get_image_type(bmp)
+    assert_equal 'TIFF image data', get_image_type(tif)
+    assert_equal 'TIFF image data', get_image_type(tiff)
+
+    assert_equal pixels,   load(png) .then {|o| o.bitmap.to_a}
+    assert_equal [10, 10], load(jpg) .then {|o| [o.width, o.height]}
+    assert_equal [10, 10], load(jpeg).then {|o| [o.width, o.height]}
+    assert_equal pixels,   load(gif) .then {|o| o.bitmap.to_a}
+    assert_equal [10, 10], load(bmp) .then {|o| [o.width, o.height]}
+    assert_equal pixels,   load(tif) .then {|o| o.bitmap.to_a}
+    assert_equal pixels,   load(tiff).then {|o| o.bitmap.to_a}
+
+    paths.each {|path| File.delete path}
+
+    assert_raise(ArgumentError) {img.save 'testimage.unknown'}
+  end
+
 end# TestImage

data/test/test_painter.rb

@@ -19,18 +19,24 @@ class TestPainter < Test::Unit::TestCase
   end
 
   def image(w = 16, h = 16, bg: 0, &block)
-    Rays::Image.new(w, h).paint {background bg}.paint(&block)
+    Rays::Image.new(w, h)
+      .paint {background bg}
+      .tap {|img| img.paint(&block) if block}
+  end
+
+  def assert_gray(expected, actual)
+    assert_in_epsilon expected, actual, 0.02
   end
 
   def assert_rgb(expected, actual)
     (0..2).each do |i|
-      assert_in_epsilon expected[i], actual[i], 0.02
+      assert_gray expected[i], actual[i]
     end
   end
 
   def assert_rgba(expected, actual)
     (0..3).each do |i|
-      assert_in_epsilon expected[i], actual[i], 0.02
+      assert_gray expected[i], actual[i]
     end
   end
 
@@ -369,7 +375,23 @@ class TestPainter < Test::Unit::TestCase
   end
 
   def test_shader()
-    img = Rays::Image.new(10, 10).paint {
+    image.paint do |pa|
+      assert_nil pa.shader
+
+      pa.shader = Rays::Shader.new "void main() {gl_FragColor = vec4(0.0);}"
+      assert_instance_of Rays::Shader, pa.shader
+
+      pa.shader = nil
+      assert_nil pa.shader
+
+      pa.shader = "void main() {gl_FragColor = vec4(0.0);}"
+      assert_instance_of Rays::Shader, pa.shader
+
+      pa.no_shader
+      assert_nil pa.shader
+    end
+
+    img = image.paint {
       shader "void main() {gl_FragColor = vec4(0.0, 0.0, 1.0, 1.0);}"
       fill   1, 0, 0
       rect   bounds

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rays
 version: !ruby/object:Gem::Version
-  version: 0.1.27
+  version: 0.1.28
 platform: ruby
 authors:
 - xordog
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-29 00:00:00.000000000 Z
+date: 2022-09-04 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.27
+        version: 0.1.28
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.27
+        version: 0.1.28
 - !ruby/object:Gem::Dependency
   name: rucy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.27
+        version: 0.1.28
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.27
+        version: 0.1.28
 description: This library helps you to develop graphics application with OpenGL.
 email: xordog@gmail.com
 executables: []