rays 0.1.6 → 0.1.7

data/include/rays/bitmap.h

@@ -6,7 +6,7 @@
 
 #include <xot/pimpl.h>
 #include <rays/defs.h>
-#include <rays/colorspace.h>
+#include <rays/color_space.h>
 #include <rays/font.h>
 
 
@@ -14,6 +14,9 @@ namespace Rays
 {
 
 
+	class Texture;
+
+
 	class Bitmap
 	{
 
@@ -23,10 +26,16 @@ namespace Rays
 
 			Bitmap ();
 
-			Bitmap (int width, int height, const ColorSpace& cs = RGBA);
+			Bitmap (
+				int width, int height, const ColorSpace& cs = RGBA,
+				const void* pixels = NULL);
+
+			Bitmap (const Texture& texture);
 
 			~Bitmap ();
 
+			Bitmap copy () const;
+
 			int width () const;
 
 			int height () const;
@@ -37,17 +46,13 @@ namespace Rays
 
 			size_t size () const;
 
-			bool dirty () const;
-
-			void set_dirty (bool b = true);
-
-			      void* data ();
+			      void* pixels ();
 
-			const void* data () const;
+			const void* pixels () const;
 
 			template <typename T>       T* at (int x, int y)
 			{
-				return (T*) (((char*) data()) + pitch() * y + x * color_space().Bpp());
+				return (T*) (((char*) pixels()) + pitch() * y + x * color_space().Bpp());
 			}
 
 			template <typename T> const T* at (int x, int y) const
@@ -55,6 +60,10 @@ namespace Rays
 				return const_cast<This*>(this)->at<T>(x, y);
 			}
 
+			bool     dirty () const;
+
+			void set_dirty (bool b = true);
+
 			operator bool () const;
 
 			bool operator ! () const;
@@ -66,12 +75,12 @@ namespace Rays
 	};// Bitmap
 
 
-	bool load_bitmap (Bitmap* bitmap, const char* path);
+	Bitmap load_bitmap (const char* path);
 
