rays 0.3.3 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 269385a45e74eaf01c182cbc322b720d22d34b5c7e0642918bd7f6bed05839bc
-  data.tar.gz: 52a94c5e763dbc4a4453ea1c119ea49933c8e6940c5e3a2455c935bbacfd64b8
+  metadata.gz: a66614f6ea052aeafe775d0bd3096b06103ea8dbc08a94ee60c7172f726ff745
+  data.tar.gz: c6020c9ccf843bbf051660d851ed494d032a9a4db564d774de94ab67d906ad44
 SHA512:
-  metadata.gz: '01789a502f4c6fd31c76ea275f2f73ee2afe60d254e9efdf340b1a443216a3c310e3620606c170c7c55b470310f4c8b8550af1ead0f658fd589407ef6e1e8ffd'
-  data.tar.gz: 24be83763d29af1b5e10ead9b2963eb53468320d721ddfd632e786071851abf7fda46db14eab5458569aad60d006f9d62b242d9f93f069d7c586036c83b26bf2
+  metadata.gz: a3f366d4930acff032af41d0eb8bd96cc3e57f6e48028a2279b6f40d0cee9773bd6fb596c0a5131cad07abc4f7fe1373fecd9297133c11e3ae889988e291f845
+  data.tar.gz: 2fd35000dbdb686a54f09653a4a97ed599ac16432b1ab801f0bfb7c07bcfd1d36a19bb39393b78a4c6b09d1fd8c48a81aec2a7f4140816a4f26ffca35ca7365f

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

@@ -13,6 +13,79 @@ RUCY_DEFINE_VALUE_OR_ARRAY_FROM_TO(RAYS_EXPORT, Rays::Color)
 #define CHECK RUCY_CHECK_OBJ(Rays::Color, self)
 
 
+static const char* NIL_COLOR_NO   = "no";
+static const char* NIL_COLOR_NONE = "none";
+
+typedef std::map<Rays::String, Rays::Color> ColorMap;
+
+static ColorMap&
+get_color_map ()
+{
+	static ColorMap map;
+	if (map.empty())
+	{
+		map[NIL_COLOR_NO]   =
+		map[NIL_COLOR_NONE] =
+		map["transp"]       =
+		map["transparent"]  = Rays::gray(0, 0);
+
+		map["black"]      = Rays::rgb8(  0,   0,   0);
+		map["white"]      = Rays::rgb8(255, 241, 232);
+		map["gray"]       =
+		map["lightgray"]  = Rays::rgb8(194, 195, 199);
+		map["darkgray"]   = Rays::rgb8( 95,  87,  79);
+		map["brown"]      = Rays::rgb8(171,  82,  54);
+		map["red"]        = Rays::rgb8(255,   0,  77);
+		map["orange"]     = Rays::rgb8(255, 163,   0);
+		map["yellow"]     = Rays::rgb8(255, 236,  39);
+		map["green"]      = Rays::rgb8(  0, 228,  54);
+		map["darkgreen"]  = Rays::rgb8(  0, 135,  81);
+		map["blue"]       = Rays::rgb8( 41, 173, 255);
+		map["darkblue"]   = Rays::rgb8( 29,  43,  83);
+		map["indigo"]     = Rays::rgb8(131, 118, 156);
+		map["pink"]       = Rays::rgb8(255, 119, 168);
+		map["peach"]      = Rays::rgb8(255, 204, 170);
+		map["darkpurple"] = Rays::rgb8(126,  37,  83);
+	}
+	return map;
+}
+
+static const Rays::String
+to_color_name (const char* name)
+{
+	return Rays::String(name).downcase();
+}
+
+static const Rays::Color&
+find_color (const char* name)
+{
+	assert(name);
+
+	const ColorMap& map = get_color_map();
+	ColorMap::const_iterator it = map.find(to_color_name(name));
+	if (it == map.end())
+		argument_error(__FILE__, __LINE__, "color '%s' is not found.", name);
+
+	return it->second;
+}
+
+bool
+is_nil_color (Value value)
+{
+	if (value.is_nil())
+		return true;
+
+	const char* name = NULL;
+	if (value.is_s())   name = value.as_s();
+	if (value.is_sym()) name = value.as_s(true);
+	if (!name) return false;
+
+	return
+		strcmp(name, NIL_COLOR_NO)   == 0 ||
+		strcmp(name, NIL_COLOR_NONE) == 0;
+}
+
+
 static
 VALUE alloc(VALUE klass)
 {
@@ -113,60 +186,6 @@ VALUE to_hsv(VALUE self)
 	return array(h, s, v, THIS->alpha);
 }
 
