rays 0.1.12 → 0.1.17

data/include/rays/debug.h

@@ -0,0 +1,22 @@
+// -*- c++ -*-
+#pragma once
+#ifndef __RAYS_DEBUG_H__
+#define __RAYS_DEBUG_H__
+
+
+#include <xot/debug.h>
+
+
+namespace Rays
+{
+
+
+	using Xot::dout;
+
+	using Xot::doutln;
+
+
+}// Rays
+
+
+#endif//EOH

data/include/rays/defs.h

@@ -4,6 +4,9 @@
 #define __RAYS_DEFS_H__
 
 
+#define GLM_FORCE_CXX03
+
+
 #include <xot/defs.h>
 #include <xot/string.h>
 
@@ -20,6 +23,39 @@ namespace Rays
 	typedef float coord;
 
 
+	enum CapType
+	{
+
+		CAP_BUTT = 0,
+
+		CAP_ROUND,
+
+		CAP_SQUARE,
+
+		CAP_MAX,
+
+		CAP_DEFAULT = CAP_BUTT
+
+	};// CapType
+
+
+	enum JoinType
+	{
+
+		JOIN_MITER = 0,
+
+		JOIN_ROUND,
+
+		JOIN_SQUARE,
+
+		JOIN_MAX,
+
+		JOIN_DEFAULT             = JOIN_MITER,
+		JOIN_DEFAULT_MITER_LIMIT = 2
+
+	};// JoinType
+
+
 }// Rays
 
 

data/include/rays/exception.h

@@ -31,9 +31,13 @@ namespace Rays
 
 		using namespace Xot::ErrorFunctions;
 
-		void rays_error   (const char* file, int line, const char* format = NULL, ...);
+		[[noreturn]]
+		void rays_error (
+			const char* file, int line, const char* format = NULL, ...);
 
-		void opengl_error (const char* file, int line, const char* format = NULL, ...);
+		[[noreturn]]
+		void opengl_error (
+			const char* file, int line, const char* format = NULL, ...);
 
 	}// ErrorFunctions
 

data/include/rays/font.h

@@ -23,8 +23,6 @@ namespace Rays
 
 			~Font ();
 
-			Font copy () const;
-
 			String name () const;
 
 			coord size () const;
@@ -32,7 +30,9 @@ namespace Rays
 			coord get_width (const char* str) const;
 
 			coord get_height (
-				coord* ascent = NULL, coord* descent = NULL, coord* leading = NULL) const;
+				coord* ascent  = NULL,
+				coord* descent = NULL,
+				coord* leading = NULL) const;
 
 			operator bool () const;
 
@@ -40,7 +40,7 @@ namespace Rays
 
 			struct Data;
 
-			Xot::PImpl<Data, true> self;
+			Xot::PSharedImpl<Data> self;
 
 	};// Font
 

data/include/rays/image.h

@@ -15,8 +15,6 @@ namespace Rays
 
 	class Bitmap;
 
-	class Texture;
-
 
 	class Image
 	{
@@ -28,48 +26,44 @@ namespace Rays
 			Image ();
 
 			Image (
-				int width, int height, const ColorSpace& cs = RGBA,
-				bool alpha_only = false);
+				int width, int height, const ColorSpace& cs = DEFAULT_COLOR_SPACE,
+				float pixel_density = 1);
 
-			Image (const Bitmap& bitmap, bool alpha_only = false);
+			Image (const Bitmap& bitmap, float pixel_density = 1);
 
 			~Image ();
 
-			Image copy () const;
-
-			Painter painter ();
+			Image dup () const;
 
-			int width () const;
+			coord width () const;
 
-			int height () const;
+			coord height () const;
 
 			const ColorSpace& color_space () const;
 
-			bool alpha_only () const;
+			float pixel_density () const;
+
+			Painter painter ();
 
 			      Bitmap& bitmap ();
 
 			const Bitmap& bitmap () const;
 
-			      Texture& texture ();
-
-			const Texture& texture () const;
-
 			operator bool () const;
 
 			bool operator ! () const;
 
 			struct Data;
 
-			Xot::PImpl<Data, true> self;
+			Xot::PSharedImpl<Data> self;
 
 	};// Image
 
 
-	Image load_image (const char* path, bool alphatexture = false);
-
 	void save_image (const Image& image, const char* path);
 
+	Image load_image (const char* path);
+
 
 }// Rays
 

