rays 0.1.12 → 0.1.13

data/include/rays/bitmap.h

@@ -14,9 +14,6 @@ namespace Rays
 {
 
 
-	class Texture;
-
-
 	class Bitmap
 	{
 
@@ -30,11 +27,9 @@ namespace Rays
 				int width, int height, const ColorSpace& cs = RGBA,
 				const void* pixels = NULL);
 
-			Bitmap (const Texture& texture);
-
 			~Bitmap ();
 
-			Bitmap copy () const;
+			Bitmap dup () const;
 
 			int width () const;
 
@@ -50,19 +45,9 @@ namespace Rays
 
 			const void* pixels () const;
 
-			template <typename T>       T* at (int x, int y)
-			{
-				return (T*) (((char*) pixels()) + pitch() * y + x * color_space().Bpp());
-			}
-
-			template <typename T> const T* at (int x, int y) const
-			{
-				return const_cast<This*>(this)->at<T>(x, y);
-			}
-
-			bool     dirty () const;
+			template <typename T>       T* at (int x, int y);
 
-			void set_dirty (bool b = true);
+			template <typename T> const T* at (int x, int y) const;
 
 			operator bool () const;
 
@@ -70,19 +55,22 @@ namespace Rays
 
 			struct Data;
 
-			Xot::PImpl<Data, true> self;
+			Xot::PSharedImpl<Data> self;
 
 	};// Bitmap
 
 
-	Bitmap load_bitmap (const char* path);
-
-	void save_bitmap (const Bitmap& bitmap, const char* path);
-
+	template <typename T> T*
+	Bitmap::at (int x, int y)
+	{
+		return (T*) (((char*) pixels()) + pitch() * y + x * color_space().Bpp());
+	}
 
-	void draw_string (
-		Bitmap* bitmap, const char* str,
-		coord x = 0, coord y = 0, const Font& font = default_font());
+	template <typename T> const T*
+	Bitmap::at (int x, int y) const
+	{
+		return const_cast<This*>(this)->at<T>(x, y);
+	}
 
 
 }// Rays

data/include/rays/bounds.h

@@ -107,20 +107,28 @@ namespace Rays
 
 		coord    front () const;
 
-		void set_center (coord x, coord y, coord z = 0);
-
-		void set_center (const Point& point);
+		void set_position (coord x, coord y, coord z = 0);
 
-		Point    center () const;
+		void set_position (const Point& position);
 
 		      Point& position ();
 
 		const Point& position () const;
 
+		void set_size (coord width, coord height, coord depth = 0);
+
+		void set_size (const Point& size);
+
 		      Point& size ();
 
 		const Point& size () const;
 
+		void set_center (coord x, coord y, coord z = 0);
+
+		void set_center (const Point& center);
+
+		Point    center () const;
+
 		String inspect () const;
 
 		      Point& operator [] (size_t index);
@@ -135,6 +143,8 @@ namespace Rays
 
 		Bounds& operator |= (const Bounds& rhs);
 
+		Bounds& operator |= (const Point& rhs);
+
 		friend bool operator == (const Bounds& lhs, const Bounds& rhs);
 
 		friend bool operator != (const Bounds& lhs, const Bounds& rhs);
@@ -143,9 +153,16 @@ namespace Rays
 
 		friend Bounds operator | (const Bounds& lhs, const Bounds& rhs);
 
+		friend Bounds operator | (const Bounds& lhs, const Point&  rhs);
+
+		friend Bounds operator | (const Point&  lhs, const Bounds& rhs);
+
 	};// Bounds
 
 
+	Bounds invalid_bounds ();
+
+
 }// Rays
 
 

data/include/rays/color.h

@@ -6,7 +6,7 @@
 
 #include <xot/util.h>
 #include <rays/defs.h>
-#include <rays/point.h>
+#include <rays/coord.h>
 
 
 namespace Rays
@@ -16,17 +16,12 @@ namespace Rays
 	class ColorSpace;
 
 
-	struct Color
+	struct Color : public Coord4
 	{
 
 		typedef Color This;
 
-		union
-		{
-			struct {float red, green, blue, alpha;};
-			struct {float r,   g,     b,    a;};
-			float array[4];
-		};
+		typedef Coord4 Super;
 
 		Color (float gray = 0,                     float alpha = 1);
 
@@ -40,9 +35,9 @@ namespace Rays
 
 		Color& reset (float red, float green, float blue, float alpha = 1);
 
-		Color& reset8 (uchar gray = 0,                     uchar alpha = 255);
+		Color& reset8 (int gray = 0,                 int alpha = 255);
 
-		Color& reset8 (uchar red, uchar green, uchar blue, uchar alpha = 255);
+		Color& reset8 (int red, int green, int blue, int alpha = 255);
 
 		Color& reset (const void* pixel, const ColorSpace& cs);
 
@@ -52,16 +47,32 @@ namespace Rays
 
 		bool operator ! () const;
 
-		static uchar float2uchar (float value) {return (uchar) Xot::clip(0.f, 255.f, value * 255);}
+		friend bool operator == (const This& lhs, const This& rhs);
+
+		friend bool operator != (const This& lhs, const This& rhs);
+
+		static uchar float2uchar (float value)
+		{
+			return (uchar) Xot::clip(0.f, 255.f, value * 255);
+		}
 
-		static float uchar2float (uchar value) {return value / 255.f;}
+		static float uchar2float (int value)
+		{
+			return value / 255.f;
+		}
 
 	};// Color
 
 
