rays 0.1.48 → 0.2

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;

data/include/rays/polygon.h

@@ -191,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/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
@@ -85,6 +87,10 @@ module Rays
       "#<#{self.class.name} #{to_a.join ' '}>"
     end
 
+    class << self
+      alias hsb hsv
+    end
+
   end# Color
 
 

data/lib/rays/image.rb

@@ -9,7 +9,9 @@ module Rays
 
     extend Forwardable
 
-    def_delegators :bitmap, :pixels=, :pixels, :[]=, :[]
+    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)
@@ -130,8 +130,8 @@ module Rays
 
     universal_accessor :background, :fill, :stroke, :color,
       :stroke_width, :stroke_outset, :stroke_cap, :stroke_join, :miter_limit,
-      :nsegment, :blend_mode, :texture, :texcoord_mode, :texcoord_wrap,
-      :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

data/lib/rays/polygon.rb

@@ -79,12 +79,12 @@ module Rays
       ellipse! args, center, radius, hole, from, to, nsegment
     end
 
-    def self.curve(*points, loop: false)
-      curve! points, loop
+    def self.curve(*points, loop: false, nsegment: nil)
+      curve! points, loop, nsegment
     end
 
-    def self.bezier(*points, loop: false)
-      bezier! points, loop
+    def self.bezier(*points, loop: false, nsegment: nil)
+      bezier! points, loop, nsegment
     end
 
   end# Polygon

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

data/src/color.cpp

@@ -47,8 +47,17 @@ namespace Rays
 		hue = fmod(hue, 1.f);
 		if (hue < 0) hue += 1.f;
 
-		auto c = glm::rgbColor(Vec3(hue * 360.f, saturation, value));
-		return Color(c[0], c[1], c[2], alpha);
+		auto rgb = glm::rgbColor(Vec3(hue * 360.f, saturation, value));
+		return Color(rgb[0], rgb[1], rgb[2], alpha);
+	}
+
+	void
+	get_hsv (float* hue, float* saturation, float* value, const Color& color)
+	{
+		auto hsv = glm::hsvColor(Vec3(color.r, color.g, color.b));
+		if (hue)        *hue        = hsv[0] / 360.f;
+		if (saturation) *saturation = hsv[1];
+		if (value)      *value      = hsv[2];
 	}
 
 

data/src/font.cpp

@@ -58,21 +58,6 @@ namespace Rays
 		return font.self->get_raw(pixel_density);
 	}
 
