rays 0.1.7 → 0.1.8

data/ext/rays/point.cpp

@@ -10,13 +10,11 @@ using namespace Rucy;
 using Rays::coord;
 
 
-static Class cPoint;
-
-RUCY_DEFINE_VALUE_FROM_TO(Rays::Point, cPoint)
+RUCY_DEFINE_VALUE_FROM_TO(Rays::Point)
 
 #define THIS  to<Rays::Point*>(self)
 
-#define CHECK RUCY_CHECK_OBJ(Rays::Point, cPoint, self)
+#define CHECK RUCY_CHECK_OBJ(Rays::Point, self)
 
 
 static
@@ -229,6 +227,9 @@ RUCY_DEF0(inspect)
 }
 RUCY_END
 
+
+static Class cPoint;
+
 void
 Init_point ()
 {

data/ext/rays/rays.cpp

@@ -7,9 +7,6 @@
 using namespace Rucy;
 
 
-static Module mRays;
-
-
 static
 RUCY_DEF0(init)
 {
@@ -35,6 +32,8 @@ RUCY_DEF0(init_offscreen_context)
 RUCY_END
 
 
+static Module mRays;
+
 void
 Init_rays ()
 {

data/ext/rays/shader.cpp

@@ -8,13 +8,11 @@
 using namespace Rucy;
 
 
-static Class cShader;
-
-RUCY_DEFINE_VALUE_FROM_TO(Rays::Shader, cShader)
+RUCY_DEFINE_VALUE_FROM_TO(Rays::Shader)
 
 #define THIS  to<Rays::Shader*>(self)
 
-#define CHECK RUCY_CHECK_OBJECT(Rays::Shader, cShader, self)
+#define CHECK RUCY_CHECK_OBJECT(Rays::Shader, self)
 
 
 static
@@ -27,7 +25,7 @@ RUCY_END
 static
 RUCY_DEF1(initialize, source)
 {
-	RUCY_CHECK_OBJ(Rays::Shader, cShader, self);
+	RUCY_CHECK_OBJ(Rays::Shader, self);
 
 	if (!source.is_s())
 		argument_error(__FILE__, __LINE__);
@@ -38,6 +36,8 @@ RUCY_DEF1(initialize, source)
 RUCY_END
 
 
+static Class cShader;
+
 void
 Init_shader ()
 {

data/ext/rays/texture.cpp

@@ -12,13 +12,11 @@ using namespace Rucy;
 using Rays::coord;
 
 
-static Class cTexture;
-
-RUCY_DEFINE_VALUE_FROM_TO(Rays::Texture, cTexture)
+RUCY_DEFINE_VALUE_FROM_TO(Rays::Texture)
 
 #define THIS  to<Rays::Texture*>(self)
 
-#define CHECK RUCY_CHECK_OBJECT(Rays::Texture, cTexture, self)
+#define CHECK RUCY_CHECK_OBJECT(Rays::Texture, self)
 
 
 static
@@ -31,7 +29,7 @@ RUCY_END
 static
 RUCY_DEF4(setup, width, height, color_space, alpha_only)
 {
-	RUCY_CHECK_OBJ(Rays::Texture, cTexture, self);
+	RUCY_CHECK_OBJ(Rays::Texture, self);
 
 	Rays::ColorSpace* cs = to<Rays::ColorSpace*>(color_space);
 	if (!cs) argument_error(__FILE__, __LINE__);
@@ -115,6 +113,8 @@ RUCY_DEF0(to_bitmap)
 RUCY_END
 
 
+static Class cTexture;
+
 void
 Init_texture ()
 {

data/include/rays/opengl.h

@@ -48,7 +48,7 @@ namespace Rays
 	#define glCheckFramebufferStatus glCheckFramebufferStatusOES
 	#define glFramebufferTexture2D   glFramebufferTexture2DOES
 	#define glRenderbufferStorage    glRenderbufferStorageOES
-	#define glOrtho                  glOrthox
+	#define glOrtho                  glOrthof
 
 	#define GL_UNSIGNED_INT             GL_UNSIGNED_INT_OES
 	#define GL_FRAMEBUFFER              GL_FRAMEBUFFER_OES

data/include/rays/painter.h

@@ -13,6 +13,10 @@ namespace Rays
 {
 
 
+	struct Coord2;
+
+	struct Coord3;
+
 	struct Point;
 
 	struct Bounds;
@@ -64,6 +68,14 @@ namespace Rays
 
 			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 polygon (const Coord3* points, size_t size);
+
 			void rect (coord x, coord y, coord width, coord height);
 
 			void rect (const Bounds& bounds);

data/include/rays/point.h

@@ -11,7 +11,27 @@ namespace Rays
 {
 
 
-	struct Point
+	struct Coord2
+	{
+
+		union
+		{
+			struct {coord x, y;};
+			coord array[2];
+		};
+
+		Coord2& reset (coord value = 0);
+
+		Coord2& reset (coord x, coord y);
+
+		      coord& operator [] (size_t index);
+
+		const coord& operator [] (size_t index) const;
+
+	};// Coord2
+
+
+	struct Coord3
 	{
 
 		union
@@ -20,16 +40,26 @@ namespace Rays
 			coord array[3];
 		};
 
+		Coord3& reset (coord value = 0);
+
+		Coord3& reset (coord x, coord y, coord z = 0);
+
+		      coord& operator [] (size_t index);
+
+		const coord& operator [] (size_t index) const;
+
+	};// Coord3
+
+
+	struct Point : public Coord3
+	{
+
 		Point (coord value = 0);
 
 		Point (coord x, coord y, coord z = 0);
 
 		Point dup () const;
 
-		Point& reset (coord value = 0);
-
-		Point& reset (coord x, coord y, coord z = 0);
-
 		Point& move_to (coord x, coord y, coord z = 0);
 
 		Point& move_to (const Point& point);
@@ -40,10 +70,6 @@ namespace Rays
 
 		String inspect () const;
 
-		      coord& operator [] (size_t index);
-
-		const coord& operator [] (size_t index) const;
-
 		Point operator - () const;
 
 		Point& operator += (const Point& rhs);

data/include/rays/ruby/bitmap.h

@@ -24,4 +24,18 @@ namespace Rays
 RUCY_DECLARE_VALUE_FROM_TO(Rays::Bitmap)
 
 
+namespace Rucy
+{
+
+
+	template <> inline Class
+	get_ruby_class<Rays::Bitmap> ()
+	{
+		return Rays::bitmap_class();
+	}
+
+
+}// Rucy
+
+
 #endif//EOH

data/include/rays/ruby/bounds.h

@@ -26,4 +26,18 @@ namespace Rays
 RUCY_DECLARE_VALUE_FROM_TO(Rays::Bounds)
 
 
+namespace Rucy
+{
+
+
+	template <> inline Class
+	get_ruby_class<Rays::Bounds> ()
+	{
+		return Rays::bounds_class();
+	}
+
+
+}// Rucy
+
+
 #endif//EOH

data/include/rays/ruby/color.h

@@ -25,4 +25,18 @@ namespace Rays
 RUCY_DECLARE_VALUE_FROM_TO(Rays::Color)
 
 
+namespace Rucy
+{
+
+
+	template <> inline Class
+	get_ruby_class<Rays::Color> ()
+	{
+		return Rays::color_class();
+	}
+
+
+}// Rucy
+
+
 #endif//EOH

data/include/rays/ruby/color_space.h

@@ -24,4 +24,18 @@ namespace Rays
 RUCY_DECLARE_VALUE_FROM_TO(Rays::ColorSpace)
 
 
+namespace Rucy
+{
+
+
+	template <> inline Class
+	get_ruby_class<Rays::ColorSpace> ()
+	{
+		return Rays::color_space_class();
+	}
+
+
+}// Rucy
+
+
 #endif//EOH

data/include/rays/ruby/font.h

@@ -24,4 +24,18 @@ namespace Rays
 RUCY_DECLARE_VALUE_FROM_TO(Rays::Font)
 
 
+namespace Rucy
+{
+
+
+	template <> inline Class
+	get_ruby_class<Rays::Font> ()
+	{
+		return Rays::font_class();
+	}
+
+
+}// Rucy
+
+
 #endif//EOH

data/include/rays/ruby/image.h

@@ -24,4 +24,18 @@ namespace Rays
 RUCY_DECLARE_VALUE_FROM_TO(Rays::Image)
 
 
+namespace Rucy
+{
+
+
+	template <> inline Class
+	get_ruby_class<Rays::Image> ()
+	{
+		return Rays::image_class();
+	}
+
+
+}// Rucy
+
+
 #endif//EOH

data/include/rays/ruby/matrix.h

@@ -24,4 +24,18 @@ namespace Rays
 RUCY_DECLARE_VALUE_FROM_TO(Rays::Matrix)
 
 
+namespace Rucy
+{
+
+
+	template <> inline Class
+	get_ruby_class<Rays::Matrix> ()
+	{
+		return Rays::matrix_class();
+	}
+
+
+}// Rucy
+
+
 #endif//EOH

data/include/rays/ruby/painter.h

@@ -24,4 +24,18 @@ namespace Rays
 RUCY_DECLARE_VALUE_FROM_TO(Rays::Painter)
 
 
+namespace Rucy
+{
+
+
+	template <> inline Class
+	get_ruby_class<Rays::Painter> ()
+	{
+		return Rays::painter_class();
+	}
+
+
+}// Rucy
+
+
 #endif//EOH

data/include/rays/ruby/point.h

@@ -25,4 +25,18 @@ namespace Rays
 RUCY_DECLARE_VALUE_FROM_TO(Rays::Point)
 
 
+namespace Rucy
+{
+
+
+	template <> inline Class
+	get_ruby_class<Rays::Point> ()
+	{
+		return Rays::point_class();
+	}
+
+
+}// Rucy
+
+
 #endif//EOH

data/include/rays/ruby/shader.h

@@ -24,4 +24,18 @@ namespace Rays
 RUCY_DECLARE_VALUE_FROM_TO(Rays::Shader)
 
 
+namespace Rucy
+{
+
+
+	template <> inline Class
+	get_ruby_class<Rays::Shader> ()
+	{
+		return Rays::shader_class();
+	}
+
+
+}// Rucy
+
+
 #endif//EOH

data/include/rays/ruby/texture.h

@@ -24,4 +24,18 @@ namespace Rays
 RUCY_DECLARE_VALUE_FROM_TO(Rays::Texture)
 
 
+namespace Rucy
+{
+
+
+	template <> inline Class
+	get_ruby_class<Rays::Texture> ()
+	{
+		return Rays::texture_class();
+	}
+
+
+}// Rucy
+
+
 #endif//EOH

data/rays.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
 
   s.authors  = %w[snori]
   s.email    = 'snori@xord.org'
-  s.homepage = "http://github.com/xord/#{name}/wiki"
+  s.homepage = "https://github.com/xord/spacy/wiki/#{name.capitalize}-Home"
 
   s.platform              = Gem::Platform::RUBY
   s.required_ruby_version = '>=1.9.0'

data/src/painter.cpp

@@ -31,8 +31,8 @@ namespace Rays
 		FILL = 0,
 		STROKE,
 
-		COLOR_TYPE_LAST,
-		COLOR_TYPE_FIRST = 0
+		COLOR_TYPE_END,
+		COLOR_TYPE_BEGIN = 0
 
 	};// ColorType
 
@@ -63,19 +63,6 @@ namespace Rays
 	};// Attributes
 
 
-	struct coord2 {
-
-		coord x, y;
-
-		void reset (coord x_, coord y_)
-		{
-			x = x_;
-			y = y_;
-		}
-
-	};// coord2
-
-
 	struct Painter::Data
 	{
 
@@ -89,6 +76,8 @@ namespace Rays
 
 		bool painting;
 
+		GLenum prev_matrix_mode;
+
 		GLuint current_texture;
 
 		Image text_image;
@@ -98,7 +87,8 @@ namespace Rays
 		mutable Matrix matrix_tmp;
 
 		Data ()
-		:	painting(false), current_texture(0), text_image(1, 1, GRAY, true)
+		:	painting(false), prev_matrix_mode(0), current_texture(0),
+			text_image(1, 1, GRAY, true)
 		{
 			attrs.init();
 		}
@@ -122,11 +112,6 @@ namespace Rays
 			check_error(__FILE__, __LINE__);
 		}
 
-		GLuint frame_buffer_id () const
-		{
-			return frame_buffer ? frame_buffer.id() : 0;
-		}
-
 		bool use_color (ColorType type)
 		{
 			const Color& c = attrs.colors[type];
@@ -262,20 +247,22 @@ namespace Rays
 		if (self->painting)
 			invalid_state_error(__FILE__, __LINE__, "self->painting should be false.");
 
-		GLuint fb = self->frame_buffer_id();
-		bind_frame_buffer(fb);
+		FrameBuffer& fb = self->frame_buffer;
+		if (fb) bind_frame_buffer(fb.id());
 
 		push_attr();
 		push_shader();
 
 		const Bounds& vp = self->viewport;
-		glViewport((int) vp.x, (int)vp.y, (int) vp.width, (int) vp.height);
+		glViewport((int) vp.x, (int) vp.y, (int) vp.width, (int) vp.height);
 
 		coord x1 = vp.x, x2 = vp.x + vp.width;
 		coord y1 = vp.y, y2 = vp.y + vp.height;
 		coord z1 = vp.z, z2 = vp.z + vp.depth;
 		if (z1 == 0 && z2 == 0) {z1 = -100; z2 = 200;}
-		if (fb == 0)            std::swap(y1, y2);
+		if (!fb)                std::swap(y1, y2);
+
+		glGetIntegerv(GL_MATRIX_MODE, (GLint*) &self->prev_matrix_mode);
 
 		glMatrixMode(GL_PROJECTION);
 		glPushMatrix();
@@ -335,15 +322,20 @@ namespace Rays
 		glPopMatrix();
 	#endif
 
+		glMatrixMode(self->prev_matrix_mode);
+
 		pop_shader();
 		pop_attr();
 
 		//glFinish();
 
-		unbind_frame_buffer();
+		if (self->frame_buffer)
+		{
+			unbind_frame_buffer();
 
-		Texture& tex = self->frame_buffer.texture();
-		if (tex) tex.set_dirty(true);
+			Texture& tex = self->frame_buffer.texture();
+			if (tex) tex.set_dirty(true);
+		}
 	}
 
 	void
@@ -390,6 +382,109 @@ namespace Rays
 		line(p1.x, p1.y, p2.x, p2.y);
 	}
 
+	void
+	Painter::lines (const Coord2* points, size_t size)
+	{
+		Data* pself = self.get();
+
+		if (!pself->painting)
+			invalid_state_error(__FILE__, __LINE__, "self->painting should be true.");
+
+		if (!pself->use_color(STROKE))
+			return;
+
+		boost::scoped_array<uint> indices(new uint[size]);
+		for (size_t i = 0; i < size; ++i)
+			indices[i] = (uint) i;
+
+		pself->draw_shape(GL_LINES, (int) size, indices.get(), 2, (coord*) points);
+	}
+
+	void
+	Painter::lines (const Coord3* points, size_t size)
+	{
+		Data* pself = self.get();
+
+		if (!pself->painting)
+			invalid_state_error(__FILE__, __LINE__, "self->painting should be true.");
+
+		if (!pself->use_color(STROKE))
+			return;
+
+		boost::scoped_array<uint>   indices(new uint[size]);
+		boost::scoped_array<Coord2> vertices(new Coord2[size]);
+		for (size_t i = 0; i < size; ++i)
+		{
+			indices[i] = (uint) i;
+			vertices[i].reset(points[i].x, points[i].y);
+		}
+
+		pself->draw_shape(
+			GL_LINES, (int) size, indices.get(), 2, (coord*) vertices.get());
+	}
+
+	void
+	Painter::polygon (const Coord2* points, size_t size)
+	{
+		Data* pself = self.get();
+
+		if (!pself->painting)
+			invalid_state_error(__FILE__, __LINE__, "self->painting should be true.");
+
+		GLenum modes[] = {GL_TRIANGLE_FAN, GL_LINE_LOOP};
+		boost::scoped_array<uint>   indices;
+
+		for (int type = COLOR_TYPE_BEGIN; type < COLOR_TYPE_END; ++type)
+		{
+			if (!pself->use_color((ColorType) type)) continue;
+
+			if (!indices.get())
+			{
+				indices.reset(new uint[size]);
+				for (size_t i = 0; i < size; ++i)
+					indices[i] = (uint) i;
+			}
+
+			pself->draw_shape(
+				modes[type], (int) size, indices.get(), 2, (coord*) points);
+		}
+	}
+
+	void
+	Painter::polygon (const Coord3* points, size_t size)
+	{
+		Data* pself = self.get();
+
+		if (!pself->painting)
+			invalid_state_error(__FILE__, __LINE__, "self->painting should be true.");
+
+		GLenum modes[] = {GL_TRIANGLE_FAN, GL_LINE_LOOP};
+		boost::scoped_array<uint>   indices;
+		boost::scoped_array<Coord2> vertices;
+
+		for (int type = COLOR_TYPE_BEGIN; type < COLOR_TYPE_END; ++type)
+		{
+			if (!pself->use_color((ColorType) type)) continue;
+
+			if (!indices.get())
+			{
+				indices.reset(new uint[size]);
+				for (size_t i = 0; i < size; ++i)
+					indices[i] = (uint) i;
+			}
+
+			if (!vertices.get())
+			{
+				vertices.reset(new Coord2[size]);
+				for (size_t i = 0; i < size; ++i)
+					vertices[i].reset(points[i].x, points[i].y);
+			}
+
+			pself->draw_shape(
+				modes[type], (int) size, indices.get(), 2, (coord*) vertices.get());
+		}
+	}
+
 	void
 	Painter::rect (coord x, coord y, coord width, coord height)
 	{
@@ -409,7 +504,7 @@ namespace Rays
 		coord x2 = x + width  - 1;
 		coord y2 = y + height - 1;
 
-		for (int type = COLOR_TYPE_FIRST; type < COLOR_TYPE_LAST; ++type)
+		for (int type = COLOR_TYPE_BEGIN; type < COLOR_TYPE_END; ++type)
 		{
 			if (!pself->use_color((ColorType) type)) continue;
 
@@ -460,19 +555,19 @@ namespace Rays
 		float from         = angle_from / 360.f;
 		float to           = angle_to   / 360.f;
 		bool hole          = radius_min != 0;
-		int nvertices      = hole ? nsegment * 2 : nsegment + 1;
+		int nvertices      = hole ? nsegment * 2 : nsegment;
 		GLenum modes[]     =
 		{
 			(GLenum) (hole ? GL_TRIANGLE_STRIP : GL_TRIANGLE_FAN),
 			GL_LINE_LOOP
 		};
-		boost::scoped_array<uint> indices;
-		boost::scoped_array<coord2> vertices;
+		boost::scoped_array<uint>   indices;
+		boost::scoped_array<Coord2> vertices;
 
 		x += radius_x;
 		y += radius_y;
 
-		for (int type = COLOR_TYPE_FIRST; type < COLOR_TYPE_LAST; ++type)
+		for (int type = COLOR_TYPE_BEGIN; type < COLOR_TYPE_END; ++type)
 		{
 			if (!pself->use_color((ColorType) type)) continue;
 
@@ -484,18 +579,12 @@ namespace Rays
 			}
 
 			if (!vertices.get())
-				vertices.reset(new coord2[nvertices]);
+				vertices.reset(new Coord2[nvertices]);
 
-			coord2* vertex = vertices.get();
+			Coord2* vertex = vertices.get();
 			assert(vertex);
 
-			if (!hole)
-			{
-				vertex->reset(x, y);
-				++vertex;
-			}
-
-			for (int seg = 0; seg <= (int) nsegment; ++seg, ++vertex)
+			for (int seg = 0; seg < (int) nsegment; ++seg, ++vertex)
 			{
 				float pos    = (float) seg / (float) nsegment;
 				float radian = (from + (to - from) * pos) * PI_2;
@@ -595,7 +684,7 @@ namespace Rays
 			x2, y
 		};
 
-		for (int type = COLOR_TYPE_FIRST; type < COLOR_TYPE_LAST; ++type)
+		for (int type = COLOR_TYPE_BEGIN; type < COLOR_TYPE_END; ++type)
 		{
 			if (
 				(nostroke && type == STROKE) ||