rays 0.1.47 → 0.1.48

data/include/rays/defs.h

@@ -23,32 +23,6 @@ namespace Rays
 	typedef float coord;
 
 
-	enum DrawMode
-	{
-
-		DRAW_POINTS = 0,
-
-		DRAW_LINES,
-
-		DRAW_LINE_STRIP,
-
-		DRAW_TRIANGLES,
-
-		DRAW_TRIANGLE_STRIP,
-
-		DRAW_TRIANGLE_FAN,
-
-		DRAW_QUADS,
-
-		DRAW_QUAD_STRIP,
-
-		DRAW_POLYGON,
-
-		DRAW_MAX,
-
-	};// DrawMode
-
-
 	enum CapType
 	{
 
@@ -108,6 +82,30 @@ namespace Rays
 	};// BlendMode
 
 
+	enum TexCoordMode
+	{
+
+		TEXCOORD_IMAGE = 0,
+
+		TEXCOORD_NORMAL,
+
+		TEXCOORD_MODE_MAX
+
+	};// TexCoordMode
+
+
+	enum TexCoordWrap
+	{
+
+		TEXCOORD_CLAMP = 0,
+
+		TEXCOORD_REPEAT,
+
+		TEXCOORD_WRAP_MAX
+
+	};// TexCoordWrap
+
+
 }// Rays
 
 

data/include/rays/font.h

@@ -4,6 +4,8 @@
 #define __RAYS_FONT_H__
 
 
+#include <vector>
+#include <map>
 #include <xot/pimpl.h>
 #include <rays/defs.h>
 
@@ -17,15 +19,21 @@ namespace Rays
 
 		public:
 
+			enum {DEFAULT_SIZE = 12};
+
 			Font ();
 
-			Font (const char* name, coord size = 0);
+			Font (const char* name, coord size = DEFAULT_SIZE);
 
 			~Font ();
 
+			Font dup () const;
+
 			String name () const;
 
-			coord size () const;
+			void set_size (coord size);
+
+			coord    size () const;
 
 			coord get_width (const char* str) const;
 
@@ -45,7 +53,13 @@ namespace Rays
 	};// Font
 
 
-	const Font& default_font ();
+	typedef std::map<String, std::vector<String>> FontFamilyMap;
+
+	const FontFamilyMap& get_font_families ();
+
+	Font load_font (const char* path, coord size = Font::DEFAULT_SIZE);
+
+	const Font& get_default_font ();
 
 
 }// Rays

data/include/rays/painter.h

@@ -253,6 +253,20 @@ namespace Rays
 
 			const Font& font () const;
 
+			void     set_texture (const Image& image);
+
+			void      no_texture ();
+
+			const Image& texture () const;
+
+			void     set_texcoord_mode (TexCoordMode mode);
+
+			TexCoordMode texcoord_mode () const;
+
+			void     set_texcoord_wrap (TexCoordWrap wrap);
+
+			TexCoordWrap texcoord_wrap () const;
+
 			void      set_shader (const Shader& shader);
 
 			void       no_shader ();

data/include/rays/polygon.h

@@ -20,50 +20,19 @@ namespace Rays
 
 		public:
 
-			struct Line : public Polyline
-			{
+			typedef std::vector<Polyline>        PolylineList;
 
-				typedef Polyline Super;
-
-				public:
-
-					Line ();
-
-					Line (
-						const Point* points, size_t size,
-						bool loop = true,
-						bool hole = false);
-
-					Line (const Polyline& polyline, bool hole = false);
-
-					bool hole () const;
-
-					operator bool () const;
-
-					bool operator ! () const;
-
-				private:
-
-					bool hole_;
-
-			};// Line
-
-			typedef std::vector<Line> LineList;
-
-			typedef LineList::const_iterator const_iterator;
+			typedef PolylineList::const_iterator const_iterator;
 
 			Polygon ();
 
 			Polygon (
-				const Point* points, size_t size, bool loop = true);
-
-			Polygon (
-				DrawMode mode,
-				const Point* points, size_t size, bool loop = true);
+				const Point* points, size_t size, bool loop = true,
+				const Color* colors = NULL, const Coord3* texcoords = NULL);
 
 			Polygon (const Polyline& polyline);
 
-			Polygon (const Line* lines, size_t size);
+			Polygon (const Polyline* polylines, size_t size);
 
 			~Polygon ();
 
