rays 0.4.0 → 0.5.0

data/src/win32/gdi.h

@@ -76,7 +76,9 @@ namespace Rays
 
 				Font (HFONT handle = NULL, bool owner = false);
 
-				Font (const char* name, coord size = 0);
+				Font (
+					const char* name, coord size = 0,
+					int weight = -1, bool italic = false);
 
 				~Font ();
 
@@ -87,6 +89,9 @@ namespace Rays
 				bool get_extent (
 					coord* width, coord* height, const char* str, HDC hdc = NULL);
 
+				bool get_extent (
+					coord* width, coord* height, const wchar_t* str, HDC hdc = NULL);
+
 				HFONT handle () const;
 
 				operator bool () const;

data/src/win32/rays.cpp

@@ -9,14 +9,28 @@ namespace Rays
 {
 
 
+	typedef void (*PreInitFun) ();
+
+
 	namespace global
 	{
 
-		static bool initialized = false;
+		static bool initialized        = false;
+
+		static PreInitFun pre_init_fun = NULL;
 
 	}// global
 
 
+	void
+	Rays_set_pre_init_fun (PreInitFun fun)
+	{
+		global::pre_init_fun = fun;
+
+		if (fun && global::initialized)
+			fun();
+	}
+
 	void
 	init ()
 	{
@@ -25,6 +39,9 @@ namespace Rays
 
 		global::initialized = true;
 
+		if (global::pre_init_fun)
+			global::pre_init_fun();
+
 		Renderer_init();
 	}
 

data/test/test_bitmap.rb

@@ -22,13 +22,13 @@ class TestBitmap < Test::Unit::TestCase
   def test_dup()
     o          = bitmap
     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]
+    o[0, 0]    = color(1, 0, 0, 1)
+    assert_equal color(1, 0, 0, 1), o[0, 0]
     x          = o.dup
-    assert_equal color(1, 0, 0, 0), x[0, 0]
-    x[0, 0]    = color(0, 1, 0, 0)
-    assert_equal color(0, 1, 0, 0), x[0, 0]
-    assert_equal color(1, 0, 0, 0), o[0, 0]
+    assert_equal color(1, 0, 0, 1), x[0, 0]
+    x[0, 0]    = color(0, 1, 0, 1)
+    assert_equal color(0, 1, 0, 1), x[0, 0]
+    assert_equal color(1, 0, 0, 1), o[0, 0]
   end
 
   def test_pixels()
@@ -37,6 +37,10 @@ class TestBitmap < Test::Unit::TestCase
 
     bmp.pixels = [0xffff0000, 0xff00ff00, 0xff0000ff, 0xffffff00]
     assert_equal [0xffff0000, 0xff00ff00, 0xff0000ff, 0xffffff00], bmp.pixels
+
+    bmp.pixels = [0x80ff0000, 0x4000ff00, 0x010000ff, 0x00ffffff]
+    assert_equal [0x80ff0000, 0x4000ff00, 0x010000ff, 0x00000000], bmp.pixels
+    assert_equal_color color(1, 0, 0, 0.5), bmp[0, 0], 0.01
   end
 
   def test_pixels_float()
@@ -45,6 +49,9 @@ class TestBitmap < Test::Unit::TestCase
 
     bmp.pixels = [1,0,0,1, 0,1,0,1, 0,0,1,1, 1,1,0,1]
     assert_equal [1,0,0,1, 0,1,0,1, 0,0,1,1, 1,1,0,1], bmp.pixels
+
+    bmp.pixels = [1,0,0,0.5, 0,1,0,0.25, 0,0,1,1, 1,1,0,0]
+    assert_equal [1,0,0,0.5, 0,1,0,0.25, 0,0,1,1, 0,0,0,0], bmp.pixels
   end unless win32?
 
   def test_at()
@@ -57,14 +64,25 @@ class TestBitmap < Test::Unit::TestCase
     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] =         [0, 1, 0, 0.5]
+    assert_equal_color color(0, 1, 0, 0.5), o[0, 0], 0.01
 
     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]
+    o[0, 0] =    color(0, 0, 1, 0.5)
+    assert_equal_color color(0, 0, 1, 0.5), o[0, 0], 0.01
+  end
+
+  def test_at_with_alpha()
+    o       = bitmap
+    o[0, 0] = color(1, 0.5, 0, 0.5)
+    assert_equal_color color(1, 0.5, 0, 0.5), o[0, 0], 0.01
+
+    # pixels are stored premultiplied, so a fully transparent color keeps no
+    # color of its own
+    o[0, 0] = color(1, 0.5, 0, 0)
+    assert_equal color(0, 0, 0, 0), o[0, 0]
   end
 
   def test_to_a()