-	coord
-	Font_get_width (const Font& font, float pixel_density, const char* str)
-	{
-		return Font_get_raw(font, pixel_density).get_width(str);
-	}
-
-	coord
-	Font_get_height (
-		const Font& font, float pixel_density,
-		coord* ascent, coord* descent, coord* leading)
-	{
-		return Font_get_raw(font, pixel_density)
-			.get_height(ascent, descent, leading);
-	}
-
 
 	Font::Font ()
 	{
@@ -116,7 +101,19 @@ namespace Rays
 	coord
 	Font::get_width (const char* str) const
 	{
-		return self->rawfont.get_width(str);
+		if (!strchr(str, '\n'))
+			return self->rawfont.get_width(str);
+
+		Xot::StringList lines;
+		split(&lines, str);
+
+		coord width = 0;
+		for (const auto& line : lines)
+		{
+			coord w = self->rawfont.get_width(line.c_str());
+			if (w > width) width = w;
+		}
+		return width;
 	}
 
 	coord

data/src/font.h

@@ -55,12 +55,6 @@ namespace Rays
 
 	const RawFont& Font_get_raw (const Font& font, float pixel_density);
 
-	coord Font_get_width (const Font& font, float pixel_density, const char* str);
-
-	coord Font_get_height (
-		const Font& font, float pixel_density,
-		coord* ascent = NULL, coord* descent = NULL, coord* leading = NULL);
-
 
 	RawFont RawFont_load (const char* path, coord size);
 

data/src/image.cpp

@@ -10,6 +10,13 @@
 #include "texture.h"
 
 
+#if 0
+#define PRINT_MODIFIED_FLAGS(message) self->print_modified_flags(message)
+#else
+#define PRINT_MODIFIED_FLAGS(message)
+#endif
+
+
 namespace Rays
 {
 
@@ -27,6 +34,16 @@ namespace Rays
 
 		mutable Texture texture;
 
+		void print_modified_flags (const char* message)
+		{
+			printf("%s: %d %d %d %d \n",
+				message,
+				bitmap ? 1 : 0,
+				Bitmap_get_modified(bitmap) ? 1 : 0,
+				texture ? 1 : 0,
+				texture.modified() ? 1 : 0);
+		}
+
 	};// Image::Data
 
 
@@ -82,18 +99,30 @@ namespace Rays
 		if (!self->bitmap)
 		{
 			if (self->texture)
+			{
+				PRINT_MODIFIED_FLAGS("new bitmap from texture");
 				self->bitmap = Bitmap_from(self->texture);
+			}
 			else
+			{
+				PRINT_MODIFIED_FLAGS("new bitmap");
 				self->bitmap = Bitmap(self->width, self->height, self->color_space);
+			}
 			clear_modified_flags(image);
 		}
-		else if (
-			self->texture &&
-			self->texture.modified() &&
-			!Bitmap_get_modified(self->bitmap))
+		else if (self->texture && self->texture.modified())
 		{
-			self->bitmap = Bitmap_from(self->texture);
-			clear_modified_flags(image);
+			if (Bitmap_get_modified(self->bitmap))
+			{
+				invalid_state_error(
+					__FILE__, __LINE__, "bitmap and texture modifications conflicted");
+			}
+			else
+			{
+				PRINT_MODIFIED_FLAGS("bitmap from texture");
+				self->bitmap = Bitmap_from(self->texture);
+				clear_modified_flags(image);
+			}
 		}
 
 		return self->bitmap;
@@ -115,9 +144,13 @@ namespace Rays
 		if (!self->texture)
 		{
 			if (self->bitmap)
+			{
+				PRINT_MODIFIED_FLAGS("new texture from bitmap");
 				self->texture = Texture(self->bitmap);
+			}
 			else
 			{
+				PRINT_MODIFIED_FLAGS("new texture");
 				self->texture = Texture(self->width, self->height, self->color_space);
 
 				Painter p = image.painter();
@@ -127,13 +160,19 @@ namespace Rays
 			}
 			clear_modified_flags(&image);
 		}
-		else if (
-			self->bitmap &&
-			Bitmap_get_modified(self->bitmap) &&
-			!self->texture.modified())
+		else if (self->bitmap && Bitmap_get_modified(self->bitmap))
 		{
-			self->texture = Texture(self->bitmap);
-			clear_modified_flags(&image);
+			if (self->texture.modified())
+			{
+				invalid_state_error(
+					__FILE__, __LINE__, "texture and bitmap modifications conflicted");
+			}
+			else
+			{
+				PRINT_MODIFIED_FLAGS("texture from bitmap");
+				self->texture = self->bitmap;
+				clear_modified_flags(&image);
+			}
 		}
 
 		return self->texture;
@@ -232,15 +271,20 @@ namespace Rays
 	}
 
 	Bitmap&
-	Image::bitmap ()
+	Image::bitmap (bool modify)
 	{
+		if (modify)
+		{
+			if (!self->bitmap) get_bitmap(this);
+			Bitmap_set_modified(&self->bitmap);
+		}
 		return get_bitmap(this);
 	}
 
 	const Bitmap&
 	Image::bitmap () const
 	{
-		return get_bitmap(const_cast<Image*>(this));
+		return const_cast<Image*>(this)->bitmap();
 	}
 
 	Image::operator bool () const

data/src/ios/font.mm

