rays 0.1.28 → 0.1.30

data/ext/rays/noise.cpp

@@ -47,7 +47,7 @@ RUCY_END
 
 
 void
-Init_noise ()
+Init_rays_noise ()
 {
 	Module mRays = define_module("Rays");
 	mRays.define_singleton_method("perlin", perlin);

data/ext/rays/painter.cpp

@@ -656,7 +656,7 @@ RUCY_END
 static Class cPainter;
 
 void
-Init_painter ()
+Init_rays_painter ()
 {
 	Module mRays = define_module("Rays");
 

data/ext/rays/point.cpp

@@ -272,7 +272,7 @@ RUCY_END
 static Class cPoint;
 
 void
-Init_point ()
+Init_rays_point ()
 {
 	Module mRays = define_module("Rays");
 

data/ext/rays/polygon.cpp

@@ -249,7 +249,7 @@ RUCY_END
 static Class cPolygon;
 
 void
-Init_polygon ()
+Init_rays_polygon ()
 {
 	Module mRays = define_module("Rays");
 

data/ext/rays/polygon_line.cpp

@@ -42,7 +42,7 @@ RUCY_END
 static Class cPolygonLine;
 
 void
-Init_polygon_line ()
+Init_rays_polygon_line ()
 {
 	Module mRays   = define_module("Rays");
 	Class cPolygon = mRays.define_class("Polygon");

data/ext/rays/polyline.cpp

@@ -114,7 +114,7 @@ RUCY_END
 static Class cPolyline;
 
 void
-Init_polyline ()
+Init_rays_polyline ()
 {
 	Module mRays = define_module("Rays");
 

data/ext/rays/shader.cpp

@@ -1,6 +1,7 @@
 #include "rays/ruby/shader.h"
 
 
+#include "rays/ruby/image.h"
 #include "defs.h"
 
 
@@ -18,12 +19,83 @@ RUCY_DEF_ALLOC(alloc, klass)
 }
 RUCY_END
 
+static const char*
+to_name (const Value& names, size_t index)
+{
+	if (!names || !names.is_array() || index >= names.size())
+		return NULL;
+
+	const auto& name = names[index];
+	if (!name) return NULL;
+
+	return name.c_str();
+}
+
+static Rays::ShaderEnv::NameList
+to_name_list (const Value& names, size_t index)
+{
+	if (!names || !names.is_array() || index >= names.size())
+		return {};
+
+	const auto& name_or_array = names[index];
+	if (name_or_array.is_array())
+	{
+		Rays::ShaderEnv::NameList list;
+		for (size_t i = 0; i < name_or_array.size(); ++i)
+			list.emplace_back(name_or_array[i].c_str());
+		return list;
+	}
+	else if (name_or_array.is_s() || name_or_array.is_sym())
+		return {Xot::String(name_or_array.c_str())};
+	else
+		return {};
+}
+
+static std::shared_ptr<Rays::ShaderEnv>
+make_env (const Value& names, const Value& ignore_no_uniform_location_error)
+{
+	bool has_names = names && names.is_array() && !names.empty();
+	if (!has_names && !ignore_no_uniform_location_error)
+		return NULL;
+
+	uint flags = 0;
+	if (ignore_no_uniform_location_error)
+		flags |= Rays::ShaderEnv::IGNORE_NO_UNIFORM_LOCATION_ERROR;
+
+	return std::make_shared<Rays::ShaderEnv>(
+		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(     names, 5),
+		to_name_list(names, 6),
+		to_name_list(names, 7),
+		to_name_list(names, 8),
+		to_name_list(names, 9),
+		to_name_list(names, 10),
+		to_name_list(names, 11),
+		flags);
+}
+
 static
-RUCY_DEF1(setup, source)
+RUCY_DEF4(setup,
+	fragment_shader_source, vertex_shader_source,
+	builtin_variable_names, ignore_no_uniform_location_error)
 {
 	RUCY_CHECK_OBJ(Rays::Shader, self);
 
-	*THIS = to<Rays::Shader>(source);
+	if (fragment_shader_source.is_nil())
+		argument_error(__FILE__, __LINE__);
+
+	const char* fs = fragment_shader_source.c_str();
+	const char* vs = vertex_shader_source ? vertex_shader_source.c_str() : NULL;
+
+	auto env = make_env(builtin_variable_names, ignore_no_uniform_location_error);
+	if (env)
+		*THIS = Rays::Shader(fs, vs, *env);
+	else
+		*THIS = Rays::Shader(fs, vs);
 }
 RUCY_END
 
@@ -33,9 +105,6 @@ RUCY_DEFN(set_uniform)
 	CHECK;
 	check_arg_count(__FILE__, __LINE__, "Painter#set_uniform", argc, 2, 3, 4, 5);
 
-	#define Ai(n) (argv[n].as_i())
-	#define Af(n) ((float) argv[n].as_f())
-
 	const char* name = argv[0].c_str();
 	if (argv[1].is_array())
 	{
@@ -48,6 +117,9 @@ RUCY_DEFN(set_uniform)
 		argv += 1;
 	}
 
+	#define Ai(n) (argv[n].as_i())
+	#define Af(n) ((float) argv[n].as_f())
+
 	if (argv[0].is_i())
 	{
 		switch (argc)
@@ -68,6 +140,8 @@ RUCY_DEFN(set_uniform)
 			case 4: THIS->set_uniform(name, Af(0), Af(1), Af(2), Af(3)); break;
 		}
 	}
+	else if (argv[0].is_kind_of(Rays::image_class()))
+		THIS->set_uniform(name, to<Rays::Image&>(argv[0]));
 	else
 		argument_error(__FILE__, __LINE__);
 
@@ -78,11 +152,31 @@ RUCY_DEFN(set_uniform)
 }
 RUCY_END
 
+static
+RUCY_DEF0(get_vertex_shader_source)
+{
+	CHECK;
+
+	const char* source = THIS->vertex_shader_source();
+	return source ? value(source) : nil();
+}
+RUCY_END
+
+static
+RUCY_DEF0(get_fragment_shader_source)
+{
+	CHECK;
+
+	const char* source = THIS->fragment_shader_source();
+	return source ? value(source) : nil();
+}
+RUCY_END
+
 
 static Class cShader;
 
 void
-Init_shader ()
+Init_rays_shader ()
 {
 	Module mRays = define_module("Rays");
 
@@ -90,6 +184,8 @@ Init_shader ()
 	cShader.define_alloc_func(alloc);
 	cShader.define_private_method("setup", setup);
 	cShader.define_private_method("set_uniform", set_uniform);
+	cShader.define_method(  "vertex_shader_source",   get_vertex_shader_source);
+	cShader.define_method("fragment_shader_source", get_fragment_shader_source);
 }
 
 

data/include/rays/exception.h

@@ -26,6 +26,13 @@ namespace Rays
 	};
 
 
+	class ShaderError : public OpenGLError
+	{
+		typedef OpenGLError Super;
+		public: ShaderError (const char* str = NULL);
+	};
+
+
 	namespace ErrorFunctions
 	{
 
@@ -39,6 +46,10 @@ namespace Rays
 		void opengl_error (
 			const char* file, int line, const char* format = NULL, ...);
 
+		[[noreturn]]
+		void shader_error (
+			const char* file, int line, const char* format = NULL, ...);
+
 	}// ErrorFunctions
 
 

data/include/rays/ruby/bitmap.h

@@ -4,7 +4,6 @@
 #define __RAYS_RUBY_BITMAP_H__
 
 
-#include <rucy/rucy.h>
 #include <rucy/class.h>
 #include <rucy/extension.h>
 #include <rays/bitmap.h>

data/include/rays/ruby/bounds.h

@@ -4,10 +4,8 @@
 #define __RAYS_RUBY_BOUNDS_H__
 
 
-#include <rucy/rucy.h>
 #include <rucy/class.h>
 #include <rucy/extension.h>
-#include <rucy/exception.h>
 #include <rays/bounds.h>
 #include <rays/ruby/point.h>
 

data/include/rays/ruby/camera.h

@@ -4,7 +4,6 @@
 #define __RAYS_RUBY_CAMERA_H__
 
 
-#include <rucy/rucy.h>
 #include <rucy/class.h>
 #include <rucy/extension.h>
 #include <rays/camera.h>

data/include/rays/ruby/color.h

@@ -4,10 +4,8 @@
 #define __RAYS_RUBY_COLOR_H__
 
 
-#include <rucy/rucy.h>
 #include <rucy/class.h>
 #include <rucy/extension.h>
-#include <rucy/exception.h>
 #include <rays/color.h>
 
 

data/include/rays/ruby/color_space.h

@@ -4,7 +4,6 @@
 #define __RAYS_RUBY_COLOR_SPACE_H__
 
 
-#include <rucy/rucy.h>
 #include <rucy/class.h>
 #include <rucy/extension.h>
 #include <rays/color_space.h>

data/include/rays/ruby/defs.h

@@ -0,0 +1,30 @@
+// -*- c++ -*-
+#pragma once
+#ifndef __RAYS_RUBY_DEFS_H__
+#define __RAYS_RUBY_DEFS_H__
+
+
+#include <rucy/extension.h>
+#include <rays/ruby/exception.h>
+
+
+#define RAYS_CATCH \
+	} \
+	catch (const Rays::ShaderError& e) \
+	{ \
+		RUCY_RAISE(Rays::shader_error_class(), e.what()); \
+	} \
+	catch (const Rays::OpenGLError& e) \
+	{ \
+		RUCY_RAISE(Rays::opengl_error_class(), e.what()); \
+	} \
+	catch (const Rays::RaysError& e) \
+	{ \
+		RUCY_RAISE(Rays::rays_error_class(), e.what());
+
+#define RUCY_END \
+	RAYS_CATCH \
+	RUCY_DEF_END
+
+
+#endif//EOH

data/include/rays/ruby/exception.h

@@ -0,0 +1,28 @@
+// -*- c++ -*-
+#pragma once
+#ifndef __RAYS_RUBY_EXCEPTION_H__
+#define __RAYS_RUBY_EXCEPTION_H__
+
+
+#include <rucy/class.h>
+#include <rays/exception.h>
+
+
+namespace Rays
+{
+
+
+	Rucy::Class rays_error_class ();
+	// class Rays::RaysError
+
+	Rucy::Class opengl_error_class ();
+	// class Rays::OpenGLError
+
+	Rucy::Class shader_error_class ();
+	// class Rays::ShaderError
+
+
+}// Rays
+
+
+#endif//EOH

data/include/rays/ruby/font.h

@@ -4,7 +4,6 @@
 #define __RAYS_RUBY_FONT_H__
 
 
-#include <rucy/rucy.h>
 #include <rucy/class.h>
 #include <rucy/extension.h>
 #include <rays/font.h>

data/include/rays/ruby/image.h

@@ -4,7 +4,6 @@
 #define __RAYS_RUBY_IMAGE_H__
 
 
-#include <rucy/rucy.h>
 #include <rucy/class.h>
 #include <rucy/extension.h>
 #include <rays/image.h>

data/include/rays/ruby/matrix.h

@@ -4,7 +4,6 @@
 #define __RAYS_RUBY_MATRIX_H__
 
 
-#include <rucy/rucy.h>
 #include <rucy/class.h>
 #include <rucy/extension.h>
 #include <rays/matrix.h>

data/include/rays/ruby/painter.h

@@ -4,7 +4,6 @@
 #define __RAYS_RUBY_PAINTER_H__
 
 
-#include <rucy/rucy.h>
 #include <rucy/class.h>
 #include <rucy/extension.h>
 #include <rays/painter.h>

data/include/rays/ruby/point.h

@@ -4,10 +4,8 @@
 #define __RAYS_RUBY_POINT_H__
 
 
-#include <rucy/rucy.h>
 #include <rucy/class.h>
 #include <rucy/extension.h>
-#include <rucy/exception.h>
 #include <rays/point.h>
 
 

data/include/rays/ruby/polygon.h

@@ -4,7 +4,6 @@
 #define __RAYS_RUBY_POLYGON_H__
 
 
-#include <rucy/rucy.h>
 #include <rucy/class.h>
 #include <rucy/extension.h>
 #include <rays/polygon.h>

data/include/rays/ruby/polyline.h

@@ -4,7 +4,6 @@
 #define __RAYS_RUBY_POLYLINE_H__
 
 
-#include <rucy/rucy.h>
 #include <rucy/class.h>
 #include <rucy/extension.h>
 #include <rays/polyline.h>

data/include/rays/ruby/rays.h

@@ -4,7 +4,6 @@
 #define __RAYS_RUBY_RAYS_H__
 
 
-#include <rucy/rucy.h>
 #include <rucy/module.h>
 #include <rucy/extension.h>
 #include <rays/rays.h>

data/include/rays/ruby/shader.h

@@ -4,7 +4,6 @@
 #define __RAYS_RUBY_SHADER_H__
 
 
-#include <rucy/rucy.h>
 #include <rucy/class.h>
 #include <rucy/extension.h>
 #include <rays/shader.h>

data/include/rays/ruby.h

@@ -5,6 +5,8 @@
 
 
 #include <rays/ruby/rays.h>
+#include <rays/ruby/defs.h>
+#include <rays/ruby/exception.h>
 
 #include <rays/ruby/point.h>
 #include <rays/ruby/bounds.h>

data/include/rays/shader.h

@@ -4,6 +4,7 @@
 #define __RAYS_SHADER_H__
 
 
+#include <vector>
 #include <xot/pimpl.h>
 #include <rays/defs.h>
 #include <rays/coord.h>
@@ -14,6 +15,7 @@ namespace Rays
 
 
 	class Image;
+	class ShaderEnv;
 
 
 	class Shader
@@ -23,7 +25,14 @@ namespace Rays
 
 		public:
 
-			Shader (const char* source = NULL);
+			Shader (
+				const char* fragment_shader_source = NULL,
+				const char*   vertex_shader_source = NULL);
+
+			Shader (
+				const char* fragment_shader_source,
+				const char*   vertex_shader_source,
+				ShaderEnv env);
 
 			~Shader ();
 
@@ -55,6 +64,10 @@ namespace Rays
 
 			void set_uniform (const char* name, const Image& texture);
 
+			const char*   vertex_shader_source () const;
+
+			const char* fragment_shader_source () const;
+
 			operator bool () const;
 
 			bool operator ! () const;
@@ -70,6 +83,40 @@ namespace Rays
 	};// Shader
 
 
+	class ShaderEnv
+	{
+
+		public:
+
+			typedef std::vector<String> NameList;
+
+			enum Flags
+			{
+				IGNORE_NO_UNIFORM_LOCATION_ERROR = 0x1 << 0,
+			};
+
+			ShaderEnv (
+				const NameList& attribute_position_names      = {},
+				const NameList& attribute_texcoord_names      = {},
+				const NameList& attribute_color_names         = {},
+				const char*     varying_position_name         = NULL,
+				const char*     varying_texcoord_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_texture_names         = {},
+				uint flags                                    = 0);
+
+			struct Data;
+
+			Xot::PSharedImpl<Data> self;
+
+	};// ShaderEnv
+
+
 }// Rays
 
 

