rays 0.1.46 → 0.1.48

data/lib/rays/color.rb

@@ -82,7 +82,7 @@ module Rays
     end
 
     def inspect()
-      "#<#{self.class.name} #{to_s}>"
+      "#<#{self.class.name} #{to_a.join ' '}>"
     end
 
   end# Color

data/lib/rays/font.rb

@@ -17,7 +17,7 @@ module Rays
     end
 
     def inspect()
-      "#<Rays::Font name=#{name}, size=#{size}>"
+      "#<Rays::Font name='#{name}', size=#{size}>"
     end
 
   end# Font

data/lib/rays/image.rb

@@ -9,7 +9,7 @@ module Rays
 
     extend Forwardable
 
-    def_delegators :bitmap, :[], :[]=
+    def_delegators :bitmap, :pixels=, :pixels, :[]=, :[]
 
     def paint(&block)
       painter.paint self, &block

data/lib/rays/painter.rb

@@ -118,9 +118,20 @@ module Rays
       replace:   BLEND_REPLACE
     }
 
+    const_symbol_accessor :texcoord_mode, **{
+      image:  TEXCOORD_IMAGE,
+      normal: TEXCOORD_NORMAL
+    }
+
+    const_symbol_accessor :texcoord_wrap, **{
+      clamp:  TEXCOORD_CLAMP,
+      repeat: TEXCOORD_REPEAT
+    }
+
     universal_accessor :background, :fill, :stroke, :color,
-      :stroke_width, :stroke_cap, :stroke_join, :miter_limit,
-      :nsegment, :blend_mode, :shader, :clip, :font
+      :stroke_width, :stroke_outset, :stroke_cap, :stroke_join, :miter_limit,
+      :nsegment, :blend_mode, :texture, :texcoord_mode, :texcoord_wrap,
+      :shader, :clip, :font
 
     private
 

data/lib/rays/point.rb

@@ -47,7 +47,7 @@ module Rays
     end
 
     def inspect()
-      "#<Rays::Point #{to_a(3).join ', '}>"
+      "#<Rays::Point #{to_a(3).join ' '}>"
     end
 
   end# Point

data/lib/rays/polygon.rb

@@ -8,45 +8,83 @@ module Rays
   class Polygon
 
     include Enumerable
+    include Comparable
 
-    def initialize(*args, loop: true)
-      setup args, loop
+    def initialize(*args, loop: true, colors: nil, texcoords: nil)
+      setup args, loop, colors, texcoords
     end
 
-    def transform(matrix = nil, &block)
-      lines = to_a
-      lines = lines.map {|line| line.transform matrix} if matrix
-      lines = block.call lines if block
-      self.class.new(*lines)
+    def transform(&block)
+      polylines = block.call to_a
+      self.class.new(*polylines)
     end
 
     def intersects(obj)
       !(self & obj).empty?
     end
 
-    def self.line(*args, loop: false)
-      new(*args, loop: loop)
+    def <=>(o)
+      (size <=> o.size).then {|cmp|                return cmp if cmp != 0}
+      to_a.zip(o.to_a).each {|a, b| cmp = a <=> b; return cmp if cmp != 0}
+      0
+    end
+
+    def inspect()
+      "#<Rays::Polygon [#{map {|polyline| polyline.inspect}.join ', '}]>"
+    end
+
+    def self.points(*points)
+      points! points
+    end
+
+    def self.line(*points, loop: false)
+      line! points, loop
+    end
+
+    def self.lines(*points)
+      lines! points
+    end
+
+    def self.triangles(*points, loop: true, colors: nil, texcoords: nil)
+      triangles! points, loop, colors, texcoords
+    end
+
+    def self.triangle_strip(*points, colors: nil, texcoords: nil)
+      triangle_strip! points, colors, texcoords
+    end
+
+    def self.triangle_fan(*points, colors: nil, texcoords: nil)
+      triangle_fan! points, colors, texcoords
     end
 
     def self.rect(
-      *args, round: nil, lt: nil, rt: nil, lb: nil, rb: nil, nsegment: nil)
+      *args, round: nil, lt: nil, rt: nil, lb: nil, rb: nil,
+      nsegment: nil)
+
+      rect! args, round, lt, rt, lb, rb, nsegment
+    end
+
+    def self.quads(*points, loop: true, colors: nil, texcoords: nil)
+      quads! points, loop, colors, texcoords
+    end
 
