rays 0.2.1 → 0.3.1

data/include/rays/ruby/color.h

@@ -9,14 +9,14 @@
 #include <rays/color.h>
 
 
-RUCY_DECLARE_VALUE_OR_ARRAY_FROM_TO(Rays::Color)
+RUCY_DECLARE_VALUE_OR_ARRAY_FROM_TO(RAYS_EXPORT, Rays::Color)
 
 
 namespace Rays
 {
 
 
-	Rucy::Class color_class ();
+	RAYS_EXPORT Rucy::Class color_class ();
 	// class Rays::Color
 
 

data/include/rays/ruby/color_space.h

@@ -9,14 +9,14 @@
 #include <rays/color_space.h>
 
 
-RUCY_DECLARE_VALUE_OR_ARRAY_FROM_TO(Rays::ColorSpace)
+RUCY_DECLARE_VALUE_OR_ARRAY_FROM_TO(RAYS_EXPORT, Rays::ColorSpace)
 
 
 namespace Rays
 {
 
 
-	Rucy::Class color_space_class ();
+	RAYS_EXPORT Rucy::Class color_space_class ();
 	// class Rays::ColorSpace
 
 

data/include/rays/ruby/exception.h

@@ -12,13 +12,13 @@ namespace Rays
 {
 
 
-	Rucy::Class rays_error_class ();
+	RAYS_EXPORT Rucy::Class rays_error_class ();
 	// class Rays::RaysError
 
-	Rucy::Class opengl_error_class ();
+	RAYS_EXPORT Rucy::Class opengl_error_class ();
 	// class Rays::OpenGLError
 
-	Rucy::Class shader_error_class ();
+	RAYS_EXPORT Rucy::Class shader_error_class ();
 	// class Rays::ShaderError
 
 

data/include/rays/ruby/font.h

@@ -9,14 +9,14 @@
 #include <rays/font.h>
 
 
-RUCY_DECLARE_VALUE_OR_ARRAY_FROM_TO(Rays::Font)
+RUCY_DECLARE_VALUE_OR_ARRAY_FROM_TO(RAYS_EXPORT, Rays::Font)
 
 
 namespace Rays
 {
 
 
-	Rucy::Class font_class ();
+	RAYS_EXPORT Rucy::Class font_class ();
 	// class Rays::Font
 
 

data/include/rays/ruby/image.h

@@ -9,14 +9,14 @@
 #include <rays/image.h>
 
 
-RUCY_DECLARE_VALUE_FROM_TO(Rays::Image)
+RUCY_DECLARE_VALUE_FROM_TO(RAYS_EXPORT, Rays::Image)
 
 
 namespace Rays
 {
 
 
-	Rucy::Class image_class ();
+	RAYS_EXPORT Rucy::Class image_class ();
 	// class Rays::Image
 
 

data/include/rays/ruby/matrix.h

@@ -9,14 +9,14 @@
 #include <rays/matrix.h>
 
 
-RUCY_DECLARE_VALUE_OR_ARRAY_FROM_TO(Rays::Matrix)
+RUCY_DECLARE_VALUE_OR_ARRAY_FROM_TO(RAYS_EXPORT, Rays::Matrix)
 
 
 namespace Rays
 {
 
 
-	Rucy::Class matrix_class ();
+	RAYS_EXPORT Rucy::Class matrix_class ();
 	// class Rays::Matrix
 
 

data/include/rays/ruby/painter.h

@@ -9,14 +9,14 @@
 #include <rays/painter.h>
 
 
-RUCY_DECLARE_VALUE_FROM_TO(Rays::Painter)
+RUCY_DECLARE_VALUE_FROM_TO(RAYS_EXPORT, Rays::Painter)
 
 
 namespace Rays
 {
 
 
-	Rucy::Class painter_class ();
+	RAYS_EXPORT Rucy::Class painter_class ();
 	// class Rays::Painter
 
 

data/include/rays/ruby/point.h

@@ -9,14 +9,14 @@
 #include <rays/point.h>
 
 
-RUCY_DECLARE_VALUE_OR_ARRAY_FROM_TO(Rays::Point)
+RUCY_DECLARE_VALUE_OR_ARRAY_FROM_TO(RAYS_EXPORT, Rays::Point)
 
 
 namespace Rays
 {
 
 
-	Rucy::Class point_class ();
+	RAYS_EXPORT Rucy::Class point_class ();
 	// class Rays::Point
 
 

data/include/rays/ruby/polygon.h

@@ -9,14 +9,14 @@
 #include <rays/polygon.h>
 
 
-RUCY_DECLARE_VALUE_OR_ARRAY_FROM_TO(Rays::Polygon)
+RUCY_DECLARE_VALUE_OR_ARRAY_FROM_TO(RAYS_EXPORT, Rays::Polygon)
 
 
 namespace Rays
 {
 
 
-	Rucy::Class polygon_class ();
+	RAYS_EXPORT Rucy::Class polygon_class ();
 	// class Rays::Polygon
 
 

data/include/rays/ruby/polyline.h

@@ -9,14 +9,14 @@
 #include <rays/polyline.h>
 
 
-RUCY_DECLARE_VALUE_OR_ARRAY_FROM_TO(Rays::Polyline)
+RUCY_DECLARE_VALUE_OR_ARRAY_FROM_TO(RAYS_EXPORT, Rays::Polyline)
 
 
 namespace Rays
 {
 
 
-	Rucy::Class polyline_class ();
+	RAYS_EXPORT Rucy::Class polyline_class ();
 	// class Rays::Polyline
 
 

data/include/rays/ruby/rays.h

@@ -9,22 +9,22 @@
 #include <rays/rays.h>
 
 
-RUCY_DECLARE_CONVERT_TO(Rays::CapType)
+RUCY_DECLARE_CONVERT_TO(RAYS_EXPORT, Rays::CapType)
 
-RUCY_DECLARE_CONVERT_TO(Rays::JoinType)
+RUCY_DECLARE_CONVERT_TO(RAYS_EXPORT, Rays::JoinType)
 
-RUCY_DECLARE_CONVERT_TO(Rays::BlendMode)
+RUCY_DECLARE_CONVERT_TO(RAYS_EXPORT, Rays::BlendMode)
 
-RUCY_DECLARE_CONVERT_TO(Rays::TexCoordMode)
+RUCY_DECLARE_CONVERT_TO(RAYS_EXPORT, Rays::TexCoordMode)
 
-RUCY_DECLARE_CONVERT_TO(Rays::TexCoordWrap)
+RUCY_DECLARE_CONVERT_TO(RAYS_EXPORT, Rays::TexCoordWrap)
 
 
 namespace Rays
 {
 
 
-	Rucy::Module rays_module ();
+	RAYS_EXPORT Rucy::Module rays_module ();
 	// module Rays
 
 

data/include/rays/ruby/shader.h

@@ -9,14 +9,14 @@
 #include <rays/shader.h>
 
 
-RUCY_DECLARE_VALUE_OR_ARRAY_FROM_TO(Rays::Shader)
+RUCY_DECLARE_VALUE_OR_ARRAY_FROM_TO(RAYS_EXPORT, Rays::Shader)
 
 
 namespace Rays
 {
 
 
-	Rucy::Class shader_class ();
+	RAYS_EXPORT Rucy::Class shader_class ();
 	// class Rays::Shader
 
 

data/lib/rays/bitmap.rb

@@ -16,6 +16,13 @@ module Rays
       end
     end
 
+    def pixels()
+      case o = pixels!
+      when Array  then o
+      when String then o.unpack 'L*'
+      end
+    end
+
     def bounds()
       Bounds.new 0, 0, width, height
     end

data/lib/rays/extension.rb

@@ -25,6 +25,10 @@ module Rays
       root_dir 'lib'
     end
 
+    def ext_dir()
+      root_dir 'ext'
+    end
+
   end# Extension
 
 

data/lib/rays/image.rb

@@ -13,6 +13,10 @@ module Rays
 
     def_delegators :bitmap_for_write, :pixels=, :[]=
 
+    def initialize(*args, pixel_density: 1, smooth: false)
+      initialize! args, pixel_density, smooth
+    end
+
     def paint(&block)
       painter.paint self, &block
       self

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

data/src/bounds.cpp

@@ -50,7 +50,9 @@ namespace Rays
 	bool
 	Bounds::is_intersect (const Bounds& other, int dimension) const
 	{
-		if (dimension < 1 || 3 < dimension)
+		if (dimension < 1)
+			argument_error(__FILE__, __LINE__);
+		if (dimension > 3)
 			argument_error(__FILE__, __LINE__);
 
 		Point size = (*this & other).size();
@@ -69,7 +71,9 @@ namespace Rays
 	bool
 	Bounds::is_include (const Point& point, int dimension) const
 	{
-		if (dimension < 1 || 3 < dimension)
+		if (dimension < 1)
+			argument_error(__FILE__, __LINE__);
+		if (dimension > 3)
 			argument_error(__FILE__, __LINE__);
 
 		const Point &pos = position(), &size_ = size();

data/src/color.cpp

@@ -117,7 +117,9 @@ namespace Rays
 	Color&
 	Color::reset (const void* pixel, const ColorSpace& cs)
 	{
-		if (!pixel || !cs)
+		if (!pixel)
+			argument_error(__FILE__, __LINE__);
+		if (!cs)
 			argument_error(__FILE__, __LINE__);
 
 		if (cs.is_float())
@@ -175,7 +177,9 @@ namespace Rays
 	static void
 	get_rgba (float* red, float* green, float* blue, float* alpha, const float* c)
 	{
-		if ((!red && !green && !blue && !alpha) || !c)
+		if (!red && !green && !blue && !alpha)
+			argument_error(__FILE__, __LINE__);
+		if (!c)
 			argument_error(__FILE__, __LINE__);
 
 		if (red)   *red   = c[0];
@@ -187,7 +191,9 @@ namespace Rays
 	static void
 	get_rgba (uchar* red, uchar* green, uchar* blue, uchar* alpha, const float* c)
 	{
-		if ((!red && !green && !blue && !alpha) || !c)
+		if (!red && !green && !blue && !alpha)
+			argument_error(__FILE__, __LINE__);
+		if (!c)
 			argument_error(__FILE__, __LINE__);
 
 		if (red)   *red   = Color::float2uchar(c[0]);
@@ -199,7 +205,9 @@ namespace Rays
 	void
 	Color::get (void* pixel, const ColorSpace& cs) const
 	{
-		if (!pixel || !cs)
+		if (!pixel)
+			argument_error(__FILE__, __LINE__);
+		if (!cs)
 			argument_error(__FILE__, __LINE__);
 
 		const float* c = array;

data/src/coord.h

@@ -13,9 +13,9 @@ namespace Rays
 {
 
 
-	typedef glm::tvec3<coord, glm::defaultp> Vec3;
+	typedef glm::vec<3, coord, glm::defaultp> Vec3;
 
-	typedef glm::tvec4<coord, glm::defaultp> Vec4;
+	typedef glm::vec<4, coord, glm::defaultp> Vec4;
 
 
 	inline       Vec3& to_glm (      Coord3& val) {return *(      Vec3*) &val;}

data/src/font.cpp

@@ -1,6 +1,7 @@
 #include "font.h"
 
 
+#include <string.h>
 #include <assert.h>
 
 

data/src/image.cpp

@@ -30,6 +30,8 @@ namespace Rays
 
 		float pixel_density = 1;
 
+		bool smooth = false;
+
 		mutable Bitmap bitmap;
 
 		mutable Texture texture;
@@ -56,6 +58,13 @@ namespace Rays
 		if (self->texture) self->texture.set_modified(false);
 	}
 
+	static void
+	invalidate_texture (Image* image)
+	{
+		image->bitmap();// update bitmap
+		image->self->texture = Texture();
+	}
+
 	static Bitmap&
 	get_bitmap (Image* image)
 	{
@@ -117,12 +126,13 @@ namespace Rays
 			if (self->bitmap)
 			{
 				PRINT_MODIFIED_FLAGS("new texture from bitmap");
-				self->texture = Texture(self->bitmap);
+				self->texture = Texture(self->bitmap, self->smooth);
 			}
 			else
 			{
 				PRINT_MODIFIED_FLAGS("new texture");
-				self->texture = Texture(self->width, self->height, self->color_space);
+				self->texture = Texture(
+					self->width, self->height, self->color_space, self->smooth);
 
 				Painter p = image.painter();
 				p.begin();
@@ -167,7 +177,8 @@ namespace Rays
 	}
 
 	Image::Image (
-		int width, int height, const ColorSpace& cs, float pixel_density)
+		int width, int height, const ColorSpace& cs,
+		float pixel_density, bool smooth)
 	{
 		if (pixel_density <= 0)
 			argument_error(__FILE__, __LINE__, "invalid pixel_density.");
@@ -176,9 +187,10 @@ namespace Rays
 		self->height        = (int) (height * pixel_density);
 		self->color_space   = cs;
 		self->pixel_density = pixel_density;
+		self->smooth        = smooth;
 	}
 
-	Image::Image (const Bitmap& bitmap, float pixel_density)
+	Image::Image (const Bitmap& bitmap, float pixel_density, bool smooth)
 	{
 		if (pixel_density <= 0)
 			argument_error(__FILE__, __LINE__, "invalid pixel_density.");
@@ -188,6 +200,7 @@ namespace Rays
 		self->height        = bitmap.height();
 		self->color_space   = bitmap.color_space();
 		self->pixel_density = pixel_density;
+		self->smooth        = smooth;
 	}
 
 	Image::~Image ()
@@ -233,6 +246,21 @@ namespace Rays
 		return self->pixel_density;
 	}
 
+	void
+	Image::set_smooth (bool smooth)
+	{
+		if (smooth == self->smooth) return;
+
+		self->smooth = smooth;
+		invalidate_texture(this);
+	}
+
+	bool
+	Image::smooth () const
+	{
+		return self->smooth;
+	}
+
 	Painter
 	Image::painter ()
 	{

data/src/ios/bitmap.mm

@@ -2,7 +2,6 @@
 #import "bitmap.h"
 
 
-#include <assert.h>
 #import <ImageIO/CGImageDestination.h>
 #import <MobileCoreServices/UTCoreTypes.h>
 #include "rays/exception.h"
@@ -61,7 +60,7 @@ namespace Rays
 
 		ColorSpace color_space;
 
-		void* pixels = NULL;
+		void* pixels         = NULL;
 
 		CGContextRef context = NULL;
 
@@ -123,37 +122,44 @@ namespace Rays
 
 	static void
 	setup_bitmap (
-		Bitmap* this_,
+		Bitmap* bitmap,
 		int w, int h, const ColorSpace& cs,
-		const void* pixels_ = NULL, bool clear_pixels = true)
+		const void* pixels = NULL, bool clear_pixels = true)
 	{
-		if (!this_ || w <= 0 || h <= 0 || !cs)
+		if (w <= 0)
 			argument_error(__FILE__, __LINE__);
+		if (h <= 0)
+			argument_error(__FILE__, __LINE__);
+		if (!cs)
+			argument_error(__FILE__, __LINE__);
+
+		Bitmap::Data* self = bitmap->self.get();
 
-		this_->self->clear();
+		self->clear();
 
-		this_->self->width       = w;
-		this_->self->height      = h;
-		this_->self->color_space = cs;
-		this_->self->modified    = true;
+		self->width       = w;
+		self->height      = h;
+		self->color_space = cs;
+		self->modified    = true;
 
 		size_t size = w * h * cs.Bpp();
-		this_->self->pixels = new uchar[size];
+		self->pixels = new uchar[size];
 
-		if (pixels_)
-			memcpy(this_->self->pixels, pixels_, size);
+		if (pixels)
+			memcpy(self->pixels, pixels, size);
 		else if (clear_pixels)
-			memset(this_->self->pixels, 0, size);
+			memset(self->pixels, 0, size);
 	}
 
-	static void
-	setup_bitmap (Bitmap* this_, const Texture& tex)
+	Bitmap
+	Bitmap_from (const Texture& tex)
 	{
-		if (!this_ || !tex)
+		if (!tex)
 			argument_error(__FILE__, __LINE__);
 
+		Bitmap bmp;
 		setup_bitmap(
-			this_, tex.width(), tex.height(), tex.color_space(), NULL, false);
+			&bmp, tex.width(), tex.height(), tex.color_space(), NULL, false);
 
 		GLenum format, type;
 		ColorSpace_get_gl_format_and_type(&format, &type, tex.color_space());
@@ -161,18 +167,12 @@ namespace Rays
 		FrameBuffer fb(tex);
 		FrameBufferBinder binder(fb.id());
 
-		for (int y = 0; y < this_->height(); ++y)
+		for (int y = 0; y < bmp.height(); ++y)
 		{
-			GLvoid* ptr = (GLvoid*) this_->at<uchar>(0, y);
-			glReadPixels(0, y, this_->width(), 1, format, type, ptr);
+			GLvoid* ptr = (GLvoid*) bmp.at<uchar>(0, y);
+			glReadPixels(0, y, bmp.width(), 1, format, type, ptr);
 		}
-	}
 
-	Bitmap
-	Bitmap_from (const Texture& texture)
-	{
-		Bitmap bmp;
-		setup_bitmap(&bmp, texture);
 		return bmp;
 	}
 
@@ -183,7 +183,9 @@ namespace Rays
 	{
 		if (width == 0 || height == 0) return;
 
-		if (!bitmap || !image)
+		if (!bitmap)
+			argument_error(__FILE__, __LINE__);
+		if (!image)
 			argument_error(__FILE__, __LINE__);
 
 		CGContextRef context = bitmap->self->get_context();
@@ -201,21 +203,24 @@ namespace Rays
 	Bitmap_draw_string (
 		Bitmap* bitmap, const RawFont& font, const char* str, coord x, coord y)
 	{
-		if (!bitmap || !*bitmap || !font || !str)
+		if (!bitmap)
+			argument_error(__FILE__, __LINE__);
+		if (!*bitmap)
+			argument_error(__FILE__, __LINE__);
+		if (!font)
+			argument_error(__FILE__, __LINE__);
+		if (!str)
 			argument_error(__FILE__, __LINE__);
 
 		if (*str == '\0') return;
 
 		font.draw_string(bitmap->self->get_context(), bitmap->height(), str, x, y);
-
 		Bitmap_set_modified(bitmap);
 	}
 
 	void
 	Bitmap_set_modified (Bitmap* bitmap, bool modified)
 	{
-		assert(bitmap);
-
 		bitmap->self->modified = modified;
 	}
 
@@ -268,7 +273,9 @@ namespace Rays
 	Bitmap
 	Bitmap_load (const char* path_)
 	{
-		if (!path_ || path_[0] == '\0')
+		if (!path_)
+			argument_error(__FILE__, __LINE__);
+		if (path_[0] == '\0')
 			argument_error(__FILE__, __LINE__);
 
 		NSString* path = [NSString stringWithUTF8String: path_];

data/src/ios/font.mm

@@ -152,11 +152,16 @@ namespace Rays
 	{
 		CGContextRef context = (CGContextRef) context_;
 
-		if (!*this || !context || !str)
+		if (!context)
+			argument_error(__FILE__, __LINE__);
+		if (!str)
 			argument_error(__FILE__, __LINE__);
 
 		if (*str == '\0') return;
 
+		if (!*this)
+			invalid_state_error(__FILE__, __LINE__);
+
 		CTLinePtr line = make_line(self->font, str);
 		if (!line)
 			rays_error(__FILE__, __LINE__, "creating CTLineRef failed.");

data/src/ios/rays.mm

@@ -25,7 +25,7 @@ namespace Rays
 	init ()
 	{
 		if (global::pool)
-			rays_error(__FILE__, __LINE__, "Rays::init(): already initialized.");
+			rays_error(__FILE__, __LINE__, "already initialized.");
 
 		global::pool = [[NSAutoreleasePool alloc] init];
 
@@ -36,7 +36,7 @@ namespace Rays
 	fin ()
 	{
 		if (!global::pool)
-			rays_error(__FILE__, __LINE__, "Rays::fin(): not initialized.");
+			rays_error(__FILE__, __LINE__, "not initialized.");
 
 		OpenGL_fin();
 

data/src/matrix.h

@@ -12,7 +12,7 @@ namespace Rays
 {
 
 
-	typedef glm::tmat4x4<coord> Mat4;
+	typedef glm::mat<4, 4, coord> Mat4;
 
 
 	inline       Mat4&   to_glm (      Matrix& val) {return *(      Mat4*)   &val;}

data/src/opengl.h

@@ -11,8 +11,7 @@
 	#include <OpenGLES/ES3/gl.h>
 	#include <OpenGLES/ES3/glext.h>
 #elif defined(WIN32)
-	#include <GL/gl.h>
-	#include <GL/glext.h>
+	#include <GL/glew.h>
 #endif
 
 #include "rays/defs.h"