@@ -78,14 +78,12 @@ namespace Rays
 	get_font_families ()
 	{
 		static const FontFamilyMap MAP = []() {
-			NSFontManager* fm = NSFontManager.sharedFontManager;
-
 			FontFamilyMap map;
-			for (NSString* family in fm.availableFontFamilies)
+			for (NSString* family in UIFont.familyNames)
 			{
 				FontFamilyMap::mapped_type array;
-				for (NSArray<NSString*>* members in [fm availableMembersOfFontFamily: family])
-					array.emplace_back(members[0].UTF8String);
+				for (NSString* name in [UIFont fontNamesForFamilyName: family])
+					array.emplace_back(name.UTF8String);
 				map[family.UTF8String] = array;
 			}
 			return map;
@@ -163,11 +161,9 @@ namespace Rays
 		if (!line)
 			rays_error(__FILE__, __LINE__, "creating CTLineRef failed.");
 
-		coord width = 0, height = 0, ascent = 0;
-		width  = get_width(str);
-		height = get_height(&ascent);
-
-		height = ceil(height);
+		coord width, height, ascent = 0;
+		width  = ceil(get_width(str));
+		height = ceil(get_height(&ascent));
 		ascent = floor(ascent);
 
 		CGRect rect = CGRectMake(x, context_height - height - y, width, height);

data/src/ios/helper.h

@@ -15,9 +15,9 @@ namespace Rays
 	void safe_cfrelease (CFTypeRef ref);
 
 
-	typedef std::shared_ptr<const __CFString> CFString;
+	typedef std::shared_ptr<const __CFString> CFStringPtr;
 
-	CFString cfstring (const char* str);
+	CFStringPtr cfstring (const char* str);
 
 
 }// Rays

data/src/ios/helper.mm

@@ -13,12 +13,12 @@ namespace Rays
 	}
 
 
-	CFString
+	CFStringPtr
 	cfstring (const char* str)
 	{
 		CFStringRef ref = CFStringCreateWithCString(
 			kCFAllocatorDefault, str, kCFStringEncodingUTF8);
-		return CFString(ref, safe_cfrelease);
+		return CFStringPtr(ref, safe_cfrelease);
 	}
 
 

data/src/matrix.cpp

@@ -13,6 +13,44 @@ namespace Rays
 {
 
 
+	Matrix
+	ortho (coord left, coord right, coord top,  coord bottom)
+	{
+		return to_rays(glm::ortho(left, right, bottom, top));
+	}
+
+	Matrix
+	ortho (coord left, coord right, coord top,  coord bottom, coord near, coord far)
+	{
+		return to_rays(glm::ortho(left, right, bottom, top, near, far));
+	}
+
+	Matrix
+	perspective (float fov_y, float aspect_ratio, coord near, coord far)
+	{
+		return to_rays(glm::perspective(
+			(float) Xot::deg2rad(fov_y), aspect_ratio, near, 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,     coord up_y, coord     up_z)
+	{
+		return to_rays(glm::lookAt(
+			Vec3(   eye_x,    eye_y,    eye_z),
+			Vec3(target_x, target_y, target_z),
+			Vec3(    up_x,     up_y,     up_z)));
+	}
+
+	Matrix
+	look_at (const Point& eye, const Point& target, const Point& up)
+	{
+		return to_rays(glm::lookAt(to_glm(eye), to_glm(target), to_glm(up)));
+	}
+
+
 	Matrix::Matrix (coord value)
 	{
 		reset(value);
@@ -84,6 +122,13 @@ namespace Rays
 		return *this;
 	}
 
+	Matrix&
+	Matrix::transpose ()
+	{
+		to_glm(*this) = glm::transpose(to_glm(*this));
+		return *this;
+	}
+
 	Matrix&
 	Matrix::translate (coord x, coord y, coord z)
 	{

data/src/osx/font.mm

@@ -163,11 +163,9 @@ namespace Rays
 		if (!line)
 			rays_error(__FILE__, __LINE__, "creating CTLineRef failed.");
 
-		coord width = 0, height = 0, ascent = 0;
-		width  = get_width(str);
-		height = get_height(&ascent);
-
-		height = ceil(height);
+		coord width, height, ascent = 0;
+		width  = ceil(get_width(str));
+		height = ceil(get_height(&ascent));
 		ascent = floor(ascent);
 
 		CGRect rect = CGRectMake(x, context_height - height - y, width, height);