rays 0.3.2 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 47cd1902082249b45167251a81932376ab40d2026963bb9161ed41a8036701b4
-  data.tar.gz: 0a455ed272895e558e0adebffe42dfd539192942d9a3e7658ba49c6b8feef331
+  metadata.gz: adb5ee45e36c5154f27cbf72379fc6f01106268f3a6a611d5077ad152ba3cde6
+  data.tar.gz: 1714d7fb8853794a510f10d702472f62a14db985ca381e01091aefb3c74639e7
 SHA512:
-  metadata.gz: ca5b45d58945bcfce469f1f01fc31073bf7ea548fab008493da1d254833cb49cf4dd3d038f8d67ae8ea55803ba8627a0dd8b6b7b252751b3831b76d27b499fe8
-  data.tar.gz: 14f66b8b7ca66c4a2d7fdaac16d45930fc345c58abc529656c59167534e17ca4ac1a7fd330c5ff241d9743b01da8c1b11b6ca6c354bcca73614656c3d8f426e3
+  metadata.gz: 9092039de7061b0cb728bdff7674f2d564cbada64746d60ff712b27cfbee0ba43a9e8d208e7a86cf418e36692c252b6aa1202f38263a21dad69ab3aaf09bb4e4
+  data.tar.gz: 16cde6166d15d706af797a2f2a6d9195c483e26e91ebf408624f4114d497ba7e143bfe9ad5b10f5d280e150803fe440abd56d75e2c4cf1b813fd628fc898d77e

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

@@ -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);
@@ -128,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;
@@ -161,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;
@@ -194,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/ChangeLog.md

@@ -1,6 +1,27 @@
 # rays ChangeLog
 
 
+## [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
+- Add Rays.renderer_info
+
+- Fix shader error on Intel GPU
+
+
 ## [v0.3.2] - 2025-01-14
 
 - Update workflow files

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.2
+0.3.4

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

@@ -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);
@@ -130,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;
@@ -163,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;
@@ -196,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/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.4', '>= 0.3.4'
+  s.add_dependency 'rucy', '~> 0.3.4', '>= 0.3.4'
 
   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/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/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.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;

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.2
+  version: 0.3.4
 platform: ruby
 authors:
 - xordog
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-13 00:00:00.000000000 Z
+date: 2025-03-06 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.4
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.3.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.3.4
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.3.4
 - !ruby/object:Gem::Dependency
   name: rucy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.3.4
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.3.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.3.4
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.3.4
 description: This library helps you to develop graphics application with OpenGL.
 email: xordog@gmail.com
 executables: []
@@ -191,6 +191,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 +257,8 @@ files:
 homepage: https://github.com/xord/rays
 licenses:
 - MIT
-metadata: {}
+metadata:
+  msys2_mingw_dependencies: glew
 post_install_message:
 rdoc_options: []
 require_paths: