rays 0.1.28 → 0.1.29

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

@@ -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.29'
+  s.add_runtime_dependency 'rucy', '~> 0.1.29'
 
   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

data/src/opengl.cpp

@@ -8,10 +8,10 @@ namespace Rays
 {
 
 
-	GLenum
-	OpenGL_get_error ()
+	bool
+	OpenGL_has_error ()
 	{
-		return glGetError();
+		return glGetError() != GL_NO_ERROR;
 	}
 
 	static String
@@ -24,12 +24,12 @@ namespace Rays
 			case GL_INVALID_VALUE:     return "GL_INVALID_VALUE";
 			case GL_INVALID_OPERATION: return "GL_INVALID_OPERATION";
 			case GL_OUT_OF_MEMORY:     return "GL_OUT_OF_MEMORY";
-			#ifndef IOS
+			#if !defined(GL_VERSION_3_0)
 				case GL_STACK_OVERFLOW:  return "GL_STACK_OVERFLOW";
 				case GL_STACK_UNDERFLOW: return "GL_STACK_UNDERFLOW";
+				case GL_INVALID_FRAMEBUFFER_OPERATION: return "GL_INVALID_FRAMEBUFFER_OPERATION";
+				case GL_TABLE_TOO_LARGE: return "GL_TABLE_TOO_LARGE";
 			#endif
-			case 0x506:                return "GL_INVALID_FRAMEBUFFER_OPERATION";
-			case 0x8031:               return "GL_TABLE_TOO_LARGE";
 			default:                   return "UNKNOWN ERROR";
 		}
 	}
@@ -37,10 +37,24 @@ namespace Rays
 	void
 	OpenGL_check_error (const char* file, int line)
 	{
-		GLenum e = OpenGL_get_error();
+		GLenum e = glGetError();
 		if (e != GL_NO_ERROR)
 			opengl_error(file, line, "OpenGL error %s", get_error_name(e).c_str());
 	}
 
+	void
+	OpenGL_check_error (const char* file, int line, const char* format, ...)
+	{
+		XOT_STRINGF(format, s);
+
+		GLenum e = glGetError();
+		if (e != GL_NO_ERROR)
+		{
+			opengl_error(
+				file, line,
+				"OpenGL error %s: %s", get_error_name(e).c_str(), s.c_str());
+		}
+	}
+
 
 }// Rays

data/src/opengl.h

@@ -22,13 +22,15 @@ namespace Rays
 {
 
 
-	void OpenGL_set_context (Context context);
+	void    OpenGL_set_context (Context context);
 
 	Context OpenGL_get_context ();
 
-	GLenum OpenGL_get_error ();
+	bool    OpenGL_has_error ();
 
-	void OpenGL_check_error (const char* file, int line);
+	void    OpenGL_check_error (const char* file, int line);
+
+	void    OpenGL_check_error (const char* file, int line, const char* format, ...);
 
 
 }// Rays

data/src/osx/font.mm

@@ -104,8 +104,6 @@ namespace Rays
 
 		CGRect rect = CGRectMake(x, context_height - height - y, width, height);
 		CGContextClearRect(context, rect);
-		//CGContextSetRGBFillColor(context, 0, 0, 0, 1);
-		//CGContextFillRect(context, rect);
 		CGContextSetRGBFillColor(context, 1, 1, 1, 1);
 
 		CGContextSaveGState(context);

data/src/osx/opengl.mm

@@ -29,8 +29,23 @@ namespace Rays
 		static Context context = NULL;
 		if (!context)
 		{
-			NSOpenGLPixelFormat* pf  = [NSOpenGLView defaultPixelFormat];
-			context = [[NSOpenGLContext alloc] initWithFormat: pf shareContext: nil];
+			NSOpenGLPixelFormatAttribute attribs[] =
+			{
+				//NSOpenGLPFAOpenGLProfile, NSOpenGLProfileVersion3_2Core,
+				//NSOpenGLPFAAccelerated, NSOpenGLPFANoRecovery,
+				//NSOpenGLPFADoubleBuffer,
+				NSOpenGLPFAAllowOfflineRenderers,
+				NSOpenGLPFAColorSize, 32,
+				NSOpenGLPFADepthSize, 32,
+				//NSOpenGLPFAMultisample,
+				//NSOpenGLPFASampleBuffers, 1,
+				//NSOpenGLPFASamples, 4,
+				0
+			};
+			NSOpenGLPixelFormat* pf = [[[NSOpenGLPixelFormat alloc]
+				initWithAttributes: attribs] autorelease];
+			context = [[[NSOpenGLContext alloc]
+				initWithFormat: pf shareContext: nil] autorelease];
 		}
 		return context;
 	}