@@ -84,12 +53,14 @@ namespace Rays
 
 			const_iterator end () const;
 
-			const Line& operator [] (size_t index) const;
+			const Polyline& operator [] (size_t index) const;
 
 			operator bool () const;
 
 			bool operator ! () const;
 
+			friend Polygon operator + (const Polygon& lhs, const Polyline& rhs);
+
 			friend Polygon operator + (const Polygon& lhs, const Polygon& rhs);
 
 			friend Polygon operator - (const Polygon& lhs, const Polygon& rhs);
@@ -115,6 +86,13 @@ namespace Rays
 	};// Polygon
 
 
+	Polygon create_point (coord x, coord y);
+
+	Polygon create_point (const Point& point);
+
+	Polygon create_points (const Point* points, size_t size);
+
+
 	Polygon create_line (coord x1, coord y1, coord x2, coord y2);
 
 	Polygon create_line (const Point& p1, const Point& p2);
@@ -123,6 +101,29 @@ namespace Rays
 
 	Polygon create_line (const Polyline& polyline);
 
+	Polygon create_lines (const Point* points, size_t size);
+
+
+	Polygon create_triangle (
+		coord x1, coord y1, coord x2, coord y2, coord x3, coord y3,
+		bool loop = true);
+
+	Polygon create_triangle (
+		const Point& p1, const Point& p2, const Point& p3,
+		bool loop = true);
+
+	Polygon create_triangles (
+		const Point* points, size_t size, bool loop = true,
+		const Color* colors = NULL, const Coord3* texcoords = NULL);
+
+	Polygon create_triangle_strip (
+		const Point* points, size_t size,
+		const Color* colors = NULL, const Coord3* texcoords = NULL);
+
+	Polygon create_triangle_fan (
+		const Point* points, size_t size,
+		const Color* colors = NULL, const Coord3* texcoords = NULL);
+
 
 	Polygon create_rect (
 		coord x, coord y, coord width, coord height,
@@ -147,6 +148,24 @@ namespace Rays
 		uint nsegment = 0);
 
 
+	Polygon create_quad (
+		coord x1, coord y1, coord x2, coord y2,
+		coord x3, coord y3, coord x4, coord y4,
+		bool loop = true);
+
+	Polygon create_quad (
+		const Point& p1, const Point& p2, const Point& p3, const Point& p4,
+		bool loop = true);
+
+	Polygon create_quads (
+		const Point* points, size_t size, bool loop = true,
+		const Color* colors = NULL, const Coord3* texcoords = NULL);
+
+	Polygon create_quad_strip (
+		const Point* points, size_t size,
+		const Color* colors = NULL, const Coord3* texcoords = NULL);
+
+
 	Polygon create_ellipse (
 		coord x, coord y, coord width, coord height = 0,
 		const Point& hole_size = 0,

data/include/rays/polyline.h

@@ -15,6 +15,7 @@ namespace Rays
 {
 
 
+	struct Color;
 	class Polygon;
 
 
@@ -29,9 +30,15 @@ namespace Rays
 
 			Polyline ();
 
-			Polyline (const Point* points, size_t size, bool loop = false);
+			Polyline (
+				const Point* points, size_t size, bool loop = false,
+				const Color* colors = NULL, const Coord3* texcoords = NULL,
+				bool hole = false);
 
-			Polyline (const Point* points, size_t size, bool loop, bool fill);
+			Polyline (
+				const Point* points, size_t size, bool loop, bool fill,
+				const Color* colors = NULL, const Coord3* texcoords = NULL,
+				bool hole = false);
 
 			~Polyline ();
 
@@ -48,6 +55,14 @@ namespace Rays
 
 			bool fill () const;
 
+			bool hole () const;
+
+			const Point* points () const;
+
+			const Color* colors () const;
+
+			const Coord3* texcoords () const;
+
 			size_t size () const;
 
 			bool empty () const;

data/include/rays/ruby/polygon.h

@@ -11,8 +11,6 @@
 
 RUCY_DECLARE_VALUE_OR_ARRAY_FROM_TO(Rays::Polygon)
 
-RUCY_DECLARE_VALUE_OR_ARRAY_FROM_TO(Rays::Polygon::Line)
-
 
 namespace Rays
 {
@@ -21,9 +19,6 @@ namespace Rays
 	Rucy::Class polygon_class ();
 	// class Rays::Polygon
 
-	Rucy::Class polygon_line_class ();
-	// class Rays::Polygon::Line
-
 
 }// Rays
 
@@ -38,12 +33,6 @@ namespace Rucy
 		return Rays::polygon_class();
 	}
 
-	template <> inline Class
-	get_ruby_class<Rays::Polygon::Line> ()
-	{
-		return Rays::polygon_line_class();
-	}
-
 
 }// Rucy
 

