rays 0.1.22 → 0.1.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a5b43fa2ac1f3b56d89da34aa5d6bd36e3d6711888357602e161e63a2bbbebc
-  data.tar.gz: a98432edc8510d81fa8e941995102b33ad0438d40281b30c52af3cfbf8c89b2d
+  metadata.gz: 040c0f759c8eb840cb1404ef8d4b784a2e8c65a0b4c45069dfc710ce4d82ea11
+  data.tar.gz: 5d23a768599e7f41c56e626077cc194e6160c9e9ce4d29755e52a7ed9125ab2a
 SHA512:
-  metadata.gz: 8a8a50e771070c66bdb4a58dad84ad4f10b29cfa53d7f4a2257e161cbc4708f9ebbe6def647f5fb888035be1ed69aeb2f522856e1ca87eaf76319391643a0b64
-  data.tar.gz: 5e6fbf805d49667fb567c8439c7356a52dee00819db6f1779b7b111649381df0f5bbf3c72af390a1b15332c1a7fe25505dde8a09e74677571e9bc76d58fe63c2
+  metadata.gz: 3a073787bd50fa263eb8ea3a773a28a82bc4e5169f61957ac1497529b6a7ce7c31a18b2b65b4914c4f210e97290de286fb4a7293e52ce2aa8a89d14807f8e4a0
+  data.tar.gz: 4d3635baaa03a28cbc06461a0af483a757a117fe2d7cd0e56efd30070f215966ebd80242b97de661dcdf7615ebbfbdb66b5d14158f9808ad9485ae7077f0ec5f

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

