rays 0.3.10 → 0.3.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9945125d1f082492c730846c72a485b8fdcf055a571e9402dde1a704a0253057
-  data.tar.gz: dfe5c15614856cf100383b706f11b25a9fca0a32cb09443e606d470a8a8e093c
+  metadata.gz: 9ccc3b9eda8d2da41df31850e7ab6a6e480936ad80dfff07adaf35e5d12c8eee
+  data.tar.gz: 46785a8507b11be71d877a87fb8f7a42478d19190086701e748978e040a16ad3
 SHA512:
-  metadata.gz: 9ba9ee244cc1a6d800e417aa2406a05d646567b2358371f98fe0f8ec19402dc98864e19233979eafe2e6bb9e7dbafbc7d4d7266cfbb700d69cadf6f92609c38f
-  data.tar.gz: f88ea6b92aae82285bfaf7edd9d12af10da4e305f3d83e158737075747585f15ce7073fe4af90567d6948b089f6a5911d8c10324e585c61f167d4a74ca9d2a3d
+  metadata.gz: 505a1f2e9a2e3a1aea29b4e69528c4741ce0ad956f9c2e7fafa67bf528b6b25c51e6d7371624d52f3a4a8e0e8fa8aab1388d76775b03445f4882af49dd3b18d0
+  data.tar.gz: 51d70c57b927a3b8564718170962d41d36ca7f9a5b209f71c6d72e23bcd6278b8bbf73181909084bb973d2fb72aa4d7172e8ee218407ebf7236c74bb46530e6f

data/.doc/ext/rays/polygon.cpp

