rays 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 47cd1902082249b45167251a81932376ab40d2026963bb9161ed41a8036701b4
-  data.tar.gz: 0a455ed272895e558e0adebffe42dfd539192942d9a3e7658ba49c6b8feef331
+  metadata.gz: 269385a45e74eaf01c182cbc322b720d22d34b5c7e0642918bd7f6bed05839bc
+  data.tar.gz: 52a94c5e763dbc4a4453ea1c119ea49933c8e6940c5e3a2455c935bbacfd64b8
 SHA512:
-  metadata.gz: ca5b45d58945bcfce469f1f01fc31073bf7ea548fab008493da1d254833cb49cf4dd3d038f8d67ae8ea55803ba8627a0dd8b6b7b252751b3831b76d27b499fe8
-  data.tar.gz: 14f66b8b7ca66c4a2d7fdaac16d45930fc345c58abc529656c59167534e17ca4ac1a7fd330c5ff241d9743b01da8c1b11b6ca6c354bcca73614656c3d8f426e3
+  metadata.gz: '01789a502f4c6fd31c76ea275f2f73ee2afe60d254e9efdf340b1a443216a3c310e3620606c170c7c55b470310f4c8b8550af1ead0f658fd589407ef6e1e8ffd'
+  data.tar.gz: 24be83763d29af1b5e10ead9b2963eb53468320d721ddfd632e786071851abf7fda46db14eab5458569aad60d006f9d62b242d9f93f069d7c586036c83b26bf2

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

@@ -70,6 +70,12 @@ VALUE fin(VALUE self)
 	return self;
 }
 
+static
+VALUE renderer_info(VALUE self)
+{
+	return value(Rays::get_renderer_info());
+}
+
 
 static Module mRays;
 
@@ -80,6 +86,7 @@ Init_rays ()
 
 	mRays.define_singleton_method("init!", init);
 	mRays.define_singleton_method("fin!", fin);
+	rb_define_singleton_method(mRays, "renderer_info", RUBY_METHOD_FUNC(renderer_info), 0);
 
 	for (auto it = CAP_TYPES.begin(); it != CAP_TYPES.end(); ++it)
 		mRays.define_const(it->name, it->value);

data/ChangeLog.md

@@ -1,6 +1,14 @@
 # rays ChangeLog
 
 
+## [v0.3.3] - 2025-01-23
+
+- Add '#version 120' line to shader source
+- Add Rays.renderer_info
+
+- Fix shader error on Intel GPU
+
+
 ## [v0.3.2] - 2025-01-14
 
 - Update workflow files

data/VERSION

@@ -1 +1 @@
-0.3.2
+0.3.3

data/ext/rays/rays.cpp

@@ -72,6 +72,13 @@ RUCY_DEF0(fin)
 }
 RUCY_END
 
+static
+RUCY_DEF0(renderer_info)
+{
+	return value(Rays::get_renderer_info());
+}
+RUCY_END
+
 
 static Module mRays;
 
@@ -82,6 +89,7 @@ Init_rays ()
 
 	mRays.define_singleton_method("init!", init);
 	mRays.define_singleton_method("fin!", fin);
+	mRays.define_singleton_method("renderer_info", renderer_info);
 
 	for (auto it = CAP_TYPES.begin(); it != CAP_TYPES.end(); ++it)
 		mRays.define_const(it->name, it->value);

data/include/rays/rays.h

@@ -23,6 +23,8 @@ namespace Rays
 
 	void activate_offscreen_context ();
 
+	String get_renderer_info ();
+
 
 }// Rays
 

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

data/src/opengl.cpp

@@ -56,4 +56,16 @@ namespace Rays
 	}
 
 
+	String
+	get_renderer_info ()
+	{
+		return Xot::stringf(
+			"{\"OpenGL Version\":\"%s\",\"GLSL Version\":\"%s\",\"Renderer\":\"%s\",\"Vendor\":\"%s\"}",
+			glGetString(GL_VERSION),
+			glGetString(GL_SHADING_LANGUAGE_VERSION),
+			glGetString(GL_RENDERER),
+			glGetString(GL_VENDOR));
+	}
+
+
 }// Rays

