rays 0.1.3 → 0.1.4

data/include/rays/color.h

@@ -0,0 +1,53 @@
+// -*- c++ -*-
+#pragma once
+#ifndef __RAYS_COLOR_H__
+#define __RAYS_COLOR_H__
+
+
+#include <xot/util.h>
+#include <rays/defs.h>
+#include <rays/point.h>
+
+
+namespace Rays
+{
+
+
+	struct Color
+	{
+
+		typedef Color This;
+
+		float red, green, blue, alpha;
+
+		Color (float value = 0,                    float alpha = 1);
+
+		Color (float red, float green, float blue, float alpha = 1);
+
+		Color dup () const;
+
+		Color& set (float value = 0,                    float alpha = 1);
+
+		Color& set (float red, float green, float blue, float alpha = 1);
+
+		bool   get (float* red, float* green, float* blue, float* alpha = NULL) const;
+
+		      float* array ();
+
+		const float* array () const;
+
+		operator bool () const;
+
+		bool operator ! () const;
+
+		static uchar float2uchar (float value) {return (uchar) Xot::clip(0.f, 255.f, value * 255);}
+
+		static float uchar2float (uchar value) {return value / 255.f;}
+
+	};// Color
+
+
+}// Rays
+
+
+#endif//EOH

data/include/rays/colorspace.h

@@ -1,7 +1,7 @@
 // -*- c++ -*-
 #pragma once
-#ifndef __RAYS_COLOR_H__
-#define __RAYS_COLOR_H__
+#ifndef __RAYS_COLORSPACE_H__
+#define __RAYS_COLORSPACE_H__
 
 
 #include <rays/defs.h>

data/include/rays/exception.h

@@ -32,7 +32,7 @@ namespace Rays
 	};// RaysException
 
 
-	void error (const char* format = NULL, ...);
+	void rays_error (const char* format = NULL, ...);
 
 
 }// Rays

data/include/rays/font.h

@@ -4,8 +4,8 @@
 #define __RAYS_FONT_H__
 
 
+#include <xot/pimpl.h>
 #include <rays/defs.h>
-#include <rays/helpers.h>
 
 
 namespace Rays
@@ -27,7 +27,11 @@ namespace Rays
 
 			coord size () const;
 
-			bool get_extent (coord* width, coord* height, const char* str) const;
+			bool get_width (coord* width, const char* str) const;
+
+			bool get_height (
+				coord* height,
+				coord* ascent = NULL, coord* descent = NULL, coord* leading = NULL) const;
 
 			operator bool () const;
 
@@ -35,7 +39,7 @@ namespace Rays
 
 			struct Data;
 
-			Impl<Data> self;
+			Xot::PImpl<Data, true> self;
 
 	};// Font
 

data/include/rays/image.h

@@ -4,8 +4,8 @@
 #define __RAYS_IMAGE_H__
 
 
+#include <xot/pimpl.h>
 #include <rays/colorspace.h>
-#include <rays/helpers.h>
 
 
 namespace Rays
@@ -20,6 +20,8 @@ namespace Rays
 	class Image
 	{
 
+		typedef Image This;
+
 		public:
 
 			Image ();
@@ -54,13 +56,15 @@ namespace Rays
 
 			struct Data;
 
-			Impl<Data> self;
+			Xot::PImpl<Data, true> self;
 
 	};// Image
 
 
 	bool load_image (Image* image, const char* path, bool alphatexture = false);
 
+	bool save_image (const Image& image, const char* path);
+
 
 }// Rays
 

data/include/rays/matrix.h

@@ -0,0 +1,63 @@
+// -*- c++ -*-
+#pragma once
+#ifndef __RAYS_MATRIX_H__
+#define __RAYS_MATRIX_H__
+
+
+#include <rays/defs.h>
+
+
+namespace Rays
+{
+
+
+	struct Matrix
+	{
+
+		float
+			a1, a2, a3, a4,
+			b1, b2, b3, b4,
+			c1, c2, c3, c4,
+			d1, d2, d3, d4;
+
+		Matrix (float 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);
+
+		Matrix (const float* elements, size_t size);
+
+		Matrix dup () const;
+
+		Matrix& set (float value = 1);
+
+		Matrix& set (
+			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);
+
+		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;
+
+	};// Matrix
+
+
+}// Rays
+
+
+#endif//EOH

