rays 0.3.11 → 0.3.13

data/src/painter.cpp

@@ -49,7 +49,7 @@ namespace Rays
 		if (!viewport)
 			argument_error(__FILE__, __LINE__);
 
-		if (self->painting)
+		if (self->is_painting())
 			invalid_state_error(__FILE__, __LINE__, "painting flag should be false.");
 
 		self->viewport = viewport;
@@ -71,7 +71,7 @@ namespace Rays
 	bool
 	Painter::painting () const
 	{
-		return self->painting;
+		return self->is_painting();
 	}
 
 	static inline void
@@ -102,7 +102,7 @@ namespace Rays
 	{
 		Painter::Data* self = painter->self.get();
 
-		if (!self->painting)
+		if (!self->is_painting())
 			invalid_state_error(__FILE__, __LINE__, "painting flag should be true.");
 
 		if (!self->state.has_color())
@@ -328,19 +328,17 @@ namespace Rays
 		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, bool nostroke,
 		const Shader* shader)
 	{
-		static const PrimitiveMode MODES[] = {MODE_TRIANGLE_FAN, MODE_LINE_LOOP};
-
 		assert(painter && image);
 
 		Painter::Data* self = painter->self.get();
 
-		if (!self->painting)
+		if (!self->is_painting())
 			invalid_state_error(__FILE__, __LINE__, "painting flag should be true.");
 
-		if (!self->state.has_color())
+		Color color;
+		if (!self->state.get_color(&color, FILL))
 			return;
 
 		const Texture& texture = Image_get_texture(image);
@@ -365,19 +363,9 @@ namespace Rays
 
 		TextureInfo texinfo(texture, src_x, src_y, src_x + src_w, src_y + src_h);
 
-		Color color;
-		for (int type = 0; type < COLOR_TYPE_MAX; ++type)
-		{
-			if ((nofill && type == FILL) || (nostroke && type == STROKE))
-				continue;
-
-			if (!painter->self->state.get_color(&color, (ColorType) type))
-				continue;
-
-			Painter_draw(
-				painter, MODES[type], &color, points, 4, NULL, 0, NULL, texcoords,
-				&texinfo, shader);
-		}
+		Painter_draw(
+			painter, MODE_TRIANGLE_FAN, &color, points, 4, NULL, 0, NULL, texcoords,
+			&texinfo, shader);
 	}
 
 	void
@@ -477,7 +465,7 @@ namespace Rays
 
 		Painter::Data* self = painter->self.get();
 
-		if (!self->painting)
+		if (!self->is_painting())
 			invalid_state_error(__FILE__, __LINE__, "painting flag should be true.");
 
 		if (!self->state.has_color())
@@ -489,7 +477,7 @@ namespace Rays
 		{
 			coord line_height = painter->line_height();
 
-			Xot::StringList lines;
+			StringList lines;
 			split(&lines, str, '\n');
 			for (const auto& line : lines)
 			{
@@ -553,7 +541,7 @@ namespace Rays
 	{
 		self->state.background = color;
 
-		if (self->painting && clear) this->clear();
+		if (self->is_painting() && clear) this->clear();
 	}
 
 	void
@@ -710,6 +698,15 @@ namespace Rays
 		return height;
 	}
 
+	void
+	Painter::set_blend_mode (BlendMode mode)
+	{
+		if (self->state.blend_mode == mode) return;
+
+		self->state.blend_mode = mode;
+		Xot::add_flag(&self->flags, Painter::Data::UNBATCHABLE_STATE_CHANGED);
+	}
+
 	BlendMode
 	Painter::blend_mode () const
 	{
@@ -725,8 +722,11 @@ namespace Rays
 	void
 	Painter::set_clip (const Bounds& bounds)
 	{
+		if (bounds == self->state.clip)
+			return;
+
 		self->state.clip = bounds;
-		Painter_update_clip(this);
+		Xot::add_flag(&self->flags, Painter::Data::UNBATCHABLE_STATE_CHANGED);
 	}
 
 	void
@@ -773,13 +773,20 @@ namespace Rays
 	void
 	Painter::set_texture (const Image& image)
 	{
+		if (image == self->state.texture)
+			return;
+
 		self->state.texture = image;
+		Xot::add_flag(&self->flags, Painter::Data::UNBATCHABLE_STATE_CHANGED);
 	}
 
 	void
 	Painter::no_texture ()
 	{
+		if (!self->state.texture) return;
+
 		self->state.texture = Image();
+		Xot::add_flag(&self->flags, Painter::Data::UNBATCHABLE_STATE_CHANGED);
 	}
 
 	const Image&
@@ -791,7 +798,11 @@ namespace Rays
 	void
 	Painter::set_texcoord_mode (TexCoordMode mode)
 	{
+		if (mode == self->state.texcoord_mode)
+			return;
+
 		self->state.texcoord_mode = mode;
+		Xot::add_flag(&self->flags, Painter::Data::UNBATCHABLE_STATE_CHANGED);
 	}
 
 	TexCoordMode
@@ -803,7 +814,11 @@ namespace Rays
 	void
 	Painter::set_texcoord_wrap (TexCoordWrap wrap)
 	{
+		if (wrap == self->state.texcoord_wrap)
+			return;
+
 		self->state.texcoord_wrap = wrap;
+		Xot::add_flag(&self->flags, Painter::Data::UNBATCHABLE_STATE_CHANGED);
 	}
 
 	TexCoordWrap
@@ -815,13 +830,20 @@ namespace Rays
 	void
 	Painter::set_shader (const Shader& shader)
 	{
+		if (shader == self->state.shader)
+			return;
+
 		self->state.shader = shader;
+		Xot::add_flag(&self->flags, Painter::Data::UNBATCHABLE_STATE_CHANGED);
 	}
 
 	void
 	Painter::no_shader ()
 	{
+		if (!self->state.shader) return;
+
 		self->state.shader = Shader();
+		Xot::add_flag(&self->flags, Painter::Data::UNBATCHABLE_STATE_CHANGED);
 	}
 
 	const Shader&
@@ -844,7 +866,7 @@ namespace Rays
 
 		self->state = self->state_stack.back();
 		self->state_stack.pop_back();
-		Painter_update_clip(this);
+		Xot::add_flag(&self->flags, Painter::Data::UNBATCHABLE_STATE_CHANGED);
 	}
 
 	void
@@ -937,6 +959,24 @@ namespace Rays
 		self->position_matrix_stack.pop_back();
 	}
 
