rays 0.4.0 → 0.5.0

data/ext/rays/matrix.cpp

@@ -9,7 +9,7 @@ RUCY_DEFINE_VALUE_OR_ARRAY_FROM_TO(RAYS_EXPORT, Rays::Matrix)
 
 #define THIS  to<Rays::Matrix*>(self)
 
-#define CHECK RUCY_CHECK_OBJ(Rays::Matrix, self)
+#define CHECK RUCY_CHECK_PTR(Rays::Matrix, self)
 
 
 static

data/ext/rays/painter.cpp

@@ -17,7 +17,7 @@ RUCY_DEFINE_VALUE_FROM_TO(RAYS_EXPORT, Rays::Painter)
 
 #define THIS  to<Rays::Painter*>(self)
 
-#define CHECK RUCY_CHECK_OBJECT(Rays::Painter, self)
+#define CHECK RUCY_CHECK_OBJ(Rays::Painter, self)
 
 
 static
@@ -172,7 +172,7 @@ RUCY_DEFN(point)
 	std::vector<Rays::Point> points;
 	get_points(&points, argc, argv);
 
-	THIS->points(&points[0], points.size());
+	THIS->points(points.data(), points.size());
 	return self;
 }
 RUCY_END
@@ -185,7 +185,7 @@ RUCY_DEF2(line, args, loop)
 	std::vector<Rays::Point> points;
 	get_points(&points, args.size(), args.as_array());
 
-	THIS->line(&points[0], points.size(), loop);
+	THIS->line(points.data(), points.size(), loop);
 	return self;
 }
 RUCY_END
@@ -247,7 +247,7 @@ RUCY_DEF2(curve, args, loop)
 	std::vector<Rays::Point> points;
 	get_points(&points, args.size(), args.as_array());
 
-	THIS->curve(&points[0], points.size(), loop);
+	THIS->curve(points.data(), points.size(), loop);
 	return self;
 }
 RUCY_END
@@ -263,7 +263,7 @@ RUCY_DEF2(bezier, args, loop)
 	std::vector<Rays::Point> points;
 	get_points(&points, args.size(), args.as_array());
 
-	THIS->bezier(&points[0], points.size(), loop);
+	THIS->bezier(points.data(), points.size(), loop);
 	return self;
 }
 RUCY_END

data/ext/rays/point.cpp

@@ -8,7 +8,7 @@ RUCY_DEFINE_VALUE_OR_ARRAY_FROM_TO(RAYS_EXPORT, Rays::Point)
 
 #define THIS  to<Rays::Point*>(self)
 
-#define CHECK RUCY_CHECK_OBJ(Rays::Point, self)
+#define CHECK RUCY_CHECK_PTR(Rays::Point, self)
 
 
 static

data/ext/rays/polygon.cpp

@@ -12,7 +12,7 @@ RUCY_DEFINE_VALUE_OR_ARRAY_FROM_TO(RAYS_EXPORT, Rays::Polygon)
 
 #define THIS  to<Rays::Polygon*>(self)
 
-#define CHECK RUCY_CHECK_OBJECT(Rays::Polygon, self)
+#define CHECK RUCY_CHECK_OBJ(Rays::Polygon, self)
 
 
 static
@@ -165,7 +165,7 @@ RUCY_DEF1(op_add, obj)
 		});
 	}
 
-	return value(Rays::Polygon(&polylines[0], polylines.size()));
+	return value(Rays::Polygon(polylines.data(), polylines.size()));
 }
 RUCY_END
 
@@ -428,14 +428,14 @@ namespace Rucy
 					polylines.reserve(argc);
 					for (int i = 0; i < argc; ++i)
 						polylines.emplace_back(to<Rays::Polyline&>(argv[i]));
-					return Rays::Polygon(&polylines[0], polylines.size());
+					return Rays::Polygon(polylines.data(), polylines.size());
 				}
 			}
 			else if (argv->is_num() || argv->is_array())
 			{
 				std::vector<Rays::Point> points;
 				get_points(&points, argc, argv);
-				return Rays::Polygon(&points[0], points.size());
+				return Rays::Polygon(points.data(), points.size());
 			}
 		}
 