data/include/rays/opengl.h

@@ -5,7 +5,7 @@
 
 
 #if defined(COCOA)
-	#include <OpenGL/OpenGL.h>
+	#include <OpenGL/gl.h>
 #elif defined(WIN32)
 	#include <GL/gl.h>
 	#include <GL/glext.h>

data/include/rays/painter.h

@@ -4,10 +4,10 @@
 #define __RAYS_PAINTER_H__
 
 
+#include <xot/pimpl.h>
 #include <rays/defs.h>
+#include <rays/texture.h>
 #include <rays/opengl.h>
-#include <rays/font.h>
-#include <rays/helpers.h>
 
 
 namespace Rays
@@ -42,7 +42,15 @@ namespace Rays
 	};// ShapeType
 
 
-	class Texture;
+	class Point;
+
+	class Bounds;
+
+	class Color;
+
+	class Matrix;
+
+	class Font;
 
 	class Image;
 
@@ -58,88 +66,172 @@ namespace Rays
 
 			bool canvas (coord x, coord y, coord width, coord height);
 
-			bool begin ();
+			bool canvas (coord x, coord y, coord z, coord width, coord height, coord depth);
 
-			bool end ();
+			bool canvas (const Bounds& bounds);
 
-			bool push_matrix ();
+			bool begin ();
 
-			bool pop_matrix ();
+			bool end ();
 
 			//
 			// high level drawing methods
 			//
 			bool line (coord x1, coord y1, coord x2, coord y2);
 
+			bool line (const Point& p1, const Point& p2);
+
 			bool rect (coord x, coord y, coord width, coord height);
 
+			bool rect (const Bounds& bounds);
+
+			bool ellipse (
+				coord x, coord y, coord width, coord height = 0,
+				coord radius_min = 0, uint nsegment = 0);
+
+			bool ellipse (
+				const Bounds& bounds,
+				coord radius_min = 0, uint nsegment = 0);
+
 			bool ellipse (
-				coord x, coord y, coord width, coord height = 0, coord radius_min = 0,
-				uint nsegment = 0);
+				const Point& center, coord radius,
+				coord radius_min = 0, uint nsegment = 0);
 
 			bool 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);
+				float angle_from = 0, float angle_to = 360,
+				coord radius_min = 0, uint nsegment = 0);
+
+			bool arc (
+				const Bounds& bounds,
+				float angle_from = 0, float angle_to = 360,
+				coord radius_min = 0, uint nsegment = 0);
+
+			bool arc (
+				const Point& center, coord radius,
+				float angle_from = 0, float angle_to = 360,
+				coord radius_min = 0, uint nsegment = 0);
 
 			bool image (
 				const Image& image, coord x = 0, coord y = 0);
 
+			bool image (
+				const Image& image, const Point& position);
+
 			bool image (
 				const Image& image, coord x, coord y, coord width, coord height);
 
+			bool image (
+				const Image& image, const Bounds& bounds);
+
 			bool image (
 				const Image& image,
 				coord  src_x, coord  src_y, coord src_width, coord src_height,
 				coord dest_x, coord dest_y);
 
+			bool image (
+				const Image& image,
+				const Bounds& src_bounds, const Point& dest_position);
+
 			bool image (
 				const Image& image,
 				coord  src_x, coord  src_y, coord  src_width, coord  src_height,
 				coord dest_x, coord dest_y, coord dest_width, coord dest_height);
 