data/include/rays/matrix.h

@@ -5,6 +5,7 @@
 
 
 #include <rays/defs.h>
+#include <rays/point.h>
 
 
 namespace Rays
@@ -14,48 +15,73 @@ namespace Rays
 	struct Matrix
 	{
 
+		typedef Matrix This;
+
+		enum {NROW = 4, NCOLUMN = 4, NELEM = NROW * NCOLUMN};
+
 		union
 		{
 			struct
 			{
-				float
-					a1, a2, a3, a4,
-					b1, b2, b3, b4,
-					c1, c2, c3, c4,
-					d1, d2, d3, d4;
+				coord
+					x0, y0, z0, w0,
+					x1, y1, z1, w1,
+					x2, y2, z2, w2,
+					x3, y3, z3, w3;
 			};
-			float array[16];
+			Coord4 column[NCOLUMN];
+			coord array[NELEM];
 		};
 
-		Matrix (float value = 1);
+		Matrix (coord value = 1);
 
 		Matrix (
-			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);
+			coord x0, coord x1, coord x2, coord x3,
+			coord y0, coord y1, coord y2, coord y3,
+			coord z0, coord z1, coord z2, coord z3,
+			coord w0, coord w1, coord w2, coord w3);
+
+		Matrix (const coord* elements, size_t size);
+
+		This dup () const;
+
+		This& reset (coord value = 1);
+
+		This& reset (
+			coord x0, coord x1, coord x2, coord x3,
+			coord y0, coord y1, coord y2, coord y3,
+			coord z0, coord z1, coord z2, coord z3,
+			coord w0, coord w1, coord w2, coord w3);
+
+		This& reset (const coord* elements, size_t size);
+
+		This& translate (coord x, coord y, coord z = 0);
+
+		This& translate (const Coord3& translate);
+
+		This& scale (coord x, coord y, coord z = 1);
+
+		This& scale (const Coord3& scale);
+
+		This& rotate (float degree, coord x = 0, coord y = 0, coord z = 1);
 
-		Matrix (const float* elements, size_t size);
+		This& rotate (float degree, const Coord3& normalized_axis);
 
-		Matrix dup () const;
+		coord& at (int row, int column);
 
-		Matrix& reset (float value = 1);
+		coord  at (int row, int column) const;
 
-		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);
+		String inspect () const;
 
-		Matrix& reset (const float* elements, size_t size);
+		coord& operator [] (int index);
 
-		float& at (int row, int column);
+		coord  operator [] (int index) const;
 
-		float  at (int row, int column) const;
+		This& operator *= (const This&  rhs);
 
-		float& operator [] (int index);
+		Point operator *  (const Point& rhs) const;
 
-		float  operator [] (int index) const;
+		This  operator *  (const This&  rhs) const;
 
 	};// Matrix
 

data/include/rays/noise.h

@@ -0,0 +1,42 @@
+// -*- c++ -*-
+#pragma once
+#ifndef __RAYS_NOISE_H__
+#define __RAYS_NOISE_H__
+
+
+#include <rays/defs.h>
+
+
+namespace Rays
+{
+
+
+	struct Coord3;
+
+
+	coord perlin (coord x);
+
+	coord perlin (coord x, coord y);
+
+	coord perlin (coord x, coord y, coord z);
+
+	coord perlin (coord x, coord y, coord z, coord w);
+
+	coord perlin (const Coord3& position);
+
+
+	coord simplex (coord x);
+
+	coord simplex (coord x, coord y);
+
+	coord simplex (coord x, coord y, coord z);
+
+	coord simplex (coord x, coord y, coord z, coord w);
+
+	coord simplex (const Coord3& position);
+
+
+}// Rays
+
+
+#endif//EOH

data/include/rays/opengl.h

@@ -4,65 +4,17 @@
 #define __RAYS_OPENGL_H__
 
 
-#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 ();
+	typedef void* Context;
 
 
-	void init_offscreen_context ();
+	Context get_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                  glOrthof
-
-	#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

data/include/rays/painter.h

@@ -6,31 +6,21 @@
 
 #include <xot/pimpl.h>
 #include <rays/defs.h>
