rays 0.1.49 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a16981d77f0cc82e3020f1a80757dc7620da39d9b309823b47b8dc49883128a
-  data.tar.gz: 0bffdff4eceb4b60326882341d2fd3f0b2ff583dabfbab05f28127b276a4ab83
+  metadata.gz: 9a7045b85aab21570ba6c4f816ea00a7638f39645d0b3393ae9ba93d14110be1
+  data.tar.gz: 8492b40089c9a7da4336b72e059b4e189739d4510a0abc2a76ec775a9297bc80
 SHA512:
-  metadata.gz: 2e417b9f4f751adeda1108ed76818171896caf4476188a7b3e9116e81f3d1a5d2c9e023e092b202a81c48f6a7a17faed7b388a5cf8211363350efe351f3b3df5
-  data.tar.gz: 33ff8e0b58b215a1e654fcc9aec4864e35a004a5470f412ce0cec7b0a81865b5d8dad003367ee6630fde11e34fb43b83e0c5f973d0d0f0fbe5cdd00795ef1255
+  metadata.gz: 3d48296b01c547a877506077fba4c3b30dae52d74589b947877e8ffc3cf62113619041e7d47d3073222af2ce5dfdc1559004ad08477b5c117c30fbae76a03f68
+  data.tar.gz: 73b031ed35d8519e3ebcf4745d18868fe3ac61559d6159f10aa2e0a2a267051ba5d76bd7f61b28b7427cbc4b1b64da2e4e3f8cf5a066c3bb98d578a69adb64a0

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

@@ -560,7 +560,7 @@ VALUE get_pixels(VALUE self)
 
 	std::vector<VALUE> pixels;
 	get_pixels(&pixels, *THIS);
-	return value(pixels.size(), (const Value*) &pixels[0]);
+	return array((const Value*) &pixels[0], pixels.size());
 }
 
 static

data/.doc/ext/rays/camera.cpp

@@ -127,7 +127,7 @@ VALUE device_names(VALUE self)
 	std::vector<Value> v;
 	for (const auto& name : names)
 		v.emplace_back(name.c_str());
-	return value(v.size(), &v[0]);
+	return array(&v[0], v.size());
 }
 
 

data/.doc/ext/rays/exception.cpp

@@ -13,7 +13,7 @@ Init_rays_exception ()
 {
 	Module mRays = rb_define_module("Rays");
 
-	cRaysError = rb_define_class_under(mRays, "RaysError", rb_eRuntimeError);
+	cRaysError = rb_define_class_under(mRays, "RaysError", rb_eStandardError);
 	cOpenGLError = rb_define_class_under(mRays, "OpenGLError", cRaysError);
 	cShaderError = rb_define_class_under(mRays, "ShaderError", cOpenGLError);
 }

data/.doc/ext/rays/font.cpp

@@ -109,7 +109,7 @@ VALUE families(VALUE self)
 		std::vector<Value> members;
 		for (const auto& member : family.second)
 			members.emplace_back(member.c_str());
-		hash.set(family.first.c_str(), value(members.size(), &members[0]));
+		hash.set(family.first.c_str(), array(&members[0], members.size()));
 	}
 	return hash;
 }

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

@@ -15,7 +15,7 @@ jobs:
           ruby-version: 3.2
 
       - name: checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: setup gems
         run: bundle install

data/.github/workflows/tag.yml

@@ -15,7 +15,7 @@ jobs:
           ruby-version: 3.2
 
       - name: checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
           token: ${{ secrets.PAT }}

data/.github/workflows/test.yml

@@ -16,7 +16,7 @@ jobs:
           ruby-version: 3.2
 
       - name: checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: setup gems
         run: bundle install
@@ -24,5 +24,11 @@ jobs:
       - name: setup dependencies
         run: "ruby -I.github/workflows -rutils -e 'setup_dependencies'"
 
+      - name: lib
+        run: bundle exec rake lib
+
+      - name: ext
+        run: bundle exec rake ext
+
       - name: test
         run: bundle exec rake test

data/ChangeLog.md

@@ -1,6 +1,21 @@
 # rays ChangeLog
 
 
+## [v0.2.1] - 2024-07-05
+
+- Add OpenGL_init() and OpenGL_fin()
+- Add activate_offscreen_context()
+- Do not redefine fin!() methods, they are no longer needed
+- Update workflows for test
+- Update to actions/checkout@v4
+
+
+## [v0.2] - 2024-03-14
+
+- Change the super class for exception class from RuntimeError to StandardError
+- Fix compile errors on iOS
+
+
 ## [v0.1.49] - 2024-02-07
 
 - Add point(), line_height(), and line_height!() to Painter

data/Gemfile.lock

