rays 0.3.11 → 0.3.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ccc3b9eda8d2da41df31850e7ab6a6e480936ad80dfff07adaf35e5d12c8eee
-  data.tar.gz: 46785a8507b11be71d877a87fb8f7a42478d19190086701e748978e040a16ad3
+  metadata.gz: b820979b1e5f5cc65ad457a6614bf068a15f03f0351709367e007a5046b02747
+  data.tar.gz: b80a61f404fb951e609cc449cc155450aaaf2c7d0f6a2eab39001d5bd8cdc8aa
 SHA512:
-  metadata.gz: 505a1f2e9a2e3a1aea29b4e69528c4741ce0ad956f9c2e7fafa67bf528b6b25c51e6d7371624d52f3a4a8e0e8fa8aab1388d76775b03445f4882af49dd3b18d0
-  data.tar.gz: 51d70c57b927a3b8564718170962d41d36ca7f9a5b209f71c6d72e23bcd6278b8bbf73181909084bb973d2fb72aa4d7172e8ee218407ebf7236c74bb46530e6f
+  metadata.gz: 9fa68f150b09b3ac24e47d8cb36c6deb4f68047755b9d5da8daccd44b568655650e6b96b4043d3c1d148bb61fc782f0a39f01dfd0ea950e078f866c0b4d1ad8c
+  data.tar.gz: b83ee77854124708af2d926de0f354e01263362fa385feb0d30a8ad3c88c522fda44d1537ba9df73c9b07570a8e6214300c858c44584535d68b3bc10a8cdfb02

data/.doc/ext/rays/image.cpp

@@ -122,6 +122,15 @@ VALUE get_smooth(VALUE self)
 	return value(THIS->smooth());
 }
 
+static
+VALUE compare(VALUE self, VALUE other)
+{
+	CHECK;
+	auto* a = THIS->self.get();
+	auto* b = to<const Rays::Image*>(other)->self.get();
+	return value(a < b ? -1 : a > b ? 1 : 0);
+}
+
 static
 VALUE load(VALUE self, VALUE path)
 {
@@ -149,6 +158,7 @@ Init_rays_image ()
 	rb_define_private_method(cImage, "get_bitmap", RUBY_METHOD_FUNC(get_bitmap), 1);
 	rb_define_method(cImage, "smooth=", RUBY_METHOD_FUNC(set_smooth), 1);
 	rb_define_method(cImage, "smooth", RUBY_METHOD_FUNC(get_smooth), 0);
+	cImage.define_method("<=>", compare);
 	cImage.define_module_function("load!", load);
 }
 

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

@@ -250,7 +250,17 @@ VALUE image(VALUE self)
 	CHECK;
 	check_arg_count(__FILE__, __LINE__, "Painter#image", argc, 1, 3, 5, 7, 9);
 
-	const Rays::Image* image = to<Rays::Image*>(argv[0]);
+	RUCY_SYM(to_image);
+	std::unique_ptr<Rays::Image> pimage;
+
+	const Rays::Image* image = NULL;
+	if (argv[0].is_a(Rays::image_class()))
+		image = to<Rays::Image*>(argv[0]);
+	else if (argv[0].respond_to(to_image))
+	{
+		pimage.reset(new Rays::Image(to<const Rays::Image&>(argv[0].call(to_image))));
+		image = pimage.get();
+	}
 	if (!image)
 		argument_error(__FILE__, __LINE__, "%s is not an image.", argv[0].inspect().c_str());
 
@@ -742,6 +752,38 @@ VALUE pop_matrix(VALUE self)
 }
 
 
+static
+VALUE set_debug(VALUE self, VALUE debug)
+{
+	CHECK;
+	if (debug)
+		THIS->remove_flag(Rays::Painter::FLAG_BATCHING);
+	else
+		THIS->   add_flag(Rays::Painter::FLAG_BATCHING);
+	return debug;
+}
+
+static
+VALUE get_debug(VALUE self)
+{
+	CHECK;
+	return value(!THIS->has_flag(Rays::Painter::FLAG_BATCHING));
+}
+
+static
+VALUE set_global_debug(VALUE self, VALUE debug)
+{
+	Rays::Painter::set_debug(debug);
+	return debug;
+}
+
+static
+VALUE get_global_debug(VALUE self)
+{
+	return value(Rays::Painter::debug());
+}
+
+
 static Class cPainter;
 
 void