data/include/rays/ruby/rays.h

@@ -15,6 +15,10 @@ RUCY_DECLARE_CONVERT_TO(Rays::JoinType)
 
 RUCY_DECLARE_CONVERT_TO(Rays::BlendMode)
 
+RUCY_DECLARE_CONVERT_TO(Rays::TexCoordMode)
+
+RUCY_DECLARE_CONVERT_TO(Rays::TexCoordWrap)
+
 
 namespace Rays
 {

data/include/rays/{noise.h → util.h}

@@ -1,7 +1,7 @@
 // -*- c++ -*-
 #pragma once
-#ifndef __RAYS_NOISE_H__
-#define __RAYS_NOISE_H__
+#ifndef __RAYS_UTIL_H__
+#define __RAYS_UTIL_H__
 
 
 #include <rays/defs.h>

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_outset, :stroke_cap, :stroke_join, :miter_limit,
-      :nsegment, :blend_mode, :shader, :clip, :font
+      :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,74 +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.points(*args)
-      points! args
+    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 self.lines(*args)
-      lines! args
+    def inspect()
+      "#<Rays::Polygon [#{map {|polyline| polyline.inspect}.join ', '}]>"
     end
 
-    def self.line_strip(*args, loop: false)
-      line_strip! args, loop
+    def self.points(*points)
+      points! points
     end
 
-    def self.rect(
-      *args, round: nil, lt: nil, rt: nil, lb: nil, rb: nil,
-      nsegment: nil)
+    def self.line(*points, loop: false)
+      line! points, loop
+    end
 
-      rect! args, round, lt, rt, lb, rb, nsegment
+    def self.lines(*points)
+      lines! points
     end
 
-    def self.ellipse(
-      *args, center: nil, radius: nil, hole: nil, from: nil, to: nil,
-      nsegment: nil)
+    def self.triangles(*points, loop: true, colors: nil, texcoords: nil)
+      triangles! points, loop, colors, texcoords
+    end
 
-      ellipse! args, center, radius, hole, from, to, nsegment
+    def self.triangle_strip(*points, colors: nil, texcoords: nil)
+      triangle_strip! points, colors, texcoords
     end
 
-    def self.triangles(*args, loop: true)
-      triangles! args, loop
+    def self.triangle_fan(*points, colors: nil, texcoords: nil)
+      triangle_fan! points, colors, texcoords
     end
 
-    def self.triangle_strip(*args)
-      triangle_strip! args
+    def self.rect(
+      *args, round: nil, lt: nil, rt: nil, lb: nil, rb: nil,
+      nsegment: nil)
+
+      rect! args, round, lt, rt, lb, rb, nsegment
     end
 
-    def self.triangle_fan(*args)
-      triangle_fan! args
+    def self.quads(*points, loop: true, colors: nil, texcoords: nil)
+      quads! points, loop, colors, texcoords
     end
 
-    def self.quads(*args, loop: true)
-      quads! args, loop
+    def self.quad_strip(*points, colors: nil, texcoords: nil)
+      quad_strip! points, colors, texcoords
     end
 
-    def self.quad_strip(*args)
-      quad_strip! args
+    def self.ellipse(
+      *args, center: nil, radius: nil, hole: nil, from: nil, to: nil,
+      nsegment: nil)
+
+      ellipse! args, center, radius, hole, from, to, nsegment
     end
 
-    def self.curve(*args, loop: false)
-      curve! args, loop
+    def self.curve(*points, loop: false)
+      curve! points, loop
     end
 
-    def self.bezier(*args, loop: false)
-      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

@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
   s.required_ruby_version = '>= 3.0.0'
 
   s.add_runtime_dependency 'xot',  '~> 0.1.41'
-  s.add_runtime_dependency 'rucy', '~> 0.1.42'
+  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/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
 	{