@@ -9,7 +9,7 @@ GEM
 
 PLATFORMS
   arm64-darwin-21
-  x86_64-darwin-20
+  arm64-darwin-22
 
 DEPENDENCIES
   rake

data/VERSION

@@ -1 +1 @@
-0.1.49
+0.2.1

data/ext/rays/bitmap.cpp

@@ -567,7 +567,7 @@ RUCY_DEF0(get_pixels)
 
 	std::vector<VALUE> pixels;
 	get_pixels(&pixels, *THIS);
-	return value(pixels.size(), (const Value*) &pixels[0]);
+	return array((const Value*) &pixels[0], pixels.size());
 }
 RUCY_END
 

data/ext/rays/camera.cpp

@@ -141,7 +141,7 @@ RUCY_DEF0(device_names)
 	std::vector<Value> v;
 	for (const auto& name : names)
 		v.emplace_back(name.c_str());
-	return value(v.size(), &v[0]);
+	return array(&v[0], v.size());
 }
 RUCY_END
 

data/ext/rays/exception.cpp

@@ -13,7 +13,7 @@ Init_rays_exception ()
 {
 	Module mRays = define_module("Rays");
 
-	cRaysError   = mRays.define_class("RaysError", rb_eRuntimeError);
+	cRaysError   = mRays.define_class("RaysError", rb_eStandardError);
 	cOpenGLError = mRays.define_class("OpenGLError", cRaysError);
 	cShaderError = mRays.define_class("ShaderError", cOpenGLError);
 }

data/ext/rays/font.cpp

@@ -120,7 +120,7 @@ RUCY_DEF0(families)
 		std::vector<Value> members;
 		for (const auto& member : family.second)
 			members.emplace_back(member.c_str());
-		hash.set(family.first.c_str(), value(members.size(), &members[0]));
+		hash.set(family.first.c_str(), array(&members[0], members.size()));
 	}
 	return hash;
 }

data/include/rays/color_space.h

@@ -56,13 +56,13 @@ namespace Rays
 
 			ColorSpaceType type () const;
 
-			int bpc () const;
+			int bpc () const;// bits  per channel
 
-			int Bpc () const;
+			int Bpc () const;// bytes per channel
 
-			int bpp () const;
+			int bpp () const;// bits  per pixel
 
-			int Bpp () const;
+			int Bpp () const;// bytes per pixel
 
 			int alpha_pos () const;
 

data/include/rays/rays.h

@@ -11,11 +11,19 @@ namespace Rays
 {
 
 
+	typedef void* Context;
+
+
 	void init ();
 
 	void fin ();
 
 
+	Context get_offscreen_context ();
+
+	void activate_offscreen_context ();
+
+
 }// Rays
 
 

data/include/rays/ruby.h

@@ -4,8 +4,8 @@
 #define __RAYS_RUBY_H__
 
 
-#include <rays/ruby/rays.h>
 #include <rays/ruby/defs.h>
+#include <rays/ruby/rays.h>
 #include <rays/ruby/exception.h>
 
 #include <rays/ruby/point.h>
@@ -23,5 +23,7 @@
 
 #include <rays/ruby/painter.h>
 
+#include <rays/ruby/camera.h>
+
 
 #endif//EOH

data/include/rays.h

@@ -25,5 +25,8 @@
 
 #include <rays/painter.h>
 
+#include <rays/camera.h>
+#include <rays/util.h>
+
 
 #endif//EOH

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_runtime_dependency 'xot',  '~> 0.1.42'
-  s.add_runtime_dependency 'rucy', '~> 0.1.44'
+  s.add_runtime_dependency 'xot',  '~> 0.2.1'
+  s.add_runtime_dependency 'rucy', '~> 0.2.1'
 
   s.files            = `git ls-files`.split $/
   s.executables      = s.files.grep(%r{^bin/}) {|f| File.basename f}

data/src/image.cpp

@@ -56,33 +56,6 @@ namespace Rays
 		if (self->texture) self->texture.set_modified(false);
 	}
 
-	static void
-	invalidate_texture (Image* image)
-	{
-		image->bitmap();// update bitmap
-		image->self->texture = Texture();
-	}
-
-	static void
-	invalidate_texture_for_another_context (Image* image)
-	{
-		assert(image);
-
-		const Texture& tex = image->self->texture;
-		if (!tex) return;
-
-		Context tex_context = tex.context();
-		if (!tex_context) return;
-
-		Context current_context = OpenGL_get_context();
-		if (tex_context == current_context)
-			return;
-
-		OpenGL_set_context(tex_context);
-		invalidate_texture(image);
-		OpenGL_set_context(current_context);
-	}
-
 	static Bitmap&
 	get_bitmap (Image* image)
 	{
@@ -139,8 +112,6 @@ namespace Rays
 			return self->texture;
 		}
 