@@ -822,6 +864,12 @@ Init_rays_painter ()
 	rb_define_method(cPainter, "matrix", RUBY_METHOD_FUNC(get_matrix), 0);
 	rb_define_method(cPainter, "push_matrix", RUBY_METHOD_FUNC(push_matrix), 0);
 	rb_define_method(cPainter, "pop_matrix", RUBY_METHOD_FUNC(pop_matrix), 0);
+
+	rb_define_method(cPainter, "debug=", RUBY_METHOD_FUNC(set_debug), 1);
+	cPainter.define_method("debug?", get_debug);
+
+	rb_define_singleton_method(cPainter, "debug=", RUBY_METHOD_FUNC(set_global_debug), 1);
+	cPainter.define_singleton_method("debug?", get_global_debug);
 }
 
 

data/.doc/ext/rays/shader.cpp

@@ -66,15 +66,17 @@ make_env (const Value& names, const Value& ignore_no_uniform_location_error)
 		to_name_list(names, 0),
 		to_name_list(names, 1),
 		to_name_list(names, 2),
-		to_name(     names, 3),
-		to_name(     names, 4),
+		to_name_list(names, 3),
+		to_name_list(names, 4),
 		to_name(     names, 5),
-		to_name_list(names, 6),
-		to_name_list(names, 7),
-		to_name_list(names, 8),
-		to_name_list(names, 9),
+		to_name(     names, 6),
+		to_name(     names, 7),
+		to_name(     names, 8),
+		to_name(     names, 9),
 		to_name_list(names, 10),
 		to_name_list(names, 11),
+		to_name_list(names, 12),
+		to_name_list(names, 13),
 		flags);
 }
 

data/.github/workflows/release-gem.yml

@@ -4,6 +4,9 @@ on:
   push:
     tags: ['v[0-9]*']
 
+permissions:
+  contents: write
+
 jobs:
   release:
     runs-on: macos-latest

data/.github/workflows/utils.rb

@@ -1,3 +1,9 @@
+require 'shellwords'
+
+ALL_REPO        = 'xord/all'
+ALL_DIR         = '../all'
+ALL_FETCH_DEPTH = 100
+
 RENAMES = {reflex: 'reflexion'}
 
 def sh(cmd)
@@ -5,7 +11,7 @@ def sh(cmd)
   system cmd
 end
 
-def setup_dependencies(build: true, only: nil)
+def setup_dependencies(only: nil)
   gemspec_path = `git ls-files`.lines(chomp: true).find {|l| l =~ /\.gemspec$/}
   return unless gemspec_path
 
@@ -13,44 +19,109 @@ def setup_dependencies(build: true, only: nil)
   name    = File.basename gemspec_path, '.gemspec'
 
   exts = File.readlines('Rakefile')
