rays 0.1.6 → 0.1.7

data/include/rays/painter.h

@@ -6,7 +6,6 @@
 
 #include <xot/pimpl.h>
 #include <rays/defs.h>
-#include <rays/texture.h>
 #include <rays/opengl.h>
 
 
@@ -14,46 +13,22 @@ namespace Rays
 {
 
 
-	enum ShapeType
-	{
-
-		SHAPE_UNKNOWN  = Xot::UNKNOWN,
-
-		POINTS         = GL_POINTS,
-
-		LINES          = GL_LINES,
-
-		LINE_STRIP     = GL_LINE_STRIP,
-
-		LINE_LOOP      = GL_LINE_LOOP,
-
-		TRIANGLES      = GL_TRIANGLES,
-
-		TRIANGLE_STRIP = GL_TRIANGLE_STRIP,
-
-		TRIANGLE_FAN   = GL_TRIANGLE_FAN,
-
-		QUADS          = GL_QUADS,
+	struct Point;
 
-		QUAD_STRIP     = GL_QUAD_STRIP,
+	struct Bounds;
 
-		POLYGON        = GL_POLYGON,
+	struct Color;
 
-	};// ShapeType
-
-
-	class Point;
-
-	class Bounds;
-
-	class Color;
-
-	class Matrix;
+	struct Matrix;
 
 	class Font;
 
 	class Image;
 
+	class Texture;
+
+	class Shader;
+
 
 	class Painter
 	{
@@ -64,201 +39,216 @@ namespace Rays
 
 			~Painter ();
 
-			bool canvas (coord x, coord y, coord width, coord height);
+			void canvas (coord x, coord y, coord width, coord height);
+
+			void canvas (coord x, coord y, coord z, coord width, coord height, coord depth);
 
-			bool canvas (coord x, coord y, coord z, coord width, coord height, coord depth);
+			void canvas (const Bounds& bounds);
 
-			bool canvas (const Bounds& bounds);
+			void bind (const Texture& texture);
 
-			bool begin ();
+			void unbind ();
 
-			bool end ();
+			const Bounds& bounds () const;
 
 			//
 			// high level drawing methods
 			//
-			bool line (coord x1, coord y1, coord x2, coord y2);
+			void begin ();
+
+			void end ();
+
+			void clear ();
 
-			bool line (const Point& p1, const Point& p2);
+			void line (coord x1, coord y1, coord x2, coord y2);
 
-			bool rect (coord x, coord y, coord width, coord height);
+			void line (const Point& p1, const Point& p2);
 
-			bool rect (const Bounds& bounds);
+			void rect (coord x, coord y, coord width, coord height);
 
-			bool ellipse (
+			void rect (const Bounds& bounds);
+
+			void ellipse (
 				coord x, coord y, coord width, coord height = 0,
 				coord radius_min = 0, uint nsegment = 0);
 
-			bool ellipse (
+			void ellipse (
 				const Bounds& bounds,
 				coord radius_min = 0, uint nsegment = 0);
 
-			bool ellipse (
+			void ellipse (
 				const Point& center, coord radius,
 				coord radius_min = 0, uint nsegment = 0);
 
-			bool arc (
+			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);
 
-			bool arc (
+			void arc (
 				const Bounds& bounds,
 				float angle_from = 0, float angle_to = 360,
 				coord radius_min = 0, uint nsegment = 0);
 
-			bool arc (
+			void arc (
 				const Point& center, coord radius,
 				float angle_from = 0, float angle_to = 360,
 				coord radius_min = 0, uint nsegment = 0);
 
-			bool image (
+			void image (
 				const Image& image, coord x = 0, coord y = 0);
 
-			bool image (
+			void image (
 				const Image& image, const Point& position);
 
-			bool image (
+			void image (
 				const Image& image, coord x, coord y, coord width, coord height);
 
-			bool image (
+			void image (
 				const Image& image, const Bounds& bounds);
 
-			bool image (
+			void image (
 				const Image& image,
 				coord  src_x, coord  src_y, coord src_width, coord src_height,
 				coord dest_x, coord dest_y);
 
-			bool image (
+			void image (
 				const Image& image,
 				const Bounds& src_bounds, const Point& dest_position);
 
-			bool image (
+			void 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 (
+			void image (
 				const Image& image,
 				const Bounds& src_bounds, const Bounds& dest_bounds);
 
-			bool text (
+			void text (
 				const char* str, coord x = 0, coord y = 0,
 				const Font* font = NULL);
 
-			bool text (
+			void text (
 				const char* str, const Point& position,
 				const Font* font = NULL);
 
-			bool text (
+			void text (
 				const char* str, coord x, coord y, coord width, coord height,
 				const Font* font = NULL);
 
-			bool text (
+			void text (
 				const char* str, const Bounds& bounds,
 				const Font* font = NULL);
 
-			bool clear ();
-
-			bool set_background (float red, float green, float blue, float alpha = 1);
+			//
+			// attributes
+			//
+			void     set_background (float red, float green, float blue, float alpha = 1, bool clear = true);
 
-			bool set_background (const Color& color);
+			void     set_background (const Color& color, bool clear = true);
 
-			bool  no_background ();
+			void      no_background (bool clear = true);
 
 			const Color& background () const;
 
-			bool set_fill (float red, float green, float blue, float alpha = 1);
+			void     set_fill (float red, float green, float blue, float alpha = 1);
 
-			bool set_fill (const Color& color);
+			void     set_fill (const Color& color);
 
-			bool  no_fill ();
+			void      no_fill ();
 
 			const Color& fill () const;
 
-			bool set_stroke (float red, float green, float blue, float alpha = 1);
+			void     set_stroke (float red, float green, float blue, float alpha = 1);
 
-			bool set_stroke (const Color& color);
+			void     set_stroke (const Color& color);
 
-			bool  no_stroke ();
+			void      no_stroke ();
 
 			const Color& stroke () const;
 
-			bool set_clip (coord x, coord y, coord width, coord height);
+			void      set_clip (coord x, coord y, coord width, coord height);
 
-			bool set_clip (const Bounds& bounds);
+			void      set_clip (const Bounds& bounds);
 
-			bool  no_clip ();
+			void       no_clip ();
 
 			const Bounds& clip () const;
 
-			bool set_font (const Font& font);
+			void    set_font (const char* name, coord size = 0);
+
+			void    set_font (const Font& font);
 
 			const Font& font () const;
 
-			bool push_attrs ();
+			void push_attr ();
 
-			bool pop_attrs ();
+			void  pop_attr ();
 
 			//
-			// transformation methods
+			// shader manipulation methods
 			//
-			bool translate (coord x, coord y, coord z = 0);
+			void attach (const Shader& shader);
 
-			bool translate (const Point& value);
+			void detach (const Shader& shader);
 
-			bool scale (coord x, coord y, coord z = 1);
+			void set_uniform (const char* name, int arg1);
 
-			bool scale (const Point& value);
+			void set_uniform (const char* name, int arg1, int arg2);
 
-			bool rotate (float angle, coord x = 0, coord y = 0, coord z = 1);
+			void set_uniform (const char* name, int arg1, int arg2, int arg3);
 
-			bool rotate (float angle, const Point& center);
+			void set_uniform (const char* name, int arg1, int arg2, int arg3, int arg4);
 
-			bool set_matrix (float value = 1);
+			void set_uniform (const char* name, const int* args, size_t size);
 
-			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);
+			void set_uniform (const char* name, float arg1);
 
-			bool set_matrix (const float* elements);
+			void set_uniform (const char* name, float arg1, float arg2);
 
-			bool set_matrix (const Matrix& matrix);
+			void set_uniform (const char* name, float arg1, float arg2, float arg3);
 
-			const Matrix& matrix () const;
+			void set_uniform (const char* name, float arg1, float arg2, float arg3, float arg4);
+
+			void set_uniform (const char* name, const float* args, size_t size);
 
-			bool push_matrix ();
+			void push_shader ();
 
-			bool pop_matrix ();
+			void  pop_shader ();
 
 			//
-			// low level drawing methods
+			// transformation methods
 			//
-			bool begin_shape (ShapeType type);
+			void translate (coord x, coord y, coord z = 0);
 
-			bool end_shape ();
+			void translate (const Point& value);
 
-			bool set_color (float red, float green, float blue, float alpha = 1);
+			void scale (coord x, coord y, coord z = 1);
 
-			bool set_color (const Color& color);
+			void scale (const Point& value);
 
-			bool set_texture (const Texture& tex);
+			void rotate (float angle, coord x = 0, coord y = 0, coord z = 1);
 
-			bool  no_texture ();
+			void rotate (float angle, const Point& center);
 
-			bool add_vertex (coord x, coord y);
+			void set_matrix (float value = 1);
 
-			bool add_vertex (coord x, coord y, coord z);
+			void 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 add_vertex (const Point& position);
+			void set_matrix (const float* elements);
 
-			bool add_vertex (coord x, coord y,          coord tex_s, coord tex_t);
+			void set_matrix (const Matrix& matrix);
+
+			const Matrix& matrix () const;
 
-			bool add_vertex (coord x, coord y, coord z, coord tex_s, coord tex_t);
+			void push_matrix ();
 
-			bool add_vertex (const Point& position,     coord tex_s, coord tex_t);
+			void pop_matrix ();
 
 
 			operator bool () const;

data/include/rays/point.h

@@ -14,7 +14,11 @@ namespace Rays
 	struct Point
 	{
 
-		coord x, y, z;
+		union
+		{
+			struct {coord x, y, z;};
+			coord array[3];
+		};
 
 		Point (coord value = 0);
 
@@ -22,13 +26,49 @@ namespace Rays
 
 		Point dup () const;
 
-		Point& set (coord value = 0);
+		Point& reset (coord value = 0);
 
-		Point& set (coord x, coord y, coord z = 0);
+		Point& reset (coord x, coord y, coord z = 0);
 
-		      coord* array ();
+		Point& move_to (coord x, coord y, coord z = 0);
 
-		const coord* array () const;
+		Point& move_to (const Point& point);
+
+		Point& move_by (coord x, coord y, coord z = 0);
+
+		Point& move_by (const Point& point);
+
+		String inspect () const;
+
+		      coord& operator [] (size_t index);
+
+		const coord& operator [] (size_t index) const;
+
+		Point operator - () const;
+
+		Point& operator += (const Point& rhs);
+
+		Point& operator -= (const Point& rhs);
+
+		Point& operator *= (const Point& rhs);
+
+		Point& operator /= (const Point& rhs);
+
+		Point& operator /= (coord rhs);
+
+		friend bool operator == (const Point& lhs, const Point& rhs);
+
+		friend bool operator != (const Point& lhs, const Point& rhs);
+
+		friend Point operator + (const Point& lhs, const Point& rhs);
+
+		friend Point operator - (const Point& lhs, const Point& rhs);
+
+		friend Point operator * (const Point& lhs, const Point& rhs);
+
+		friend Point operator / (const Point& lhs, const Point& rhs);
+
+		friend Point operator / (const Point& lhs, coord        rhs);
 
 	};// Point
 

data/include/rays/rays.h

@@ -8,9 +8,9 @@ namespace Rays
 {
 
 
-	bool init ();
+	void init ();
 
-	bool fin ();
+	void fin ();
 
 
 }// Rays

data/include/rays/ruby/bitmap.h

@@ -6,6 +6,7 @@
 
 #include <rucy/rucy.h>
 #include <rucy/class.h>
+#include <rucy/extension.h>
 #include <rays/bitmap.h>
 
 
@@ -20,22 +21,7 @@ namespace Rays
 }// Rays
 
 
-namespace Rucy
-{
-
-
-	Value value (const Rays::Bitmap& obj);
-
-	Value value (const Rays::Bitmap* obj);
-
-	template <> inline Rays::Bitmap*
-	value_to<Rays::Bitmap*> (Value val, bool)
-	{
-		return get_type_ptr<Rays::Bitmap>(val, Rays::bitmap_class());
-	}
-
-
-}// Rucy
+RUCY_DECLARE_VALUE_FROM_TO(Rays::Bitmap)
 
 
 #endif//EOH

data/include/rays/ruby/bounds.h

@@ -6,7 +6,10 @@
 
 #include <rucy/rucy.h>
 #include <rucy/class.h>
+#include <rucy/extension.h>
+#include <rucy/exception.h>
 #include <rays/bounds.h>
+#include <rays/ruby/point.h>
 
 
 namespace Rays
@@ -20,22 +23,7 @@ namespace Rays
 }// Rays
 
 
-namespace Rucy
-{
-
-
-	Value value (const Rays::Bounds& obj);
-
-	Value value (const Rays::Bounds* obj);
-
-	template <> inline Rays::Bounds*
-	value_to<Rays::Bounds*> (Value val, bool)
-	{
-		return get_type_ptr<Rays::Bounds>(val, Rays::bounds_class());
-	}
-
-
-}// Rucy
+RUCY_DECLARE_VALUE_FROM_TO(Rays::Bounds)
 
 
 #endif//EOH

data/include/rays/ruby/color.h

@@ -6,6 +6,8 @@
 
 #include <rucy/rucy.h>
 #include <rucy/class.h>
+#include <rucy/extension.h>
+#include <rucy/exception.h>
 #include <rays/color.h>
 
 
@@ -20,22 +22,7 @@ namespace Rays
 }// Rays
 
 
-namespace Rucy
-{
-
-
-	Value value (const Rays::Color& obj);
-
-	Value value (const Rays::Color* obj);
-
-	template <> inline Rays::Color*
-	value_to<Rays::Color*> (Value val, bool)
-	{
-		return get_type_ptr<Rays::Color>(val, Rays::color_class());
-	}
-
-
-}// Rucy
+RUCY_DECLARE_VALUE_FROM_TO(Rays::Color)
 
 
 #endif//EOH

data/include/rays/ruby/color_space.h

@@ -0,0 +1,27 @@
+// -*- c++ -*-
+#pragma once
+#ifndef __RAYS_RUBY_COLOR_SPACE_H__
+#define __RAYS_RUBY_COLOR_SPACE_H__
+
+
+#include <rucy/rucy.h>
+#include <rucy/class.h>
+#include <rucy/extension.h>
+#include <rays/color_space.h>
+
+
+namespace Rays
+{
+
+
+	Rucy::Class color_space_class ();
+	// class Rays::ColorSpace
+
+
+}// Rays
+
+
+RUCY_DECLARE_VALUE_FROM_TO(Rays::ColorSpace)
+
+
+#endif//EOH

data/include/rays/ruby/font.h

@@ -6,6 +6,7 @@
 
 #include <rucy/rucy.h>
 #include <rucy/class.h>
+#include <rucy/extension.h>
 #include <rays/font.h>
 
 
@@ -20,22 +21,7 @@ namespace Rays
 }// Rays
 
 
-namespace Rucy
-{
-
-
-	Value value (const Rays::Font& obj);
-
-	Value value (const Rays::Font* obj);
-
-	template <> inline Rays::Font*
-	value_to<Rays::Font*> (Value val, bool)
-	{
-		return get_type_ptr<Rays::Font>(val, Rays::font_class());
-	}
-
-
-}// Rucy
+RUCY_DECLARE_VALUE_FROM_TO(Rays::Font)
 
 
 #endif//EOH

data/include/rays/ruby/image.h

@@ -6,6 +6,7 @@
 
 #include <rucy/rucy.h>
 #include <rucy/class.h>
+#include <rucy/extension.h>
 #include <rays/image.h>
 
 
@@ -20,22 +21,7 @@ namespace Rays
 }// Rays
 
 
-namespace Rucy
-{
-
-
-	Value value (const Rays::Image& obj);
-
-	Value value (const Rays::Image* obj);
-
-	template <> inline Rays::Image*
-	value_to<Rays::Image*> (Value val, bool)
-	{
-		return get_type_ptr<Rays::Image>(val, Rays::image_class());
-	}
-
-
-}// Rucy
+RUCY_DECLARE_VALUE_FROM_TO(Rays::Image)
 
 
 #endif//EOH

data/include/rays/ruby/matrix.h

@@ -6,6 +6,7 @@
 
 #include <rucy/rucy.h>
 #include <rucy/class.h>
+#include <rucy/extension.h>
 #include <rays/matrix.h>
 
 
@@ -20,22 +21,7 @@ namespace Rays
 }// Rays
 
 
-namespace Rucy
-{
-
-
-	Value value (const Rays::Matrix& obj);
-
-	Value value (const Rays::Matrix* obj);
-
-	template <> inline Rays::Matrix*
-	value_to<Rays::Matrix*> (Value val, bool)
-	{
-		return get_type_ptr<Rays::Matrix>(val, Rays::matrix_class());
-	}
-
-
-}// Rucy
+RUCY_DECLARE_VALUE_FROM_TO(Rays::Matrix)
 
 
 #endif//EOH

data/include/rays/ruby/painter.h

@@ -6,6 +6,7 @@
 
 #include <rucy/rucy.h>
 #include <rucy/class.h>
+#include <rucy/extension.h>
 #include <rays/painter.h>
 
 
@@ -20,22 +21,7 @@ namespace Rays
 }// Rays
 
 
-namespace Rucy
-{
-
-
-	Value value (const Rays::Painter& obj);
-
-	Value value (const Rays::Painter* obj);
-
-	template <> inline Rays::Painter*
-	value_to<Rays::Painter*> (Value val, bool)
-	{
-		return get_type_ptr<Rays::Painter>(val, Rays::painter_class());
-	}
-
-
-}// Rucy
+RUCY_DECLARE_VALUE_FROM_TO(Rays::Painter)
 
 
 #endif//EOH