@@ -127,9 +127,10 @@ void get_ellipse_args (
 	assert(x && y && w && h && hole_size && from && to_ && nseg && argv);
 
 	if (argc <= 0)
-		argument_error(__FILE__, __LINE__);
-
-	if (argv[0].is_kind_of(Rays::bounds_class()))
+	{
+		*x = *y = *w = *h = 0;
+	}
+	else if (argv[0].is_kind_of(Rays::bounds_class()))
 	{
 		const Rays::Bounds& b = to<Rays::Bounds&>(argv[0]);
 		*x = b.x;
@@ -162,13 +163,6 @@ void get_ellipse_args (
 		*h = argc >= 4 ? to<coord>(argv[3]) : *w;
 	}
 
-	if (center)
-	{
-		Rays::Point p = to<Rays::Point>(center);
-		*x = p.x;
-		*y = p.y;
-	}
-
 	if (radius)
 	{
 		Rays::Point p = to<Rays::Point>(radius);
@@ -176,6 +170,13 @@ void get_ellipse_args (
 		*h = p.y * 2;
 	}
 
+	if (center)
+	{
+		Rays::Point p = to<Rays::Point>(center);
+		*x = p.x - *w / 2;
+		*y = p.y - *h / 2;
+	}
+
 	*hole_size = hole       ? to<Rays::Point>(hole) : 0;
 	*from      = angle_from ? to<float>(angle_from) : 0;
 	*to_       = angle_to   ? to<float>(angle_to)   : 360;

data/VERSION

@@ -1 +1 @@
-0.1.22
+0.1.23

data/ext/rays/defs.cpp

@@ -127,9 +127,10 @@ void get_ellipse_args (
 	assert(x && y && w && h && hole_size && from && to_ && nseg && argv);
 
 	if (argc <= 0)
-		argument_error(__FILE__, __LINE__);
-
-	if (argv[0].is_kind_of(Rays::bounds_class()))
+	{
+		*x = *y = *w = *h = 0;
+	}
+	else if (argv[0].is_kind_of(Rays::bounds_class()))
 	{
 		const Rays::Bounds& b = to<Rays::Bounds&>(argv[0]);
 		*x = b.x;
@@ -162,13 +163,6 @@ void get_ellipse_args (
 		*h = argc >= 4 ? to<coord>(argv[3]) : *w;
 	}
 
-	if (center)
-	{
-		Rays::Point p = to<Rays::Point>(center);
-		*x = p.x;
-		*y = p.y;
-	}
-
 	if (radius)
 	{
 		Rays::Point p = to<Rays::Point>(radius);
@@ -176,6 +170,13 @@ void get_ellipse_args (
 		*h = p.y * 2;
 	}
 
+	if (center)
+	{
+		Rays::Point p = to<Rays::Point>(center);
+		*x = p.x - *w / 2;
+		*y = p.y - *h / 2;
+	}
+
 	*hole_size = hole       ? to<Rays::Point>(hole) : 0;
 	*from      = angle_from ? to<float>(angle_from) : 0;
 	*to_       = angle_to   ? to<float>(angle_to)   : 360;

data/rays.gemspec

@@ -26,10 +26,10 @@ Gem::Specification.new do |s|
   s.homepage = "https://github.com/xord/rays"
 
   s.platform              = Gem::Platform::RUBY
-  s.required_ruby_version = '~> 2'
+  s.required_ruby_version = '>= 2.6.0'
 
-  s.add_runtime_dependency 'xot',  '~> 0.1.22'
-  s.add_runtime_dependency 'rucy', '~> 0.1.22'
+  s.add_runtime_dependency 'xot',  '~> 0.1.23'
+  s.add_runtime_dependency 'rucy', '~> 0.1.23'
 
   s.files            = `git ls-files`.split $/
   s.executables      = s.files.grep(%r{^bin/}) {|f| File.basename f}

data/src/painter.cpp

@@ -129,7 +129,7 @@ namespace Rays
 		GLint scissor_box[4];
 
 		GLboolean blend;
-		GLint blend_src_factor, blend_dst_factor;
+		GLint blend_src_rgb, blend_src_alpha, blend_dst_rgb, blend_dst_alpha;
 
 		GLint framebuffer_binding;
 
@@ -143,8 +143,10 @@ namespace Rays
 			glGetIntegerv(GL_SCISSOR_BOX, scissor_box);
 
 			glGetBooleanv(GL_BLEND, &blend);
-			glGetIntegerv(GL_BLEND_SRC_ALPHA, &blend_src_factor);
-			glGetIntegerv(GL_BLEND_DST_ALPHA, &blend_dst_factor);
+			glGetIntegerv(GL_BLEND_SRC_RGB,   &blend_src_rgb);
+			glGetIntegerv(GL_BLEND_SRC_ALPHA, &blend_src_alpha);
+			glGetIntegerv(GL_BLEND_DST_RGB,   &blend_dst_rgb);
+			glGetIntegerv(GL_BLEND_DST_ALPHA, &blend_dst_alpha);
 
 			glGetIntegerv(GL_FRAMEBUFFER_BINDING, &framebuffer_binding);
 		}
@@ -160,7 +162,8 @@ namespace Rays
 			glScissor(scissor_box[0], scissor_box[1], scissor_box[2], scissor_box[3]);
 
 			enable(GL_BLEND, blend);
-			glBlendFunc(blend_src_factor, blend_dst_factor);
+			glBlendFuncSeparate(
+				blend_src_rgb, blend_dst_rgb, blend_src_alpha, blend_dst_alpha);
 
 			glBindFramebuffer(GL_FRAMEBUFFER, framebuffer_binding);
 		}
@@ -230,7 +233,7 @@ namespace Rays
 	}
 
 	static const Shader&
-	get_default_shader_for_color_texture ()
+	get_default_shader_for_texture ()
 	{
 		static const Shader SHADER(
 			"varying vec4 " VARYING_TEXCOORD ";"
@@ -244,21 +247,6 @@ namespace Rays
 		return SHADER;
 	}
 
-	static const Shader&
-	get_default_shader_for_alpha_texture ()
-	{
-		static const Shader SHADER(
-			"varying vec4 " VARYING_TEXCOORD ";"
-			"varying vec4 " VARYING_COLOR ";"
-			"vec4 sampleTexture(vec2);"
-			"void main ()"
-			"{"
-			"  vec4 color   = sampleTexture(" VARYING_TEXCOORD ".xy);"
-			"  gl_FragColor = vec4(v_Color.rgb, color.a);"
-			"}");
-		return SHADER;
-	}
-
 
 	struct Painter::Data
 	{
@@ -943,7 +931,7 @@ namespace Rays
 		TextureInfo texinfo(texture, src_x, src_y, src_x + src_w, src_y + src_h);
 
 		if (!shader)
-			shader = &get_default_shader_for_color_texture();
+			shader = &get_default_shader_for_texture();
 
 		draw_polygon(
 			painter, MODES, 0, 0, false, nostroke, points, 4, NULL, 0, texcoords,
@@ -1100,7 +1088,7 @@ namespace Rays
 		{
 			int bmp_w = std::max(texture.width(),  tex_w);
 			int bmp_h = std::max(texture.height(), tex_h);
-			self->text_image = Image(Bitmap(bmp_w, bmp_h, ALPHA), density);
+			self->text_image = Image(Bitmap(bmp_w, bmp_h), density);
 		}
 
 		if (!self->text_image)
@@ -1120,7 +1108,7 @@ namespace Rays
 			painter, self->text_image,
 			0, 0, str_w, str_h,
 			x, y, str_w, str_h,
-			true, &get_default_shader_for_alpha_texture());
+			true, &get_default_shader_for_texture());
 
 		debug_draw_text(painter, font, x, y, str_w / density, str_h / density);
 	}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rays
 version: !ruby/object:Gem::Version
-  version: 0.1.22
+  version: 0.1.23
 platform: ruby
 authors:
 - xordog
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-13 00:00:00.000000000 Z
+date: 2021-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xot
@@ -16,52 +16,52 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.22
+        version: 0.1.23
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.22
+        version: 0.1.23
 - !ruby/object:Gem::Dependency
   name: rucy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.22
+        version: 0.1.23
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.22
+        version: 0.1.23
 description: This library helps you to develop graphics application with OpenGL.
 email: xordog@gmail.com
 executables: []
 extensions:
 - Rakefile
 extra_rdoc_files:
-- ".doc/ext/rays/defs.cpp"
-- ".doc/ext/rays/image.cpp"
 - ".doc/ext/rays/bitmap.cpp"
+- ".doc/ext/rays/bounds.cpp"
 - ".doc/ext/rays/camera.cpp"
-- ".doc/ext/rays/rays.cpp"
-- ".doc/ext/rays/font.cpp"
-- ".doc/ext/rays/color_space.cpp"
-- ".doc/ext/rays/polygon_line.cpp"
-- ".doc/ext/rays/painter.cpp"
-- ".doc/ext/rays/noise.cpp"
 - ".doc/ext/rays/color.cpp"
-- ".doc/ext/rays/shader.cpp"
+- ".doc/ext/rays/color_space.cpp"
+- ".doc/ext/rays/defs.cpp"
+- ".doc/ext/rays/font.cpp"
+- ".doc/ext/rays/image.cpp"
+- ".doc/ext/rays/matrix.cpp"
 - ".doc/ext/rays/native.cpp"
+- ".doc/ext/rays/noise.cpp"
+- ".doc/ext/rays/painter.cpp"
 - ".doc/ext/rays/point.cpp"
-- ".doc/ext/rays/matrix.cpp"
 - ".doc/ext/rays/polygon.cpp"
+- ".doc/ext/rays/polygon_line.cpp"
 - ".doc/ext/rays/polyline.cpp"
-- ".doc/ext/rays/bounds.cpp"
+- ".doc/ext/rays/rays.cpp"
+- ".doc/ext/rays/shader.cpp"
 files:
 - ".doc/ext/rays/bitmap.cpp"
 - ".doc/ext/rays/bounds.cpp"
@@ -243,16 +243,16 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '2'
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: A Drawing Engine using OpenGL.