@@ -26,7 +26,7 @@ VALUE setup(VALUE self, VALUE args, VALUE loop, VALUE colors, VALUE texcoords)
 {
 	CHECK;
 
-	if (args[0].is_a(Rays::polyline_class()))
+	if (args.size() >= 1 && args[0].is_a(Rays::polyline_class()))
 		*THIS = to<Rays::Polygon>(args.size(), args.as_array());
 	else
 	{

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

@@ -24,7 +24,7 @@ jobs:
         run: "ruby -I.github/workflows -rutils -e 'setup_dependencies'"
 
       - name: test
-        run: bundle exec rake quiet packages test
+        run: bundle exec rake packages test
 
       - name: create gem
         id: gem

data/.github/workflows/test.yml

@@ -25,13 +25,13 @@ jobs:
         run: "ruby -I.github/workflows -rutils -e 'setup_dependencies'"
 
       - name: packages
-        run: bundle exec rake packages
+        run: bundle exec rake verbose packages
 
       - name: lib
-        run: bundle exec rake lib
+        run: bundle exec rake verbose lib
 
       - name: ext
-        run: bundle exec rake ext
+        run: bundle exec rake verbose ext
 
       - name: test
-        run: bundle exec rake test
+        run: bundle exec rake verbose test

data/ChangeLog.md

@@ -1,6 +1,13 @@
 # rays ChangeLog
 
 
+## [v0.3.11] - 2026-04-17
+
+- Move OpenGL code into src/opengl/ and introduce Renderer abstraction
+
+- Fix Polygon#initialize crash on empty args
+
+
 ## [v0.3.10] - 2026-04-09
 
 - Add Font::smooth

data/Gemfile.lock

@@ -1,15 +1,16 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    power_assert (2.0.3)
-    rake (13.1.0)
-    test-unit (3.6.1)
+    power_assert (3.0.1)
+    rake (13.3.1)
+    test-unit (3.7.7)
       power_assert
-    yard (0.9.34)
+    yard (0.9.39)
 
 PLATFORMS
   arm64-darwin-21
   arm64-darwin-23
+  arm64-darwin-24
 
 DEPENDENCIES
   rake
@@ -17,4 +18,4 @@ DEPENDENCIES
   yard
 
 BUNDLED WITH
-   2.4.13
+   2.4.19

data/VERSION

@@ -1 +1 @@
-0.3.10
+0.3.11

data/ext/rays/polygon.cpp

@@ -27,7 +27,7 @@ RUCY_DEF4(setup, args, loop, colors, texcoords)
 {
 	CHECK;
 
-	if (args[0].is_a(Rays::polyline_class()))
+	if (args.size() >= 1 && args[0].is_a(Rays::polyline_class()))
 		*THIS = to<Rays::Polygon>(args.size(), args.as_array());
 	else
 	{

data/rays.gemspec

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

data/src/bitmap.h

@@ -16,6 +16,10 @@ namespace Rays
 	class RawFont;
 
 
+	void Bitmap_setup (
+		Bitmap* bitmap, int w, int h, const ColorSpace& cs,
+		const void* pixels = NULL, bool clear_pixels = true);
+
 	Bitmap Bitmap_from (const Texture& texture);
 
 	void Bitmap_draw_string (

data/src/color_space.cpp

@@ -1,4 +1,4 @@
-#include "color_space.h"
+#include "rays/color_space.h"
 
 
 #include <xot/util.h>
@@ -194,44 +194,4 @@ namespace Rays
 	}
 
 
-	void
-	ColorSpace_get_gl_format_and_type (
-		GLenum* format, GLenum* type, const ColorSpace& cs)
-	{
-		if (!format && !type)
-			argument_error(__FILE__, __LINE__);
-
-		if (!cs)
-			invalid_state_error(__FILE__, __LINE__);
-
-		if (format)
-		{
-			     if (cs.is_rgb())   *format = cs.has_alpha() ? GL_RGBA  : GL_RGB;
-		#ifndef IOS
-			else if (cs.is_bgr())   *format = cs.has_alpha() ? GL_BGRA  : GL_BGR;
-		#endif
-			else if (cs.is_gray())  *format = GL_LUMINANCE;
-			else if (cs.is_alpha()) *format = GL_ALPHA;
-			else
-				rays_error(__FILE__, __LINE__, "invalid color space.");
-		}
-
-		if (type)
-		{
-			if (cs.is_float())
-				*type = GL_FLOAT;
-			else switch (cs.bpc())
-			{
-				case 8:  *type = GL_UNSIGNED_BYTE; break;
-				case 16: *type = GL_UNSIGNED_SHORT; break;
-			#ifndef IOS
-				case 32: *type = GL_UNSIGNED_INT; break;
-			#endif
-				default:
-					rays_error(__FILE__, __LINE__, "invalid bpc.");
-			}
-		}
-	}
-
-
 }// Rays

data/src/image.cpp

@@ -5,7 +5,6 @@
 #include <assert.h>
 #include "rays/exception.h"
 #include "rays/debug.h"
-#include "opengl.h"
 #include "bitmap.h"
 #include "texture.h"
 

data/src/ios/bitmap.mm

@@ -6,10 +6,8 @@
 #import <MobileCoreServices/UTCoreTypes.h>
 #include <xot/util.h>
 #include "rays/exception.h"
-#include "../color_space.h"
 #include "../font.h"
 #include "../texture.h"
-#include "../frame_buffer.h"
 
 
 namespace Rays
@@ -131,11 +129,10 @@ namespace Rays
 	};// Bitmap::Data
 
 
-	static void
-	setup_bitmap (
-		Bitmap* bitmap,
-		int w, int h, const ColorSpace& cs,
-		const void* pixels = NULL, bool clear_pixels = true)
+	void
+	Bitmap_setup (
+		Bitmap* bitmap, int w, int h, const ColorSpace& cs,
+		const void* pixels, bool clear_pixels)
 	{
 		if (w <= 0)
 			argument_error(__FILE__, __LINE__);
@@ -162,30 +159,6 @@ namespace Rays
 			memset(self->pixels, 0, size);
 	}
 
-	Bitmap
-	Bitmap_from (const Texture& tex)
-	{
-		if (!tex)
-			argument_error(__FILE__, __LINE__);
-
-		Bitmap bmp;
-		setup_bitmap(
-			&bmp, tex.width(), tex.height(), tex.color_space(), NULL, false);
-
-		GLenum format, type;
-		ColorSpace_get_gl_format_and_type(&format, &type, tex.color_space());
-
-		FrameBuffer fb(tex);
-		FrameBufferBinder binder(fb.id());
-
-		for (int y = 0; y < bmp.height(); ++y)
-		{
-			GLvoid* ptr = (GLvoid*) bmp.at<uchar>(0, y);
-			glReadPixels(0, y, bmp.width(), 1, format, type, ptr);
-		}
-
-		return bmp;
-	}
 
 	void
 	Bitmap_draw_image (
@@ -318,7 +291,7 @@ namespace Rays
 	Bitmap::Bitmap (
 		int width, int height, const ColorSpace& color_space, const void* pixels)
 	{
-		setup_bitmap(this, width, height, color_space, pixels);
+		Bitmap_setup(this, width, height, color_space, pixels);
 	}
 
 	Bitmap::~Bitmap ()

data/src/ios/rays.mm

@@ -4,7 +4,7 @@
 
 #import <Foundation/Foundation.h>
 #include "rays/exception.h"
-#include "../opengl.h"
+#include "../renderer.h"
 
 
 namespace Rays
@@ -29,7 +29,7 @@ namespace Rays
 
 		global::pool = [[NSAutoreleasePool alloc] init];
 
-		OpenGL_init();
+		Renderer_init();
 	}
 
 	void
@@ -38,7 +38,7 @@ namespace Rays
 		if (!global::pool)
 			rays_error(__FILE__, __LINE__, "not initialized.");
 
-		OpenGL_fin();
+		Renderer_fin();
 
 		[global::pool release];
 		global::pool = nil;

data/src/opengl/bitmap.cpp

@@ -0,0 +1,41 @@
+#include "../bitmap.h"
+
+
+#include "rays/exception.h"
+#include "../texture.h"
+#include "opengl.h"
+#include "color_space.h"
+#include "frame_buffer.h"
+
+
+namespace Rays
+{
+
+
+	Bitmap
+	Bitmap_from (const Texture& tex)
+	{
+		if (!tex)
+			argument_error(__FILE__, __LINE__);
+
+		Bitmap bmp;
+		Bitmap_setup(
+			&bmp, tex.width(), tex.height(), tex.color_space(), NULL, false);
+
+		GLenum format, type;
+		ColorSpace_get_gl_format_and_type(&format, &type, tex.color_space());
+
+		FrameBuffer fb(tex);
+		FrameBufferBinder binder(fb.id());
+
+		for (int y = 0; y < bmp.height(); ++y)
+		{
+			GLvoid* ptr = (GLvoid*) bmp.at<uchar>(0, y);
+			glReadPixels(0, y, bmp.width(), 1, format, type, ptr);
+		}
+
+		return bmp;
+	}
+
+
+}// Rays

data/src/opengl/color_space.cpp

@@ -0,0 +1,51 @@
+#include "color_space.h"
+
+
+#include "rays/exception.h"
+
+
+namespace Rays
+{
+
+
+	void
+	ColorSpace_get_gl_format_and_type (
+		GLenum* format, GLenum* type, const ColorSpace& cs)
+	{
+		if (!format && !type)
+			argument_error(__FILE__, __LINE__);
+
+		if (!cs)
+			invalid_state_error(__FILE__, __LINE__);
+
+		if (format)
+		{
+			     if (cs.is_rgb())   *format = cs.has_alpha() ? GL_RGBA  : GL_RGB;
+		#ifndef IOS
+			else if (cs.is_bgr())   *format = cs.has_alpha() ? GL_BGRA  : GL_BGR;
+		#endif
+			else if (cs.is_gray())  *format = GL_LUMINANCE;
+			else if (cs.is_alpha()) *format = GL_ALPHA;
+			else
+				rays_error(__FILE__, __LINE__, "invalid color space.");
+		}
+
+		if (type)
+		{
+			if (cs.is_float())
+				*type = GL_FLOAT;
+			else switch (cs.bpc())
+			{
+				case 8:  *type = GL_UNSIGNED_BYTE; break;
+				case 16: *type = GL_UNSIGNED_SHORT; break;
+			#ifndef IOS
+				case 32: *type = GL_UNSIGNED_INT; break;
+			#endif
+				default:
+					rays_error(__FILE__, __LINE__, "invalid bpc.");
+			}
+		}
+	}
+
+
+}// Rays

data/src/{color_space.h → opengl/color_space.h}

@@ -1,7 +1,7 @@
 // -*- c++ -*-
 #pragma once
-#ifndef __RAYS_SRC_COLOR_SPACE_H__
-#define __RAYS_SRC_COLOR_SPACE_H__
+#ifndef __RAYS_SRC_OPENGL_COLOR_SPACE_H__
+#define __RAYS_SRC_OPENGL_COLOR_SPACE_H__
 
 
 #include "rays/color_space.h"

data/src/{frame_buffer.cpp → opengl/frame_buffer.cpp}

@@ -105,7 +105,7 @@ namespace Rays
 		FrameBufferBinder binder(id());
 
 		glFramebufferTexture2D(
-			GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, texture.id(), 0);
+			GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, Texture_get_id(texture), 0);
 		OpenGL_check_error(__FILE__, __LINE__);
 
 		self->texture = texture;

data/src/{frame_buffer.h → opengl/frame_buffer.h}

@@ -1,7 +1,7 @@
 // -*- c++ -*-
 #pragma once
-#ifndef __RAYS_SRC_FRAME_BUFFER_H__
-#define __RAYS_SRC_FRAME_BUFFER_H__
+#ifndef __RAYS_SRC_OPENGL_FRAME_BUFFER_H__
+#define __RAYS_SRC_OPENGL_FRAME_BUFFER_H__
 
 
 #include <xot/pimpl.h>

data/src/{ios → opengl/ios}/opengl.mm

@@ -1,5 +1,5 @@
 // -*- objc -*-
-#include "../opengl.h"
+#include "../../renderer.h"
 
 
 #import <OpenGLES/EAGL.h>
@@ -22,13 +22,13 @@ namespace Rays
 
 
 	void
-	OpenGL_init ()
+	Renderer_init ()
 	{
 		activate_offscreen_context();
 	}
 
 	void
-	OpenGL_fin ()
+	Renderer_fin ()
 	{
 	}
 

data/src/{opengl.h → opengl/opengl.h}

@@ -1,7 +1,7 @@
 // -*- c++ -*-
 #pragma once
-#ifndef __RAYS_SRC_OPENGL_H__
-#define __RAYS_SRC_OPENGL_H__
+#ifndef __RAYS_SRC_OPENGL_OPENGL_H__
+#define __RAYS_SRC_OPENGL_OPENGL_H__
 
 
 #if defined(OSX)
@@ -21,10 +21,6 @@ namespace Rays
 {
 
 
-	void OpenGL_init ();
-
-	void OpenGL_fin ();
-
 	bool OpenGL_has_error ();
 
 	void OpenGL_check_error (const char* file, int line);

data/src/{osx → opengl/osx}/opengl.mm

@@ -1,5 +1,5 @@
 // -*- objc -*-
-#include "../opengl.h"
+#include "../../renderer.h"
 
 
 #import <AppKit/AppKit.h>
@@ -39,13 +39,13 @@ namespace Rays
 
 
 	void
-	OpenGL_init ()
+	Renderer_init ()
 	{
 		activate_offscreen_context();
 	}
 
 	void
-	OpenGL_fin ()
+	Renderer_fin ()
 	{
 	}