-    .map {|l| l[%r|^\s*require\W+(\w+)/extension\W+$|, 1]}
+    .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]
+    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} )
-    sh %( cd ../#{ext} && rake ext )
   end
 end
 
 def tag_versions()
-  tags = `git tag`.lines chomp: true
-  vers = `git log --oneline ./VERSION`
+  changes = changelogs
+  tags    = `git tag`.lines chomp: true
+  vers    = `git log --oneline ./VERSION`
     .lines(chomp: true)
     .map {|line| line.split.first[/^\w+$/]}
-    .map {|hash| [`git cat-file -p #{hash}:./VERSION 2>/dev/null`[/[\d\.]+/], hash]}
-    .select {|ver, hash| ver && hash}
+    .map {|sha| [`git cat-file -p #{sha}:./VERSION 2>/dev/null`[/[\d\.]+/], sha]}
+    .select {|ver, sha| ver && sha}
     .reverse
     .to_h
 
-  changes = File.read('ChangeLog.md')
-    .split(/^\s*##\s*\[\s*v([\d\.]+)\s*\].*$/)
-    .slice(1..-1)
-    .each_slice(2)
-    .to_h
-    .transform_values(&:strip!)
-
-  vers.to_a.reverse.each do |ver, hash|
+  vers.to_a.reverse.each do |ver, sha|
     tag = "v#{ver}"
     break if tags.include?(tag)
-    sh %( git tag -a -m \"#{changes[ver]&.gsub '"', '\\"'}\" #{tag} #{hash} )
+    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

data/ChangeLog.md

@@ -1,6 +1,23 @@
 # rays ChangeLog
 
 
+## [v0.3.12] - 2026-05-10
+
+- Support WebAssembly
+- Implement batch rendering
+- Implement WASM font rendering via HTMLCanvasElement
+- Implement SDL_ttf font rendering for SDL backend
+- Use GL_DEPTH_COMPONENT16 on WASM builds
+- Rename texcoord_offset to texcoord_pixel
+- Pin external library versions
+- Add Image and Texture comparison operators
+- Add Painter::set_debug / debug singleton API
+- Pin position attribute to location 0 on macOS
+- Simplify Painter_draw_image to fill-only
+- Add libsdl2-ttf-dev to CI apt packages
+- Remove deprecated has_rdoc= from gemspecs
+
+
 ## [v0.3.11] - 2026-04-17
 
 - Move OpenGL code into src/opengl/ and introduce Renderer abstraction

data/Rakefile

@@ -16,7 +16,7 @@ TESTS_ALONE = ['test/test_rays_init.rb']
 
 install_packages(
   mingw: %w[MINGW_PACKAGE_PREFIX-glew],
-  apt:   %w[libglew-dev libsdl2-dev])
+  apt:   %w[libglew-dev libsdl2-dev libsdl2-ttf-dev])
 
 use_external_library 'https://github.com/g-truc/glm',
   tag:     '1.0.1',
@@ -29,7 +29,7 @@ use_external_library 'https://github.com/skyrpex/clipper',
   excludes: 'clipper/cpp/cpp_'
 
 use_external_library 'https://github.com/mapbox/earcut.hpp',
-  tag:     'v2.2.4',
+  commit:  '365be263bfed498f9d3d3bf065bcb39b0d0e4ba6',
   incdirs: 'include/mapbox',
   srcdirs: 'NOSRC'
 
@@ -44,7 +44,7 @@ use_external_library 'https://github.com/andrewwillmott/splines-lib',
     end
   }
 
-if win32? || linux?
+if win32? || linux? || wasm?
   use_external_library 'https://github.com/nothings/stb',
     commit:  'ae721c50eaf761660b4f90cc590453cdb0c2acd0',
     srcdirs: 'NOSRC'

data/VERSION

@@ -1 +1 @@
-0.3.11
+0.3.12

data/ext/rays/extconf.rb

@@ -13,11 +13,10 @@ Xot::ExtConf.new Xot, Rucy, Rays do
   setup do
     headers    << 'ruby.h'
     libs.unshift 'gdi32', 'opengl32', 'glew32'           if win32?
-    libs.unshift 'SDL2', 'GLEW', 'GL'                    if linux?
+    libs.unshift 'SDL2', 'SDL2_ttf', 'GLEW', 'GL'        if linux? || wasm?
     frameworks << 'AppKit' << 'OpenGL' << 'AVFoundation' if osx?
-
-    $CPPFLAGS << ' -DRAYS_32BIT_PIXELS_STRING'      if RUBY_PLATFORM == 'x64-mingw-ucrt'
-    $LDFLAGS  << ' -Wl,--out-implib=rays_ext.dll.a' if mingw? || cygwin?
+    $CPPFLAGS << ' -DRAYS_32BIT_PIXELS_STRING'           if RUBY_PLATFORM == 'x64-mingw-ucrt'
+    $LDFLAGS  << ' -Wl,--out-implib=librays.dll.a'       if mingw? || cygwin?
   end
 
   create_makefile 'rays_ext'

data/ext/rays/image.cpp

@@ -134,6 +134,16 @@ RUCY_DEF0(get_smooth)
 }
 RUCY_END
 
+static
+RUCY_DEF1(compare, other)
+{
+	CHECK;
+	auto* a = THIS->self.get();
+	auto* b = to<const Rays::Image*>(other)->self.get();
+	return value(a < b ? -1 : a > b ? 1 : 0);
+}
+RUCY_END
+
 static
 RUCY_DEF1(load, path)
 {
@@ -162,6 +172,7 @@ Init_rays_image ()
 	cImage.define_private_method("get_bitmap", get_bitmap);
 	cImage.define_method("smooth=", set_smooth);
 	cImage.define_method("smooth",  get_smooth);
+	cImage.define_method("<=>", compare);
 	cImage.define_module_function("load!", load);
 }
 

data/ext/rays/painter.cpp