+			bool image (
+				const Image& image,
+				const Bounds& src_bounds, const Bounds& dest_bounds);
+
 			bool text (
 				const char* str, coord x = 0, coord y = 0,
-				const Font& font = default_font());
+				const Font* font = NULL);
+
+			bool text (
+				const char* str, const Point& position,
+				const Font* font = NULL);
 
 			bool text (
 				const char* str, coord x, coord y, coord width, coord height,
-				const Font& font = default_font());
+				const Font* font = NULL);
+
+			bool text (
+				const char* str, const Bounds& bounds,
+				const Font* font = NULL);
 
 			bool clear ();
 
-			bool get_clear (
-				float* red, float* green = NULL, float* blue = NULL,
-				float* alpha = NULL);
+			bool set_background (float red, float green, float blue, float alpha = 1);
 
-			bool set_clear (
-				float red, float green, float blue, float alpha = 1);
+			bool set_background (const Color& color);
 
-			bool no_clear ();
+			bool  no_background ();
 
-			bool get_fill (
-				float* red, float* green = NULL, float* blue  = NULL,
-				float* alpha = NULL);
+			const Color& background () const;
 
 			bool set_fill (float red, float green, float blue, float alpha = 1);
 
-			bool no_fill ();
+			bool set_fill (const Color& color);
+
+			bool  no_fill ();
 
-			bool get_stroke (
-				float* red, float* green = NULL, float* blue  = NULL,
-				float* alpha = NULL);
+			const Color& fill () const;
 
 			bool set_stroke (float red, float green, float blue, float alpha = 1);
 
-			bool no_stroke ();
+			bool set_stroke (const Color& color);
 
-			bool get_clip (
-				coord* x,            coord* y      = NULL,
-				coord* width = NULL, coord* height = NULL);
+			bool  no_stroke ();
+
+			const Color& stroke () const;
 
 			bool set_clip (coord x, coord y, coord width, coord height);
 
-			bool no_clip ();
+			bool set_clip (const Bounds& bounds);
+
+			bool  no_clip ();
+
+			const Bounds& clip () const;
+
+			bool set_font (const Font& font);
+
+			const Font& font () const;
+
+			bool push_attrs ();
+
+			bool pop_attrs ();
+
+			//
+			// transformation methods
+			//
+			bool translate (coord x, coord y, coord z = 0);
+
+			bool translate (const Point& value);
+
+			bool scale (coord x, coord y, coord z = 1);
+
+			bool scale (const Point& value);
+
+			bool rotate (float angle, coord x = 0, coord y = 0, coord z = 1);
+
+			bool rotate (float angle, const Point& center);
+
+			bool set_matrix (float value = 1);
+
+			bool set_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);
+
+			bool set_matrix (const float* elements);
+
+			bool set_matrix (const Matrix& matrix);
+
+			const Matrix& matrix () const;
+
+			bool push_matrix ();
+
+			bool pop_matrix ();
 
 			//
 			// low level drawing methods
@@ -148,19 +240,26 @@ namespace Rays
 
 			bool end_shape ();
 
-			bool color (float red, float green, float blue, float alpha = 1);
+			bool set_color (float red, float green, float blue, float alpha = 1);
+
+			bool set_color (const Color& color);
+
+			bool set_texture (const Texture& tex);
+
+			bool  no_texture ();
+
+			bool add_vertex (coord x, coord y);
 
-			bool texture (const Texture& tex);
+			bool add_vertex (coord x, coord y, coord z);
 
-			bool no_texture ();
+			bool add_vertex (const Point& position);
 
-			bool vertex (coord x, coord y);
+			bool add_vertex (coord x, coord y,          coord tex_s, coord tex_t);
 
-			bool vertex (coord x, coord y, coord z);
+			bool add_vertex (coord x, coord y, coord z, coord tex_s, coord tex_t);
 
-			bool vertex (coord x, coord y, coord texture_s, coord texture_t);
+			bool add_vertex (const Point& position,     coord tex_s, coord tex_t);
 
-			bool vertex (coord x, coord y, coord z, coord texture_s, coord texture_t);
 
 			operator bool () const;
 
@@ -168,7 +267,7 @@ namespace Rays
 
 			struct Data;
 
-			Impl<Data> self;
+			Xot::PImpl<Data, true> self;
 
 	};// Painter