-#include <rays/opengl.h>
+#include <rays/point.h>
 
 
 namespace Rays
 {
 
 
-	struct Coord2;
-
-	struct Coord3;
-
-	struct Point;
-
 	struct Bounds;
-
 	struct Color;
-
 	struct Matrix;
 
-	class Font;
-
+	class Polyline;
+	class Polygon;
 	class Image;
-
-	class Texture;
-
+	class Font;
 	class Shader;
 
 
@@ -39,31 +29,33 @@ namespace Rays
 
 		public:
 
-			enum
-			{
-
-				ELLIPSE_NSEGMENT = 32
-
-			};
-
 			Painter ();
 
 			~Painter ();
 
-			void canvas (coord x, coord y, coord width, coord height);
+			void canvas (
+				coord x, coord y, coord width, coord height,
+				float pixel_density = 1);
 
-			void canvas (coord x, coord y, coord z, coord width, coord height, coord depth);
+			void canvas (
+				coord x, coord y, coord z, coord width, coord height, coord depth,
+				float pixel_density = 1);
 
-			void canvas (const Bounds& bounds);
+			void canvas (
+				const Bounds& bounds,
+				float pixel_density = 1);
 
-			void bind (const Texture& texture);
+			void bind (const Image& image);
 
 			void unbind ();
 
 			const Bounds& bounds () const;
 
+			float pixel_density () const;
+
+
 			//
-			// high level drawing methods
+			// drawing methods
 			//
 			void begin ();
 
@@ -71,17 +63,15 @@ namespace Rays
 
 			void clear ();
 
+			void polygon (const Polygon& polygon);
+
 			void line (coord x1, coord y1, coord x2, coord y2);
 
 			void line (const Point& p1, const Point& p2);
 
-			void lines   (const Coord2* points, size_t size);
-
-			void lines   (const Coord3* points, size_t size);
-
-			void polygon (const Coord2* points, size_t size);
+			void line (const Point* points, size_t size, bool loop = false);
 
-			void polygon (const Coord3* points, size_t size);
+			void line (const Polyline& polyline);
 
 			void rect (
 				coord x, coord y, coord width, coord height,
@@ -89,7 +79,8 @@ namespace Rays
 
 			void rect (
 				coord x, coord y, coord width, coord height,
-				coord round_width, coord round_height);
+				coord round_left_top,    coord round_right_top,
+				coord round_left_bottom, coord round_right_bottom);
 
 			void rect (
 				const Bounds& bounds,
@@ -97,34 +88,49 @@ namespace Rays
 
 			void rect (
 				const Bounds& bounds,
-				coord round_width, coord round_height);
+				coord round_left_top,    coord round_right_top,
+				coord round_left_bottom, coord round_right_bottom);
 
 			void ellipse (
 				coord x, coord y, coord width, coord height = 0,
-				coord radius_min = 0, uint nsegment = 0);
+				const Point& hole_size = 0,
+				float angle_from = 0, float angle_to = 360);
 
 			void ellipse (
 				const Bounds& bounds,
-				coord radius_min = 0, uint nsegment = 0);
+				const Point& hole_size = 0,
+				float angle_from = 0, float angle_to = 360);
 
 			void ellipse (
-				const Point& center, coord radius,
-				coord radius_min = 0, uint nsegment = 0);
+				const Point& center, const Point& radius,
+				const Point& hole_radius = 0,
+				float angle_from = 0, float angle_to = 360);
 
-			void arc (
-				coord x, coord y, coord width, coord height = 0,
-				float angle_from = 0, float angle_to = 360,
-				coord radius_min = 0, uint nsegment = 0);
+			void curve (
+				coord x1, coord y1, coord x2, coord y2,
+				coord x3, coord y3, coord x4, coord y4,
+				bool loop = false);
 
-			void arc (
-				const Bounds& bounds,
-				float angle_from = 0, float angle_to = 360,
-				coord radius_min = 0, uint nsegment = 0);
+			void curve (
+				const Point& p1, const Point& p2, const Point& p3, const Point& p4,
+				bool loop = false);
 
-			void arc (
-				const Point& center, coord radius,
-				float angle_from = 0, float angle_to = 360,
-				coord radius_min = 0, uint nsegment = 0);
+			void curve (
+				const Point* points, size_t size,
+				bool loop = false);
+
+			void bezier (
+				coord x1, coord y1, coord x2, coord y2,
+				coord x3, coord y3, coord x4, coord y4,
+				bool loop = false);
+
+			void bezier (
+				const Point& p1, const Point& p2, const Point& p3, const Point& p4,
+				bool loop = false);
+
+			void bezier (
+				const Point* points, size_t size,
+				bool loop = false);
 
 			void image (
 				const Image& image, coord x = 0, coord y = 0);
