rays 0.3.10 → 0.3.12

data/include/rays/ruby.h

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

data/include/rays/shader.h

@@ -98,15 +98,17 @@ namespace Rays
 			ShaderEnv (
 				const NameList& attribute_position_names      = {},
 				const NameList& attribute_texcoord_names      = {},
+				const NameList& attribute_texcoord_min_names  = {},
+				const NameList& attribute_texcoord_max_names  = {},
 				const NameList& attribute_color_names         = {},
 				const char*     varying_position_name         = NULL,
 				const char*     varying_texcoord_name         = NULL,
+				const char*     varying_texcoord_min_name     = NULL,
+				const char*     varying_texcoord_max_name     = NULL,
 				const char*     varying_color_name            = NULL,
 				const NameList& uniform_position_matrix_names = {},
 				const NameList& uniform_texcoord_matrix_names = {},
-				const NameList& uniform_texcoord_min_names    = {},
-				const NameList& uniform_texcoord_max_names    = {},
-				const NameList& uniform_texcoord_offset_names = {},
+				const NameList& uniform_texcoord_pixel_names  = {},
 				const NameList& uniform_texture_names         = {},
 				uint flags                                    = 0);
 

data/include/rays.h

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

data/lib/rays/extension.rb

@@ -5,8 +5,10 @@ module Rays
 
     module_function
 
-    def name()
-      super.split('::')[-2]
+    def name(downcase = false)
+      super().split('::')[-2].then {|s|
+        downcase ? s.gsub(/([a-z])([A-Z])/) {"#{$1}-#{$2}"}.downcase : s
+      }
     end
 
     def version()
@@ -29,6 +31,10 @@ module Rays
       root_dir 'ext'
     end
 
+    def lib_name()
+      "#{name true}.dll" if /mswin|ming|cygwin/.match? RUBY_PLATFORM
+    end
+
   end# Extension
 
 

data/lib/rays/image.rb

@@ -7,7 +7,8 @@ module Rays
 
   class Image
 
-    extend Forwardable
+    include Comparable
+    extend  Forwardable
 
     def_delegators :bitmap,           :pixels,  :[]
 

data/lib/rays/shader.rb

@@ -17,10 +17,19 @@ module Rays
       setup(
         fragment_shader_source, vertex_shader_source,
         builtin_variable_names&.values_at(
-          :attribute_position, :attribute_texcoord, :attribute_color,
-            :varying_position,   :varying_texcoord,   :varying_color,
-          :uniform_position_matrix, :uniform_texcoord_matrix,
-          :uniform_texcoord_min, :uniform_texcoord_max, :uniform_texcoord_offset,
+          :attribute_position,
+          :attribute_texcoord,
+          :attribute_texcoord_min,
+          :attribute_texcoord_max,
+          :attribute_color,
+            :varying_position,
+            :varying_texcoord,
+            :varying_texcoord_min,
+            :varying_texcoord_max,
+            :varying_color,
+          :uniform_position_matrix,
+          :uniform_texcoord_matrix,
+          :uniform_texcoord_pixel,
           :uniform_texture),
         ignore_no_uniform_location_error)
 

data/rays.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   end
 
   ext   = Rays::Extension
-  name  = ext.name.downcase
+  name  = ext.name true
   rdocs = glob.call *%w[README .doc/ext/**/*.cpp]
 
   s.name        = name
@@ -25,14 +25,13 @@ Gem::Specification.new do |s|
   s.platform              = Gem::Platform::RUBY
   s.required_ruby_version = '>= 3.0.0'
 
-  s.add_dependency 'xot',  '~> 0.3.10'
-  s.add_dependency 'rucy', '~> 0.3.10'
+  s.add_dependency 'xot',  '~> 0.3.12'
+  s.add_dependency 'rucy', '~> 0.3.12'
 
   s.files            = `git ls-files`.split $/
   s.executables      = s.files.grep(%r{^bin/}) {|f| File.basename f}
   s.test_files       = s.files.grep %r{^(test|spec|features)/}
   s.extra_rdoc_files = rdocs.to_a
-  s.has_rdoc         = true
 
   s.metadata['msys2_mingw_dependencies'] = 'glew'
 

data/src/bitmap.h