-	bool save_bitmap (const Bitmap& bitmap, const char* path);
+	void save_bitmap (const Bitmap& bitmap, const char* path);
 
 
-	bool draw_string (
+	void draw_string (
 		Bitmap* bitmap, const char* str,
 		coord x = 0, coord y = 0, const Font& font = default_font());
 

data/include/rays/bounds.h

@@ -17,7 +17,19 @@ namespace Rays
 
 		typedef Bounds This;
 
-		coord x, y, z, width, height, depth;
+		union
+		{
+			struct
+			{
+				coord x, y, z;
+				union
+				{
+					struct {coord width, height, depth;};
+					struct {coord w,     h,      d;};
+				};
+			};
+			coord array[6];
+		};
 
 		Bounds (coord size = 0);
 
@@ -27,19 +39,49 @@ namespace Rays
 
 		Bounds (coord x, coord y, coord z, coord width, coord height, coord depth);
 
+		Bounds (const Point& size);
+
+		Bounds (const Point& position, const Point& size);
+
 		Bounds dup () const;
 
-		Bounds& set (coord size = 0);
+		bool is_intersect (const Bounds& other, int dimension = 2) const;
+
+		bool is_include (coord x, coord y, coord z = 0, int dimension = 2) const;
+
+		bool is_include (const Point& p, int dimension = 2) const;
+
+		Bounds& reset (coord size = 0);
+
+		Bounds& reset (                           coord width, coord height, coord depth = 0);
+
+		Bounds& reset (coord x, coord y,          coord width, coord height);
+
+		Bounds& reset (coord x, coord y, coord z, coord width, coord height, coord depth);
+
+		Bounds& reset (const Point& size);
+
+		Bounds& reset (const Point& position, const Point& size);
+
+		Bounds& move_to (coord x, coord y, coord z = 0);
+
+		Bounds& move_to (const Point& point);
 
-		Bounds& set (                           coord width, coord height, coord depth = 0);
+		Bounds& move_by (coord x, coord y, coord z = 0);
 
-		Bounds& set (coord x, coord y,          coord width, coord height);
+		Bounds& move_by (const Point& point);
 
-		Bounds& set (coord x, coord y, coord z, coord width, coord height, coord depth);
+		Bounds& resize_to (coord x, coord y, coord z = 0);
 
-		bool get (coord* x, coord* y, coord* width, coord* height) const;
+		Bounds& resize_to (const Point& point);
 
-		bool get (coord* x, coord* y, coord* z, coord* width, coord* height, coord* depth) const;
+		Bounds& resize_by (coord x, coord y, coord z = 0);
+
+		Bounds& resize_by (const Point& point);
+
+		Bounds& inset_by (coord x, coord y, coord z = 0);
+
+		Bounds& inset_by (const Point& point);
 
 		void set_left (coord left);
 
@@ -65,6 +107,12 @@ namespace Rays
 
 		coord    front () const;
 
+		void set_center (coord x, coord y, coord z = 0);
+
+		void set_center (const Point& point);
+
+		Point    center () const;
+
 		      Point& position ();
 
 		const Point& position () const;
@@ -73,18 +121,28 @@ namespace Rays
 
 		const Point& size () const;
 
-		      coord* array ();
+		String inspect () const;
 
-		const coord* array () const;
+		      Point& operator [] (size_t index);
+
+		const Point& operator [] (size_t index) const;
 
 		operator bool () const;
 
 		bool operator ! () const;
 
+		Bounds& operator &= (const Bounds& rhs);
+
+		Bounds& operator |= (const Bounds& rhs);
+
 		friend bool operator == (const Bounds& lhs, const Bounds& rhs);
 
 		friend bool operator != (const Bounds& lhs, const Bounds& rhs);
 
+		friend Bounds operator & (const Bounds& lhs, const Bounds& rhs);
+
+		friend Bounds operator | (const Bounds& lhs, const Bounds& rhs);
+
 	};// Bounds
 
 

data/include/rays/color.h

@@ -13,28 +13,39 @@ namespace Rays
 {
 
 
+	class ColorSpace;
+
+
 	struct Color
 	{
 
 		typedef Color This;
 
-		float red, green, blue, alpha;
+		union
+		{
+			struct {float red, green, blue, alpha;};
+			float array[4];
+		};
 
-		Color (float value = 0,                    float alpha = 1);
+		Color (float gray = 0,                     float alpha = 1);
 
 		Color (float red, float green, float blue, float alpha = 1);
 
+		Color (void* pixel, const ColorSpace& cs);
+
 		Color dup () const;
 
-		Color& set (float value = 0,                    float alpha = 1);
+		Color& reset (float gray = 0,                     float alpha = 1);
+
+		Color& reset (float red, float green, float blue, float alpha = 1);
 
-		Color& set (float red, float green, float blue, float alpha = 1);
+		Color& reset8 (uchar gray = 0,                     uchar alpha = 255);
 
-		bool   get (float* red, float* green, float* blue, float* alpha = NULL) const;
+		Color& reset8 (uchar red, uchar green, uchar blue, uchar alpha = 255);
 
-		      float* array ();
+		Color& reset (const void* pixel, const ColorSpace& cs);
 
-		const float* array () const;
+		void     get (      void* pixel, const ColorSpace& cs) const;
 
 		operator bool () const;
 
@@ -47,6 +58,11 @@ namespace Rays
 	};// Color
 
 
+	Color Color8 (uchar gray = 0,                     uchar alpha = 255);
+
+	Color Color8 (uchar red, uchar green, uchar blue, uchar alpha = 255);
+
+
 }// Rays
 
 

data/include/rays/{colorspace.h → color_space.h}

@@ -1,10 +1,11 @@
 // -*- c++ -*-
 #pragma once
-#ifndef __RAYS_COLORSPACE_H__
-#define __RAYS_COLORSPACE_H__
+#ifndef __RAYS_COLOR_SPACE_H__
+#define __RAYS_COLOR_SPACE_H__
 
 
 #include <rays/defs.h>
+#include <rays/opengl.h>
 
 
 namespace Rays
@@ -46,7 +47,7 @@ namespace Rays
 
 			ColorSpace ();
 
-			ColorSpace (ColorSpaceType type, bool premultiplied = false);
+			ColorSpace (ColorSpaceType type, bool premultiplied = true);
 
 			ColorSpaceType type () const;
 
@@ -82,6 +83,8 @@ namespace Rays
 
 			bool is_premult () const;
 
+			void get_gl_enums (GLenum* format, GLenum* type, bool alpha_only) const;
+
 			operator bool () const;
 
 			bool operator ! () const;

data/include/rays/exception.h

@@ -4,7 +4,7 @@
 #define __RAYS_EXCEPTION_H__
 
 
-#include <stdexcept>
+#include <xot/exception.h>
 #include <rays/defs.h>
 
 
@@ -12,27 +12,33 @@ namespace Rays
 {
 
 
-	class RaysException : public std::runtime_error
+	class RaysError : public Xot::XotError
 	{
+		typedef Xot::XotError Super;
+		public: RaysError (const char* str = NULL);
+	};
 
-		typedef std::runtime_error Super;
 
-		public:
+	class OpenGLError : public RaysError
+	{
+		typedef RaysError Super;
+		public: OpenGLError (const char* str = NULL);
+	};
 
-			RaysException (const char* format = NULL, ...);
 
-			~RaysException () throw();
+	namespace ErrorFunctions
+	{
 
-			const char* what () const throw();
+		using namespace Xot::ErrorFunctions;
 
-		private:
+		void rays_error   (const char* file, int line, const char* format = NULL, ...);
 
-			String text;
+		void opengl_error (const char* file, int line, const char* format = NULL, ...);
 
-	};// RaysException
+	}// ErrorFunctions
 
 
-	void rays_error (const char* format = NULL, ...);
+	using namespace ErrorFunctions;
 
 
 }// Rays

data/include/rays/font.h

@@ -23,14 +23,15 @@ namespace Rays
 
 			~Font ();
 
+			Font copy () const;
+
 			String name () const;
 
 			coord size () const;
 
-			bool get_width (coord* width, const char* str) const;
+			coord get_width (const char* str) const;
 
-			bool get_height (
-				coord* height,
+			coord get_height (
 				coord* ascent = NULL, coord* descent = NULL, coord* leading = NULL) const;
 
 			operator bool () const;

data/include/rays/image.h

@@ -5,7 +5,8 @@
 
 
 #include <xot/pimpl.h>
-#include <rays/colorspace.h>
+#include <rays/color_space.h>
+#include <rays/painter.h>
 
 
 namespace Rays
@@ -28,19 +29,23 @@ namespace Rays
 
 			Image (
 				int width, int height, const ColorSpace& cs = RGBA,
-				bool alphatexture = false);
+				bool alpha_only = false);
 
-			Image (const Bitmap& bitmap, bool alphatexture = false);
+			Image (const Bitmap& bitmap, bool alpha_only = false);
 
 			~Image ();
 
+			Image copy () const;
+
+			Painter painter ();
+
 			int width () const;
 
 			int height () const;
 
 			const ColorSpace& color_space () const;
 
-			bool alpha_texture () const;
+			bool alpha_only () const;
 
 			      Bitmap& bitmap ();
 
@@ -61,9 +66,9 @@ namespace Rays
 	};// Image
 
 
-	bool load_image (Image* image, const char* path, bool alphatexture = false);
+	Image load_image (const char* path, bool alphatexture = false);
 
-	bool save_image (const Image& image, const char* path);
+	void save_image (const Image& image, const char* path);
 
 
 }// Rays

data/include/rays/matrix.h

@@ -14,11 +14,18 @@ namespace Rays
 	struct Matrix
 	{
 
-		float
-			a1, a2, a3, a4,
-			b1, b2, b3, b4,
-			c1, c2, c3, c4,
-			d1, d2, d3, d4;
+		union
+		{
+			struct
+			{
+				float
+					a1, a2, a3, a4,
+					b1, b2, b3, b4,
+					c1, c2, c3, c4,
+					d1, d2, d3, d4;
+			};
+			float array[16];
+		};
 
 		Matrix (float value = 1);
 
@@ -32,24 +39,20 @@ namespace Rays
 
 		Matrix dup () const;
 
-		Matrix& set (float value = 1);
+		Matrix& reset (float value = 1);
 
-		Matrix& set (
+		Matrix& reset (
 			float a1, float a2, float a3, float a4,
 			float b1, float b2, float b3, float b4,
 			float c1, float c2, float c3, float c4,
 			float d1, float d2, float d3, float d4);
 
-		Matrix& set (const float* elements, size_t size);
+		Matrix& reset (const float* elements, size_t size);
 
 		float& at (int row, int column);
 
 		float  at (int row, int column) const;
 
-		      float* array ();
-
-		const float* array () const;
-
 		float& operator [] (int index);
 
 		float  operator [] (int index) const;

data/include/rays/opengl.h

@@ -4,12 +4,65 @@
 #define __RAYS_GL_H__
 
 
-#if defined(COCOA)
+#if defined(OSX)
 	#include <OpenGL/gl.h>
+	#include <OpenGL/glext.h>
+#elif defined(IOS)
+	#include <OpenGLES/ES1/gl.h>
+	#include <OpenGLES/ES1/glext.h>
 #elif defined(WIN32)
 	#include <GL/gl.h>
 	#include <GL/glext.h>
 #endif
 
 
+namespace Rays
+{
+
+
+	GLenum get_error ();
+
+	bool no_error ();
+
+	bool is_error (GLenum err);
+
+	void check_error(const char* file, int line);
+
+	void clear_error ();
+
+
+	void init_offscreen_context ();
+
+
+}// Rays
+
+
+#ifdef IOS
+
+	#define glGenFramebuffers        glGenFramebuffersOES
+	#define glGenRenderbuffers       glGenRenderbuffersOES
+	#define glDeleteFramebuffers     glDeleteFramebuffersOES
+	#define glDeleteRenderbuffers    glDeleteRenderbuffersOES
+	#define glBindFramebuffer        glBindFramebufferOES
+	#define glBindRenderbuffer       glBindRenderbufferOES
+	#define glCheckFramebufferStatus glCheckFramebufferStatusOES
+	#define glFramebufferTexture2D   glFramebufferTexture2DOES
+	#define glRenderbufferStorage    glRenderbufferStorageOES
+	#define glOrtho                  glOrthox
+
+	#define GL_UNSIGNED_INT             GL_UNSIGNED_INT_OES
+	#define GL_FRAMEBUFFER              GL_FRAMEBUFFER_OES
+	#define GL_RENDERBUFFER             GL_RENDERBUFFER_OES
+	#define GL_DRAW_FRAMEBUFFER         GL_DRAW_FRAMEBUFFER_APPLE
+	#define GL_READ_FRAMEBUFFER         GL_READ_FRAMEBUFFER_APPLE
+	#define GL_DRAW_FRAMEBUFFER_BINDING GL_DRAW_FRAMEBUFFER_BINDING_APPLE
+	#define GL_READ_FRAMEBUFFER_BINDING GL_READ_FRAMEBUFFER_BINDING_APPLE
+	#define GL_COLOR_ATTACHMENT0        GL_COLOR_ATTACHMENT0_OES
+	#define GL_DEPTH_ATTACHMENT         GL_DEPTH_ATTACHMENT_OES
+	#define GL_DEPTH_COMPONENT24        GL_DEPTH_COMPONENT24_OES
+	#define GL_FRAMEBUFFER_COMPLETE     GL_FRAMEBUFFER_COMPLETE_OES
+
+#endif// IOS
+
+
 #endif//EOH