data/src/shader.cpp

@@ -2,7 +2,6 @@
 
 
 #include <assert.h>
-#include <regex>
 #include "rays/exception.h"
 #include "opengl.h"
 #include "image.h"
@@ -50,7 +49,7 @@ namespace Rays
 
 			program.reset(new ShaderProgram(
 				make_vertex_shader_source(vertex_shader_source),
-				make_fragment_shader_source(fragment_shader_source),
+				ShaderSource(GL_FRAGMENT_SHADER, fragment_shader_source),
 				env_ ? ShaderEnv_get_flags(*env_) : 0));
 		}
 
@@ -65,21 +64,6 @@ namespace Rays
 			}
 		}
 
-		ShaderSource make_fragment_shader_source (const char* source)
-		{
-			#ifdef IOS
-				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))
-					return ShaderSource(GL_FRAGMENT_SHADER, SHARED_HEADER + source);
-				else
-					return ShaderSource(GL_FRAGMENT_SHADER, source);
-			#else
-				return ShaderSource(GL_FRAGMENT_SHADER, source);
-			#endif
-		}
-
 	};// Shader::Data
 
 
@@ -110,12 +94,12 @@ namespace Rays
 			"uniform sampler2D " + U_TEXTURE + ";\n"
 			"void main ()\n"
 			"{\n"
-			"  vec2 texcoord__ = clamp(" +
+			"  vec2 _rays_texcoord = clamp(" +
 				V_TEXCOORD     + ".xy, " +
 				U_TEXCOORD_MIN + ".xy, " +
 				U_TEXCOORD_MAX + ".xy - " + U_TEXCOORD_OFFSET + ".xy);\n"
-			"  vec4 color__    = texture2D(" + U_TEXTURE + ", texcoord__);\n"
-			"  gl_FragColor    = " + V_COLOR + " * color__;\n"
+			"  vec4 _rays_color    = texture2D(" + U_TEXTURE + ", _rays_texcoord);\n"
+			"  gl_FragColor        = " + V_COLOR + " * _rays_color;\n"
 			"}\n");
 	}
 
@@ -132,11 +116,11 @@ namespace Rays
 			"uniform sampler2D " + U_TEXTURE + ";\n"
 			"void main ()\n"
 			"{\n"
-			"  vec2 min__      = " + U_TEXCOORD_MIN + ".xy;\n"
-			"  vec2 len__      = " + U_TEXCOORD_MAX + ".xy - min__;\n"
-			"  vec2 texcoord__ = mod(" + V_TEXCOORD + ".xy - min__, len__) + min__;\n"
-			"  vec4 color__    = texture2D(" + U_TEXTURE + ", texcoord__);\n"
-			"  gl_FragColor    = " + V_COLOR + " * color__;\n"
+			"  vec2 _rays_min      = " + U_TEXCOORD_MIN + ".xy;\n"
+			"  vec2 _rays_len      = " + U_TEXCOORD_MAX + ".xy - _rays_min;\n"
+			"  vec2 _rays_texcoord = mod(" + V_TEXCOORD + ".xy - _rays_min, _rays_len) + _rays_min;\n"
+			"  vec4 _rays_color    = texture2D(" + U_TEXTURE + ", _rays_texcoord);\n"
+			"  gl_FragColor        = " + V_COLOR + " * _rays_color;\n"
 			"}\n");
 	}
 
@@ -151,16 +135,16 @@ namespace Rays
 			"uniform sampler2D " + U_TEXTURE + ";\n"
 			"void main ()\n"
 			"{\n"
-			"  vec4 col__   = texture2D(" + U_TEXTURE + ", " + V_TEXCOORD + ".xy);\n"
+			"  vec4 _rays_col = texture2D(" + U_TEXTURE + ", " + V_TEXCOORD + ".xy);\n"
 			#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"