data/lib/rays/painter.rb

@@ -27,15 +27,15 @@ module Rays
       if block
         attributes.each do |key, value|
           attributes[key] = __send__ key
-          __send__ key, *value
+          __send__ key, *(value.nil? ? [nil] : value)
         end
-
         Xot::BlockUtil.instance_eval_or_block_call self, &block
-
+      end
+    ensure
+      if block
         attributes.each do |key, value|
-          __send__ key, *value
+          __send__ key, *(value.nil? ? [nil] : value)
         end
-
         pop(*types)
       end
     end
@@ -92,6 +92,7 @@ module Rays
     end
 
     def shader=(shader, **uniforms)
+      shader = Shader.new shader if shader.is_a?(String)
       shader.uniform(**uniforms) if shader && !uniforms.empty?
       set_shader shader
     end

data/lib/rays/point.rb

@@ -33,6 +33,7 @@ module Rays
       when 1 then [x]
       when 2 then [x, y]
       when 3 then [x, y, z]
+      when 4 then [x, y, z, 1.0]
       else raise ArgumentError
       end
     end

data/lib/rays/shader.rb

@@ -10,11 +10,24 @@ module Rays
 
   class Shader
 
-    def initialize(source = nil, **uniforms, &block)
-      if source
-        setup source
-        uniform(**uniforms) unless uniforms.empty?
-      end
+    def initialize(
+      fragment_shader_source,
+      vertex_shader_source   = nil,
+      builtin_variable_names = nil,
+      ignore_no_uniform_location_error: false,
+      **uniforms, &block)
+
+      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,
+          :uniform_texture),
+        ignore_no_uniform_location_error)
+
+      uniform(**uniforms) unless uniforms.empty?
 
       Xot::BlockUtil.instance_eval_or_block_call self, &block if block
     end

