rays 0.1.47 → 0.1.49

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/image.h

@@ -47,7 +47,7 @@ namespace Rays
 
 			Painter painter ();
 
-			      Bitmap& bitmap ();
+			      Bitmap& bitmap (bool modify = false);
 
 			const Bitmap& bitmap () const;
 

data/include/rays/matrix.h

@@ -57,6 +57,8 @@ namespace Rays
 
 		This& reset (const coord* elements, size_t size);
 
+		This& transpose ();
+
 		This& translate (coord x, coord y, coord z = 0);
 
 		This& translate (const Coord3& translate);
@@ -92,6 +94,28 @@ namespace Rays
 	};// Matrix
 
 
+	Matrix ortho (
+		coord left, coord right,
+		coord top,  coord bottom);
+
+	Matrix ortho (
+		coord left, coord right,
+		coord top,  coord bottom,
+		coord near, coord far);
+
+	Matrix perspective (float fov_y, float aspect_ratio, coord near, coord far);
+
+	Matrix look_at (
+		coord    eye_x,     coord    eye_y,     coord    eye_z,
+		coord target_x,     coord target_y,     coord target_z,
+		coord     up_x = 0, coord     up_y = 1, coord     up_z = 0);
+
+	Matrix look_at (
+		const Point& eye,
+		const Point& target,
+		const Point& up = Point(0, 1, 0));
+
+
 }// Rays
 
 

data/include/rays/painter.h

@@ -77,6 +77,12 @@ namespace Rays
 			void polygon (
 				const Polygon& polygon, const Bounds& bounds);
 
+			void point (coord x, coord y);
+
+			void point (const Point& point);
+
+			void points (const Point* points, size_t size);
+
 			void line (coord x1, coord y1, coord x2, coord y2);
 
 			void line (const Point& p1, const Point& p2);
@@ -235,6 +241,10 @@ namespace Rays
 
 			uint     nsegment () const;
 
+			void set_line_height (coord height);
+
+			coord    line_height (bool raw = false) const;
+
 			void  set_blend_mode (BlendMode mode);
 
 			BlendMode blend_mode () const;
@@ -253,6 +263,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,
@@ -172,29 +191,35 @@ namespace Rays
 	Polygon create_curve (
 		coord x1, coord y1, coord x2, coord y2,
 		coord x3, coord y3, coord x4, coord y4,
-		bool loop = false);
+		bool loop     = false,
+		uint nsegment = 0);
 
 	Polygon create_curve (
 		const Point& p1, const Point& p2, const Point& p3, const Point& p4,
-		bool loop = false);
+		bool loop     = false,
+		uint nsegment = 0);
 
 	Polygon create_curve (
 		const Point* points, size_t size,
-		bool loop = false);
+		bool loop     = false,
+		uint nsegment = 0);
 
 
 	Polygon create_bezier (
 		coord x1, coord y1, coord x2, coord y2,
 		coord x3, coord y3, coord x4, coord y4,
-		bool loop = false);
+		bool loop     = false,
+		uint nsegment = 0);
 
 	Polygon create_bezier (
 		const Point& p1, const Point& p2, const Point& p3, const Point& p4,
-		bool loop = false);
+		bool loop     = false,
+		uint nsegment = 0);
 
 	Polygon create_bezier (
 		const Point* points, size_t size,
-		bool loop = false);
+		bool loop     = false,
+		uint nsegment = 0);
 
 
 }// Rays

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

@@ -21,6 +21,8 @@ module Rays
     alias a= alpha=
     alias a  alpha
 
+    alias to_hsb to_hsv
+
     def opaque?()
       alpha >= 1
     end
@@ -82,7 +84,11 @@ module Rays
     end
 
     def inspect()
-      "#<#{self.class.name} #{to_s}>"
+      "#<#{self.class.name} #{to_a.join ' '}>"
+    end
+
+    class << self
+      alias hsb hsv
     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,9 @@ module Rays
 
     extend Forwardable
 
-    def_delegators :bitmap, :[], :[]=
+    def_delegators :bitmap,           :pixels,  :[]
+
+    def_delegators :bitmap_for_write, :pixels=, :[]=
 
     def paint(&block)
       painter.paint self, &block
@@ -24,6 +26,14 @@ module Rays
       Bounds.new 0, 0, width, height
     end
 
+    def bitmap(modify = false)
+      get_bitmap modify
+    end
+
+    private def bitmap_for_write()
+      get_bitmap true
+    end
+
   end# Image
 
 

data/lib/rays/matrix.rb

@@ -9,6 +9,22 @@ module Rays
     include Comparable
     include Enumerable
 
+    def transpose()
+      dup.transpose!
+    end
+
+    def translate(*args)
+      dup.translate!(*args)
+    end
+
+    def scale(*args)
+      dup.scale!(*args)
+    end
+
+    def rotate(*args)
+      dup.rotate!(*args)
+    end
+
     def each(&block)
       to_a.each(&block)
     end

data/lib/rays/painter.rb

@@ -57,26 +57,26 @@ module Rays
 
     def line(*args, loop: false)
       if args.first.kind_of?(Polyline)
-        draw_polyline args.first
+        polyline! args.first
       else
-        draw_line args, loop
+        line! args, loop
       end
     end
 
     def rect(*args, round: nil, lt: nil, rt: nil, lb: nil, rb: nil)
-      draw_rect args, round, lt, rt, lb, rb
+      rect! args, round, lt, rt, lb, rb
     end
 
     def ellipse(*args, center: nil, radius: nil, hole: nil, from: nil, to: nil)
-      draw_ellipse args, center, radius, hole, from, to
+      ellipse! args, center, radius, hole, from, to
     end
 
     def curve(*args, loop: false)
-      draw_curve args, loop
+      curve! args, loop
     end
 
     def bezier(*args, loop: false)
-      draw_bezier args, loop
+      bezier! args, loop
     end
 
     def color=(fill, stroke = nil)
@@ -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, :line_height, :blend_mode, :clip, :font,
+      :texture, :texcoord_mode, :texcoord_wrap, :shader
 
     private
 

data/lib/rays/point.rb

@@ -17,6 +17,10 @@ module Rays
       dup.move_by!(*args)
     end
 
+    def rotate(degree)
+      dup.rotate!(degree)
+    end
+
     def zero?()
       length == 0
     end
@@ -47,7 +51,7 @@ module Rays
     end
 
     def inspect()
-      "#<Rays::Point #{to_a(3).join ', '}>"
+      "#<Rays::Point #{to_a(3).join ' '}>"
     end
 
   end# Point