-	Color Color8 (uchar gray = 0,                     uchar alpha = 255);
+	Color gray  (float gray, float alpha = 1);
+
+	Color gray8 (int   gray, int   alpha = 255);
+
+	Color rgb  (float red, float green, float blue, float alpha = 1);
+
+	Color rgb8 (int   red, int   green, int   blue, int   alpha = 255);
 
-	Color Color8 (uchar red, uchar green, uchar blue, uchar alpha = 255);
+	Color hsv (float hue, float saturation, float value, float alpha = 1);
 
 
 }// Rays

data/include/rays/color_space.h

@@ -5,7 +5,6 @@
 
 
 #include <rays/defs.h>
-#include <rays/opengl.h>
 
 
 namespace Rays
@@ -17,7 +16,9 @@ namespace Rays
 
 		COLORSPACE_UNKNOWN = Xot::UNKNOWN,
 
-		GRAY_8, GRAY_16, GRAY_24, GRAY_32, GRAY_float,
+		 GRAY_8,  GRAY_16,  GRAY_24,  GRAY_32,  GRAY_float,
+
+		ALPHA_8, ALPHA_16, ALPHA_24, ALPHA_32, ALPHA_float,
 
 		RGB_888, RGBA_8888, RGBX_8888, ARGB_8888, XRGB_8888,
 
@@ -29,13 +30,15 @@ namespace Rays
 
 		COLORSPACE_LAST,
 
-		GRAY = GRAY_8,
+		GRAY  =  GRAY_8,
+
+		ALPHA = ALPHA_8,
 
-		RGB  = RGB_888,   BGR  = BGR_888,
+		RGB   =  RGB_888,  BGR  =  BGR_888,
 
-		RGBA = RGBA_8888, RGBX = RGBX_8888, ARGB = ARGB_8888, XRGB = XRGB_8888,
+		RGBA  = RGBA_8888, RGBX = RGBX_8888, ARGB = ARGB_8888, XRGB = XRGB_8888,
 
-		BGRA = BGRA_8888, BGRX = BGRX_8888, ABGR = ABGR_8888, XBGR = XBGR_8888,
+		BGRA  = BGRA_8888, BGRX = BGRX_8888, ABGR = ABGR_8888, XBGR = XBGR_8888,
 
 	};// ColorSpaceType
 
@@ -63,6 +66,8 @@ namespace Rays
 
 			bool is_gray () const;
 
+			bool is_alpha () const;
+
 			bool is_rgb () const;
 
 			bool is_bgr () const;
@@ -83,8 +88,6 @@ 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/coord.h

@@ -0,0 +1,114 @@
+// -*- c++ -*-
+#pragma once
+#ifndef __RAYS_COORD_H__
+#define __RAYS_COORD_H__
+
+
+#include <rays/defs.h>
+
+
+namespace Rays
+{
+
+
+	struct Coord2
+	{
+
+		typedef Coord2 This;
+
+		enum {SIZE = 2};
+
+		union
+		{
+			struct {coord x, y;};
+			struct {coord s, t;};
+			coord array[SIZE];
+		};
+
+		Coord2& reset (coord value = 0);
+
+		Coord2& reset (coord x, coord y);
+
+		size_t size () const;
+
+		String inspect () const;
+
+		      coord& operator [] (size_t index);
+
+		const coord& operator [] (size_t index) const;
+
+	};// Coord2
+
+
+	struct Coord3
+	{
+
+		typedef Coord3 This;
+
+		enum {SIZE = 3};
+
+		union
+		{
+			struct {coord x,   y,     z;};
+			struct {coord s,   t,     p;};
+			struct {coord r,   g,     b;};
+			struct {coord red, green, blue;};
+			coord array[SIZE];
+		};
+
+		This& operator = (const Coord2& rhs);
+
+		Coord3& reset (coord value = 0);
+
+		Coord3& reset (coord x, coord y, coord z = 0);
+
+		size_t size () const;
+
+		String inspect () const;
+
+		      coord& operator [] (size_t index);
+
+		const coord& operator [] (size_t index) const;
+
+	};// Coord3
+
+
+	struct Coord4
+	{
+
+		typedef Coord4 This;
+
+		enum {SIZE = 4};
+
+		union
+		{
+			struct {coord x,   y,     z,    w;};
+			struct {coord s,   t,     p,    q;};
+			struct {coord r,   g,     b,    a;};
+			struct {coord red, green, blue, alpha;};
+			coord array[SIZE];
+		};
+
+		This& operator = (const Coord2& rhs);
+
+		This& operator = (const Coord3& rhs);
+
+		Coord4& reset (coord value = 0);
+
+		Coord4& reset (coord x, coord y, coord z = 0, coord w = 1);
+
+		size_t size () const;
+
+		String inspect () const;
+
+		      coord& operator [] (size_t index);
+
+		const coord& operator [] (size_t index) const;
+
+	};// Coord4
+
+
+}// Rays
+
+
+#endif//EOH

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>
 

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
 	{
@@ -29,47 +27,43 @@ namespace Rays
 
 			Image (
 				int width, int height, const ColorSpace& cs = RGBA,
-				bool alpha_only = false);
+				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