rays 0.1.27 → 0.1.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d8fe0c0eb8632278d900cfa9fdcee0616bcc5e1b82853d78fd5cc34863191bd
-  data.tar.gz: 1e201ddc102dcfdcead64b384c41e7df8da56f7b19c1f9557b5990762dbc84e1
+  metadata.gz: d598cf8c5059a425c7f26881d6a5f411969ed3ad46f07c331372d398f17bf9e6
+  data.tar.gz: 7f87f57fbaf8deee511e248ce2d8fea4b1e445cda91ec324fd85b9f3959a8e16
 SHA512:
-  metadata.gz: b200a686a6b9d60fbb8da6e94b2820a5837f883777bfed161928e5391f1da7a1deaccdabe0c8e662c18f043505f6728faa78dc192e9cdbf3cb1c31749ff80dfd
-  data.tar.gz: e01f6167b255a358f7cd84b211fb17e007c17439ee03334ce8449d99fb0d83b73eb405dfb103185de328dd091a115d88f091e50745f62dbb8dec4645892c9883
+  metadata.gz: 3e82501e4410fdb429f04cc8acd33a56eeff585ba918a9bfed05ef59db5db61997e279557ec5c3f7e329af285a439f5c49d94be4a4cf7de909f299926e584d2a
+  data.tar.gz: 8f27df0f080dc97f0f22bbc45abd6a0355d39190a3ff6d48a53abe0c947ca6bc92a5304a214680c7c9871dfa7fde426ef65acc361de594fb113e9ed0c19615fe

data/.doc/ext/rays/exception.cpp

@@ -0,0 +1,45 @@
+#include "rays/ruby/exception.h"
+
+
+#include "defs.h"
+
+
+static Class cRaysError;
+static Class cOpenGLError;
+static Class cShaderError;
+
+void
+Init_exception ()
+{
+	Module mRays = rb_define_module("Rays");
+
+	cRaysError = rb_define_class_under(mRays, "RaysError", rb_eRuntimeError);
+	cOpenGLError = rb_define_class_under(mRays, "OpenGLError", cRaysError);
+	cShaderError = rb_define_class_under(mRays, "ShaderError", cOpenGLError);
+}
+
+
+namespace Rays
+{
+
+
+	Class
+	rays_error_class ()
+	{
+		return cRaysError;
+	}
+
+	Class
+	opengl_error_class ()
+	{
+		return cOpenGLError;
+	}
+
+	Class
+	shader_error_class ()
+	{
+		return cShaderError;
+	}
+
+
+}// Rays

data/.doc/ext/rays/native.cpp

@@ -2,6 +2,7 @@
 
 
 void Init_rays ();
+void Init_exception ();
 
 void Init_point ();
 void Init_bounds ();
@@ -34,6 +35,7 @@ extern "C" void
 	Rucy::init();
 
 	Init_rays();
+	Init_exception();
 
 	Init_point();
 	Init_bounds();

data/.doc/ext/rays/painter.cpp

@@ -479,7 +479,10 @@ VALUE set_shader(VALUE self)
 	CHECK;
 	check_arg_count(__FILE__, __LINE__, "Painter#set_shader", argc, 1);
 
-	THIS->set_shader(to<Rays::Shader>(argc, argv));
+	if (argc >= 1 && !argv[0])
+		THIS->no_shader();
+	else
+		THIS->set_shader(to<Rays::Shader>(argc, argv));
 	return self;
 }
 
@@ -487,7 +490,9 @@ static
 VALUE get_shader(VALUE self)
 {
 	CHECK;
-	return value(THIS->shader());
+
+	const Rays::Shader& shader = THIS->shader();
+	return shader ? value(shader) : nil();
 }
 
 static

data/.doc/ext/rays/shader.cpp

@@ -1,6 +1,7 @@
 #include "rays/ruby/shader.h"
 
 
+#include "rays/ruby/image.h"
 #include "defs.h"
 
 
@@ -17,12 +18,83 @@ VALUE alloc(VALUE klass)
 	return new_type<Rays::Shader>(klass);
 }
 
+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
-VALUE setup(VALUE self, VALUE source)
+VALUE setup(VALUE self, VALUE
+	fragment_shader_source, VALUE vertex_shader_source, VALUE
+	builtin_variable_names, VALUE 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);
 }
 
 static