data/test/test_font.rb

@@ -9,8 +9,20 @@ class TestFont < Test::Unit::TestCase
     R::Font.new(*args)
   end
 
+  def test_dup()
+    font.tap do |f1|
+      f1.weight = 1
+      f2        = f1.dup
+      f1.weight = 2
+      assert_equal 2, f1.weight
+      assert_equal 1, f2.weight
+    end
+  end
+
   def test_name()
     assert_kind_of String, font.name
+    assert_equal 'menlo',         font('menlo').name(false) if osx?
+    assert_equal 'Menlo Regular', font('menlo').name(true)  if osx?
   end
 
   def test_size()
@@ -30,6 +42,44 @@ class TestFont < Test::Unit::TestCase
     assert_equal 11, f11.size
   end
 
+  def test_weight()
+    assert_equal 400,  font                             .weight
+    assert_equal 100,  font(weight: :thin)              .weight
+    assert_equal 200,  font(weight: :extralight)        .weight
+    assert_equal 300,  font(weight: :light)             .weight
+    assert_equal 400,  font(weight: :normal)            .weight
+    assert_equal 500,  font(weight: :medium)            .weight
+    assert_equal 600,  font(weight: :semibold)          .weight
+    assert_equal 700,  font(weight: :bold)              .weight
+    assert_equal 800,  font(weight: :extrabold)         .weight
+    assert_equal 900,  font(weight: :black)             .weight
+    assert_equal 400,  font(weight: :regular)           .weight
+    assert_equal 400,  font(weight: 'regular')          .weight
+    assert_equal 0,    font(weight: R::Font::WEIGHT_MIN).weight
+    assert_equal 1000, font(weight: R::Font::WEIGHT_MAX).weight
+    assert_equal 0,    font(weight: -1)                 .weight
+    assert_equal 1000, font(weight: 1001)               .weight
+
+    font.tap do |f|
+      f.weight = 1;       assert_equal 1,   f.weight
+      f.weight = :normal; assert_equal 400, f.weight
+    end
+
+    assert_raise(ArgumentError) {font weight: :unknown}
+  end
+
+  def test_italic?()
+    assert_false font               .italic?
+    assert_true  font(italic: true) .italic?
+    assert_false font(italic: false).italic?
+  end
+
+  def test_smooth?()
+    assert_true  font               .smooth?
+    assert_true  font(smooth: true) .smooth?
+    assert_false font(smooth: false).smooth?
+  end
+
   def test_width()
     assert_equal 0, font.width('')
     w = font.width 'X'
@@ -46,6 +96,14 @@ class TestFont < Test::Unit::TestCase
 
   def test_families()
     assert_not R::Font.families.empty?
+
+    families = begin
+      GC.stress = true
+      R::Font.families
+    ensure
+      GC.stress = false
+    end
+    assert families.values.flatten.all? {_1.is_a? String}
   end
 
 end# TestFont

data/test/test_image.rb

@@ -32,13 +32,13 @@ class TestImage < Test::Unit::TestCase
   def test_dup()
     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]
+    o[0, 0]    = color(1, 0, 0, 1)
+    assert_equal color(1, 0, 0, 1), o[0, 0]
     x          = o.dup
-    assert_equal color(1, 0, 0, 0), x[0, 0]
-    x[0, 0]    = color(0, 1, 0, 0)
-    assert_equal color(0, 1, 0, 0), x[0, 0]
-    assert_equal color(1, 0, 0, 0), o[0, 0]
+    assert_equal color(1, 0, 0, 1), x[0, 0]
+    x[0, 0]    = color(0, 1, 0, 1)
+    assert_equal color(0, 1, 0, 1), x[0, 0]
+    assert_equal color(1, 0, 0, 1), o[0, 0]
   end
 
   def test_bitmap()
@@ -46,6 +46,13 @@ class TestImage < Test::Unit::TestCase
     assert_equal 10, image(20, 10).bitmap.height
   end
 