@@ -16,6 +16,10 @@ namespace Rays
 	class RawFont;
 
 
+	void Bitmap_setup (
+		Bitmap* bitmap, int w, int h, const ColorSpace& cs,
+		const void* pixels = NULL, bool clear_pixels = true);
+
 	Bitmap Bitmap_from (const Texture& texture);
 
 	void Bitmap_draw_string (

data/src/color_space.cpp

@@ -1,4 +1,4 @@
-#include "color_space.h"
+#include "rays/color_space.h"
 
 
 #include <xot/util.h>
@@ -133,7 +133,7 @@ namespace Rays
 	ColorSpace::has_alpha () const
 	{
 		return
-			(ALPHA_FIRST <= type_ && type_ <= ALPHA_LAST) ||
+			(ALPHA_FIRST <= (int) type_ && (int) type_ <= ALPHA_LAST) ||
 			type_ == RGBA_8888  || type_ == ARGB_8888  ||
 			type_ == BGRA_8888  || type_ == ABGR_8888  ||
 			type_ == RGBA_float || type_ == ARGB_float ||
@@ -194,44 +194,4 @@ namespace Rays
 	}
 
 
-	void
-	ColorSpace_get_gl_format_and_type (
-		GLenum* format, GLenum* type, const ColorSpace& cs)
-	{
-		if (!format && !type)
-			argument_error(__FILE__, __LINE__);
-
-		if (!cs)
-			invalid_state_error(__FILE__, __LINE__);
-
-		if (format)
-		{
-			     if (cs.is_rgb())   *format = cs.has_alpha() ? GL_RGBA  : GL_RGB;
-		#ifndef IOS
-			else if (cs.is_bgr())   *format = cs.has_alpha() ? GL_BGRA  : GL_BGR;
-		#endif
-			else if (cs.is_gray())  *format = GL_LUMINANCE;
-			else if (cs.is_alpha()) *format = GL_ALPHA;
-			else
-				rays_error(__FILE__, __LINE__, "invalid color space.");
-		}
-
-		if (type)
-		{
-			if (cs.is_float())
-				*type = GL_FLOAT;
-			else switch (cs.bpc())
-			{
-				case 8:  *type = GL_UNSIGNED_BYTE; break;
-				case 16: *type = GL_UNSIGNED_SHORT; break;
-			#ifndef IOS
-				case 32: *type = GL_UNSIGNED_INT; break;
-			#endif
-				default:
-					rays_error(__FILE__, __LINE__, "invalid bpc.");
-			}
-		}
-	}
-
-
 }// Rays

data/src/coord.h

@@ -21,12 +21,22 @@ namespace Rays
 
 	inline const Vec3& to_glm (const Coord3& val) {return *(const Vec3*) &val;}
 
+	inline       Vec4& to_glm (      Coord4& val) {return *(      Vec4*) &val;}
+
+	inline const Vec4& to_glm (const Coord4& val) {return *(const Vec4*) &val;}
+
 	template <typename T>
 	inline       T&    to_rays (      Vec3&  val) {return *(      T*)    &val;}
 
 	template <typename T>
 	inline const T&    to_rays (const Vec3&  val) {return *(const T*)    &val;}
 
+	template <typename T>
+	inline       T&    to_rays (      Vec4&  val) {return *(      T*)    &val;}
+
+	template <typename T>
+	inline const T&    to_rays (const Vec4&  val) {return *(const T*)    &val;}
+
 
 }// Rays
 

data/src/font.cpp

@@ -121,7 +121,7 @@ namespace Rays
 		if (!strchr(str, '\n'))
 			return self->rawfont.get_width(str);
 
-		Xot::StringList lines;
+		StringList lines;
 		split(&lines, str);
 
 		coord width = 0;

data/src/image.cpp

@@ -5,13 +5,12 @@
 #include <assert.h>
 #include "rays/exception.h"
 #include "rays/debug.h"
-#include "opengl.h"
 #include "bitmap.h"
 #include "texture.h"
 
 
 #if 0
-#define PRINT_MODIFIED_FLAGS(message) self->print_modified_flags(message)
+#define PRINT_MODIFIED_FLAGS(message) get_data(this)->print_modified_flags(message)
 #else
 #define PRINT_MODIFIED_FLAGS(message)
 #endif
