Refactor render queue management

This makes it easier to switch render queue object memory management
to internal implementation, speeding stuff up.

include/core/render.hpp

@@ -331,15 +331,7 @@ struct premultiplied_color
 struct render_queue
 {
 /**
- * Adds new object to render queue. The object must be allocated by new.
- *
- * parameter obj: The object to add
- * throws std::bad_alloc: Not enough memory.
- */
-	void add(struct render_object& obj) throw(std::bad_alloc);
-
-/**
- * Applies all objects in the queue in order, freeing them in progress.
+ * Applies all objects in the queue in order.
  *
  * parameter scr: The screen to apply queue to.
  */
@@ -350,11 +342,25 @@ struct render_queue
  */
 	void clear() throw();
 
+/**
+ * Get memory from internal allocator.
+ */
+	void* alloc(size_t block) throw(std::bad_alloc);
+
+/**
+ * Call object constructor on internal memory.
+ */
+	template<class T, typename... U> void create_add(U... args)
+	{
+		add(*new(alloc(sizeof(T))) T(args...));
+	}
+
 /**
  * Destructor.
  */
 	~render_queue() throw();
 private:
+	void add(struct render_object& obj) throw(std::bad_alloc);
 	std::list<struct render_object*> q;
 };
 

src/core/render.cpp

@@ -305,6 +305,14 @@ void render_queue::clear() throw()
 	q.clear();
 }
 
+void* render_queue::alloc(size_t block) throw(std::bad_alloc)
+{
+	void* ptr = malloc(block);
+	if(!ptr)
+		throw std::bad_alloc();
+	return ptr;
+}
+
 render_queue::~render_queue() throw()
 {
 	clear();

src/lua/gui-bitmap.cpp

@@ -105,11 +105,11 @@ namespace
 			lua_class<lua_palette>::get(LS, 4, fname.c_str());
 			auto b = lua_class<lua_bitmap>::pin(LS, 3, fname.c_str());
 			auto p = lua_class<lua_palette>::pin(LS, 4, fname.c_str());
-			lua_render_ctx->queue->add(*new render_object_bitmap(x, y, b, p));
+			lua_render_ctx->queue->create_add<render_object_bitmap>(x, y, b, p);
 		} else if(lua_class<lua_dbitmap>::is(LS, 3)) {
 			lua_class<lua_dbitmap>::get(LS, 3, fname.c_str());
 			auto b = lua_class<lua_dbitmap>::pin(LS, 3, fname.c_str());
-			lua_render_ctx->queue->add(*new render_object_bitmap(x, y, b));
+			lua_render_ctx->queue->create_add<render_object_bitmap>(x, y, b);
 		} else {
 			lua_pushstring(LS, "Expected BITMAP or DBITMAP as argument 3 for gui.bitmap_draw.");
 			lua_error(LS);

src/lua/gui-circle.cpp

@@ -67,7 +67,7 @@ namespace
 		get_numeric_argument<int64_t>(LS, 6, fill, fname.c_str());
 		premultiplied_color poutline(outline);
 		premultiplied_color pfill(fill);
-		lua_render_ctx->queue->add(*new render_object_circle(x, y, radius, poutline, pfill, thickness));
+		lua_render_ctx->queue->create_add<render_object_circle>(x, y, radius, poutline, pfill, thickness);
 		return 0;
 	});
 }

src/lua/gui-crosshair.cpp

@@ -41,7 +41,7 @@ namespace
 		get_numeric_argument<uint32_t>(LS, 3, length, fname.c_str());
 		get_numeric_argument<int64_t>(LS, 4, color, fname.c_str());
 		premultiplied_color pcolor(color);
-		lua_render_ctx->queue->add(*new render_object_crosshair(x, y, pcolor, length));
+		lua_render_ctx->queue->create_add<render_object_crosshair>(x, y, pcolor, length);
 		return 0;
 	});
 }

src/lua/gui-line.cpp

@@ -90,7 +90,7 @@ nodraw2:
 		int32_t y2 = get_numeric_argument<int32_t>(LS, 4, fname.c_str());
 		get_numeric_argument<int64_t>(LS, 5, color, fname.c_str());
 		premultiplied_color pcolor(color);
-		lua_render_ctx->queue->add(*new render_object_line(x1, x2, y1, y2, pcolor));
+		lua_render_ctx->queue->create_add<render_object_line>(x1, x2, y1, y2, pcolor);
 		return 0;
 	});
 }

src/lua/gui-pixel.cpp

@@ -33,7 +33,7 @@ namespace
 		int32_t y = get_numeric_argument<int32_t>(LS, 2, fname.c_str());
 		get_numeric_argument<int64_t>(LS, 3, color, fname.c_str());
 		premultiplied_color pcolor(color);
-		lua_render_ctx->queue->add(*new render_object_pixel(x, y, pcolor));
+		lua_render_ctx->queue->create_add<render_object_pixel>(x, y, pcolor);
 		return 0;
 	});
 }

src/lua/gui-rectangle.cpp

@@ -56,8 +56,8 @@ namespace
 		get_numeric_argument<int64_t>(LS, 7, fill, fname.c_str());
 		premultiplied_color poutline(outline);
 		premultiplied_color pfill(fill);
-		lua_render_ctx->queue->add(*new render_object_rectangle(x, y, width, height, poutline, pfill,
-			thickness));
+		lua_render_ctx->queue->create_add<render_object_rectangle>(x, y, width, height, poutline, pfill,
+			thickness);
 		return 0;
 	});
 }

src/lua/gui-text.cpp

@@ -38,7 +38,7 @@ namespace
 		std::string text = get_string_argument(LS, 3, fname.c_str());
 		premultiplied_color fg(fgc);
 		premultiplied_color bg(bgc);
-		lua_render_ctx->queue->add(*new render_object_text(_x, _y, text, fg, bg, hdbl, vdbl));
+		lua_render_ctx->queue->create_add<render_object_text>(_x, _y, text, fg, bg, hdbl, vdbl);
 		return 0;
 	}