-      create_rect args, round, lt, rt, lb, rb, nsegment
+    def self.quad_strip(*points, colors: nil, texcoords: nil)
+      quad_strip! points, colors, texcoords
     end
 
     def self.ellipse(
       *args, center: nil, radius: nil, hole: nil, from: nil, to: nil,
       nsegment: nil)
 
-      create_ellipse args, center, radius, hole, from, to, nsegment
+      ellipse! args, center, radius, hole, from, to, nsegment
     end
 
-    def self.curve(*args, loop: false)
-      create_curve args, loop
+    def self.curve(*points, loop: false)
+      curve! points, loop
     end
 
-    def self.bezier(*args, loop: false)
-      create_bezier args, loop
+    def self.bezier(*points, loop: false)
+      bezier! points, loop
     end
 
   end# Polygon

data/lib/rays/polyline.rb

@@ -7,20 +7,66 @@ module Rays
   class Polyline
 
     include Enumerable
+    include Comparable
 
-    def initialize(*points, loop: false)
-      setup points, loop
+    def initialize(
+      *points, loop: false, fill: nil, colors: nil, texcoords: nil, hole: false)
+
+      setup points, loop, (fill != nil ? fill : loop), colors, texcoords, hole
+    end
+
+    def with(**kwargs)
+      points_, loop_, fill_, colors_, texcoords_, hole_ =
+        kwargs.values_at :points, :loop, :fill, :colors, :texcoords, :hole
+      self.class.new(
+                 *(points_    || (points?    ? points    : [])),
+        loop:      loop_ != nil ? loop_ : loop?,
+        fill:      fill_ != nil ? fill_ : fill?,
+        colors:    colors_    || (colors?    ? colors    : nil),
+        texcoords: texcoords_ || (texcoords? ? texcoords : nil),
+        hole:      hole_ != nil ? hole_ : hole?)
+    end
+
+    def points()
+      each_point.to_a
+    end
+
+    def colors()
+      each_color.to_a
+    end
+
+    def texcoords()
+      each_texcoord.to_a
+    end
+
+    def each_point(&block)
+      block ? each_point!(&block) : enum_for(:each_point!)
+    end
+
+    def each_color(&block)
+      block ? each_color!(&block) : enum_for(:each_color!)
+    end
+
+    def each_texcoord(&block)
+      block ? each_texcoord!(&block) : enum_for(:each_texcoord!)
     end
 
-    def transform(matrix = nil, loop: loop?, &block)
-      points = to_a
-      points = points.map {|point| matrix * point} if matrix
-      points = block.call points if block
-      self.class.new(*points, loop: loop)
+    alias each each_point
+
+    def <=>(o)
+      (size  <=> o.size) .then {|cmp|                        return cmp if cmp != 0}
+      (loop? <=> o.loop?).then {|cmp|                        return cmp if cmp != 0}
+      (fill? <=> o.fill?).then {|cmp|                        return cmp if cmp != 0}
+      points   .zip(o.points)   .each {|a, b| cmp = a <=> b; return cmp if cmp != 0}
+      colors   .zip(o.colors)   .each {|a, b| cmp = a <=> b; return cmp if cmp != 0}
+      texcoords.zip(o.texcoords).each {|a, b| cmp = a <=> b; return cmp if cmp != 0}
+      0
     end
 
     def inspect()
-      "#<Rays::Polyline #{to_a.join ', '}, loop: #{loop?}>"
+      p    = points.map {|o| o.to_a.join ','}.join ', '
+      c, t = colors.size, texcoords.size
+      "#<Rays::Polyline [#{p}] loop:#{loop?} fill:#{fill?} hole:#{hole?} colors:#{c} texcoords:#{t}>"
     end
 
   end# Polyline

data/lib/rays.rb

@@ -10,7 +10,6 @@ require 'rays/matrix'
 require 'rays/painter'
 require 'rays/polyline'
 require 'rays/polygon'
-require 'rays/polygon_line'
 require 'rays/bitmap'
 require 'rays/image'
 require 'rays/font'

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

data/src/color_space.cpp

