rays 0.1.28 → 0.1.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 38052c848aef75871de813ae9cc59a956672b1c6b8db25b55916f041ae0df976
-  data.tar.gz: d1f462fce0b73364a015fa1826eef17c3d1a4ac0b4378590f20438d87ce8e1cf
+  metadata.gz: 88387a7d63567dd0f87d5c28708d1c666b7bd41df31ae34d676a9fcfeb4b19b5
+  data.tar.gz: 6a05891d8c4aee2b2ffbdc11fd9d6acc9dee8678f7e98180d399f6a64b04383b
 SHA512:
-  metadata.gz: 9e01828d4ac2ad4749a9d050d3890669be7e35dd057cc92b0dae23f645954b44bf7f3775d193ef36d9590d10879175a7937b28ceddf0bf9fd29a84723f0cfdbe
-  data.tar.gz: da8b670d9e704d4cc48070d5d252ec504e433f00222160a5c42ccf7a036eabc1a31580b6318da59672bc8576b0dddf84fce635ce9194f4a462eebfc8d4e03451
+  metadata.gz: 14ec81d1d115983f66e39432af1f98d29efe759bf891412fb67e85b09801c89fa6702e4970fd56fcb29cc1d2dfacbeb7d5edc8fb43aaa17accf964bca2b4df30
+  data.tar.gz: 4d07ba7e7280e7aba01eed8b483978e750a6bfc5201a345e062977cf379c10f12ca1d75b38ef00677bc0bd0798245050cc14c5f0aa33e70fd93dcca5aa58d920

data/.doc/ext/rays/bitmap.cpp

@@ -94,7 +94,7 @@ VALUE get_at(VALUE self, VALUE x, VALUE y)
 static Class cBitmap;
 
 void