@@ -31,9 +103,6 @@ VALUE set_uniform(VALUE self)
 	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())
 	{
@@ -46,6 +115,9 @@ VALUE set_uniform(VALUE self)
 		argv += 1;
 	}
 
+	#define Ai(n) (argv[n].as_i())
+	#define Af(n) ((float) argv[n].as_f())
+
 	if (argv[0].is_i())
 	{
 		switch (argc)
@@ -66,6 +138,8 @@ VALUE set_uniform(VALUE self)
 			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__);
 
@@ -75,6 +149,24 @@ VALUE set_uniform(VALUE self)
 	return self;
 }
 
+static
+VALUE get_vertex_shader_source(VALUE self)
+{
+	CHECK;
+
+	const char* source = THIS->vertex_shader_source();
+	return source ? value(source) : nil();
+}
+
+static
+VALUE get_fragment_shader_source(VALUE self)
+{
+	CHECK;
+
+	const char* source = THIS->fragment_shader_source();
+	return source ? value(source) : nil();
+}
+
 
 static Class cShader;
 
@@ -85,8 +177,10 @@ Init_shader ()
 
 	cShader = rb_define_class_under(mRays, "Shader", rb_cObject);
 	rb_define_alloc_func(cShader, alloc);
-	rb_define_private_method(cShader, "setup", RUBY_METHOD_FUNC(setup), 1);
+	rb_define_private_method(cShader, "setup", RUBY_METHOD_FUNC(setup), 4);
 	rb_define_private_method(cShader, "set_uniform", RUBY_METHOD_FUNC(set_uniform), -1);
+	rb_define_method(cShader, "vertex_shader_source", RUBY_METHOD_FUNC(get_vertex_shader_source), 0);
+	rb_define_method(cShader, "fragment_shader_source", RUBY_METHOD_FUNC(get_fragment_shader_source), 0);
 }
 
 

data/VERSION

@@ -1 +1 @@
-0.1.27
+0.1.29

data/ext/rays/defs.h

@@ -8,6 +8,7 @@
 #include <rucy.h>
 #include <rays/defs.h>
 #include <rays/point.h>
+#include <rays/ruby/defs.h>
 
 
 using namespace Rucy;

data/ext/rays/exception.cpp

@@ -0,0 +1,45 @@
+#include "rays/ruby/exception.h"
+
+
+#include "defs.h"
+
+
+static Class cRaysError;
+static Class cOpenGLError;
+static Class cShaderError;
+
+void
+Init_exception ()
+{
+	Module mRays = define_module("Rays");
+
+	cRaysError   = mRays.define_class("RaysError", rb_eRuntimeError);
+	cOpenGLError = mRays.define_class("OpenGLError", cRaysError);
+	cShaderError = mRays.define_class("ShaderError", cOpenGLError);
+}
+
+
+namespace Rays
+{
+
+
+	Class
+	rays_error_class ()
+	{
+		return cRaysError;
+	}
+
+	Class
+	opengl_error_class ()
+	{
+		return cOpenGLError;
+	}
+
+	Class
+	shader_error_class ()
+	{
+		return cShaderError;
+	}
+
+
+}// Rays

data/ext/rays/native.cpp

@@ -2,6 +2,7 @@
 
 
 void Init_rays ();
+void Init_exception ();
 
 void Init_point ();
 void Init_bounds ();
@@ -34,6 +35,7 @@ extern "C" void
 	Rucy::init();
 
 	Init_rays();
+	Init_exception();
 
 	Init_point();
 	Init_bounds();

data/ext/rays/painter.cpp

@@ -521,7 +521,10 @@ RUCY_DEFN(set_shader)
 	CHECK;
 	check_arg_count(__FILE__, __LINE__, "Painter#set_shader", argc, 1);
 
-	THIS->set_shader(to<Rays::Shader>(argc, argv));
+	if (argc >= 1 && !argv[0])
+		THIS->no_shader();
+	else
+		THIS->set_shader(to<Rays::Shader>(argc, argv));
 	return self;
 }
 RUCY_END
@@ -530,7 +533,9 @@ static
 RUCY_DEF0(get_shader)
 {
 	CHECK;
-	return value(THIS->shader());
+
+	const Rays::Shader& shader = THIS->shader();
+	return shader ? value(shader) : nil();
 }
 RUCY_END
 

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,6 +152,26 @@ 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;
 
@@ -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>