rays 0.3.11 → 0.3.13

data/ext/rays/painter.cpp

@@ -266,7 +266,17 @@ RUCY_DEFN(image)
 	CHECK;
 	check_arg_count(__FILE__, __LINE__, "Painter#image", argc, 1, 3, 5, 7, 9);
 
-	const Rays::Image* image = to<Rays::Image*>(argv[0]);
+	RUCY_SYM(to_image);
+	std::unique_ptr<Rays::Image> pimage;
+
+	const Rays::Image* image = NULL;
+	if (argv[0].is_a(Rays::image_class()))
+		image = to<Rays::Image*>(argv[0]);
+	else if (argv[0].respond_to(to_image))
+	{
+		pimage.reset(new Rays::Image(to<const Rays::Image&>(argv[0].call(to_image))));
+		image = pimage.get();
+	}
 	if (!image)
 		argument_error(__FILE__, __LINE__, "%s is not an image.", argv[0].inspect().c_str());
 
@@ -810,6 +820,42 @@ RUCY_DEF0(pop_matrix)
 RUCY_END
 
 
+static
+RUCY_DEF1(set_debug, debug)
+{
+	CHECK;
+	if (debug)
+		THIS->remove_flag(Rays::Painter::FLAG_BATCHING);
+	else
+		THIS->   add_flag(Rays::Painter::FLAG_BATCHING);
+	return debug;
+}
+RUCY_END
+
+static
+RUCY_DEF0(get_debug)
+{
+	CHECK;
+	return value(!THIS->has_flag(Rays::Painter::FLAG_BATCHING));
+}
+RUCY_END
+
+static
+RUCY_DEF1(set_global_debug, debug)
+{
+	Rays::Painter::set_debug(debug);
+	return debug;
+}
+RUCY_END
+
+static
+RUCY_DEF0(get_global_debug)
+{
+	return value(Rays::Painter::debug());
+}
+RUCY_END
+
+
 static Class cPainter;
 
 void
@@ -890,6 +936,12 @@ Init_rays_painter ()
 	cPainter.define_method("matrix",  get_matrix);
 	cPainter.define_method("push_matrix", push_matrix);
 	cPainter.define_method( "pop_matrix",  pop_matrix);
+
+	cPainter.define_method("debug=", set_debug);
+	cPainter.define_method("debug?", get_debug);
+
+	cPainter.define_singleton_method("debug=", set_global_debug);
+	cPainter.define_singleton_method("debug?", get_global_debug);
 }
 
 

data/ext/rays/shader.cpp

@@ -67,15 +67,17 @@ make_env (const Value& names, const Value& ignore_no_uniform_location_error)
 		to_name_list(names, 0),
 		to_name_list(names, 1),
 		to_name_list(names, 2),
-		to_name(     names, 3),
-		to_name(     names, 4),
+		to_name_list(names, 3),
+		to_name_list(names, 4),
 		to_name(     names, 5),
-		to_name_list(names, 6),
-		to_name_list(names, 7),
-		to_name_list(names, 8),
-		to_name_list(names, 9),
+		to_name(     names, 6),
+		to_name(     names, 7),
+		to_name(     names, 8),
+		to_name(     names, 9),
 		to_name_list(names, 10),
 		to_name_list(names, 11),
+		to_name_list(names, 12),
+		to_name_list(names, 13),
 		flags);
 }
 

data/include/rays/coord.h

@@ -25,9 +25,9 @@ namespace Rays
 			coord array[SIZE];
 		};
 
-		Coord2& reset (coord value = 0);
+		This& reset (coord value = 0);
 
-		Coord2& reset (coord x, coord y);
+		This& reset (coord x, coord y);
 
 		size_t size () const;
 
@@ -58,9 +58,9 @@ namespace Rays
 
 		This& operator = (const Coord2& rhs);
 
-		Coord3& reset (coord value = 0);
+		This& reset (coord value = 0);
 
-		Coord3& reset (coord x, coord y, coord z = 0);
+		This& reset (coord x, coord y, coord z = 0);
 
 		size_t size () const;
 
@@ -93,9 +93,9 @@ namespace Rays
 
 		This& operator = (const Coord3& rhs);
 
-		Coord4& reset (coord value = 0);
+		This& reset (coord value = 0);
 
-		Coord4& reset (coord x, coord y, coord z = 0, coord w = 1);
+		This& reset (coord x, coord y, coord z = 0, coord w = 1);
 
 		size_t size () const;
 

data/include/rays/defs.h

@@ -26,6 +26,8 @@ namespace Rays
 
 	using Xot::String;
 
+	using Xot::StringList;
+
 
 	typedef float coord;
 

data/include/rays/image.h

@@ -61,10 +61,20 @@ namespace Rays
 
 			bool operator ! () const;
 
-			struct Data;
+			friend bool operator == (const This& lhs, const This& rhs);
+
+			friend bool operator != (const This& lhs, const This& rhs);
+
+			struct Data
+			{
+				virtual ~Data ();
+				virtual void preprocess (const Image* image) const;
+			};
 
 			Xot::PSharedImpl<Data> self;
 
+			Image (Data* data);
+
 	};// Image
 
 

data/include/rays/painter.h

@@ -5,6 +5,7 @@
 
 
 #include <xot/pimpl.h>
+#include <xot/util.h>
 #include <rays/defs.h>
 #include <rays/point.h>
 
@@ -29,6 +30,15 @@ namespace Rays
 
 		public:
 
+			enum Flag
+			{
+
+				FLAG_BATCHING = Xot::bit(0),
+
+				FLAG_LAST     = FLAG_BATCHING
+
+			};// Flag
+
 			Painter ();
 
 			~Painter ();
@@ -322,10 +332,19 @@ namespace Rays
 			void pop_matrix ();
 
 
+			void    add_flag (uint flags);
+
+			void remove_flag (uint flags);
+
+			bool    has_flag (uint flags) const;
+
 			operator bool () const;
 
 			bool operator ! () const;
 
+			static void set_debug (bool debug);
+
+			static bool     debug ();
 
 			struct Data;
 

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.11'
-  s.add_dependency 'rucy', '~> 0.3.11'
+  s.add_dependency 'xot',  '~> 0.3.13'
+  s.add_dependency 'rucy', '~> 0.3.13'
 
   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/color_space.cpp

@@ -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 ||

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

@@ -10,7 +10,7 @@
 
 
 #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
@@ -20,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;
 
@@ -48,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);
@@ -61,7 +74,7 @@ namespace Rays
 	invalidate_texture (Image* image)
 	{
 		image->bitmap();// update bitmap
-		image->self->texture = Texture();
+		get_data(image)->texture = Texture();
 	}
 
 	static Bitmap&
@@ -69,7 +82,7 @@ namespace Rays
 	{
 		assert(image);
 
-		Image::Data* self = image->self.get();
+		ImageData* self = get_data(image);
 
 		if (!*image)
 		{
@@ -112,7 +125,7 @@ namespace Rays
 	Texture&
 	Image_get_texture (Image& image)
 	{
-		Image::Data* self = image.self.get();
+		ImageData* self = get_data(&image);
 
 		if (!image)
 		{
@@ -171,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;
@@ -190,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();
@@ -202,6 +230,11 @@ namespace Rays
 		self->smooth        = smooth;
 	}
 
+	Image::Image (Data* data)
+	:	self(data)
+	{
+	}
+
 	Image::~Image ()
 	{
 	}
@@ -209,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__);
 
@@ -224,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);
 	}
@@ -257,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;
@@ -271,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);
@@ -287,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 &&
@@ -300,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