-Init_bitmap ()
+Init_rays_bitmap ()
 {
 	Module mRays = rb_define_module("Rays");
 

data/.doc/ext/rays/bounds.cpp

@@ -522,7 +522,7 @@ VALUE invalid(VALUE self)
 static Class cBounds;
 
 void
-Init_bounds ()
+Init_rays_bounds ()
 {
 	Module mRays = rb_define_module("Rays");
 

data/.doc/ext/rays/camera.cpp

@@ -134,7 +134,7 @@ VALUE device_names(VALUE self)
 static Class cCamera;
 
 void
-Init_camera ()
+Init_rays_camera ()
 {
 	Module mRays = rb_define_module("Rays");
 

data/.doc/ext/rays/color.cpp

@@ -182,7 +182,7 @@ VALUE set_palette_color(VALUE self)
 static Class cColor;
 
 void
-Init_color ()
+Init_rays_color ()
 {
 	Module mRays = rb_define_module("Rays");
 

data/.doc/ext/rays/color_space.cpp

@@ -177,7 +177,7 @@ VALUE to_s(VALUE self)
 static Class cColorSpace;
 
 void
-Init_color_space ()
+Init_rays_color_space ()
 {
 	Module mRays = rb_define_module("Rays");
 

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_rays_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/font.cpp

@@ -86,7 +86,7 @@ VALUE leading(VALUE self)
 static Class cFont;
 
 void
-Init_font ()
+Init_rays_font ()
 {
 	Module mRays = rb_define_module("Rays");
 

data/.doc/ext/rays/image.cpp

@@ -123,7 +123,7 @@ VALUE load(VALUE self)
 static Class cImage;
 
 void
-Init_image ()
+Init_rays_image ()
 {
 	Module mRays = rb_define_module("Rays");
 

data/.doc/ext/rays/matrix.cpp

@@ -193,7 +193,7 @@ VALUE s_rotate(VALUE self)
 static Class cMatrix;
 
 void
-Init_matrix ()
+Init_rays_matrix ()
 {
 	Module mRays = rb_define_module("Rays");
 

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

@@ -2,24 +2,25 @@
 
 
 void Init_rays ();
+void Init_rays_exception ();
 
-void Init_point ();
-void Init_bounds ();
-void Init_color ();
-void Init_color_space ();
-void Init_matrix ();
+void Init_rays_point ();
+void Init_rays_bounds ();
+void Init_rays_color ();
+void Init_rays_color_space ();
+void Init_rays_matrix ();
 
-void Init_painter ();
-void Init_polyline ();
-void Init_polygon_line ();
-void Init_polygon ();
-void Init_bitmap ();
-void Init_image ();
-void Init_font ();
-void Init_shader ();
-void Init_camera ();
+void Init_rays_painter ();
+void Init_rays_polyline ();
+void Init_rays_polygon_line ();
+void Init_rays_polygon ();
+void Init_rays_bitmap ();
+void Init_rays_image ();
+void Init_rays_font ();
+void Init_rays_shader ();
+void Init_rays_camera ();
 
-void Init_noise ();
+void Init_rays_noise ();
 
 
 extern "C" void
@@ -34,24 +35,25 @@ extern "C" void
 	Rucy::init();
 
 	Init_rays();
-
-	Init_point();
-	Init_bounds();
-	Init_color();
-	Init_color_space();
-	Init_matrix();
-
-	Init_painter();
-	Init_polyline();
-	Init_polygon_line();
-	Init_polygon();
-	Init_bitmap();
-	Init_image();
-	Init_font();
-	Init_shader();
-	Init_camera();
-
-	Init_noise();
+	Init_rays_exception();
+
+	Init_rays_point();
+	Init_rays_bounds();
+	Init_rays_color();
+	Init_rays_color_space();
+	Init_rays_matrix();
+
+	Init_rays_painter();
+	Init_rays_polyline();
+	Init_rays_polygon_line();
+	Init_rays_polygon();
+	Init_rays_bitmap();
+	Init_rays_image();
+	Init_rays_font();
+	Init_rays_shader();
+	Init_rays_camera();
+
+	Init_rays_noise();
 
 	RUCY_CATCH
 }

data/.doc/ext/rays/noise.cpp

@@ -45,7 +45,7 @@ VALUE simplex(VALUE self)
 
 
 void
-Init_noise ()
+Init_rays_noise ()
 {
 	Module mRays = rb_define_module("Rays");
 	rb_define_singleton_method(mRays, "perlin", RUBY_METHOD_FUNC(perlin), -1);

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

@@ -602,7 +602,7 @@ VALUE pop_matrix(VALUE self)
 static Class cPainter;
 
 void
-Init_painter ()
+Init_rays_painter ()
 {
 	Module mRays = rb_define_module("Rays");
 

data/.doc/ext/rays/point.cpp

@@ -247,7 +247,7 @@ VALUE cross(VALUE self, VALUE p1, VALUE p2)
 static Class cPoint;
 
 void
-Init_point ()
+Init_rays_point ()
 {
 	Module mRays = rb_define_module("Rays");
 

data/.doc/ext/rays/polygon.cpp

@@ -233,7 +233,7 @@ VALUE create_bezier(VALUE self, VALUE args, VALUE loop)
 static Class cPolygon;
 
 void
-Init_polygon ()
+Init_rays_polygon ()
 {
 	Module mRays = rb_define_module("Rays");
 

data/.doc/ext/rays/polygon_line.cpp

@@ -39,7 +39,7 @@ VALUE hole(VALUE self)
 static Class cPolygonLine;
 
 void
-Init_polygon_line ()
+Init_rays_polygon_line ()
 {
 	Module mRays = rb_define_module("Rays");
 	Class cPolygon = rb_define_class_under(mRays, "Polygon", rb_cObject);

data/.doc/ext/rays/polyline.cpp

@@ -105,7 +105,7 @@ VALUE each(VALUE self)
 static Class cPolyline;
 
 void
-Init_polyline ()
+Init_rays_polyline ()
 {
 	Module mRays = rb_define_module("Rays");
 

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,18 +149,38 @@ 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;
 
 void
-Init_shader ()
+Init_rays_shader ()
 {
 	Module mRays = rb_define_module("Rays");
 
 	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.28
+0.1.30

data/ext/rays/bitmap.cpp

@@ -102,7 +102,7 @@ RUCY_END
 static Class cBitmap;
 
 void
-Init_bitmap ()
+Init_rays_bitmap ()
 {
 	Module mRays = define_module("Rays");
 

data/ext/rays/bounds.cpp

@@ -569,7 +569,7 @@ RUCY_END
 static Class cBounds;
 
 void
-Init_bounds ()
+Init_rays_bounds ()
 {
 	Module mRays = define_module("Rays");
 

data/ext/rays/camera.cpp

@@ -149,7 +149,7 @@ RUCY_END
 static Class cCamera;
 
 void
-Init_camera ()
+Init_rays_camera ()
 {
 	Module mRays = define_module("Rays");
 

data/ext/rays/color.cpp

@@ -195,7 +195,7 @@ RUCY_END
 static Class cColor;
 
 void
-Init_color ()
+Init_rays_color ()
 {
 	Module mRays = define_module("Rays");
 

data/ext/rays/color_space.cpp

@@ -190,7 +190,7 @@ RUCY_END
 static Class cColorSpace;
 
 void
-Init_color_space ()
+Init_rays_color_space ()
 {
 	Module mRays = define_module("Rays");
 

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_rays_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/extconf.rb

@@ -2,7 +2,7 @@
 
 
 %w[../xot ../rucy .]
-  .map  {|s| File.expand_path "../../../#{s}/lib", __FILE__}
+  .map  {|s| File.expand_path "../../#{s}/lib", __dir__}
   .each {|s| $:.unshift s if !$:.include?(s) && File.directory?(s)}
 
 require 'mkmf'

data/ext/rays/font.cpp

@@ -95,7 +95,7 @@ RUCY_END
 static Class cFont;
 
 void
-Init_font ()
+Init_rays_font ()
 {
 	Module mRays = define_module("Rays");
 

data/ext/rays/image.cpp

@@ -134,7 +134,7 @@ RUCY_END
 static Class cImage;
 
 void
-Init_image ()
+Init_rays_image ()
 {
 	Module mRays = define_module("Rays");
 

data/ext/rays/matrix.cpp

@@ -209,7 +209,7 @@ RUCY_END
 static Class cMatrix;
 
 void
-Init_matrix ()
+Init_rays_matrix ()
 {
 	Module mRays = define_module("Rays");
 

data/ext/rays/native.cpp

@@ -2,24 +2,25 @@
 
 
 void Init_rays ();
+void Init_rays_exception ();
 
-void Init_point ();
-void Init_bounds ();
-void Init_color ();
-void Init_color_space ();
-void Init_matrix ();
+void Init_rays_point ();
+void Init_rays_bounds ();
+void Init_rays_color ();
+void Init_rays_color_space ();
+void Init_rays_matrix ();
 
-void Init_painter ();
-void Init_polyline ();
-void Init_polygon_line ();
-void Init_polygon ();
-void Init_bitmap ();
-void Init_image ();
-void Init_font ();
-void Init_shader ();
-void Init_camera ();
+void Init_rays_painter ();
+void Init_rays_polyline ();
+void Init_rays_polygon_line ();
+void Init_rays_polygon ();
+void Init_rays_bitmap ();
+void Init_rays_image ();
+void Init_rays_font ();
+void Init_rays_shader ();
+void Init_rays_camera ();
 
-void Init_noise ();
+void Init_rays_noise ();
 
 
 extern "C" void
@@ -34,24 +35,25 @@ extern "C" void
 	Rucy::init();
 
 	Init_rays();
-
-	Init_point();
-	Init_bounds();
-	Init_color();
-	Init_color_space();
-	Init_matrix();
-
-	Init_painter();
-	Init_polyline();
-	Init_polygon_line();
-	Init_polygon();
-	Init_bitmap();
-	Init_image();
-	Init_font();
-	Init_shader();
-	Init_camera();
-
-	Init_noise();
+	Init_rays_exception();
+
+	Init_rays_point();
+	Init_rays_bounds();
+	Init_rays_color();
+	Init_rays_color_space();
+	Init_rays_matrix();
+
+	Init_rays_painter();
+	Init_rays_polyline();
+	Init_rays_polygon_line();
+	Init_rays_polygon();
+	Init_rays_bitmap();
+	Init_rays_image();
+	Init_rays_font();
+	Init_rays_shader();
+	Init_rays_camera();
+
+	Init_rays_noise();
 
 	RUCY_CATCH
 }