-
-typedef std::map<Rays::String, Rays::Color> ColorMap;
-
-static ColorMap&
-get_color_map ()
-{
-	static ColorMap map;
-	if (map.empty())
-	{
-		map["no"]          =
-		map["none"]        =
-		map["transp"]      =
-		map["transparent"] = Rays::gray(0, 0);
-
-		map["black"]      = Rays::rgb8(  0,   0,   0);
-		map["white"]      = Rays::rgb8(255, 241, 232);
-		map["gray"]       =
-		map["lightgray"]  = Rays::rgb8(194, 195, 199);
-		map["darkgray"]   = Rays::rgb8( 95,  87,  79);
-		map["brown"]      = Rays::rgb8(171,  82,  54);
-		map["red"]        = Rays::rgb8(255,   0,  77);
-		map["orange"]     = Rays::rgb8(255, 163,   0);
-		map["yellow"]     = Rays::rgb8(255, 236,  39);
-		map["green"]      = Rays::rgb8(  0, 228,  54);
-		map["darkgreen"]  = Rays::rgb8(  0, 135,  81);
-		map["blue"]       = Rays::rgb8( 41, 173, 255);
-		map["darkblue"]   = Rays::rgb8( 29,  43,  83);
-		map["indigo"]     = Rays::rgb8(131, 118, 156);
-		map["pink"]       = Rays::rgb8(255, 119, 168);
-		map["peach"]      = Rays::rgb8(255, 204, 170);
-		map["darkpurple"] = Rays::rgb8(126,  37,  83);
-	}
-	return map;
-}
-
-static const Rays::String
-to_color_name (const char* name)
-{
-	return Rays::String(name).downcase();
-}
-
-static const Rays::Color&
-find_color (const char* name)
-{
-	assert(name);
-
-	const ColorMap& map = get_color_map();
-	ColorMap::const_iterator it = map.find(to_color_name(name));
-	if (it == map.end())
-		argument_error(__FILE__, __LINE__, "color '%s' is not found.", name);
-
-	return it->second;
-}
-
 static
 VALUE hsv(VALUE self)
 {

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

@@ -338,7 +338,10 @@ static
 VALUE set_fill(VALUE self)
 {
 	CHECK;
-	THIS->set_fill(to<Rays::Color>(argc, argv));
+	if (argc >= 1 && is_nil_color(argv[0]))
+		THIS->no_fill();
+	else
+		THIS->set_fill(to<Rays::Color>(argc, argv));
 	return self;
 }
 
@@ -361,7 +364,10 @@ static
 VALUE set_stroke(VALUE self)
 {
 	CHECK;
-	THIS->set_stroke(to<Rays::Color>(argc, argv));
+	if (argc >= 1 && is_nil_color(argv[0]))
+		THIS->no_stroke();
+	else
+		THIS->set_stroke(to<Rays::Color>(argc, argv));
 	return self;
 }
 

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

@@ -135,7 +135,7 @@ namespace Rucy
 		int type = value_to<int>(*argv, convert);
 		if (type < 0)
 			argument_error(__FILE__, __LINE__, "invalid cap type -- %d", type);
-		if (type >= Rays::CAP_MAX)
+		if (type >= Rays::CAP_TYPE_MAX)
 			argument_error(__FILE__, __LINE__, "invalid cap type -- %d", type);
 
 		return (Rays::CapType) type;
@@ -168,7 +168,7 @@ namespace Rucy
 		int type = value_to<int>(*argv, convert);
 		if (type < 0)
 			argument_error(__FILE__, __LINE__, "invalid join type -- %d", type);
-		if (type >= Rays::JOIN_MAX)
+		if (type >= Rays::JOIN_TYPE_MAX)
 			argument_error(__FILE__, __LINE__, "invalid join type -- %d", type);
 
 		return (Rays::JoinType) type;
@@ -201,7 +201,7 @@ namespace Rucy
 		int mode = value_to<int>(*argv, convert);
 		if (mode < 0)
 			argument_error(__FILE__, __LINE__, "invalid blend mode -- %d", mode);
-		if (mode >= Rays::BLEND_MAX)
+		if (mode >= Rays::BLEND_MODE_MAX)
 			argument_error(__FILE__, __LINE__, "invalid blend mode -- %d", mode);
 
 		return (Rays::BlendMode) mode;

data/.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,12 @@
+## Pull Requests Not Accepted 🚫
+
+Thank you for your interest in contributing!
+However, this repository does not accept pull requests directly.
+
+### Where to Contribute?
+
+Please submit your changes to the [xord/all](https://github.com/xord/all) monorepo, which serves as the primary repository for all our main libraries.
+
+For more details, please refer to our [contribution guidelines](../CONTRIBUTING.md).
+
+Thanks for your understanding! 🙌

data/CONTRIBUTING.md

@@ -0,0 +1,7 @@
+# Contribution Guide
+
+Thank you for your interest in contributing!
+However, this repository does not accept pull requests.
+Instead, please submit your changes to the [xord/all](https://github.com/xord/all) monorepo, which serves as the primary repository for all our main libraries.
+
+For any questions, feel free to open an issue.

data/ChangeLog.md

@@ -1,6 +1,27 @@
 # rays ChangeLog
 
 
+## [v0.3.5] - 2025-03-24
+
+- Add PULL_REQUEST_TEMPLATE.md
+- Add CONTRIBUTING.md
+
+- Fix shader error on iOS
+
+
+## [v0.3.4] - 2025-03-07
+
+- Add msys2_mingw_dependencies for openal and glew
+
+- Update glm library
+- Painter: no stroke by default
+- Passing :no or :none to Painter::set_fill()/set_stroke() is equivalent to calling no_fill()/no_stroke()
+- BLEND_REPLACE disables fill/stroke only on calling no_fill/no_stroke (alpha 0 does not mean to no_fill/no_stroke)
+
+- Fix a bug that both fill and stroke were drawn even with blend_mode REPLACE, no_fill, and no_stroke combinations
+- Fix problem of not drawing when BLEND_REPLACE is combined with alpha 0
+
+
 ## [v0.3.3] - 2025-01-23
 
 - Add '#version 120' line to shader source

data/README.md

@@ -1,4 +1,47 @@
-
 # Rays - A Drawing Engine using OpenGL.
 
- by xordog@gmail.com
+![License](https://img.shields.io/github/license/xord/rays)
+![Build Status](https://github.com/xord/rays/actions/workflows/test.yml/badge.svg)
+![Gem Version](https://badge.fury.io/rb/rays.svg)
+
+## ⚠️  Notice
+
+This repository is a read-only mirror of our monorepo.
+We do not accept pull requests or direct contributions here.
+
+### 🔄 Where to Contribute?
+
+All development happens in our [xord/all](https://github.com/xord/all) monorepo, which contains all our main libraries.
+If you'd like to contribute, please submit your changes there.
+
+For more details, check out our [Contribution Guidelines](./CONTRIBUTING.md).
+
+Thanks for your support! 🙌
+
+## 🚀 About
+
+**Rays** is a drawing engine that utilizes OpenGL for 2D rendering.
+
+It is designed to provide efficient graphics capabilities, making it ideal for creating complex visualizations and graphics applications.
+
+## 📦 Installation
+
+Add this line to your Gemfile:
+```ruby
+$ gem 'rays'
+```
+
+Then, install gem:
+```bash
+$ bundle install
+```
+
+Or install it directly:
+```bash
+$ gem install rays
+```
+
+## 📜 License
+
+**Rays** is licensed under the MIT License.
+See the [LICENSE](./LICENSE) file for details.

data/Rakefile

@@ -17,7 +17,7 @@ TESTS_ALONE = ['test/test_rays_init.rb']
 install_packages win32: %w[MINGW_PACKAGE_PREFIX-glew]
 
 use_external_library 'https://github.com/g-truc/glm',
-  tag:     '0.9.9.8',
+  tag:     '1.0.1',
   srcdirs: 'NOSRC'
 
 use_external_library 'https://github.com/skyrpex/clipper',

data/VERSION

@@ -1 +1 @@
-0.3.3
+0.3.5

data/ext/rays/color.cpp

@@ -13,6 +13,79 @@ RUCY_DEFINE_VALUE_OR_ARRAY_FROM_TO(RAYS_EXPORT, Rays::Color)
 #define CHECK RUCY_CHECK_OBJ(Rays::Color, self)
 
 
+static const char* NIL_COLOR_NO   = "no";
+static const char* NIL_COLOR_NONE = "none";
+
+typedef std::map<Rays::String, Rays::Color> ColorMap;
+
+static ColorMap&
+get_color_map ()
+{
+	static ColorMap map;
+	if (map.empty())
+	{
+		map[NIL_COLOR_NO]   =
+		map[NIL_COLOR_NONE] =
+		map["transp"]       =
+		map["transparent"]  = Rays::gray(0, 0);
+
+		map["black"]      = Rays::rgb8(  0,   0,   0);
+		map["white"]      = Rays::rgb8(255, 241, 232);
+		map["gray"]       =
+		map["lightgray"]  = Rays::rgb8(194, 195, 199);
+		map["darkgray"]   = Rays::rgb8( 95,  87,  79);
+		map["brown"]      = Rays::rgb8(171,  82,  54);
+		map["red"]        = Rays::rgb8(255,   0,  77);
+		map["orange"]     = Rays::rgb8(255, 163,   0);
+		map["yellow"]     = Rays::rgb8(255, 236,  39);
+		map["green"]      = Rays::rgb8(  0, 228,  54);
+		map["darkgreen"]  = Rays::rgb8(  0, 135,  81);
+		map["blue"]       = Rays::rgb8( 41, 173, 255);
+		map["darkblue"]   = Rays::rgb8( 29,  43,  83);
+		map["indigo"]     = Rays::rgb8(131, 118, 156);
+		map["pink"]       = Rays::rgb8(255, 119, 168);
+		map["peach"]      = Rays::rgb8(255, 204, 170);
+		map["darkpurple"] = Rays::rgb8(126,  37,  83);
+	}
+	return map;
+}
+
+static const Rays::String
+to_color_name (const char* name)
+{
+	return Rays::String(name).downcase();
+}
+
+static const Rays::Color&
+find_color (const char* name)
+{
+	assert(name);
+
+	const ColorMap& map = get_color_map();
+	ColorMap::const_iterator it = map.find(to_color_name(name));
+	if (it == map.end())
+		argument_error(__FILE__, __LINE__, "color '%s' is not found.", name);
+
+	return it->second;
+}
+
+bool
+is_nil_color (Value value)
+{
+	if (value.is_nil())
+		return true;
+
+	const char* name = NULL;
+	if (value.is_s())   name = value.as_s();
+	if (value.is_sym()) name = value.as_s(true);
+	if (!name) return false;
+
+	return
+		strcmp(name, NIL_COLOR_NO)   == 0 ||
+		strcmp(name, NIL_COLOR_NONE) == 0;
+}
+
+
 static
 RUCY_DEF_ALLOC(alloc, klass)
 {
@@ -125,60 +198,6 @@ RUCY_DEF0(to_hsv)
 }
 RUCY_END
 
-
-typedef std::map<Rays::String, Rays::Color> ColorMap;
-
-static ColorMap&
-get_color_map ()
-{
-	static ColorMap map;
-	if (map.empty())
-	{
-		map["no"]          =
-		map["none"]        =
-		map["transp"]      =
-		map["transparent"] = Rays::gray(0, 0);
-
-		map["black"]      = Rays::rgb8(  0,   0,   0);
-		map["white"]      = Rays::rgb8(255, 241, 232);
-		map["gray"]       =
-		map["lightgray"]  = Rays::rgb8(194, 195, 199);
-		map["darkgray"]   = Rays::rgb8( 95,  87,  79);
-		map["brown"]      = Rays::rgb8(171,  82,  54);
-		map["red"]        = Rays::rgb8(255,   0,  77);
-		map["orange"]     = Rays::rgb8(255, 163,   0);
-		map["yellow"]     = Rays::rgb8(255, 236,  39);
-		map["green"]      = Rays::rgb8(  0, 228,  54);
-		map["darkgreen"]  = Rays::rgb8(  0, 135,  81);
-		map["blue"]       = Rays::rgb8( 41, 173, 255);
-		map["darkblue"]   = Rays::rgb8( 29,  43,  83);
-		map["indigo"]     = Rays::rgb8(131, 118, 156);
-		map["pink"]       = Rays::rgb8(255, 119, 168);
-		map["peach"]      = Rays::rgb8(255, 204, 170);
-		map["darkpurple"] = Rays::rgb8(126,  37,  83);
-	}
-	return map;
-}
-
-static const Rays::String
-to_color_name (const char* name)
-{
-	return Rays::String(name).downcase();
-}
-
-static const Rays::Color&
-find_color (const char* name)
-{
-	assert(name);
-
-	const ColorMap& map = get_color_map();
-	ColorMap::const_iterator it = map.find(to_color_name(name));
-	if (it == map.end())
-		argument_error(__FILE__, __LINE__, "color '%s' is not found.", name);
-
-	return it->second;
-}
-
 static
 RUCY_DEFN(hsv)
 {

data/ext/rays/defs.h

@@ -19,6 +19,9 @@ using namespace Rucy;
 using Rays::coord;
 
 
+bool is_nil_color (Value value);
+
+
 void get_points (std::vector<Rays::Point>* points, int argc, const Value* argv);
 
 void get_colors (std::vector<Rays::Color>* colors, int argc, const Value* argv);

data/ext/rays/painter.cpp

@@ -359,7 +359,10 @@ static
 RUCY_DEFN(set_fill)
 {
 	CHECK;
-	THIS->set_fill(to<Rays::Color>(argc, argv));
+	if (argc >= 1 && is_nil_color(argv[0]))
+		THIS->no_fill();
+	else
+		THIS->set_fill(to<Rays::Color>(argc, argv));
 	return self;
 }
 RUCY_END
@@ -385,7 +388,10 @@ static
 RUCY_DEFN(set_stroke)
 {
 	CHECK;
-	THIS->set_stroke(to<Rays::Color>(argc, argv));
+	if (argc >= 1 && is_nil_color(argv[0]))
+		THIS->no_stroke();
+	else
+		THIS->set_stroke(to<Rays::Color>(argc, argv));
 	return self;
 }
 RUCY_END

data/ext/rays/rays.cpp

@@ -138,7 +138,7 @@ namespace Rucy
 		int type = value_to<int>(*argv, convert);
 		if (type < 0)
 			argument_error(__FILE__, __LINE__, "invalid cap type -- %d", type);
-		if (type >= Rays::CAP_MAX)
+		if (type >= Rays::CAP_TYPE_MAX)
 			argument_error(__FILE__, __LINE__, "invalid cap type -- %d", type);
 
 		return (Rays::CapType) type;
@@ -171,7 +171,7 @@ namespace Rucy
 		int type = value_to<int>(*argv, convert);
 		if (type < 0)
 			argument_error(__FILE__, __LINE__, "invalid join type -- %d", type);
-		if (type >= Rays::JOIN_MAX)
+		if (type >= Rays::JOIN_TYPE_MAX)
 			argument_error(__FILE__, __LINE__, "invalid join type -- %d", type);
 
 		return (Rays::JoinType) type;
@@ -204,7 +204,7 @@ namespace Rucy
 		int mode = value_to<int>(*argv, convert);
 		if (mode < 0)
 			argument_error(__FILE__, __LINE__, "invalid blend mode -- %d", mode);
-		if (mode >= Rays::BLEND_MAX)
+		if (mode >= Rays::BLEND_MODE_MAX)
 			argument_error(__FILE__, __LINE__, "invalid blend mode -- %d", mode);
 
 		return (Rays::BlendMode) mode;

data/include/rays/defs.h

@@ -39,7 +39,7 @@ namespace Rays
 
 		CAP_SQUARE,
 
-		CAP_MAX,
+		CAP_TYPE_MAX,
 
 		CAP_DEFAULT = CAP_BUTT
 
@@ -55,7 +55,7 @@ namespace Rays
 
 		JOIN_SQUARE,
 
-		JOIN_MAX,
+		JOIN_TYPE_MAX,
 
 		JOIN_DEFAULT             = JOIN_MITER,
 		JOIN_DEFAULT_MITER_LIMIT = 2
@@ -84,7 +84,7 @@ namespace Rays
 
 		BLEND_REPLACE,
 
-		BLEND_MAX
+		BLEND_MODE_MAX
 
 	};// BlendMode
 

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.3', '>= 0.3.3'
-  s.add_dependency 'rucy', '~> 0.3.3', '>= 0.3.3'
+  s.add_dependency 'xot',  '~> 0.3.5', '>= 0.3.5'
+  s.add_dependency 'rucy', '~> 0.3.5', '>= 0.3.5'
 
   s.files            = `git ls-files`.split $/
   s.executables      = s.files.grep(%r{^bin/}) {|f| File.basename f}
@@ -34,5 +34,7 @@ Gem::Specification.new do |s|
   s.extra_rdoc_files = rdocs.to_a
   s.has_rdoc         = true
 
+  s.metadata['msys2_mingw_dependencies'] = 'glew'
+
   s.extensions << 'Rakefile'
 end

data/src/color.cpp

@@ -2,10 +2,10 @@
 
 
 #include <limits.h>
-#include <glm/gtx/color_space.hpp>
 #include <xot/util.h>
 #include "rays/exception.h"
 #include "rays/color_space.h"
+#include "glm.h"
 #include "coord.h"
 
 

data/src/coord.h

@@ -4,8 +4,7 @@
 #define __RAYS_SRC_COORD_H__
 
 
-#include <glm/vec2.hpp>
-#include <glm/vec3.hpp>
+#include "glm.h"
 #include "rays/coord.h"
 
 

data/src/glm.h

@@ -0,0 +1,18 @@
+// -*- c++ -*-
+#pragma once
+#ifndef __RAYS_SRC_GLM_H__
+#define __RAYS_SRC_GLM_H__
+
+
+#define GLM_ENABLE_EXPERIMENTAL
+#include <glm/vec2.hpp>
+#include <glm/vec3.hpp>
+#include <glm/mat4x4.hpp>
+#include <glm/geometric.hpp>
+#include <glm/gtc/matrix_transform.hpp>
+#include <glm/gtc/noise.hpp>
+#include <glm/gtx/color_space.hpp>
+#include <glm/gtx/rotate_vector.hpp>
+
+
+#endif//EOH

data/src/matrix.cpp

@@ -1,8 +1,6 @@
 #include "matrix.h"
 
 
-#include <glm/mat4x4.hpp>
-#include <glm/gtc/matrix_transform.hpp>
 #include <xot/util.h>
 #include "rays/exception.h"
 #include "rays/point.h"

data/src/matrix.h

@@ -4,8 +4,8 @@
 #define __RAYS_SRC_MATRIX_H__
 
 
-#include <glm/mat4x4.hpp>
 #include "rays/matrix.h"
+#include "glm.h"
 
 
 namespace Rays

data/src/painter.cpp

@@ -8,13 +8,13 @@
 #include <vector>
 #include <algorithm>
 #include <functional>
-#include <glm/gtc/matrix_transform.hpp>
 #include "rays/exception.h"
 #include "rays/point.h"
 #include "rays/bounds.h"
 #include "rays/color.h"
 #include "rays/debug.h"
 #include "opengl.h"
+#include "glm.h"
 #include "matrix.h"
 #include "polygon.h"
 #include "bitmap.h"
@@ -37,8 +37,7 @@ namespace Rays
 		FILL = 0,
 		STROKE,
 
-		COLOR_TYPE_END,
-		COLOR_TYPE_BEGIN = 0
+		COLOR_TYPE_MAX
 
 	};// ColorType
 
@@ -46,7 +45,9 @@ namespace Rays
 	struct State
 	{
 
-		Color background, colors[2];
+		Color background, colors[COLOR_TYPE_MAX];
+
+		bool nocolors[COLOR_TYPE_MAX];
 
 		coord stroke_width;
 
@@ -78,28 +79,43 @@ namespace Rays
 
 		void init ()
 		{
-			background     .reset(0, 0);
-			colors[FILL]   .reset(1, 1);
-			colors[STROKE] .reset(1, 0);
-			stroke_width   = 0;
-			stroke_outset  = 0;
-			stroke_cap     = CAP_DEFAULT;
-			stroke_join    = JOIN_DEFAULT;
-			miter_limit    = JOIN_DEFAULT_MITER_LIMIT;
-			nsegment       = 0;
-			line_height    = -1;
-			blend_mode     = BLEND_NORMAL;
-			clip           .reset(-1);
-			font           = get_default_font();
-			texture        = Image();
-			texcoord_mode  = TEXCOORD_IMAGE;
-			texcoord_wrap  = TEXCOORD_CLAMP;
-			shader         = Shader();
+			background       .reset(0, 0);
+			  colors[FILL]   .reset(1, 1);
+			  colors[STROKE] .reset(1, 0);
+			nocolors[FILL]   = false;
+			nocolors[STROKE] = true;
+			stroke_width     = 0;
+			stroke_outset    = 0;
+			stroke_cap       = CAP_DEFAULT;
+			stroke_join      = JOIN_DEFAULT;
+			miter_limit      = JOIN_DEFAULT_MITER_LIMIT;
+			nsegment         = 0;
+			line_height      = -1;
+			blend_mode       = BLEND_NORMAL;
+			clip             .reset(-1);
+			font             = get_default_font();
+			texture          = Image();
+			texcoord_mode    = TEXCOORD_IMAGE;
+			texcoord_wrap    = TEXCOORD_CLAMP;
+			shader           = Shader();
+		}
+
+		bool get_color (Color* color, ColorType type) const
+		{
+			const Color& c = colors[type];
+			if (blend_mode == BLEND_REPLACE ? nocolors[type] : !c)
+				return false;
+
+			*color = c;
+			return true;
 		}
 
-		bool has_color ()
+		bool has_color () const
 		{
-			return colors[FILL] || colors[STROKE];
+			if (blend_mode == BLEND_REPLACE)
+				return !nocolors[FILL] || !nocolors[STROKE];
+			else
+				return colors[FILL] || colors[STROKE];
 		}
 
 	};// State
@@ -314,15 +330,6 @@ namespace Rays
 			OpenGL_check_error(__FILE__, __LINE__);
 		}
 
-		bool get_color (Color* color, ColorType type)
-		{
-			const Color& c = state.colors[type];
-			if (!c) return false;
-
-			*color = c;
-			return true;
-		}
-
 		void draw (
 			GLenum mode, const Color* color,
 			const Coord3* points,           size_t npoints,
@@ -861,13 +868,13 @@ namespace Rays
 
 		Color color;
 
-		if (self->get_color(&color, FILL))
+		if (self->state.get_color(&color, FILL))
 		{
 			Polygon_fill(polygon, painter, color);
 			debug_draw_triangulation(painter, polygon, color);
 		}
 
-		if (self->get_color(&color, STROKE))
+		if (self->state.get_color(&color, STROKE))
 			Polygon_stroke(polygon, painter, color);
 
 		if (backup)
@@ -1098,12 +1105,12 @@ namespace Rays
 		TextureInfo texinfo(texture, src_x, src_y, src_x + src_w, src_y + src_h);
 
 		Color color;
-		for (int type = COLOR_TYPE_BEGIN; type < COLOR_TYPE_END; ++type)
+		for (int type = 0; type < COLOR_TYPE_MAX; ++type)
 		{
 			if ((nofill && type == FILL) || (nostroke && type == STROKE))
 				continue;
 
-			if (!painter->self->get_color(&color, (ColorType) type))
+			if (!painter->self->state.get_color(&color, (ColorType) type))
 				continue;
 
 			painter->self->draw(
@@ -1392,13 +1399,15 @@ namespace Rays
 	void
 	Painter::set_fill (const Color& color)
 	{
-		self->state.colors[FILL] = color;
+		self->state.  colors[FILL] = color;
+		self->state.nocolors[FILL] = false;
 	}
 
 	void
 	Painter::no_fill ()
 	{
-		self->state.colors[FILL].alpha = 0;
+		self->state.  colors[FILL].alpha = 0;
+		self->state.nocolors[FILL]       = true;
 	}
 
 	const Color&
@@ -1416,13 +1425,15 @@ namespace Rays
 	void
 	Painter::set_stroke (const Color& color)
 	{
-		self->state.colors[STROKE] = color;
+		self->state.  colors[STROKE] = color;
+		self->state.nocolors[STROKE] = false;
 	}
 
 	void
 	Painter::no_stroke ()
 	{
-		self->state.colors[STROKE].alpha = 0;
+		self->state.  colors[STROKE].alpha = 0;
+		self->state.nocolors[STROKE]       = true;
 	}
 
 	const Color&

data/src/point.cpp

@@ -2,10 +2,9 @@
 
 
 #include <math.h>
-#include <glm/geometric.hpp>
-#include <glm/gtx/rotate_vector.hpp>
 #include <xot/util.h>
 #include "rays/exception.h"
+#include "glm.h"
 #include "coord.h"
 
 

data/src/polygon.cpp

@@ -1454,7 +1454,7 @@ namespace Rays
 		if (!painter)
 			argument_error(__FILE__, __LINE__);
 
-		if (!color || !polygon || polygon.empty())
+		if (!polygon || polygon.empty())
 			return;
 
 		polygon.self->fill(painter, color);
@@ -1466,7 +1466,7 @@ namespace Rays
 		if (!painter)
 			argument_error(__FILE__, __LINE__);
 
-		if (!color || !polygon || polygon.empty())
+		if (!polygon || polygon.empty())
 			return;
 
 		polygon.self->stroke(polygon, painter, color);

data/src/shader_source.cpp

@@ -71,6 +71,7 @@ namespace Rays
 			}
 #endif
 
+#ifndef IOS
 			static const std::regex VERSION(R"(^\s*#\s*version\s+\d+)");
 			if (!std::regex_search(source, VERSION))
 			{
@@ -78,6 +79,7 @@ namespace Rays
 				*buffer = VERSION_HEADER + source;
 				source  = buffer->c_str();
 			}
+#endif
 
 			return source;
 		}

data/src/util.cpp

@@ -1,7 +1,7 @@
 #include "rays/util.h"
 
 
-#include <glm/gtc/noise.hpp>
+#include "glm.h"
 #include "coord.h"
 
 

data/test/test_painter.rb

@@ -21,19 +21,19 @@ class TestPainter < Test::Unit::TestCase
       .tap {|img| img.paint(&block) if block}
   end
 
-  def assert_gray(expected, actual)
-    assert_in_epsilon expected, actual, 0.02
+  def assert_gray(expected, actual, message = nil)
+    assert_in_epsilon expected, actual, 0.02, message
   end
 
   def assert_rgb(expected, actual)
     (0..2).each do |i|
-      assert_gray expected[i], actual[i]
+      assert_gray expected[i], actual[i], "Expected: #{expected}, Actual: #{actual}"
     end
   end
 
   def assert_rgba(expected, actual)
     (0..3).each do |i|
-      assert_gray expected[i], actual[i]
+      assert_gray expected[i], actual[i], "Expected: #{expected}, Actual: #{actual}"
     end
   end
 
@@ -347,14 +347,16 @@ class TestPainter < Test::Unit::TestCase
 
   def test_blend_mode_replace()
     i = image bg: 1 do
-      fill 0.1, 0.2, 0.3, 0.4
+      fill 0.1, 0.2, 0.3
       rect 0, 0, 2
       blend_mode :replace
-      fill 0.5, 0.6, 0.7, 0.8
+      no_stroke
+      fill 0.4, 0.5, 0.6, 0.7
       rect 1, 0, 2
     end
-    assert_rgba [0.5, 0.6, 0.7, 0.8], i[1, 0]
-    assert_rgba [0.5, 0.6, 0.7, 0.8], i[2, 0]
+    assert_rgba [0.1, 0.2, 0.3, 1.0], i[0, 0]
+    assert_rgba [0.4, 0.5, 0.6, 0.7], i[1, 0]
+    assert_rgba [0.4, 0.5, 0.6, 0.7], i[2, 0]
   end
 
   def test_blend_mode_invalid()

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rays
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.5
 platform: ruby
 authors:
 - xordog
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-22 00:00:00.000000000 Z
+date: 2025-03-23 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.3
+        version: 0.3.5
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 0.3.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 0.3.5
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 0.3.5
 - !ruby/object:Gem::Dependency
   name: rucy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 0.3.5
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 0.3.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 0.3.5
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 0.3.5
 description: This library helps you to develop graphics application with OpenGL.
 email: xordog@gmail.com
 executables: []
@@ -93,10 +93,12 @@ files:
 - ".doc/ext/rays/rays.cpp"
 - ".doc/ext/rays/shader.cpp"
 - ".doc/ext/rays/util.cpp"
+- ".github/PULL_REQUEST_TEMPLATE.md"
 - ".github/workflows/release-gem.yml"
 - ".github/workflows/tag.yml"
 - ".github/workflows/test.yml"
 - ".github/workflows/utils.rb"
+- CONTRIBUTING.md
 - ChangeLog.md
 - Gemfile
 - Gemfile.lock
@@ -191,6 +193,7 @@ files:
 - src/font.h
 - src/frame_buffer.cpp
 - src/frame_buffer.h
+- src/glm.h
 - src/image.cpp
 - src/image.h
 - src/ios/bitmap.h
@@ -256,7 +259,8 @@ files:
 homepage: https://github.com/xord/rays
 licenses:
 - MIT
-metadata: {}
+metadata:
+  msys2_mingw_dependencies: glew
 post_install_message:
 rdoc_options: []
 require_paths: