rays 0.1.46 → 0.1.48

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

@@ -9,6 +9,8 @@
 RUCY_DEFINE_CONVERT_TO(Rays::CapType)
 RUCY_DEFINE_CONVERT_TO(Rays::JoinType)
 RUCY_DEFINE_CONVERT_TO(Rays::BlendMode)
+RUCY_DEFINE_CONVERT_TO(Rays::TexCoordMode)
+RUCY_DEFINE_CONVERT_TO(Rays::TexCoordWrap)
 
 
 template <typename T>
@@ -16,7 +18,7 @@ struct EnumType
 {
 	const char* name;
 	const char* short_name;
-	T type;
+	T value;
 };
 
 static std::vector<EnumType<Rays::CapType>> CAP_TYPES({
@@ -43,6 +45,16 @@ static std::vector<EnumType<Rays::BlendMode>> BLEND_MODES({
 	{"BLEND_REPLACE",   "REPLACE",   Rays::BLEND_REPLACE},
 });
 
+static std::vector<EnumType<Rays::TexCoordMode>> TEXCOORD_MODES({
+	{"TEXCOORD_IMAGE",  "IMAGE",  Rays::TEXCOORD_IMAGE},
+	{"TEXCOORD_NORMAL", "NORMAL", Rays::TEXCOORD_NORMAL},
+});
+
+static std::vector<EnumType<Rays::TexCoordWrap>> TEXCOORD_WRAPS({
+	{"TEXCOORD_CLAMP",  "CLAMP",  Rays::TEXCOORD_CLAMP},
+	{"TEXCOORD_REPEAT", "REPEAT", Rays::TEXCOORD_REPEAT},
+});
+
 
 static
 VALUE init(VALUE self)
@@ -70,13 +82,19 @@ Init_rays ()
 	mRays.define_singleton_method("fin!", fin);
 
 	for (auto it = CAP_TYPES.begin(); it != CAP_TYPES.end(); ++it)
-		mRays.define_const(it->name, it->type);
+		mRays.define_const(it->name, it->value);
 
 	for (auto it = JOIN_TYPES.begin(); it != JOIN_TYPES.end(); ++it)
-		mRays.define_const(it->name, it->type);
+		mRays.define_const(it->name, it->value);
 
 	for (auto it = BLEND_MODES.begin(); it != BLEND_MODES.end(); ++it)
-		mRays.define_const(it->name, it->type);
+		mRays.define_const(it->name, it->value);
+
+	for (auto it = TEXCOORD_MODES.begin(); it != TEXCOORD_MODES.end(); ++it)
+		mRays.define_const(it->name, it->value);
+
+	for (auto it = TEXCOORD_WRAPS.begin(); it != TEXCOORD_WRAPS.end(); ++it)
+		mRays.define_const(it->name, it->value);
 }
 
 
@@ -100,7 +118,7 @@ namespace Rucy
 						strcasecmp(str, it->name)       == 0 ||
 						strcasecmp(str, it->short_name) == 0)
 					{
-						return it->type;
+						return it->value;
 					}
 				}
 				argument_error(__FILE__, __LINE__, "invalid cap type -- %s", str);
@@ -131,7 +149,7 @@ namespace Rucy
 						strcasecmp(str, it->name)       == 0 ||
 						strcasecmp(str, it->short_name) == 0)
 					{
-						return it->type;
+						return it->value;
 					}
 				}
 				argument_error(__FILE__, __LINE__, "invalid join type -- %s", str);
@@ -162,18 +180,80 @@ namespace Rucy
 						strcasecmp(str, it->name)       == 0 ||
 						strcasecmp(str, it->short_name) == 0)
 					{
-						return it->type;
+						return it->value;
 					}
 				}
 				argument_error(__FILE__, __LINE__, "invalid blend mode -- %s", str);
 			}
 		}
 
-		int type = value_to<int>(*argv, convert);
-		if (type < 0 || Rays::BLEND_MAX <= type)
-			argument_error(__FILE__, __LINE__, "invalid blend mode -- %d", type);
+		int mode = value_to<int>(*argv, convert);
+		if (mode < 0 || Rays::BLEND_MAX <= mode)
+			argument_error(__FILE__, __LINE__, "invalid blend mode -- %d", mode);
+
+		return (Rays::BlendMode) mode;
+	}
+
+
+	template <> Rays::TexCoordMode
+	value_to<Rays::TexCoordMode> (int argc, const Value* argv, bool convert)
+	{
+		assert(argc > 0 && argv);
+
+		if (convert)
+		{
+			if (argv->is_s() || argv->is_sym())
+			{
+				const char* str = argv->c_str();
+				for (auto it = TEXCOORD_MODES.begin(); it != TEXCOORD_MODES.end(); ++it)
+				{
+					if (
+						strcasecmp(str, it->name)       == 0 ||
+						strcasecmp(str, it->short_name) == 0)
+					{
+						return it->value;
+					}
+				}
+				argument_error(__FILE__, __LINE__, "invalid texcoord mode -- %s", str);
+			}
+		}
+
+		int mode = value_to<int>(*argv, convert);
+		if (mode < 0 || Rays::TEXCOORD_MODE_MAX <= mode)
+			argument_error(__FILE__, __LINE__, "invalid texcoord mode -- %d", mode);
+
+		return (Rays::TexCoordMode) mode;
+	}
+
+
+	template <> Rays::TexCoordWrap
+	value_to<Rays::TexCoordWrap> (int argc, const Value* argv, bool convert)
+	{
+		assert(argc > 0 && argv);
+
+		if (convert)
+		{
+			if (argv->is_s() || argv->is_sym())
+			{
+				const char* str = argv->c_str();
+				for (auto it = TEXCOORD_WRAPS.begin(); it != TEXCOORD_WRAPS.end(); ++it)
+				{
+					if (
+						strcasecmp(str, it->name)       == 0 ||
+						strcasecmp(str, it->short_name) == 0)
+					{
+						return it->value;
+					}
+				}
+				argument_error(__FILE__, __LINE__, "invalid texcoord wrap -- %s", str);
+			}
+		}
+
+		int wrap = value_to<int>(*argv, convert);
+		if (wrap < 0 || Rays::TEXCOORD_WRAP_MAX <= wrap)
+			argument_error(__FILE__, __LINE__, "invalid texcoord wrap -- %d", wrap);
 
-		return (Rays::BlendMode) type;
+		return (Rays::TexCoordWrap) wrap;
 	}
 
 

data/.doc/ext/rays/{noise.cpp → util.cpp}

@@ -1,4 +1,4 @@
-#include "rays/noise.h"
+#include "rays/util.h"
 #include "rays/ruby/point.h"
 #include "defs.h"
 
@@ -45,7 +45,7 @@ VALUE simplex(VALUE self)
 
 
 void
-Init_rays_noise ()
+Init_rays_util ()
 {
 	Module mRays = rb_define_module("Rays");
 	rb_define_singleton_method(mRays, "perlin", RUBY_METHOD_FUNC(perlin), -1);

data/.github/workflows/test.yml

@@ -4,7 +4,6 @@ on:
   push:
     branches: [master]
   pull_request:
-    branches: [master]
 
 jobs:
   test:

data/ChangeLog.md

@@ -1,6 +1,44 @@
 # rays ChangeLog
 
 
+## [v0.1.48] - 2024-01-08
+
+- Add Bitmap#pixels=
+- Add Font#dup, Font#size=, Font.families, and Font.load
+- Add Polyline#with
+- Add Painter#texture, Painter#texcoord_mode,  and Painter#texcoord_wrap
+
+- Delete Polygon::Line because it was merged into Polyline
+
+- Polygon and Polyline can take colors and texcoords for each vertex
+- Polyline.new can take 'hole' parameter
+- 'polygonA + polygonB' means Polygon.new(*polygonA.to_a, *polygonB.to_a)
+- Polygon with only holes raises an ArgumentError
+- Image delegates 'pixels' accessors to Bitmap
+- Use GL_CLAMP_TO_EDGE for texturing
+- Refine Point#inspect(), Color#inspect(), and Font#inspect()
+- default_font() -> get_default_font()
+- rays/include/noise.h -> rays/include/util.h
+
+- Fix Polygon.bezier() returns broken object
+- Fix get_pixels() does not work with float colors
+
+
+## [v0.1.47] - 2023-12-09
+
+- Add Polygon's singleton methods: points(), lines(), triangles(), triangle_strip(), triangle_fan(), quads(), quad_strip()
+- Add create_polygon(DrawMode, ...)
+- Add Painter#stroke_outset
+- Add Bitmap#pixels
+- Use earcut.hpp for polygon triangulation and delete poly2tri
+- Painter#polygon() can take x, y, width, and height
+- Polygon#bounds() caches bounds
+- Polygon.line() -> Polygon.line_strip()
+- Rays::Polygon.new() can take DrawMode
+- Matrix(nullptr) avoids initialization
+- Trigger github actions on all pull_request
+
+
 ## [v0.1.46] - 2023-11-09
 
 - Use Gemfile to install gems for development instead of add_development_dependency in gemspec

data/Rakefile

@@ -25,10 +25,10 @@ use_external_library 'https://github.com/skyrpex/clipper',
   srcdirs:  'cpp',
   excludes: 'clipper/cpp/cpp_'
 
-use_external_library 'https://github.com/greenm01/poly2tri',
-  commit:  '88de49021b6d9bef6faa1bc94ceb3fbd85c3c204',
-  incdirs: 'poly2tri',
-  srcdirs: 'poly2tri'
+use_external_library 'https://github.com/mapbox/earcut.hpp',
+  tag:     'v2.2.4',
+  incdirs: 'include/mapbox',
+  srcdirs: 'NOSRC'
 
 use_external_library 'https://github.com/andrewwillmott/splines-lib',
   commit:   '11e7240d57b0d22871aec3308186a5fcf915ba77',

data/VERSION

@@ -1 +1 @@
-0.1.46
+0.1.48