@@ -266,7 +266,17 @@ RUCY_DEFN(image)
 	CHECK;
 	check_arg_count(__FILE__, __LINE__, "Painter#image", argc, 1, 3, 5, 7, 9);
 
-	const Rays::Image* image = to<Rays::Image*>(argv[0]);
+	RUCY_SYM(to_image);
+	std::unique_ptr<Rays::Image> pimage;
+
+	const Rays::Image* image = NULL;
+	if (argv[0].is_a(Rays::image_class()))
+		image = to<Rays::Image*>(argv[0]);
+	else if (argv[0].respond_to(to_image))
+	{
+		pimage.reset(new Rays::Image(to<const Rays::Image&>(argv[0].call(to_image))));
+		image = pimage.get();
+	}
 	if (!image)
 		argument_error(__FILE__, __LINE__, "%s is not an image.", argv[0].inspect().c_str());
 
@@ -810,6 +820,42 @@ RUCY_DEF0(pop_matrix)
 RUCY_END
 
 
+static
+RUCY_DEF1(set_debug, debug)
+{
+	CHECK;
+	if (debug)
+		THIS->remove_flag(Rays::Painter::FLAG_BATCHING);
+	else
+		THIS->   add_flag(Rays::Painter::FLAG_BATCHING);
+	return debug;
+}
+RUCY_END
+
+static
+RUCY_DEF0(get_debug)
+{
+	CHECK;
+	return value(!THIS->has_flag(Rays::Painter::FLAG_BATCHING));
+}
+RUCY_END
+
+static
+RUCY_DEF1(set_global_debug, debug)
+{
+	Rays::Painter::set_debug(debug);
+	return debug;
+}
+RUCY_END
+
+static
+RUCY_DEF0(get_global_debug)
+{
+	return value(Rays::Painter::debug());
+}
+RUCY_END
+
+
 static Class cPainter;
 
 void
@@ -890,6 +936,12 @@ Init_rays_painter ()
 	cPainter.define_method("matrix",  get_matrix);
 	cPainter.define_method("push_matrix", push_matrix);
 	cPainter.define_method( "pop_matrix",  pop_matrix);
+
+	cPainter.define_method("debug=", set_debug);
+	cPainter.define_method("debug?", get_debug);
+
+	cPainter.define_singleton_method("debug=", set_global_debug);
+	cPainter.define_singleton_method("debug?", get_global_debug);
 }
 
 

data/ext/rays/shader.cpp

@@ -67,15 +67,17 @@ make_env (const Value& names, const Value& ignore_no_uniform_location_error)
 		to_name_list(names, 0),
 		to_name_list(names, 1),
 		to_name_list(names, 2),
-		to_name(     names, 3),
-		to_name(     names, 4),
+		to_name_list(names, 3),
+		to_name_list(names, 4),
 		to_name(     names, 5),
-		to_name_list(names, 6),
-		to_name_list(names, 7),
-		to_name_list(names, 8),
-		to_name_list(names, 9),
+		to_name(     names, 6),
+		to_name(     names, 7),
+		to_name(     names, 8),
+		to_name(     names, 9),
 		to_name_list(names, 10),
 		to_name_list(names, 11),
+		to_name_list(names, 12),
+		to_name_list(names, 13),
 		flags);
 }
 

data/include/rays/coord.h

@@ -25,9 +25,9 @@ namespace Rays
 			coord array[SIZE];
 		};
 
-		Coord2& reset (coord value = 0);
+		This& reset (coord value = 0);
 
-		Coord2& reset (coord x, coord y);
+		This& reset (coord x, coord y);
 
 		size_t size () const;
 
@@ -58,9 +58,9 @@ namespace Rays
 
 		This& operator = (const Coord2& rhs);
 
-		Coord3& reset (coord value = 0);
+		This& reset (coord value = 0);
 
-		Coord3& reset (coord x, coord y, coord z = 0);
+		This& reset (coord x, coord y, coord z = 0);
 
 		size_t size () const;
 
@@ -93,9 +93,9 @@ namespace Rays
 
 		This& operator = (const Coord3& rhs);
 
-		Coord4& reset (coord value = 0);
+		This& reset (coord value = 0);
 
-		Coord4& reset (coord x, coord y, coord z = 0, coord w = 1);
+		This& reset (coord x, coord y, coord z = 0, coord w = 1);
 
 		size_t size () const;
 