+			"  vec3 _rays_rgb = _rays_col.a != 0.0 ? _rays_col.rgb / _rays_col.a : _rays_col.rgb;\n"
+			"  gl_FragColor   = " + V_COLOR + " * vec4(_rays_rgb, _rays_col.a);\n"
 			#elif defined(WIN32)
-			"  float a__    = (col__.r + col__.g + col__.b) / 3.0;\n"
-			"  gl_FragColor = " + V_COLOR + " * vec4(1.0, 1.0, 1.0, a__);\n"
+			"  float _rays_a  = (_rays_col.r + _rays_col.g + _rays_col.b) / 3.0;\n"
+			"  gl_FragColor   = " + V_COLOR + " * vec4(1.0, 1.0, 1.0, _rays_a);\n"
 			#else
-			"  gl_FragColor = " + V_COLOR + " * col__;\n"
+			"  gl_FragColor   = " + V_COLOR + " * _rays_col;\n"
 			#endif
 			"}\n");
 	}
@@ -422,12 +406,12 @@ 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"
-				"  " + V_POSITION +  " = pos__;\n"
-				"  " + V_TEXCOORD +  " = " + U_TEXCOORD_MATRIX + " * texcoord__;\n"
+				"  vec4 _rays_pos      = vec4(" + A_POSITION + ", 1.0);\n"
+				"  vec4 _rays_texcoord = vec4(" + A_TEXCOORD + ", 1.0);\n"
+				"  " + V_POSITION +  " = _rays_pos;\n"
+				"  " + V_TEXCOORD +  " = " + U_TEXCOORD_MATRIX + " * _rays_texcoord;\n"
 				"  " + V_COLOR    +  " = " + A_COLOR + ";\n"
-				"  gl_Position         = " + U_POSITION_MATRIX + " * pos__;\n"
+				"  gl_Position         = " + U_POSITION_MATRIX + " * _rays_pos;\n"
 				"}\n";
 		}
 

data/src/shader_source.cpp

@@ -1,6 +1,7 @@
 #include "shader_source.h"
 
 
+#include <regex>
 #include "rays/exception.h"
 #include "rays/debug.h"
 
@@ -39,8 +40,11 @@ namespace Rays
 			if (is_valid())
 				invalid_state_error(__FILE__, __LINE__);
 
+			String buffer;
+			const char* src = add_headers(type_, source_, &buffer);
+
 			id = glCreateShader(type_);
-			glShaderSource(id, 1, &source_, NULL);
+			glShaderSource(id, 1, &src, NULL);
 			glCompileShader(id);
 
 			GLint status = GL_FALSE;
@@ -52,6 +56,32 @@ namespace Rays
 			source = source_;
 		}
 
+		const char* add_headers (GLenum type, const char* source, String* buffer)
+		{
+#ifdef IOS
+			if (type == GL_FRAGMENT_SHADER)
+			{
+				static const std::regex PRECISION(R"(^\s*precision\s+\w+p\s+float\s*;)");
+				if (!std::regex_search(source, PRECISION))
+				{
+					static const String PRECISION_HEADER = "precision highp float;\n";
+					*buffer = PRECISION_HEADER + source;
+					source  = buffer->c_str();
+				}
+			}
+#endif
+
+			static const std::regex VERSION(R"(^\s*#\s*version\s+\d+)");
+			if (!std::regex_search(source, VERSION))
+			{
+				static const String VERSION_HEADER = "#version 120\n";
+				*buffer = VERSION_HEADER + source;
+				source  = buffer->c_str();
+			}
+
+			return source;
+		}
+
 		String get_compile_log () const
 		{
 			GLsizei len = 0;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rays
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - xordog
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-13 00:00:00.000000000 Z
+date: 2025-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xot
@@ -16,40 +16,40 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.3.3
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.3.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.3.3
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.3.3
 - !ruby/object:Gem::Dependency
   name: rucy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.3.3
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.3.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.3.3
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.3.3
 description: This library helps you to develop graphics application with OpenGL.
 email: xordog@gmail.com
 executables: []