data/ext/rays/polyline.cpp

@@ -13,7 +13,7 @@ RUCY_DEFINE_VALUE_OR_ARRAY_FROM_TO(RAYS_EXPORT, Rays::Polyline)
 
 #define THIS  to<Rays::Polyline*>(self)
 
-#define CHECK RUCY_CHECK_OBJECT(Rays::Polyline, self)
+#define CHECK RUCY_CHECK_OBJ(Rays::Polyline, self)
 
 
 static
@@ -243,7 +243,7 @@ namespace Rucy
 			{
 				std::vector<Rays::Point> points;
 				get_points(&points, argc, argv);
-				return Rays::Polyline(&points[0], points.size());
+				return Rays::Polyline(points.data(), points.size());
 			}
 		}
 

data/ext/rays/shader.cpp

@@ -10,7 +10,7 @@ RUCY_DEFINE_VALUE_OR_ARRAY_FROM_TO(RAYS_EXPORT, Rays::Shader)
 
 #define THIS  to<Rays::Shader*>(self)
 
-#define CHECK RUCY_CHECK_OBJECT(Rays::Shader, self)
+#define CHECK RUCY_CHECK_OBJ(Rays::Shader, self)
 
 
 static
@@ -93,7 +93,7 @@ RUCY_DEF4(initialize,
 	fragment_shader_source, vertex_shader_source,
 	builtin_variable_names, ignore_no_uniform_location_error)
 {
-	RUCY_CHECK_OBJ(Rays::Shader, self);
+	RUCY_CHECK_PTR(Rays::Shader, self);
 
 	if (fragment_shader_source.is_nil())
 		argument_error(__FILE__, __LINE__);

data/include/rays/bitmap.h

@@ -31,6 +31,8 @@ namespace Rays
 
 			Bitmap dup () const;
 
+			Bitmap dup (bool premult) const;
+
 			int width () const;
 
 			int height () const;

data/include/rays/font.h

@@ -19,22 +19,64 @@ namespace Rays
 
 		public:
 
-			enum {DEFAULT_SIZE = 12};
+			enum
+			{
+
+				WEIGHT_MIN        = 0,
+
+				WEIGHT_THIN       = 100,
+
+				WEIGHT_EXTRALIGHT = 200,
+
+				WEIGHT_LIGHT      = 300,
+
+				WEIGHT_NORMAL     = 400,
+
+				WEIGHT_MEDIUM     = 500,
+
+				WEIGHT_SEMIBOLD   = 600,
+
+				WEIGHT_BOLD       = 700,
+
+				WEIGHT_EXTRABOLD  = 800,
+
+				WEIGHT_BLACK      = 900,
+
+				WEIGHT_MAX        = 1000,
+
+				DEFAULT_SIZE      = 12,
+
+				DEFAULT_WEIGHT    = WEIGHT_NORMAL,
+
+			};
 
 			Font ();
 
-			Font (const char* name, coord size = DEFAULT_SIZE, bool smooth = true);
+			Font (
+				const char* name,
+				coord size  = DEFAULT_SIZE,
+				int weight  = DEFAULT_WEIGHT,
+				bool italic = false,
+				bool smooth = true);
 
 			~Font ();
 
 			Font dup () const;
 
-			String name () const;
+			String name (bool resolved = false) const;
 
 			void set_size (coord size);
 
 			coord    size () const;
 
+			void set_weight (int weight);
+
+			int      weight () const;
+
+			void set_italic (bool italic);
+
+			bool     italic () const;
+
 			void set_smooth (bool smooth);
 
 			bool     smooth () const;
@@ -63,7 +105,7 @@ namespace Rays
 
 	Font load_font (const char* path, coord size = Font::DEFAULT_SIZE);
 
-	const Font& get_default_font ();
+	Font get_default_font ();
 
 
 }// Rays