@@ -156,24 +162,17 @@ namespace Rays
 				const Image& image,
 				const Bounds& src_bounds, const Bounds& dest_bounds);
 
-			void text (
-				const char* str, coord x = 0, coord y = 0,
-				const Font* font = NULL);
+			void text (const char* str, coord x = 0, coord y = 0);
 
-			void text (
-				const char* str, const Point& position,
-				const Font* font = NULL);
+			void text (const char* str, const Point& position);
 
-			void text (
-				const char* str, coord x, coord y, coord width, coord height,
-				const Font* font = NULL);
+			void text (const char* str, coord x, coord y, coord width, coord height);
+
+			void text (const char* str, const Bounds& bounds);
 
-			void text (
-				const char* str, const Bounds& bounds,
-				const Font* font = NULL);
 
 			//
-			// attributes
+			// states
 			//
 			void     set_background (float red, float green, float blue, float alpha = 1, bool clear = true);
 
@@ -199,54 +198,50 @@ namespace Rays
 
 			const Color& stroke () const;
 
-			void      set_clip (coord x, coord y, coord width, coord height);
+			void set_stroke_width (coord width);
 
-			void      set_clip (const Bounds& bounds);
+			coord    stroke_width () const;
 
-			void       no_clip ();
+			void set_stroke_cap (CapType cap);
 
-			const Bounds& clip () const;
+			CapType  stroke_cap () const;
 
-			void    set_font (const char* name, coord size = 0);
+			void set_stroke_join (JoinType join);
 
-			void    set_font (const Font& font);
+			JoinType stroke_join () const;
 
-			const Font& font () const;
+			void set_miter_limit (coord limit);
 
-			void push_attr ();
+			coord    miter_limit () const;
 
-			void  pop_attr ();
+			void set_nsegment (int nsegment);
 
-			//
-			// shader manipulation methods
-			//
-			void attach (const Shader& shader);
+			uint     nsegment () const;
 
-			void detach (const Shader& shader);
+			void      set_clip (coord x, coord y, coord width, coord height);
 
-			void set_uniform (const char* name, int arg1);
+			void      set_clip (const Bounds& bounds);
 
-			void set_uniform (const char* name, int arg1, int arg2);
+			void       no_clip ();
 
-			void set_uniform (const char* name, int arg1, int arg2, int arg3);
+			const Bounds& clip () const;
 
-			void set_uniform (const char* name, int arg1, int arg2, int arg3, int arg4);
+			void    set_font (const char* name, coord size = 0);
 
-			void set_uniform (const char* name, const int* args, size_t size);
+			void    set_font (const Font& font);
 
-			void set_uniform (const char* name, float arg1);
+			const Font& font () const;
 
-			void set_uniform (const char* name, float arg1, float arg2);
+			void      set_shader (const Shader& shader);
 
-			void set_uniform (const char* name, float arg1, float arg2, float arg3);
+			void       no_shader ();
 
-			void set_uniform (const char* name, float arg1, float arg2, float arg3, float arg4);
+			const Shader& shader () const;
 
-			void set_uniform (const char* name, const float* args, size_t size);
+			void push_state ();
 
-			void push_shader ();
+			void  pop_state ();
 
-			void  pop_shader ();
 
 			//
 			// transformation methods
@@ -259,9 +254,9 @@ namespace Rays
 
 			void scale (const Point& value);
 
-			void rotate (float angle, coord x = 0, coord y = 0, coord z = 1);
+			void rotate (float degree, coord x = 0, coord y = 0, coord z = 1);
 
-			void rotate (float angle, const Point& axis);
+			void rotate (float degree, const Point& normalized_axis);
 
 			void set_matrix (float value = 1);
 
@@ -271,7 +266,7 @@ namespace Rays
 				float c1, float c2, float c3, float c4,
 				float d1, float d2, float d3, float d4);
 
-			void set_matrix (const float* elements);
+			void set_matrix (const float* elements, size_t size);
 
 			void set_matrix (const Matrix& matrix);
 
@@ -286,9 +281,10 @@ namespace Rays
 
 			bool operator ! () const;
 
+
 			struct Data;
 
-			Xot::PImpl<Data, true> self;
+			Xot::PSharedImpl<Data> self;
 
 	};// Painter