rays 0.3.10 → 0.3.11

data/src/painter.h

@@ -4,26 +4,225 @@
 #define __RAYS_SRC_PAINTER_H__
 
 
+#include <vector>
 #include "rays/painter.h"
-#include "opengl.h"
+#include "rays/bounds.h"
+#include "rays/color.h"
+#include "rays/font.h"
+#include "rays/image.h"
+#include "rays/shader.h"
+#include "matrix.h"
+#include "texture.h"
 
 
 namespace Rays
 {
 
 
-	void Painter_draw (
-		Painter* painter, GLenum mode, const Color& color,
-		const Coord3* points,           size_t npoints,
-		const uint*   indices   = NULL, size_t nindices = 0,
-		const Coord3* texcoords = NULL);
+	enum ColorType
+	{
+
+		FILL = 0,
+
+		STROKE,
+
+		COLOR_TYPE_MAX
+
+	};// ColorType
+
+
+	enum PrimitiveMode
+	{
+
+		MODE_NONE           = -1,
+
+		MODE_POINTS         = 0x0,
+
+		MODE_LINES          = 0x1,
+
+		MODE_LINE_LOOP      = 0x2,
+
+		MODE_LINE_STRIP     = 0x3,
+
+		MODE_TRIANGLES      = 0x4,
+
+		MODE_TRIANGLE_STRIP = 0x5,
+
+		MODE_TRIANGLE_FAN   = 0x6,
+
+		MODE_QUADS          = 0x7,
+
+		MODE_QUAD_STRIP     = 0x8,
+
+		MODE_POLYGON        = 0x9,
+
+	};// PrimitiveMode
+
+
+	struct State
+	{
+
+		Color background, colors[COLOR_TYPE_MAX];
+
+		bool nocolors[COLOR_TYPE_MAX];
+
+		coord stroke_width;
+
+		float stroke_outset;
+
+		CapType stroke_cap;
+
+		JoinType stroke_join;
+
+		coord miter_limit;
+
+		uint nsegment;
+
+		coord line_height;
+
+		BlendMode blend_mode;
+
+		Bounds clip;
+
+		Font font;
+
+		Image texture;
+
+		TexCoordMode texcoord_mode;
+
+		TexCoordWrap texcoord_wrap;
+
+		Shader shader;
+
+		void init ()
+		{
+			background       .reset(0, 0);
+			  colors[FILL]   .reset(1, 1);
+			  colors[STROKE] .reset(1, 0);
+			nocolors[FILL]   = false;
+			nocolors[STROKE] = true;
+			stroke_width     = 0;
+			stroke_outset    = 0;
+			stroke_cap       = CAP_DEFAULT;
+			stroke_join      = JOIN_DEFAULT;
+			miter_limit      = JOIN_DEFAULT_MITER_LIMIT;
+			nsegment         = 0;
+			line_height      = -1;
+			blend_mode       = BLEND_NORMAL;
+			clip             .reset(-1);
+			font             = get_default_font();
+			texture          = Image();
+			texcoord_mode    = TEXCOORD_IMAGE;
+			texcoord_wrap    = TEXCOORD_CLAMP;
+			shader           = Shader();
+		}
+
+		bool get_color (Color* color, ColorType type) const
+		{
+			const Color& c = colors[type];
+			if (blend_mode == BLEND_REPLACE ? nocolors[type] : !c)
+				return false;
+
+			*color = c;
+			return true;
+		}
+
+		bool has_color () const
+		{
+			if (blend_mode == BLEND_REPLACE)
+				return !nocolors[FILL] || !nocolors[STROKE];
+			else
+				return colors[FILL] || colors[STROKE];
+		}
+
+	};// State
+
+
+	struct TextureInfo
+	{
+
+		const Texture& texture;
+
+		Point min, max;
+
+		TextureInfo (
+			const Texture& texture,
+			coord x_min, coord y_min,
+			coord x_max, coord y_max)
+		:	texture(texture)
+		{
+			min.reset(x_min, y_min);
+			max.reset(x_max, y_max);
+		}
+
+		operator bool () const
+		{
+			return
+				texture &&
+				min.x < max.x &&
+				min.y < max.y;
+		}
+
+		bool operator ! () const
+		{
+			return !operator bool();
+		}
+
+	};// TextureInfo
+
+
+	struct Painter::Data
+	{
+
+		bool painting       = false;
+
+		float pixel_density = 1;
+
+		Bounds viewport;
+
+		State              state;
+
+		std::vector<State> state_stack;
+
+		Matrix              position_matrix;
+
+		std::vector<Matrix> position_matrix_stack;
+
+		Image text_image;
+
+		Data ()
+		{
+			state.init();
+		}
+
+		virtual ~Data () = default;
+
+		void set_pixel_density (float density);
+
+	};// Painter::Data
+
+
+	void Painter_update_clip (Painter* painter);
 
 	void Painter_draw (
-		Painter* painter, GLenum mode,
-		const Coord3* points,           size_t npoints,
-		const uint*   indices   = NULL, size_t nindices = 0,
-		const Color*  colors    = NULL,
-		const Coord3* texcoords = NULL);
+		Painter* painter, PrimitiveMode mode, const Color* color,
+		const Coord3* points,              size_t npoints,
+		const uint*   indices      = NULL, size_t nindices = 0,
+		const Color*  colors       = NULL,
+		const Coord3* texcoords    = NULL,
+		const TextureInfo* texinfo = NULL,
+		const Shader* shader       = NULL);
+
+	void Painter_draw_image (
+		Painter* painter, const Image& image,
+		coord src_x, coord src_y, coord src_w, coord src_h,
+		coord dst_x, coord dst_y, coord dst_w, coord dst_h,
+		bool nofill = false, bool nostroke = false,
+		const Shader* shader = NULL);
+
+	void Painter_draw_text_line (
+		Painter* painter, const Font& font, const char* line, coord x, coord y,
+		coord width = 0, coord height = 0);
 
 
 }// Rays

data/src/polygon.cpp

@@ -50,6 +50,32 @@ namespace Rays
 {
 
 
+	static void
+	draw_polygon (
+		Painter* painter, PrimitiveMode mode, const Color& color,
+		const Coord3* points,           size_t npoints,
+		const uint*   indices   = NULL, size_t nindices = 0,
+		const Coord3* texcoords = NULL)
+	{
+		Painter_draw(
+			painter, mode, &color, points, npoints, indices, nindices,
+			NULL, texcoords);
+	}
+
+	static void
+	draw_polygon (
+		Painter* painter, PrimitiveMode mode,
+		const Coord3* points,  size_t npoints,
+		const uint*   indices   = NULL, size_t nindices = 0,
+		const Color*  colors    = NULL,
+		const Coord3* texcoords = NULL)
+	{
+		Painter_draw(
+			painter, mode, NULL, points, npoints, indices, nindices,
+			colors, texcoords);
+	}
+
+
 	class Triangles
 	{
 
@@ -119,8 +145,8 @@ namespace Rays
 
 				if (pcolors)
 				{
-					Painter_draw(
-						painter, GL_TRIANGLES,
+					draw_polygon(
+						painter, MODE_TRIANGLES,
 						&points[0],  points.size(),
 						&indices[0], indices.size(),
 						&(*pcolors)[0],
@@ -128,8 +154,8 @@ namespace Rays
 				}
 				else
 				{
-					Painter_draw(
-						painter, GL_TRIANGLES, color,
+					draw_polygon(
+						painter, MODE_TRIANGLES, color,
 						&points[0],  points.size(),
 						&indices[0], indices.size(),
 						ptexcoords ? &(*ptexcoords)[0] : NULL);
@@ -383,8 +409,8 @@ namespace Rays
 
 				for (const auto& polyline : polylines)
 				{
-					Painter_draw(
-						painter, polyline.loop() ? GL_LINE_LOOP : GL_LINE_STRIP, color,
+					draw_polygon(
+						painter, polyline.loop() ? MODE_LINE_LOOP : MODE_LINE_STRIP, color,
 						&polyline[0], polyline.size());
 				}
 			}
@@ -666,8 +692,7 @@ namespace Rays
 				invalid_state_error(__FILE__, __LINE__);
 
 			const auto& outline = polylines[0];
-			Painter_draw(
-				painter, GL_TRIANGLE_FAN, color, &outline[0], outline.size());
+			draw_polygon(painter, MODE_TRIANGLE_FAN, color, &outline[0], outline.size());
 		}
 
 		private:
@@ -802,7 +827,7 @@ namespace Rays
 
 		typedef Polygon::Data Super;
 
-		GLenum mode = 0;
+		PrimitiveMode mode = MODE_NONE;
 
 		EllipseData (
 			coord x, coord y, coord width, coord height,
@@ -826,7 +851,7 @@ namespace Rays
 			if (polylines.size() <= 0)
 				invalid_state_error(__FILE__, __LINE__);
 
-			if (mode == 0)
+			if (mode == MODE_NONE)
 			{
 				Super::fill(painter, color);
 				return;
@@ -836,7 +861,7 @@ namespace Rays
 				invalid_state_error(__FILE__, __LINE__);
 
 			const auto& outline = polylines[0];
-			Painter_draw(painter, mode, color, &outline[0], outline.size());
+			draw_polygon(painter, mode, color, &outline[0], outline.size());
 		}
 
 		private:
@@ -867,7 +892,7 @@ namespace Rays
 				float radian_from = Xot::deg2rad(0);
 				float radian_to   = Xot::deg2rad(360);
 
-				if (!has_hole) mode = GL_TRIANGLE_FAN;
+				if (!has_hole) mode = MODE_TRIANGLE_FAN;
 
 				std::vector<Point> points;
 				points.reserve(nsegment);
@@ -915,7 +940,7 @@ namespace Rays
 				if (!has_hole)
 				{
 					points.emplace_back(x + width / 2, y + height / 2);
-					mode = GL_TRIANGLE_FAN;
+					mode = MODE_TRIANGLE_FAN;
 				}
 
 				for (uint seg = 0; seg <= nsegment; ++seg)

data/src/renderer.h

@@ -0,0 +1,22 @@
+// -*- c++ -*-
+#pragma once
+#ifndef __RAYS_SRC_RENDERER_H__
+#define __RAYS_SRC_RENDERER_H__
+
+
+#include "rays/defs.h"
+
+
+namespace Rays
+{
+
+
+	void Renderer_init ();
+
+	void Renderer_fin ();
+
+
+}// Rays
+
+
+#endif//EOH

data/src/sdl/bitmap.cpp

@@ -9,10 +9,8 @@
 #include <SDL.h>
 #include <xot/util.h>
 #include "rays/exception.h"
-#include "../color_space.h"
 #include "../font.h"
 #include "../texture.h"
-#include "../frame_buffer.h"
 
 
 namespace Rays
@@ -50,11 +48,10 @@ namespace Rays
 	};// Bitmap::Data
 
 
-	static void
-	setup_bitmap (
-		Bitmap* bitmap,
-		int w, int h, const ColorSpace& cs,
-		const void* pixels = NULL, bool clear_pixels = true)
+	void
+	Bitmap_setup (
+		Bitmap* bitmap, int w, int h, const ColorSpace& cs,
+		const void* pixels, bool clear_pixels)
 	{
 		if (w <= 0)
 			argument_error(__FILE__, __LINE__);
@@ -104,31 +101,6 @@ namespace Rays
 			SDL_FillRect(self->surface, NULL, 0);
 	}
 
-	Bitmap
-	Bitmap_from (const Texture& tex)
-	{
-		if (!tex)
-			argument_error(__FILE__, __LINE__);
-
-		Bitmap bmp;
-		setup_bitmap(
-			&bmp, tex.width(), tex.height(), tex.color_space(), NULL, false);
-
-		GLenum format, type;
-		ColorSpace_get_gl_format_and_type(&format, &type, tex.color_space());
-
-		FrameBuffer fb(tex);
-		FrameBufferBinder binder(fb.id());
-
-		for (int y = 0; y < bmp.height(); ++y)
-		{
-			GLvoid* ptr = (GLvoid*) bmp.at<uchar>(0, y);
-			glReadPixels(0, y, bmp.width(), 1, format, type, ptr);
-		}
-
-		return bmp;
-	}
-
 	void
 	Bitmap_draw_string (
 		Bitmap* bitmap, const RawFont& font,
@@ -248,7 +220,7 @@ namespace Rays
 	Bitmap::Bitmap (
 		int width, int height, const ColorSpace& color_space, const void* pixels)
 	{
-		setup_bitmap(this, width, height, color_space, pixels);
+		Bitmap_setup(this, width, height, color_space, pixels);
 	}
 
 	Bitmap::~Bitmap ()

data/src/sdl/rays.cpp

@@ -4,7 +4,7 @@
 #include <SDL.h>
 #include "rays/exception.h"
 #include "rays/debug.h"
-#include "../opengl.h"
+#include "../renderer.h"
 
 
 namespace Rays
@@ -28,7 +28,7 @@ namespace Rays
 		if (SDL_Init(SDL_INIT_VIDEO) < 0)
 			rays_error(__FILE__, __LINE__, SDL_GetError());
 
-		OpenGL_init();
+		Renderer_init();
 
 		global::initialized = true;
 	}
@@ -39,7 +39,7 @@ namespace Rays
 		if (!global::initialized)
 			rays_error(__FILE__, __LINE__, "not initialized");
 
-		OpenGL_fin();
+		Renderer_fin();
 
 		SDL_Quit();
 

data/src/texture.h

@@ -7,7 +7,6 @@
 #include <xot/pimpl.h>
 #include "rays/defs.h"
 #include "rays/color_space.h"
-#include "opengl.h"
 
 
 namespace Rays
@@ -46,8 +45,6 @@ namespace Rays
 
 			bool smooth () const;
 
-			GLuint id () const;
-
 			void set_modified (bool modified = true);
 
 			bool     modified () const;

data/src/win32/bitmap.cpp

@@ -7,10 +7,8 @@
 #include <stb_image_write.h>
 
 #include "rays/exception.h"
-#include "../color_space.h"
 #include "../font.h"
 #include "../texture.h"
-#include "../frame_buffer.h"
 #include "gdi.h"
 
 
@@ -54,11 +52,10 @@ namespace Rays
 	};// Bitmap::Data
 
 
-	static void
-	setup_bitmap (
-		Bitmap* bitmap,
-		int w, int h, const ColorSpace& cs,
-		const void* pixels = NULL, bool clear_pixels = true, HDC hdc = NULL)
+	void
+	Bitmap_setup (
+		Bitmap* bitmap, int w, int h, const ColorSpace& cs,
+		const void* pixels, bool clear_pixels)
 	{
 		if (w <= 0)
 			argument_error(__FILE__, __LINE__);
@@ -91,7 +88,7 @@ namespace Rays
 		header.biBitCount    = self->color_space.bpp();
 		header.biCompression = BI_RGB;
 
-		Win32::DC dc = hdc ? Win32::DC(hdc) : Win32::screen_dc();
+		Win32::DC dc = Win32::screen_dc();
 
 		HBITMAP hbmp = CreateDIBSection(
 			dc.handle(), &bmpinfo, DIB_RGB_COLORS, (void**) &self->pixels, NULL, 0);
@@ -109,31 +106,6 @@ namespace Rays
 			memset(self->pixels, 0, size);
 	}
 
-	Bitmap
-	Bitmap_from (const Texture& tex)
-	{
-		if (!tex)
-			argument_error(__FILE__, __LINE__);
-
-		Bitmap bmp;
-		setup_bitmap(
-			&bmp, tex.width(), tex.height(), tex.color_space(), NULL, false);
-
-		GLenum format, type;
-		ColorSpace_get_gl_format_and_type(&format, &type, tex.color_space());
-
-		FrameBuffer fb(tex);
-		FrameBufferBinder binder(fb.id());
-
-		for (int y = 0; y < bmp.height(); ++y)
-		{
-			GLvoid* ptr = (GLvoid*) bmp.at<uchar>(0, y);
-			glReadPixels(0, y, bmp.width(), 1, format, type, ptr);
-		}
-
-		return bmp;
-	}
-
 	void
 	Bitmap_draw_string (
 		Bitmap* bitmap, const RawFont& font,
@@ -253,7 +225,7 @@ namespace Rays
 	Bitmap::Bitmap (
 		int width, int height, const ColorSpace& color_space, const void* pixels)
 	{
-		setup_bitmap(this, width, height, color_space, pixels);
+		Bitmap_setup(this, width, height, color_space, pixels);
 	}
 
 	Bitmap::~Bitmap ()

data/src/win32/rays.cpp

@@ -2,7 +2,7 @@
 
 
 #include "rays/exception.h"
-#include "../opengl.h"
+#include "../renderer.h"
 
 
 namespace Rays
@@ -25,7 +25,7 @@ namespace Rays
 
 		global::initialized = true;
 
-		OpenGL_init();
+		Renderer_init();
 	}
 
 	void
@@ -34,7 +34,7 @@ namespace Rays
 		if (!global::initialized)
 			rays_error(__FILE__, __LINE__, "not initialized.");
 
-		OpenGL_fin();
+		Renderer_fin();
 
 		global::initialized = false;
 	}