@@ -70,8 +70,8 @@ namespace Rays
 		static const int BPPS[] =
 		{
 			0,                     // UNKNOWN
-			8,  16, 24,  32,  32,  // GRAY
-			8,  16, 24,  32,  32,  // ALPHA
+			8,  16,  24,  32,  32, // GRAY
+			8,  16,  24,  32,  32, // ALPHA
 			24, 32,  32,  32,  32, // RGB(A)
 			24, 32,  32,  32,  32, // BGR(A)
 			96, 128, 128,          // RGB(A) float

data/src/font.cpp

@@ -27,7 +27,7 @@ namespace Rays
 			if (pixel_density != for_pixel_density)
 			{
 				rawfont_for_pixel_density =
-					RawFont(rawfont.name(), rawfont.size() * pixel_density);
+					RawFont(rawfont, rawfont.size() * pixel_density);
 				for_pixel_density = pixel_density;
 			}
 
@@ -37,8 +37,16 @@ namespace Rays
 	};// Font::Data
 
 
+	Font
+	load_font (const char* path, coord size)
+	{
+		Font font;
+		font.self->rawfont = RawFont_load(path, size);
+		return font;
+	}
+
 	const Font&
-	default_font ()
+	get_default_font ()
 	{
 		static const Font FONT(NULL);
 		return FONT;
@@ -79,12 +87,26 @@ namespace Rays
 	{
 	}
 
+	Font
+	Font::dup () const
+	{
+		Font f;
+		f.self->rawfont = RawFont(self->rawfont, self->rawfont.size());
+		return f;
+	}
+
 	String
 	Font::name () const
 	{
 		return self->rawfont.name();
 	}
 
+	void
+	Font::set_size (coord size)
+	{
+		self->rawfont = RawFont(self->rawfont, size);
+	}
+
 	coord
 	Font::size () const
 	{

data/src/font.h

@@ -15,11 +15,15 @@ namespace Rays
 	class RawFont
 	{
 
+		typedef RawFont This;
+
 		public:
 
 			RawFont ();
 
-			RawFont (const char* name, coord size = 0);
+			RawFont (const char* name, coord size);
+
+			RawFont (const This& obj, coord size);
 
 			~RawFont ();
 
@@ -58,6 +62,9 @@ namespace Rays
 		coord* ascent = NULL, coord* descent = NULL, coord* leading = NULL);
 
 
+	RawFont RawFont_load (const char* path, coord size);
+
+
 }// Rays
 
 

data/src/ios/font.mm

@@ -2,6 +2,7 @@
 #include "../font.h"
 
 
+#include <memory>
 #import <CoreGraphics/CGContext.h>
 #import <CoreText/CoreText.h>
 #include "rays/exception.h"
@@ -12,15 +13,23 @@ namespace Rays
 {
 
 
+	typedef std::shared_ptr<const __CFDictionary>       CFDictionaryPtr;
+
+	typedef std::shared_ptr<const __CFAttributedString> CFAttributedStringPtr;
+
+	typedef std::shared_ptr<CGDataProvider>             CGDataProviderPtr;
+
+	typedef std::shared_ptr<CGFont>                     CGFontPtr;
+
+	typedef std::shared_ptr<const __CTLine>             CTLinePtr;
+
+
 	struct RawFont::Data
 	{
 
-		CTFontRef font;
+		CTFontRef font = NULL;
 
-		Data ()
-		:	font(NULL)
-		{
-		}
+		String path;
 
 		~Data ()
 		{
@@ -34,7 +43,7 @@ namespace Rays
 	};// RawFont::Data
 
 
-	static CTLineRef
+	static CTLinePtr
 	make_line (CTFontRef font, const char* str)
 	{
 		if (!font || !str || *str == '\0')
@@ -50,18 +59,67 @@ namespace Rays
 		};
 		size_t nkeys = sizeof(keys) / sizeof(keys[0]);
 
-		CFDictionaryRef attr = CFDictionaryCreate(
-			NULL, (const void**) &keys, (const void**) &values, nkeys,
-			&kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);
+		CFDictionaryPtr attr(
+			CFDictionaryCreate(
+				NULL, (const void**) &keys, (const void**) &values, nkeys,
+				&kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks),
+			CFRelease);
+
+		CFAttributedStringPtr attrstr(
+			CFAttributedStringCreate(NULL, cfstring(str).get(), attr.get()),
+			CFRelease);
 
-		CFAttributedStringRef attrstr = CFAttributedStringCreate(
-			NULL, cfstring(str).get(), attr);
-		CFRelease(attr);
+		return CTLinePtr(
+			CTLineCreateWithAttributedString(attrstr.get()),
+			CFRelease);
+	}
 
-		CTLineRef line = CTLineCreateWithAttributedString(attrstr);
-		CFRelease(attrstr);
+	const FontFamilyMap&
+	get_font_families ()
+	{
+		static const FontFamilyMap MAP = []() {
+			NSFontManager* fm = NSFontManager.sharedFontManager;
 
-		return line;
+			FontFamilyMap map;
+			for (NSString* family in fm.availableFontFamilies)
+			{
+				FontFamilyMap::mapped_type array;
+				for (NSArray<NSString*>* members in [fm availableMembersOfFontFamily: family])
+					array.emplace_back(members[0].UTF8String);
+				map[family.UTF8String] = array;
+			}
+			return map;
+		}();
+		return MAP;
+	}
+
+	RawFont
+	RawFont_load (const char* path, coord size)
+	{
+		if (!path)
+			argument_error(__FILE__, __LINE__);
+
+		CGDataProviderPtr data_provider(
+			CGDataProviderCreateWithFilename(path),
+			CGDataProviderRelease);
+		if (!data_provider)
+			rays_error(__FILE__, __LINE__, "failed to create CGDataProvider");
+
+		CGFontPtr cgfont(
+			CGFontCreateWithDataProvider(data_provider.get()),
+			CGFontRelease);
+		if (!cgfont)
+			rays_error(__FILE__, __LINE__, "failed to create CGFont");
+
+		CTFontRef ctfont = CTFontCreateWithGraphicsFont(
+			cgfont.get(), size, NULL, NULL);
+		if (!ctfont)
+			rays_error(__FILE__, __LINE__, "failed to create CTFont");
+
+		RawFont rawfont;
+		rawfont.self->font = ctfont;
+		rawfont.self->path = path;
+		return rawfont;
 	}
 
 
@@ -76,6 +134,15 @@ namespace Rays
 			:	CTFontCreateUIFontForLanguage(kCTFontSystemFontType, size, NULL);
 	}
 
+	RawFont::RawFont (const This& obj, coord size)
+	{
+		const char* path = obj.self->path.empty() ? NULL : obj.self->path.c_str();
+		if (path)
+			*this = RawFont_load(path, size);
+		else
+			self->font = CTFontCreateWithName(cfstring(obj.name()).get(), size, NULL);
+	}
+
 	RawFont::~RawFont ()
 	{
 	}
@@ -92,7 +159,7 @@ namespace Rays
 
 		if (*str == '\0') return;
 
-		CTLineRef line = make_line(self->font, str);
+		CTLinePtr line = make_line(self->font, str);
 		if (!line)
 			rays_error(__FILE__, __LINE__, "creating CTLineRef failed.");
 
@@ -112,10 +179,8 @@ namespace Rays
 		CGContextSaveGState(context);
 		CGContextSetTextMatrix(context, CGAffineTransformIdentity);
 		CGContextSetTextPosition(context, x, context_height - ascent - y);
-		CTLineDraw(line, context);
+		CTLineDraw(line.get(), context);
 		CGContextRestoreGState(context);
-
-		CFRelease(line);
 	}
 
 	String
@@ -123,14 +188,13 @@ namespace Rays
 	{
 		if (!*this) return "";
 
-		CFStringRef str = CTFontCopyFullName(self->font);
+		CFStringPtr str(CTFontCopyFullName(self->font), CFRelease);
 
 		enum {BUFSIZE = 2048};
 		char buf[BUFSIZE + 1];
-		if (!CFStringGetCString(str, buf, BUFSIZE, kCFStringEncodingUTF8))
+		if (!CFStringGetCString(str.get(), buf, BUFSIZE, kCFStringEncodingUTF8))
 			buf[0] = '\0';
 
-		CFRelease(str);
 		return buf;
 	}
 
@@ -152,14 +216,11 @@ namespace Rays
 
 		if (*str == '\0') return 0;
 
-		CTLineRef line = make_line(self->font, str);
+		CTLinePtr line = make_line(self->font, str);
 		if (!line)
 			rays_error(__FILE__, __LINE__, "creating CTLineRef failed.");
 
-		coord w = CTLineGetTypographicBounds(line, NULL, NULL, NULL);
-		CFRelease(line);
-
-		return w;
+		return CTLineGetTypographicBounds(line.get(), NULL, NULL, NULL);
 	}
 
 	coord

data/src/matrix.cpp

@@ -32,6 +32,14 @@ namespace Rays
 		reset(elements, size);
 	}
 
+	Matrix::Matrix (void* null)
+	{
+		if (null != NULL)
+			argument_error(__FILE__, __LINE__);
+
+		// do nothing to avoid initialization
+	}
+
 	Matrix
 	Matrix::dup () const
 	{