-		invalidate_texture_for_another_context(&image);
-
 		if (!self->texture)
 		{
 			if (self->bitmap)

data/src/ios/opengl.mm

@@ -2,34 +2,47 @@
 #include "../opengl.h"
 
 
-#include <vector>
 #import <OpenGLES/EAGL.h>
+#include "rays/rays.h"
+#include "rays/exception.h"
 
 
 namespace Rays
 {
 
 
+	static EAGLContext*
+	get_opengl_offscreen_context ()
+	{
+		static EAGLContext* context = nil;
+		if (!context)
+			context = [[EAGLContext alloc] initWithAPI: kEAGLRenderingAPIOpenGLES3];
+		return context;
+	}
+
+
 	void
-	OpenGL_set_context (Context context)
+	OpenGL_init ()
 	{
-		[EAGLContext setCurrentContext: (EAGLContext*) context];
+		activate_offscreen_context();
 	}
 
-	Context
-	OpenGL_get_context ()
+	void
+	OpenGL_fin ()
 	{
-		return [EAGLContext currentContext];
 	}
 
 
 	Context
 	get_offscreen_context ()
 	{
-		static Context context = NULL;
-		if (!context)
-			context = [[EAGLContext alloc] initWithAPI: kEAGLRenderingAPIOpenGLES3];
-		return context;
+		return get_opengl_offscreen_context();
+	}
+
+	void
+	activate_offscreen_context ()
+	{
+		[EAGLContext setCurrentContext: get_opengl_offscreen_context()];
 	}
 
 

data/src/ios/rays.mm

@@ -29,7 +29,7 @@ namespace Rays
 
 		global::pool = [[NSAutoreleasePool alloc] init];
 
-		OpenGL_set_context(get_offscreen_context());
+		OpenGL_init();
 	}
 
 	void
@@ -38,6 +38,8 @@ namespace Rays
 		if (!global::pool)
 			rays_error(__FILE__, __LINE__, "Rays::fin(): not initialized.");
 
+		OpenGL_fin();
+
 		[global::pool release];
 		global::pool = nil;
 	}

data/src/opengl.h

@@ -15,22 +15,22 @@
 	#include <GL/glext.h>
 #endif
 
-#include "rays/opengl.h"
+#include "rays/defs.h"
 
 
 namespace Rays
 {
 
 
-	void    OpenGL_set_context (Context context);
+	void OpenGL_init ();
 
-	Context OpenGL_get_context ();
+	void OpenGL_fin ();
 
-	bool    OpenGL_has_error ();
+	bool OpenGL_has_error ();
 
-	void    OpenGL_check_error (const char* file, int line);
+	void OpenGL_check_error (const char* file, int line);
 
-	void    OpenGL_check_error (const char* file, int line, const char* format, ...);
+	void OpenGL_check_error (const char* file, int line, const char* format, ...);
 
 
 }// Rays

data/src/osx/opengl.mm

@@ -3,30 +3,18 @@
 
 
 #import <AppKit/AppKit.h>
+#include "rays/rays.h"
+#include "rays/exception.h"
 
 
 namespace Rays
 {
 
 
-	void
-	OpenGL_set_context (Context context)
-	{
-		NSOpenGLContext* c = (NSOpenGLContext*) context;
-		[c makeCurrentContext];
-	}
-
-	Context
-	OpenGL_get_context ()
+	static NSOpenGLContext*
+	get_opengl_offscreen_context ()
 	{
-		return [NSOpenGLContext currentContext];
-	}
-
-
-	Context
-	get_offscreen_context ()
-	{
-		static Context context = NULL;
+		static NSOpenGLContext* context = nil;
 		if (!context)
 		{
 			NSOpenGLPixelFormatAttribute attribs[] =
@@ -44,11 +32,35 @@ namespace Rays
 			};
 			NSOpenGLPixelFormat* pf = [[[NSOpenGLPixelFormat alloc]
 				initWithAttributes: attribs] autorelease];
-			context = [[[NSOpenGLContext alloc]
-				initWithFormat: pf shareContext: nil] autorelease];
+			context = [[NSOpenGLContext alloc] initWithFormat: pf shareContext: nil];
 		}
 		return context;
 	}
 
 
+	void
+	OpenGL_init ()
+	{
+		activate_offscreen_context();
+	}
+
+	void
+	OpenGL_fin ()
+	{
+	}
+
+
+	Context
+	get_offscreen_context ()
+	{
+		return get_opengl_offscreen_context();
+	}
+
+	void
+	activate_offscreen_context ()
+	{
+		[get_opengl_offscreen_context() makeCurrentContext];
+	}
+
+
 }// Rays

data/src/osx/rays.mm