@@ -21,16 +20,16 @@ namespace Rays
 {
 
 
-	struct Image::Data
+	struct ImageData : Image::Data
 	{
 
 		int width = 0, height = 0;
 
-		ColorSpace color_space;
-
 		float pixel_density = 1;
 
-		bool smooth = false;
+		bool smooth         = false;
+
+		ColorSpace color_space;
 
 		mutable Bitmap bitmap;
 
@@ -49,10 +48,23 @@ namespace Rays
 	};// Image::Data
 
 
+	static ImageData*
+	get_data (Image* image)
+	{
+		return (ImageData*) image->self.get();
+	}
+
+	static const ImageData*
+	get_data (const Image* image)
+	{
+		return (const ImageData*) image->self.get();
+	}
+
+
 	static void
 	clear_modified_flags (Image* image)
 	{
-		Image::Data* self = image->self.get();
+		ImageData* self = get_data(image);
 
 		if (self->bitmap)  Bitmap_set_modified(&self->bitmap, false);
 		if (self->texture) self->texture.set_modified(false);
@@ -62,7 +74,7 @@ namespace Rays
 	invalidate_texture (Image* image)
 	{
 		image->bitmap();// update bitmap
-		image->self->texture = Texture();
+		get_data(image)->texture = Texture();
 	}
 
 	static Bitmap&
@@ -70,7 +82,7 @@ namespace Rays
 	{
 		assert(image);
 
-		Image::Data* self = image->self.get();
+		ImageData* self = get_data(image);
 
 		if (!*image)
 		{
@@ -113,7 +125,7 @@ namespace Rays
 	Texture&
 	Image_get_texture (Image& image)
 	{
-		Image::Data* self = image.self.get();
+		ImageData* self = get_data(&image);
 
 		if (!image)
 		{
@@ -172,17 +184,30 @@ namespace Rays
 	}
 
 
+	Image::Data::~Data ()
+	{
+	}
+
+	void
+	Image::Data::preprocess (const Image*) const
+	{
+	}
+
+
 	Image::Image ()
+	:	self(new ImageData())
 	{
 	}
 
 	Image::Image (
 		int width, int height, const ColorSpace& cs,
 		float pixel_density, bool smooth)
+	:	self(new ImageData())
 	{
 		if (pixel_density <= 0)
 			argument_error(__FILE__, __LINE__, "invalid pixel_density.");
 
+		ImageData* self     = get_data(this);
 		self->width         = (int) (width  * pixel_density);
 		self->height        = (int) (height * pixel_density);
 		self->color_space   = cs;
@@ -191,10 +216,12 @@ namespace Rays
 	}
 
 	Image::Image (const Bitmap& bitmap, float pixel_density, bool smooth)
+	:	self(new ImageData())
 	{
 		if (pixel_density <= 0)
 			argument_error(__FILE__, __LINE__, "invalid pixel_density.");
 
+		ImageData* self     = get_data(this);
 		self->bitmap        = bitmap;
 		self->width         = bitmap.width();
 		self->height        = bitmap.height();
@@ -203,6 +230,11 @@ namespace Rays
 		self->smooth        = smooth;
 	}
 
+	Image::Image (Data* data)
+	:	self(data)
+	{
+	}
+
 	Image::~Image ()
 	{
 	}
@@ -210,12 +242,16 @@ namespace Rays
 	Image
 	Image::dup () const
 	{
+		self->preprocess(this);
+
 		return Image(bitmap().dup(), pixel_density());
 	}
 
 	void
 	Image::save (const char* path)
 	{
+		self->preprocess(this);
+
 		if (!*this)
 			invalid_state_error(__FILE__, __LINE__);
 
@@ -225,32 +261,47 @@ namespace Rays
 	coord
 	Image::width () const
 	{
+		self->preprocess(this);
+
+		const ImageData* self = get_data(this);
 		return self->width / self->pixel_density;
 	}
 
 	coord
 	Image::height () const
 	{
+		self->preprocess(this);
+
+		const ImageData* self = get_data(this);
 		return self->height / self->pixel_density;
 	}
 
 	const ColorSpace&
 	Image::color_space () const
 	{
+		self->preprocess(this);
+
+		const ImageData* self = get_data(this);
 		return self->color_space;
 	}
 
 	float
 	Image::pixel_density () const
 	{
+		self->preprocess(this);
+
+		const ImageData* self = get_data(this);
 		return self->pixel_density;
 	}
 
 	void
 	Image::set_smooth (bool smooth)
 	{
-		if (smooth == self->smooth) return;
+		self->preprocess(this);
+
+		ImageData* self = get_data(this);
 
+		if (smooth == self->smooth) return;
 		self->smooth = smooth;
 		invalidate_texture(this);
 	}
@@ -258,12 +309,17 @@ namespace Rays
 	bool
 	Image::smooth () const
 	{
+		self->preprocess(this);
+
+		const ImageData* self = get_data(this);
 		return self->smooth;
 	}
 
 	Painter
 	Image::painter ()
 	{
+		self->preprocess(this);
+
 		Painter p;
 		p.bind(*this);
 		return p;
@@ -272,6 +328,9 @@ namespace Rays
 	Bitmap&
 	Image::bitmap (bool modify)
 	{
+		self->preprocess(this);
+
+		ImageData* self = get_data(this);
 		if (modify)
 		{
 			if (!self->bitmap) get_bitmap(this);
@@ -288,6 +347,9 @@ namespace Rays
 
 	Image::operator bool () const
 	{
+		self->preprocess(this);
+
+		const ImageData* self = get_data(this);
 		return
 			self->width         > 0 &&
 			self->height        > 0 &&
@@ -301,5 +363,17 @@ namespace Rays
 		return !operator bool();
 	}
 
+	bool
+	operator == (const Image& lhs, const Image& rhs)
+	{
+		return lhs.self == rhs.self;
+	}
+
+	bool
+	operator != (const Image& lhs, const Image& rhs)
+	{
+		return !operator==(lhs, rhs);
+	}
+
 
 }// Rays

data/src/ios/bitmap.mm

@@ -6,10 +6,8 @@
 #import <MobileCoreServices/UTCoreTypes.h>
 #include <xot/util.h>
 #include "rays/exception.h"
-#include "../color_space.h"
 #include "../font.h"
 #include "../texture.h"
-#include "../frame_buffer.h"
 
 
 namespace Rays
@@ -131,11 +129,10 @@ namespace Rays
 	};// Bitmap::Data
 
 
-	static void
-	setup_bitmap (
-		Bitmap* bitmap,
-		int w, int h, const ColorSpace& cs,
-		const void* pixels = NULL, bool clear_pixels = true)
+	void
+	Bitmap_setup (
+		Bitmap* bitmap, int w, int h, const ColorSpace& cs,
+		const void* pixels, bool clear_pixels)
 	{
 		if (w <= 0)
 			argument_error(__FILE__, __LINE__);
@@ -162,30 +159,6 @@ namespace Rays
 			memset(self->pixels, 0, size);
 	}
 
-	Bitmap
-	Bitmap_from (const Texture& tex)
-	{
-		if (!tex)
-			argument_error(__FILE__, __LINE__);
-
-		Bitmap bmp;
-		setup_bitmap(
-			&bmp, tex.width(), tex.height(), tex.color_space(), NULL, false);
-
-		GLenum format, type;
-		ColorSpace_get_gl_format_and_type(&format, &type, tex.color_space());
-
-		FrameBuffer fb(tex);
-		FrameBufferBinder binder(fb.id());
-
-		for (int y = 0; y < bmp.height(); ++y)
-		{
-			GLvoid* ptr = (GLvoid*) bmp.at<uchar>(0, y);
-			glReadPixels(0, y, bmp.width(), 1, format, type, ptr);
-		}
-
-		return bmp;
-	}
 
 	void
 	Bitmap_draw_image (
@@ -318,7 +291,7 @@ namespace Rays
 	Bitmap::Bitmap (
 		int width, int height, const ColorSpace& color_space, const void* pixels)
 	{
-		setup_bitmap(this, width, height, color_space, pixels);
+		Bitmap_setup(this, width, height, color_space, pixels);
 	}
 
 	Bitmap::~Bitmap ()

data/src/ios/rays.mm

@@ -4,7 +4,7 @@
 
 #import <Foundation/Foundation.h>
 #include "rays/exception.h"
-#include "../opengl.h"
+#include "../renderer.h"
 
 
 namespace Rays
@@ -29,7 +29,7 @@ namespace Rays
 
 		global::pool = [[NSAutoreleasePool alloc] init];
 
-		OpenGL_init();
+		Renderer_init();
 	}
 
 	void
@@ -38,7 +38,7 @@ namespace Rays
 		if (!global::pool)
 			rays_error(__FILE__, __LINE__, "not initialized.");
 
-		OpenGL_fin();
+		Renderer_fin();
 
 		[global::pool release];
 		global::pool = nil;

data/src/opengl/bitmap.cpp

@@ -0,0 +1,41 @@
+#include "../bitmap.h"
+
+
+#include "rays/exception.h"
+#include "../texture.h"
+#include "opengl.h"
+#include "color_space.h"
+#include "frame_buffer.h"
+
+
+namespace Rays
+{
+
+
+	Bitmap
+	Bitmap_from (const Texture& tex)
+	{
+		if (!tex)
+			argument_error(__FILE__, __LINE__);
+
+		Bitmap bmp;
+		Bitmap_setup(
+			&bmp, tex.width(), tex.height(), tex.color_space(), NULL, false);
+
+		GLenum format, type;
+		ColorSpace_get_gl_format_and_type(&format, &type, tex.color_space());
+
+		FrameBuffer fb(tex);
+		FrameBufferBinder binder(fb.id());
+
+		for (int y = 0; y < bmp.height(); ++y)
+		{
+			GLvoid* ptr = (GLvoid*) bmp.at<uchar>(0, y);
+			glReadPixels(0, y, bmp.width(), 1, format, type, ptr);
+		}
+
+		return bmp;
+	}
+
+
+}// Rays

data/src/opengl/color_space.cpp

@@ -0,0 +1,51 @@
+#include "color_space.h"
+
+
+#include "rays/exception.h"
+
+
+namespace Rays
+{
+
+
+	void
+	ColorSpace_get_gl_format_and_type (
+		GLenum* format, GLenum* type, const ColorSpace& cs)
+	{
+		if (!format && !type)
+			argument_error(__FILE__, __LINE__);
+
+		if (!cs)
+			invalid_state_error(__FILE__, __LINE__);
+
+		if (format)
+		{
+			     if (cs.is_rgb())   *format = cs.has_alpha() ? GL_RGBA  : GL_RGB;
+		#ifndef IOS
+			else if (cs.is_bgr())   *format = cs.has_alpha() ? GL_BGRA  : GL_BGR;
+		#endif
+			else if (cs.is_gray())  *format = GL_LUMINANCE;
+			else if (cs.is_alpha()) *format = GL_ALPHA;
+			else
+				rays_error(__FILE__, __LINE__, "invalid color space.");
+		}
+
+		if (type)
+		{
+			if (cs.is_float())
+				*type = GL_FLOAT;
+			else switch (cs.bpc())
+			{
+				case 8:  *type = GL_UNSIGNED_BYTE; break;
+				case 16: *type = GL_UNSIGNED_SHORT; break;
+			#ifndef IOS
+				case 32: *type = GL_UNSIGNED_INT; break;
+			#endif
+				default:
+					rays_error(__FILE__, __LINE__, "invalid bpc.");
+			}
+		}
+	}
+
+
+}// Rays

data/src/{color_space.h → opengl/color_space.h}

@@ -1,7 +1,7 @@
 // -*- c++ -*-
 #pragma once
-#ifndef __RAYS_SRC_COLOR_SPACE_H__
-#define __RAYS_SRC_COLOR_SPACE_H__
+#ifndef __RAYS_SRC_OPENGL_COLOR_SPACE_H__
+#define __RAYS_SRC_OPENGL_COLOR_SPACE_H__
 
 
 #include "rays/color_space.h"

data/src/{frame_buffer.cpp → opengl/frame_buffer.cpp}

@@ -105,7 +105,7 @@ namespace Rays
 		FrameBufferBinder binder(id());
 
 		glFramebufferTexture2D(
-			GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, texture.id(), 0);
+			GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, Texture_get_id(texture), 0);
 		OpenGL_check_error(__FILE__, __LINE__);
 
 		self->texture = texture;