data/include/rays/image.h

@@ -65,15 +65,19 @@ namespace Rays
 
 			friend bool operator != (const This& lhs, const This& rhs);
 
-			struct Data
+			struct Loader
 			{
-				virtual ~Data ();
-				virtual void preprocess (const Image* image) const;
+				virtual ~Loader ();
+				virtual bool load (Bitmap* bitmap) = 0;
 			};
 
-			Xot::PSharedImpl<Data> self;
+			Image (const Image& pixels, Loader* loader);
+
+			const Loader* loader () const;
 
-			Image (Data* data);
+			struct Data;
+
+			Xot::PSharedImpl<Data> self;
 
 	};// Image
 

data/include/rays/painter.h

@@ -267,7 +267,9 @@ namespace Rays
 
 			const Bounds& clip () const;
 
-			void    set_font (const char* name, coord size = 0, bool smooth = true);
+			void    set_font (
+				const char* name, coord size = 0,
+				int weight = -1, bool italic = false, bool smooth = true);
 
 			void    set_font (const Font& font);
 

data/include/rays/ruby/color_space.h

@@ -11,6 +11,8 @@
 
 RUCY_DECLARE_VALUE_OR_ARRAY_FROM_TO(RAYS_EXPORT, Rays::ColorSpace)
 
+RUCY_DECLARE_CONVERT_TO(RAYS_EXPORT, Rays::ColorSpaceType)
+
 
 namespace Rays
 {

data/include/rays/shader.h

@@ -20,6 +20,9 @@ namespace Rays
 
 	class Shader
 	{
+		// A fragment shader sees premultiplied alpha and must produce it too:
+		// samples from the texture uniform are premultiplied, and gl_FragColor
+		// is blended as premultiplied. The vertex color is straight.
 
 		typedef Shader This;
 

data/lib/rays/font.rb

@@ -11,13 +11,16 @@ module Rays
     alias w width
     alias h height
 
+    alias italic? italic
+    alias smooth? smooth
+
     def <=>(o)
       ret = name <=> o.name; return ret if ret != 0
             size <=> o.size
     end
 
     def inspect()
-      "#<Rays::Font name='#{name}', size=#{size}>"
+      "#<Rays::Font name='#{name}', size=#{size}, weight=#{weight}#{italic? ? ', italic' : ''}>"
     end
 
   end# Font

data/lib/rays/image.rb

@@ -18,6 +18,8 @@ module Rays
       initialize! args, pixel_density, smooth
     end
 
+    alias smooth? smooth
+
     def paint(&block)
       painter.paint self, &block
       self

data/lib/rays/painter.rb

@@ -135,11 +135,11 @@ module Rays
 
     private
 
-      def each_type(types, reverse: false, &block)
-        types = [:state, :matrix] if types.empty? || types.include?(:all)
-        types = types.reverse if reverse
-        types.each(&block)
-      end
+    def each_type(types, reverse: false, &block)
+      types = [:state, :matrix] if types.empty? || types.include?(:all)
+      types = types.reverse if reverse
+      types.each(&block)
+    end
 
   end# Painter
 

data/rays.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
 
   ext   = Rays::Extension
   name  = ext.name true
-  rdocs = glob.call *%w[README .doc/ext/**/*.cpp]
+  rdocs = glob.call(*%w[README .doc/ext/**/*.cpp])
 
   s.name        = name
   s.version     = ext.version
@@ -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.4.0'
-  s.add_dependency 'rucy', '~> 0.4.0'
+  s.add_dependency 'xot',  '~> 0.5.0'
+  s.add_dependency 'rucy', '~> 0.5.0'
 
   s.files            = `git ls-files`.split $/
   s.executables      = s.files.grep(%r{^bin/}) {|f| File.basename f}

data/src/bitmap.cpp

@@ -0,0 +1,107 @@
+#include "bitmap.h"
+
+
+#include <algorithm>
+#include "rays/exception.h"
+
+
+namespace Rays
+{
+
+
+	template <typename Fun>
+	static void
+	each_alpha_pixel (Bitmap* bitmap, Fun fun)
+	{
+		if (!bitmap)
+			argument_error(__FILE__, __LINE__);
+		if (!*bitmap)
+			argument_error(__FILE__, __LINE__);
+
+		const ColorSpace& cs = bitmap->color_space();
+		if (!cs.has_alpha() || cs.is_alpha())
+			return;
+
+		int width  = bitmap->width();
+		int height = bitmap->height();
+		int Bpp    = cs.Bpp();
+		int apos   = cs.alpha_pos();
+
+		for (int y = 0; y < height; ++y)
+		{
+			uchar* p = bitmap->at<uchar>(0, y);
+			for (int x = 0; x < width; ++x, p += Bpp)
+				fun(p, apos);
+		}
+	}
+
+	static void
+	premultiply (Bitmap* bitmap)
+	{
+		if (bitmap && bitmap->color_space().is_float())
+		{
+			each_alpha_pixel(bitmap, [](uchar* p, int apos)
+			{
+				float* f = (float*) p;
+				float a  = f[apos];
+				if (a == 1) return;
+				for (int i = 0; i < 4; ++i)
+					if (i != apos) f[i] *= a;
+			});
+		}
+		else
+		{
+			each_alpha_pixel(bitmap, [](uchar* p, int apos)
+			{
+				uint a = p[apos];
+				if (a == 255) return;
+				for (int i = 0; i < 4; ++i)
+					if (i != apos) p[i] = (uchar) ((p[i] * a + 127) / 255);
+			});
+		}
+	}
+
+	static void
+	unpremultiply (Bitmap* bitmap)
+	{
+		if (bitmap && bitmap->color_space().is_float())
+		{
+			each_alpha_pixel(bitmap, [](uchar* p, int apos)
+			{
+				float* f = (float*) p;
+				float a  = f[apos];
+				if (a <= 0 || a == 1) return;
+				for (int i = 0; i < 4; ++i)
+					if (i != apos) f[i] = std::min(f[i] / a, 1.f);
+			});
+		}
+		else
+		{
+			each_alpha_pixel(bitmap, [](uchar* p, int apos)
+			{
+				uint a = p[apos];
+				if (a == 0 || a == 255) return;
+				for (int i = 0; i < 4; ++i)
+					if (i != apos) p[i] = (uchar) std::min<uint>((p[i] * 255 + a / 2) / a, 255);
+			});
+		}
+	}
+
+	Bitmap
+	Bitmap::dup (bool premult) const
+	{
+		const ColorSpace& cs = color_space();
+
+		Bitmap bitmap(width(), height(), ColorSpace(cs.type(), premult), pixels());
+		if (premult != cs.is_premult())
+		{
+			if (premult)
+				premultiply(&bitmap);
+			else
+				unpremultiply(&bitmap);
+		}
+		return bitmap;
+	}
+
+
+}// Rays

data/src/color.cpp

@@ -159,6 +159,13 @@ namespace Rays
 			}
 		}
 
+		if (cs.has_alpha() && cs.is_premult() && alpha > 0)
+		{
+			red   = std::min(red   / alpha, 1.f);
+			green = std::min(green / alpha, 1.f);
+			blue  = std::min(blue  / alpha, 1.f);
+		}
+
 		return *this;
 	}
 
@@ -211,6 +218,16 @@ namespace Rays
 			argument_error(__FILE__, __LINE__);
 
 		const float* c = array;
+		float premult[4];
+		if (cs.has_alpha() && cs.is_premult())
+		{
+			premult[0] = red   * alpha;
+			premult[1] = green * alpha;
+			premult[2] = blue  * alpha;
+			premult[3] = alpha;
+			c = premult;
+		}
+
 		if (cs.is_float())
 		{
 			float* p = (float*) pixel;