+  def test_draw_bgra_image()
+    img = Rays::Image.new Rays::Bitmap.new(1, 1, Rays::ColorSpace.new(:BGRA))
+    img[0, 0] = color 1, 0, 0, 1
+    assert_equal color(1, 0, 0, 1), img[0, 0]
+    assert_equal [0xffff0000], image(1, 1).paint {image img}.pixels
+  end
+
   def test_bitmap_with_modify_flag()
     img1 = image 1, 1
     update_texture img1
@@ -98,6 +105,22 @@ class TestImage < Test::Unit::TestCase
     assert drawn.call {|p| p.text "a"}
   end
 
+  def test_frozen()
+    img = image(2, 1).freeze
+    assert_equal color(0, 0, 0, 0),        img[0, 0]
+    assert_equal [0x00000000, 0x00000000], img.pixels
+    assert_raise(FrozenError) {img.paint {}}
+    assert_raise(FrozenError) {img[0, 0]  = color 1, 0, 0, 1}
+    assert_raise(FrozenError) {img.pixels = [0xffff0000, 0xff00ff00]}
+    assert_raise(FrozenError) {img.smooth = true}
+
+    dup = img.dup
+    assert_false dup.frozen?
+    dup[0, 0] = color 1, 0, 0, 1
+    assert_equal color(1, 0, 0, 1), dup[0, 0]
+    assert_equal color(0, 0, 0, 0), img[0, 0]
+  end
+
   def test_save_load()
     get_image_type = -> filename {
       `file #{filename}`.match(/#{filename}: ([^,]+),/)[1]

data/test/test_painter.rb

@@ -379,6 +379,45 @@ class TestPainter < Test::Unit::TestCase
     end
   end
 
+  def test_alpha_blending()
+    i = image bg: color(0, 0, 0, 0) do
+      fill 1, 1, 1, 0.5
+      rect 0, 0, 2
+    end
+    assert_rgba [1, 1, 1, 0.5], i[0, 0]
+
+    i = image bg: color(0, 1, 0) do
+      fill 1, 1, 1, 0.5
+      rect 0, 0, 2
+    end
+    assert_rgba [0.5, 1, 0.5, 1], i[0, 0]
+  end
+
+  def test_alpha_accumulation()
+    i = image bg: color(0, 0, 0, 0) do
+      fill 1, 1, 1, 0.5
+      rect 0, 0, 2
+      rect 0, 0, 2
+    end
+    assert_rgba [1, 1, 1, 0.75], i[0, 0]
+  end
+
+  def test_clear_with_alpha()
+    i = image bg: color(1, 0, 0, 0.5)
+    assert_rgba [1, 0, 0, 0.5], i[0, 0]
+  end
+
+  def test_image_with_alpha()
+    src = image bg: color(0, 0, 0, 0) do
+      fill 1, 1, 1, 0.5
+      rect 0, 0, 16
+    end
+    i = image bg: color(0, 1, 0) do
+      image src, 0, 0
+    end
+    assert_rgba [0.5, 1, 0.5, 1], i[0, 0]
+  end
+
   def test_push()
     pa = painter
     pa.fill =           [1, 0, 0]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rays
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - xordog
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-08-04 00:00:00.000000000 Z
+date: 2026-11-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.4.0
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: rucy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.5.0
 description: This library helps you to develop graphics application with OpenGL.
 email: xordog@gmail.com
 executables: []
@@ -85,7 +85,6 @@ files:
 - ".github/workflows/release-gem.yml"
 - ".github/workflows/tag.yml"
 - ".github/workflows/test.yml"
-- ".github/workflows/utils.rb"
 - CLAUDE.md
 - CONTRIBUTING.md
 - ChangeLog.md
@@ -170,6 +169,7 @@ files:
 - lib/rays/polyline.rb
 - lib/rays/shader.rb
 - rays.gemspec
+- src/bitmap.cpp
 - src/bitmap.h
 - src/bounds.cpp
 - src/color.cpp
@@ -272,7 +272,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.19
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: A Drawing Engine using OpenGL.

data/.github/workflows/utils.rb

@@ -1,127 +0,0 @@
-require 'shellwords'
-
-ALL_REPO        = 'xord/all'
-ALL_DIR         = '../all'
-ALL_FETCH_DEPTH = 100
-
-RENAMES = {reflex: 'reflexion'}
-
-def sh(cmd)
-  puts cmd
-  system cmd
-end
-
-def setup_dependencies(only: nil)
-  gemspec_path = `git ls-files`.lines(chomp: true).find {|l| l =~ /\.gemspec$/}
-  return unless gemspec_path
-
-  gemspec = File.read gemspec_path
-  name    = File.basename gemspec_path, '.gemspec'
-
-  exts = File.readlines('Rakefile')
-    .map {|l| l[%r|^\s*require\W+([\w\-\_]+)/extension\W+$|, 1]}
-    .compact
-    .reject {|ext| ext == name}
-  exts = exts & [only].flatten.map(&:to_s) if only
-  return if exts.empty?
-
-  unless setup_dependencies_via_monorepo(exts)
-    setup_dependencies_via_each_repo_by_version(gemspec, exts)
-  end
-
-  exts.each {|ext| sh %( cd ../#{ext} && rake ext )}
-end
-
-def setup_dependencies_via_monorepo(exts)
-  return false unless checkout_monorepo
-  exts.each {|ext| sh %( ln -snf all/#{ext} ../#{ext} )}
-  true
-end
-
-def checkout_monorepo()
-  uuid = `git log -1 --format=%B`[/^\[\[([0-9a-fA-F-]+)\]\]$/, 1]
-  return false unless uuid
-
-  commit = setup_monorepo uuid
-  return false unless commit
-
-  Dir.chdir(ALL_DIR) {sh %( git checkout -q #{commit} )}
-  true
-end
-
-def setup_monorepo(uuid)
-  unless File.directory? ALL_DIR
-    url = "https://github.com/#{ALL_REPO}.git"
-    sh %( git clone --no-tags --depth #{ALL_FETCH_DEPTH} #{url} #{ALL_DIR} )
-  end
-  loop do
-    commit = find_monorepo_commit uuid
-    return commit if commit
-
-    deepened = Dir.chdir ALL_DIR do
-      before = `git rev-list --count HEAD`.to_i
-      sh %( git fetch --deepen #{ALL_FETCH_DEPTH} )
-      `git rev-list --count HEAD`.to_i > before
-    end
-    return nil unless deepened
-  end
-end
-
-def find_monorepo_commit(uuid)
-  Dir.chdir ALL_DIR do
-    out = `git log origin/HEAD -F --grep="[[#{uuid}]]" --format=%H -1`.strip
-    out.empty? ? nil : out
-  end
-end
-
-def setup_dependencies_via_each_repo_by_version(gemspec, exts)
-  exts.each do |ext|
-    gem   = RENAMES[ext.to_sym].then {|s| s || ext}
-    ver   = gemspec[/add_dependency.*['"]#{gem}['"].*['"]\s*~>\s*([\d\.]+)\s*['"]/, 1]
-    opts  = '-c advice.detachedHead=false --depth 1'
-    clone = "git clone #{opts} https://github.com/xord/#{ext}.git ../#{ext}"
-
-    # 'rake subtree:push' pushes all subrepos, so cloning by new tag
-    # often fails before tagging each new tag
-    sh %( #{clone} --branch v#{ver} || #{clone} )
-  end
-end
-
-def tag_versions()
-  changes = changelogs
-  tags    = `git tag`.lines chomp: true
-  vers    = `git log --oneline ./VERSION`
-    .lines(chomp: true)
-    .map {|line| line.split.first[/^\w+$/]}
-    .map {|sha| [`git cat-file -p #{sha}:./VERSION 2>/dev/null`[/[\d\.]+/], sha]}
-    .select {|ver, sha| ver && sha}
-    .reverse
-    .to_h
-
-  vers.to_a.reverse.each do |ver, sha|
-    tag = "v#{ver}"
-    break if tags.include?(tag)
-    sh %( git tag -a -m \"#{changes[tag]&.gsub '"', '\\"'}\" #{tag} #{sha} )
-  end
-end
-
-def release(*paths)
-  tag   = ENV['GITHUB_REF']&.sub(%r|^refs/tags/|, '') || raise('GITHUB_REF tag not set')
-  notes = (changelogs[tag] || '').shellescape
-  paths = paths.flatten.join ' '
-
-  sh(%( gh release create #{tag} #{paths} --notes #{notes} )) ||
-    sh(%( gh release upload #{tag} #{paths} --clobber )) ||
-    raise('failed to upload to releases')
-end
-
-def changelogs()
-  File.read('ChangeLog.md')
-    .split(/^\s*##\s*\[\s*(v[\d\.]+)\s*\].*$/)
-    .slice(1..)
-    .each_slice(2)
-    .to_h
-    .transform_values(&:strip!)
-rescue Errno::ENOENT
-  raise 'failed to get changelogs'
-end