data/rays.gemspec

@@ -1,7 +1,7 @@
 # -*- mode: ruby; coding: utf-8 -*-
 
 
-File.expand_path('../lib', __FILE__)
+File.expand_path('lib', __dir__)
   .tap {|s| $:.unshift s if !$:.include?(s) && File.directory?(s)}
 
 require 'rays/module'
@@ -28,8 +28,8 @@ Gem::Specification.new do |s|
   s.platform              = Gem::Platform::RUBY
   s.required_ruby_version = '>= 2.6.0'
 
-  s.add_runtime_dependency 'xot',  '~> 0.1.28'
-  s.add_runtime_dependency 'rucy', '~> 0.1.28'
+  s.add_runtime_dependency 'xot',  '~> 0.1.30'
+  s.add_runtime_dependency 'rucy', '~> 0.1.30'
 
   s.files            = `git ls-files`.split $/
   s.executables      = s.files.grep(%r{^bin/}) {|f| File.basename f}

data/src/exception.cpp

@@ -20,6 +20,12 @@ namespace Rays
 	}
 
 
+	ShaderError::ShaderError (const char* str)
+	:	Super(str)
+	{
+	}
+
+
 	namespace ErrorFunctions
 	{
 
@@ -37,6 +43,13 @@ namespace Rays
 			throw OpenGLError(Xot::error_text(file, line, s));
 		}
 
+		void
+		shader_error (const char* file, int line, const char* format, ...)
+		{
+			XOT_STRINGF(format, s);
+			throw ShaderError(Xot::error_text(file, line, s));
+		}
+
 	}// ErrorFunctions
 
 

data/src/image.cpp

@@ -58,9 +58,11 @@ namespace Rays
 	}
 
 	static Bitmap&
-	get_bitmap (Image& image)
+	get_bitmap (Image* image)
 	{
-		Image::Data* self = image.self.get();
+		assert(image);
+
+		Image::Data* self = image->self.get();
 
 		if (!image)
 		{
@@ -230,13 +232,13 @@ namespace Rays
 	Bitmap&
 	Image::bitmap ()
 	{
-		return get_bitmap(*this);
+		return get_bitmap(this);
 	}
 
 	const Bitmap&
 	Image::bitmap () const
 	{
-		return get_bitmap(const_cast<Image&>(*this));
+		return get_bitmap(const_cast<Image*>(this));
 	}
 
 	Image::operator bool () const