@@ -29,7 +29,7 @@ namespace Rays
 
 		global::pool = [[NSAutoreleasePool alloc] init];
 
-		OpenGL_set_context(get_offscreen_context());
+		OpenGL_init();
 	}
 
 	void
@@ -38,6 +38,8 @@ namespace Rays
 		if (!global::pool)
 			rays_error(__FILE__, __LINE__, "Rays::fin(): not initialized.");
 
+		OpenGL_fin();
+
 		[global::pool release];
 		global::pool = nil;
 	}

data/src/painter.cpp

@@ -1236,7 +1236,7 @@ namespace Rays
 		Painter* painter, const Font& font,
 		const char* line, coord x, coord y, coord width = 0, coord height = 0)
 	{
-		assert(painter && font && str && *str != '\0');
+		assert(painter && font && line && *line != '\0');
 
 		Painter::Data* self = painter->self.get();
 

data/src/texture.cpp

@@ -17,8 +17,6 @@ namespace Rays
 	struct Texture::Data
 	{
 
-		Context context = NULL;
-
 		GLuint id = 0;
 
 		int width, height, width_pow2, height_pow2;
@@ -53,22 +51,15 @@ namespace Rays
 		{
 			if (!has_id()) return;
 
-			Context current_context = OpenGL_get_context();
-
-			assert(context);
-			OpenGL_set_context(context);
-
 			glDeleteTextures(1, &id);
+			OpenGL_check_error(__FILE__, __LINE__);
 
-			OpenGL_set_context(current_context);
-
-			context = NULL;
-			id      = 0;
+			id = 0;
 		}
 
 		bool has_id () const
 		{
-			return context && id > 0;
+			return id > 0;
 		}
 
 	};// Texture::Data
@@ -185,13 +176,6 @@ namespace Rays
 	{
 		assert(self && !self->has_id());
 
-		if (self->context)
-			invalid_state_error(__FILE__, __LINE__);
-
-		self->context = OpenGL_get_context();
-		if (!self->context)
-			opengl_error(__FILE__, __LINE__);
-
 		glGenTextures(1, &self->id);
 		glBindTexture(GL_TEXTURE_2D, self->id);
 		if (glIsTexture(self->id) == GL_FALSE)
@@ -313,12 +297,6 @@ namespace Rays
 		return self->color_space;
 	}
 
-	Context
-	Texture::context () const
-	{
-		return self->context;
-	}
-
 	GLuint
 	Texture::id () const
 	{

data/src/texture.h

@@ -42,8 +42,6 @@ namespace Rays
 
 			const ColorSpace& color_space () const;
 
-			Context context () const;
-
 			GLuint id () const;
 
 			void set_modified (bool modified = true);

data/src/win32/gdi.cpp

@@ -43,10 +43,8 @@ namespace Rays
 
 				typedef HANDLE Handle;
 
-				HandleObject (
-					Handle handle = NULL, bool owner = true,
-					DeleteHandleFunc delfun = delete_object)
-				:	handle_(handle), delfun_(delfun)
+				HandleObject ()
+				:	handle_(NULL), delfun_(NULL)
 				{
 				}
 

data/test/helper.rb

@@ -10,11 +10,6 @@ require 'test/unit'
 include Xot::Test
 
 
-unless defined?($RAYS_NOAUTOINIT) && $RAYS_NOAUTOINIT
-  def Rays.fin!() end
-end
-
-
 def assert_equal_color(c1, c2, delta = 0.000001)
   assert_in_delta c1.r, c2.r, delta
   assert_in_delta c1.g, c2.g, delta

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rays
 version: !ruby/object:Gem::Version
-  version: 0.1.49
+  version: 0.2.1
 platform: ruby
 authors:
 - xordog
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-06 00:00:00.000000000 Z
+date: 2024-07-05 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.42
+        version: 0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.42
+        version: 0.2.1
 - !ruby/object:Gem::Dependency
   name: rucy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.44
+        version: 0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.44
+        version: 0.2.1
 description: This library helps you to develop graphics application with OpenGL.
 email: xordog@gmail.com
 executables: []
@@ -125,7 +125,6 @@ files:
 - include/rays/font.h
 - include/rays/image.h
 - include/rays/matrix.h
-- include/rays/opengl.h
 - include/rays/painter.h
 - include/rays/point.h
 - include/rays/polygon.h

data/include/rays/opengl.h

@@ -1,20 +0,0 @@
-// -*- c++ -*-
-#pragma once
-#ifndef __RAYS_OPENGL_H__
-#define __RAYS_OPENGL_H__
-
-
-namespace Rays
-{
-
-
-	typedef void* Context;
-
-
-	Context get_offscreen_context ();
-
-
-}// Rays
-
-
-#endif//EOH