+	void
+	Painter::add_flag (uint flags)
+	{
+		Xot::add_flag(&self->flags, flags);
+	}
+
+	void
+	Painter::remove_flag (uint flags)
+	{
+		Xot::remove_flag(&self->flags, flags);
+	}
+
+	bool
+	Painter::has_flag (uint flags) const
+	{
+		return Xot::has_flag(self->flags, flags);
+	}
+
 	Painter::operator bool () const
 	{
 		return self->viewport;
@@ -948,5 +988,19 @@ namespace Rays
 		return !operator bool();
 	}
 
+	static bool g_debug = false;
+
+	void
+	Painter::set_debug (bool debug)
+	{
+		g_debug = debug;
+	}
+
+	bool
+	Painter::debug ()
+	{
+		return g_debug;
+	}
+
 
 }// Rays

data/src/painter.h

@@ -59,7 +59,7 @@ namespace Rays
 	};// PrimitiveMode
 
 
-	struct State
+	struct PainterState
 	{
 
 		Color background, colors[COLOR_TYPE_MAX];
@@ -82,16 +82,16 @@ namespace Rays
 
 		BlendMode blend_mode;
 
+		TexCoordMode texcoord_mode;
+
+		TexCoordWrap texcoord_wrap;
+
 		Bounds clip;
 
 		Font font;
 
 		Image texture;
 
-		TexCoordMode texcoord_mode;
-
-		TexCoordWrap texcoord_wrap;
-
 		Shader shader;
 
 		void init ()
@@ -109,11 +109,11 @@ namespace Rays
 			nsegment         = 0;
 			line_height      = -1;
 			blend_mode       = BLEND_NORMAL;
+			texcoord_mode    = TEXCOORD_IMAGE;
+			texcoord_wrap    = TEXCOORD_CLAMP;
 			clip             .reset(-1);
 			font             = get_default_font();
 			texture          = Image();
-			texcoord_mode    = TEXCOORD_IMAGE;
-			texcoord_wrap    = TEXCOORD_CLAMP;
 			shader           = Shader();
 		}
 
@@ -135,7 +135,7 @@ namespace Rays
 				return colors[FILL] || colors[STROKE];
 		}
 
-	};// State
+	};// PainterState
 
 
 	struct TextureInfo
@@ -174,15 +174,24 @@ namespace Rays
 	struct Painter::Data
 	{
 
-		bool painting       = false;
+		enum Flag
+		{
+
+			PAINTING                  = Xot::bit(1, Painter::FLAG_LAST),
+
+			UNBATCHABLE_STATE_CHANGED = Xot::bit(2, Painter::FLAG_LAST),
+
+		};// Flag
+
+		uint flags          = Painter::FLAG_BATCHING;
 
 		float pixel_density = 1;
 
 		Bounds viewport;
 
-		State              state;
+		PainterState              state;
 
-		std::vector<State> state_stack;
+		std::vector<PainterState> state_stack;
 
 		Matrix              position_matrix;
 
@@ -197,12 +206,17 @@ namespace Rays
 
 		virtual ~Data () = default;
 
+		bool is_painting () const
+		{
+			return Xot::has_flag(flags, PAINTING);
+		}
+
 		void set_pixel_density (float density);
 
 	};// Painter::Data
 
 
-	void Painter_update_clip (Painter* painter);
+	void Painter_flush (Painter* painter);
 
 	void Painter_draw (
 		Painter* painter, PrimitiveMode mode, const Color* color,
@@ -217,7 +231,6 @@ namespace Rays
 		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 (