data/include/rays/defs.h

@@ -26,6 +26,8 @@ namespace Rays
 
 	using Xot::String;
 
+	using Xot::StringList;
+
 
 	typedef float coord;
 

data/include/rays/image.h

@@ -61,10 +61,20 @@ namespace Rays
 
 			bool operator ! () const;
 
-			struct Data;
+			friend bool operator == (const This& lhs, const This& rhs);
+
+			friend bool operator != (const This& lhs, const This& rhs);
+
+			struct Data
+			{
+				virtual ~Data ();
+				virtual void preprocess (const Image* image) const;
+			};
 
 			Xot::PSharedImpl<Data> self;
 
+			Image (Data* data);
+
 	};// Image
 
 

data/include/rays/painter.h

@@ -5,6 +5,7 @@
 
 
 #include <xot/pimpl.h>
+#include <xot/util.h>
 #include <rays/defs.h>
 #include <rays/point.h>
 
@@ -29,6 +30,15 @@ namespace Rays
 
 		public:
 
+			enum Flag
+			{
+
+				FLAG_BATCHING = Xot::bit(0),
+
+				FLAG_LAST     = FLAG_BATCHING
+
+			};// Flag
+
 			Painter ();
 
 			~Painter ();
@@ -322,10 +332,19 @@ namespace Rays
 			void pop_matrix ();
 
 
+			void    add_flag (uint flags);
+
+			void remove_flag (uint flags);
+
+			bool    has_flag (uint flags) const;
+
 			operator bool () const;
 
 			bool operator ! () const;
 
+			static void set_debug (bool debug);
+
+			static bool     debug ();
 
 			struct Data;
 

data/include/rays/ruby.h

@@ -1,7 +1,7 @@
 // -*- c++ -*-
 #pragma once
-#ifndef __RAYS_RUBY_H__
-#define __RAYS_RUBY_H__
+#ifndef __RAYS_RUBY_ALL_H__
+#define __RAYS_RUBY_ALL_H__
 
 
 #include <rays/ruby/defs.h>

data/include/rays/shader.h

@@ -98,15 +98,17 @@ namespace Rays
 			ShaderEnv (
 				const NameList& attribute_position_names      = {},
 				const NameList& attribute_texcoord_names      = {},
+				const NameList& attribute_texcoord_min_names  = {},
+				const NameList& attribute_texcoord_max_names  = {},
 				const NameList& attribute_color_names         = {},
 				const char*     varying_position_name         = NULL,
 				const char*     varying_texcoord_name         = NULL,
+				const char*     varying_texcoord_min_name     = NULL,
+				const char*     varying_texcoord_max_name     = NULL,
 				const char*     varying_color_name            = NULL,
 				const NameList& uniform_position_matrix_names = {},
 				const NameList& uniform_texcoord_matrix_names = {},
-				const NameList& uniform_texcoord_min_names    = {},
-				const NameList& uniform_texcoord_max_names    = {},
-				const NameList& uniform_texcoord_offset_names = {},
+				const NameList& uniform_texcoord_pixel_names  = {},
 				const NameList& uniform_texture_names         = {},
 				uint flags                                    = 0);
 

data/include/rays.h

@@ -1,7 +1,7 @@
 // -*- c++ -*-
 #pragma once
-#ifndef __RAYS_H__
-#define __RAYS_H__
+#ifndef __RAYS_ALL_H__
+#define __RAYS_ALL_H__
 
 
 #include <rays/defs.h>

data/lib/rays/extension.rb

@@ -5,8 +5,10 @@ module Rays
 
     module_function
 
-    def name()
-      super.split('::')[-2]
+    def name(downcase = false)
+      super().split('::')[-2].then {|s|
+        downcase ? s.gsub(/([a-z])([A-Z])/) {"#{$1}-#{$2}"}.downcase : s
+      }
     end
 
     def version()
@@ -29,6 +31,10 @@ module Rays
       root_dir 'ext'
     end
 
+    def lib_name()
+      "#{name true}.dll" if /mswin|ming|cygwin/.match? RUBY_PLATFORM
+    end
+
   end# Extension
 
 

data/lib/rays/image.rb

@@ -7,7 +7,8 @@ module Rays
 
   class Image
 
-    extend Forwardable
+    include Comparable
+    extend  Forwardable
 
     def_delegators :bitmap,           :pixels,  :[]