rays 0.1.29 → 0.1.31

data/ext/rays/painter.cpp

@@ -656,7 +656,7 @@ RUCY_END
 static Class cPainter;
 
 void
-Init_painter ()
+Init_rays_painter ()
 {
 	Module mRays = define_module("Rays");
 

data/ext/rays/point.cpp

@@ -272,7 +272,7 @@ RUCY_END
 static Class cPoint;
 
 void
-Init_point ()
+Init_rays_point ()
 {
 	Module mRays = define_module("Rays");
 

data/ext/rays/polygon.cpp

@@ -249,7 +249,7 @@ RUCY_END
 static Class cPolygon;
 
 void
-Init_polygon ()
+Init_rays_polygon ()
 {
 	Module mRays = define_module("Rays");
 

data/ext/rays/polygon_line.cpp

@@ -42,7 +42,7 @@ RUCY_END
 static Class cPolygonLine;
 
 void
-Init_polygon_line ()
+Init_rays_polygon_line ()
 {
 	Module mRays   = define_module("Rays");
 	Class cPolygon = mRays.define_class("Polygon");

data/ext/rays/polyline.cpp

@@ -114,7 +114,7 @@ RUCY_END
 static Class cPolyline;
 
 void
-Init_polyline ()
+Init_rays_polyline ()
 {
 	Module mRays = define_module("Rays");
 

data/ext/rays/shader.cpp

@@ -176,7 +176,7 @@ RUCY_END
 static Class cShader;
 
 void
-Init_shader ()
+Init_rays_shader ()
 {
 	Module mRays = define_module("Rays");
 

data/lib/rays/{module.rb → extension.rb}

@@ -4,7 +4,7 @@
 module Rays
 
 
-  module Module
+  module Extension
 
     module_function
 
@@ -13,7 +13,7 @@ module Rays
     end
 
     def version()
-      open(root_dir 'VERSION') {|f| f.readline.chomp}
+      File.read(root_dir 'VERSION')[/[\d\.]+/]
     end
 
     def root_dir(path = '')
@@ -28,7 +28,7 @@ module Rays
       root_dir 'lib'
     end
 
-  end# Module
+  end# Extension
 
 
 end# Rays

data/lib/rays.rb

@@ -2,7 +2,7 @@
 
 
 require 'rays/autoinit'
-require 'rays/module'
+require 'rays/extension'
 
 require 'rays/point'
 require 'rays/bounds'

data/rays.gemspec

@@ -1,10 +1,10 @@
 # -*- mode: ruby; coding: utf-8 -*-
 
 
-File.expand_path('../lib', __FILE__)
+File.expand_path('lib', __dir__)
   .tap {|s| $:.unshift s if !$:.include?(s) && File.directory?(s)}
 
-require 'rays/module'
+require 'rays/extension'
 
 
 Gem::Specification.new do |s|
@@ -12,24 +12,27 @@ Gem::Specification.new do |s|
     patterns.map {|pat| Dir.glob(pat).to_a}.flatten
   end
 
-  mod   = Rays::Module
-  name  = mod.name.downcase
+  ext   = Rays::Extension
+  name  = ext.name.downcase
   rdocs = glob.call *%w[README .doc/ext/**/*.cpp]
 
   s.name        = name
   s.summary     = 'A Drawing Engine using OpenGL.'
   s.description = 'This library helps you to develop graphics application with OpenGL.'
-  s.version     = mod.version
+  s.version     = ext.version
 
   s.authors  = %w[xordog]
   s.email    = 'xordog@gmail.com'
   s.homepage = "https://github.com/xord/rays"
 
   s.platform              = Gem::Platform::RUBY
-  s.required_ruby_version = '>= 2.6.0'
+  s.required_ruby_version = '>= 2.7.0'
 
-  s.add_runtime_dependency 'xot',  '~> 0.1.29'
-  s.add_runtime_dependency 'rucy', '~> 0.1.29'
+  s.add_runtime_dependency 'xot',  '~> 0.1.31'
+  s.add_runtime_dependency 'rucy', '~> 0.1.31'
+
+  s.add_development_dependency 'rake'
+  s.add_development_dependency 'test-unit'
 
   s.files            = `git ls-files`.split $/
   s.executables      = s.files.grep(%r{^bin/}) {|f| File.basename f}

data/src/opengl.cpp

@@ -24,7 +24,7 @@ namespace Rays
 			case GL_INVALID_VALUE:     return "GL_INVALID_VALUE";
 			case GL_INVALID_OPERATION: return "GL_INVALID_OPERATION";
 			case GL_OUT_OF_MEMORY:     return "GL_OUT_OF_MEMORY";
-			#if !defined(GL_VERSION_3_0)
+			#if !defined(GL_VERSION_3_0) && !defined(GL_ES_VERSION_2_0)
 				case GL_STACK_OVERFLOW:  return "GL_STACK_OVERFLOW";
 				case GL_STACK_UNDERFLOW: return "GL_STACK_UNDERFLOW";
 				case GL_INVALID_FRAMEBUFFER_OPERATION: return "GL_INVALID_FRAMEBUFFER_OPERATION";
@@ -45,11 +45,10 @@ namespace Rays
 	void
 	OpenGL_check_error (const char* file, int line, const char* format, ...)
 	{
-		XOT_STRINGF(format, s);
-
 		GLenum e = glGetError();
 		if (e != GL_NO_ERROR)
 		{
+			XOT_STRINGF(format, s);
 			opengl_error(
 				file, line,
 				"OpenGL error %s: %s", get_error_name(e).c_str(), s.c_str());

data/src/painter.cpp

@@ -329,16 +329,18 @@ namespace Rays
 
 			const auto& names = Shader_get_builtin_variable_names(shader);
 			apply_builtin_uniforms(*program, names, texinfo);
-			apply_attributes(*program, names, points, npoints, texcoords, color, [&]() {
-				draw_indices(mode, indices, nindices, npoints);
-			});
+			apply_attributes(*program, names, points, npoints, texcoords, color);
+			draw_indices(mode, indices, nindices, npoints);
+			cleanup();
 
 			ShaderProgram_deactivate();
 		}
 
 		private:
 
-			typedef std::vector<GLint> LocationList;
+			std::vector<GLint> locations;
+
+			std::vector<GLuint> buffers;
 
 			void apply_builtin_uniforms (
 				const ShaderProgram& program, const ShaderBuiltinVariableNames& names,
@@ -406,21 +408,16 @@ namespace Rays
 
 			void apply_attributes (
 				const ShaderProgram& program, const ShaderBuiltinVariableNames& names,
-				const Coord3* points, size_t npoints, const Coord3* texcoords, const Color& color,
-				std::function<void()> draw_fun)
+				const Coord3* points, size_t npoints, const Coord3* texcoords,
+				const Color& color)
 			{
 				assert(points && npoints > 0);
 
-				std::vector<GLuint> buffers;
-				LocationList locations;
-
 				apply_attribute(
-					&buffers, &locations,
 					program, names.attribute_position_names,
 					points, npoints);
 
 				apply_attribute(
-					&buffers, &locations,
 					program, names.attribute_texcoord_names,
 					texcoords ? texcoords : points, npoints);
 
@@ -429,54 +426,44 @@ namespace Rays
 				// with specific glsl 'attribute' name.
 				std::vector<Color> colors(npoints, color);
 				apply_attribute(
-					&buffers, &locations,
 					program, names.attribute_color_names,
 					(const Coord4*) &colors[0], npoints);
 #else
 				for (const auto& name : names.attribute_color_names)
 				{
-					apply_attribute(NULL, program, name, [&](GLint loc) {
+					apply_attribute(program, name, [&](GLint loc) {
 						glVertexAttrib4fv(loc, color.array);
 					});
 				}
 #endif
-
-				draw_fun();
-
-				for (auto loc : locations)
-				{
-					glDisableVertexAttribArray(loc);
-					OpenGL_check_error(__FILE__, __LINE__);
-				}
-
-				glDeleteBuffers((GLsizei) buffers.size(), &buffers[0]);
-				OpenGL_check_error(__FILE__, __LINE__);
 			}
 
 			template <typename CoordN>
 			void apply_attribute(
-				auto* buffers, LocationList* locations,
 				const ShaderProgram& program, const auto& names,
 				const CoordN* values, size_t nvalues)
 			{
-				assert(buffers);
-
 				GLuint buffer = 0;
 				for (const auto& name : names)
 				{
-					apply_attribute(locations, program, name, [&](GLint loc) {
+					#ifndef IOS
 						if (buffer == 0)
 						{
-							buffer = create_and_bind_coordn_buffer(values, nvalues);
-							buffers->push_back(buffer);
+							buffer = create_and_bind_buffer(
+								GL_ARRAY_BUFFER, values, sizeof(CoordN) * nvalues);
+							values = 0;
 						}
+					#endif
 
+					apply_attribute(program, name, [&](GLint loc) {
 						glEnableVertexAttribArray(loc);
-						OpenGL_check_error(__FILE__, __LINE__, "loc: %d %s\n", loc, name.c_str());
+						OpenGL_check_error(
+							__FILE__, __LINE__, "loc: %d %s\n", loc, name.c_str());
 
 						glVertexAttribPointer(
-							loc, CoordN::SIZE, get_gl_type<coord>(),
-							GL_FALSE, sizeof(CoordN), NULL);
+							loc, CoordN::SIZE, get_gl_type<coord>(), GL_FALSE, 0, values);
+
+						locations.push_back(loc);
 					});
 				}
 
@@ -485,26 +472,24 @@ namespace Rays
 			}
 
 			void apply_attribute (
-				LocationList* locations, const ShaderProgram& program, const char* name,
-				std::function<void(GLint)> apply)
+				const ShaderProgram& program, const char* name,
+				std::function<void(GLint)> apply_fun)
 			{
 				GLint loc = glGetAttribLocation(program.id(), name);
 				if (loc < 0) return;
 
-				apply(loc);
+				apply_fun(loc);
 				OpenGL_check_error(__FILE__, __LINE__);
-
-				if (locations) locations->push_back(loc);
 			}
 
 			void apply_uniform (
 				const ShaderProgram& program, const char* name,
-				std::function<void(GLint)> apply)
+				std::function<void(GLint)> apply_fun)
 			{
 				GLint loc = glGetUniformLocation(program.id(), name);
 				if (loc < 0) return;
 
-				apply(loc);
+				apply_fun(loc);
 				OpenGL_check_error(__FILE__, __LINE__);
 			}
 
@@ -518,75 +503,52 @@ namespace Rays
 					nindices = npoints;
 				}
 
-				GLuint buffer = create_buffer();
-				size_t size   = sizeof(uint) * nindices;
-
-				glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, buffer);
-				OpenGL_check_error(__FILE__, __LINE__);
-
-				glBufferData(GL_ELEMENT_ARRAY_BUFFER, size, indices, GL_STREAM_DRAW);
-				OpenGL_check_error(__FILE__, __LINE__);
+				#ifdef IOS
+					glDrawElements(mode, (GLsizei) nindices, GL_UNSIGNED_INT, indices);
+					OpenGL_check_error(__FILE__, __LINE__);
+				#else
+					create_and_bind_buffer(
+						GL_ELEMENT_ARRAY_BUFFER, indices, sizeof(uint) * nindices);
 
-				glDrawElements(mode, (GLsizei) nindices, GL_UNSIGNED_INT, NULL);
-				OpenGL_check_error(__FILE__, __LINE__);
+					glDrawElements(mode, (GLsizei) nindices, GL_UNSIGNED_INT, 0);
+					OpenGL_check_error(__FILE__, __LINE__);
 
-				glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
-				OpenGL_check_error(__FILE__, __LINE__);
+					glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
+					OpenGL_check_error(__FILE__, __LINE__);
+				#endif
 			}
 
-			template <typename CoordN>
-			GLuint create_and_bind_coordn_buffer (const CoordN* values, size_t nvalues)
+			GLuint create_and_bind_buffer (
+				GLenum target, const void* data, GLsizeiptr size)
 			{
-				GLuint id   = create_buffer();
-				size_t size = sizeof(CoordN) * nvalues;
-
-				glBindBuffer(GL_ARRAY_BUFFER, id);
+				GLuint id = 0;
+				glGenBuffers(1, &id);
 				OpenGL_check_error(__FILE__, __LINE__);
 
-				glBufferData(GL_ARRAY_BUFFER, size, values, GL_STREAM_DRAW);
-				OpenGL_check_error(__FILE__, __LINE__);
+				buffers.push_back(id);
 
-				return id;
-			}
+				glBindBuffer(target, id);
+				OpenGL_check_error(__FILE__, __LINE__);
 
-			GLuint create_buffer ()
-			{
-				GLuint id;
-				glGenBuffers(1, &id);
+				glBufferData(target, size, data, GL_STREAM_DRAW);
 				OpenGL_check_error(__FILE__, __LINE__);
+
 				return id;
 			}
 
-			void activate_texture (const Texture* texture)
+			void cleanup ()
 			{
-				if (!texture)
+				for (auto loc : locations)
 				{
-					glDisable(GL_TEXTURE_2D);
-					return;
+					glDisableVertexAttribArray(loc);
+					OpenGL_check_error(__FILE__, __LINE__);
 				}
 
-				if (!*texture)
-					argument_error(__FILE__, __LINE__, "invalid texture.");
-
-				GLuint id = texture->id();
-				if (id != get_current_texture_id())
-					glBindTexture(GL_TEXTURE_2D, id);
-
-				glEnable(GL_TEXTURE_2D);
-			}
-
-			GLuint get_current_texture_id ()
-			{
-				GLint id = 0;
-				glGetIntegerv(GL_TEXTURE_BINDING_2D, &id);
-				return (GLuint) id;
-			}
-
-			void deactivate_texture (const Texture* texture)
-			{
-				if (!texture) return;
+				glDeleteBuffers((GLsizei) buffers.size(), &buffers[0]);
+				OpenGL_check_error(__FILE__, __LINE__);
 
-				glDisable(GL_TEXTURE_2D);
+				locations.clear();
+				buffers.clear();
 			}
 
 	};// Painter::Data

data/src/shader.cpp

@@ -67,7 +67,7 @@ namespace Rays
 		ShaderSource make_fragment_shader_source (const char* source)
 		{
 			#ifdef IOS
-				static const String SHARED_HEADER = "precision mediump float;\n";
+				static const String SHARED_HEADER = "precision highp float;\n";
 				static const std::regex PRECISION(R"(^\s*precision\s+\w+p\s+float\s*;)");
 
 				if (!std::regex_search(source, PRECISION))
@@ -128,7 +128,7 @@ namespace Rays
 			"void main ()\n"
 			"{\n"
 			"  vec4 col__   = texture2D(" + U_TEXTURE + ", " + V_TEXCOORD + ".xy);\n"
-			#ifdef OSX
+			#if defined(OSX) || defined(IOS)
 			// restore premultiplied rgb values
 			"  vec3 rgb__   = col__.a != 0.0 ? col__.rgb / col__.a : col__.rgb;\n"
 			"  gl_FragColor = " + V_COLOR + " * vec4(rgb__, col__.a);\n"
@@ -386,8 +386,8 @@ namespace Rays
 				"uniform mat4 "   + U_TEXCOORD_MATRIX + ";\n"
 				"void main ()\n"
 				"{\n"
-				"  vec4 pos__      = vec4(" + A_POSITION + ", 1.0);\n"
-				"  vec4 texcoord__ = vec4(" + A_TEXCOORD + ", 1.0);\n"
+				"  vec4 pos__          = vec4(" + A_POSITION + ", 1.0);\n"
+				"  vec4 texcoord__     = vec4(" + A_TEXCOORD + ", 1.0);\n"
 				"  " + V_POSITION +  " = pos__;\n"
 				"  " + V_TEXCOORD +  " = " + U_TEXCOORD_MATRIX + " * texcoord__;\n"
 				"  " + V_COLOR    +  " = " + A_COLOR + ";\n"

data/src/texture.cpp

@@ -181,7 +181,7 @@ namespace Rays
 	static void
 	setup_texture (
 		Texture::Data* self, int width, int height, const ColorSpace& cs,
-		const Bitmap* bitmap = NULL)
+		const Bitmap* bitmap = NULL, bool npot = false)
 	{
 		assert(self && !self->has_id());
 
@@ -205,11 +205,16 @@ namespace Rays
 		GLenum format, type;
 		ColorSpace_get_gl_format_and_type(&format, &type, cs);
 
-		// create non-power-of-two texture
-		glTexImage2D(
-			GL_TEXTURE_2D, 0, format, width, height, 0, format, type,
-			bitmap ? bitmap->pixels() : NULL);
-		if (OpenGL_has_error())
+		if (npot)
+		{
+			// create non-power-of-two texture
+			glTexImage2D(
+				GL_TEXTURE_2D, 0, format, width, height, 0, format, type,
+				bitmap ? bitmap->pixels() : NULL);
+			npot = OpenGL_has_error();
+		}
+
+		if (!npot)
 		{
 			// create power-of-two texture
 			int width_pow2  = min_pow2(width);

data/test/helper.rb

@@ -2,7 +2,7 @@
 
 
 %w[../xot ../rucy .]
-  .map  {|s| File.expand_path "../../#{s}/lib", __FILE__}
+  .map  {|s| File.expand_path "../#{s}/lib", __dir__}
   .each {|s| $:.unshift s if !$:.include?(s) && File.directory?(s)}
 
 require 'test/unit'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rays
 version: !ruby/object:Gem::Version
-  version: 0.1.29
+  version: 0.1.31
 platform: ruby
 authors:
 - xordog
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-13 00:00:00.000000000 Z
+date: 2023-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xot
@@ -16,28 +16,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.29
+        version: 0.1.31
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.29
+        version: 0.1.31
 - !ruby/object:Gem::Dependency
   name: rucy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.29
+        version: 0.1.31
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.29
+        version: 0.1.31
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: This library helps you to develop graphics application with OpenGL.
 email: xordog@gmail.com
 executables: []
@@ -83,6 +111,11 @@ files:
 - ".doc/ext/rays/polyline.cpp"
 - ".doc/ext/rays/rays.cpp"
 - ".doc/ext/rays/shader.cpp"
+- ".github/workflows/release.yml"
+- ".github/workflows/tag.yml"
+- ".github/workflows/test.yml"
+- ".github/workflows/utils.rb"
+- ChangeLog.md
 - LICENSE
 - README.md
 - Rakefile
@@ -154,10 +187,10 @@ files:
 - lib/rays/color.rb
 - lib/rays/color_space.rb
 - lib/rays/ext.rb
+- lib/rays/extension.rb
 - lib/rays/font.rb
 - lib/rays/image.rb
 - lib/rays/matrix.rb
-- lib/rays/module.rb
 - lib/rays/painter.rb
 - lib/rays/point.rb
 - lib/rays/polygon.rb
@@ -250,14 +283,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.33
+rubygems_version: 3.4.6
 signing_key:
 specification_version: 4
 summary: A Drawing Engine using OpenGL.