Merge pull request #1 from EliasFleckenstein03/master

update

1 files changed, 63 insertions, 14 deletions

diff --git a/src/client/camera.h b/src/client/camera.h
index 16a1961be..30fac5289 100644
--- a/src/client/camera.h
+++ b/src/client/camera.h
@@ -25,27 +25,74 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <ICameraSceneNode.h>
 #include <ISceneNode.h>
 #include <list>
+#include "util/Optional.h"
 
 class LocalPlayer;
 struct MapDrawControl;
 class Client;
+class RenderingEngine;
 class WieldMeshSceneNode;
 
-struct Nametag {
+struct Nametag
+{
+	scene::ISceneNode *parent_node;
+	std::string text;
+	video::SColor textcolor;
+	Optional<video::SColor> bgcolor;
+	v3f pos;
+	ITextureSource *texture_source;
+	std::vector<video::ITexture *> images;
+	core::dimension2di images_dim;
+
 	Nametag(scene::ISceneNode *a_parent_node,
-			const std::string &a_nametag_text,
-			const video::SColor &a_nametag_color,
-			const v3f &a_nametag_pos):
+			const std::string &text,
+			const video::SColor &textcolor,
+			const Optional<video::SColor> &bgcolor,
+			const v3f &pos,
+			ITextureSource *tsrc,
+			const std::vector<std::string> &image_names):
 		parent_node(a_parent_node),
-		nametag_text(a_nametag_text),
-		nametag_color(a_nametag_color),
-		nametag_pos(a_nametag_pos)
+		text(text),
+		textcolor(textcolor),
+		bgcolor(bgcolor),
+		pos(pos),
+		texture_source(tsrc),
+		images(),
+		images_dim(0, 0)
 	{
+		setImages(image_names);
+	}
+
+	void setImages(const std::vector<std::string> &image_names)
+	{
+		images.clear();
+		images_dim = core::dimension2di(0, 0);
+
+		for (const std::string &image_name : image_names) {
+			video::ITexture *texture = texture_source->getTexture(image_name);
+			core::dimension2di imgsize(texture->getOriginalSize());
+
+			images_dim.Width += imgsize.Width;
+			if (images_dim.Height < imgsize.Height)
+				images_dim.Height = imgsize.Height;
+
+			images.push_back(texture);
+		}
+	}
+
+	video::SColor getBgColor(bool use_fallback) const
+	{
+		if (bgcolor)
+			return bgcolor.value();
+		else if (!use_fallback)
+			return video::SColor(0, 0, 0, 0);
+		else if (textcolor.getLuminance() > 186)
+			// Dark background for light text
+			return video::SColor(50, 50, 50, 50);
+		else
+			// Light background for dark text
+			return video::SColor(50, 255, 255, 255);
 	}
-	scene::ISceneNode *parent_node;
-	std::string nametag_text;
-	video::SColor nametag_color;
-	v3f nametag_pos;
 };
 
 enum CameraMode {CAMERA_MODE_FIRST, CAMERA_MODE_THIRD, CAMERA_MODE_THIRD_FRONT};
@@ -58,7 +105,7 @@ enum CameraMode {CAMERA_MODE_FIRST, CAMERA_MODE_THIRD, CAMERA_MODE_THIRD_FRONT};
 class Camera
 {
 public:
-	Camera(MapDrawControl &draw_control, Client *client);
+	Camera(MapDrawControl &draw_control, Client *client, RenderingEngine *rendering_engine);
 	~Camera();
 
 	// Get camera scene node.
@@ -164,8 +211,9 @@ public:
 	}
 
 	Nametag *addNametag(scene::ISceneNode *parent_node,
-		const std::string &nametag_text, video::SColor nametag_color,
-		const v3f &pos);
+		const std::string &text, video::SColor textcolor,
+		Optional<video::SColor> bgcolor, const v3f &pos,
+		const std::vector<std::string> &image_names);
 
 	void removeNametag(Nametag *nametag);
 
@@ -245,4 +293,5 @@ private:
 	bool m_arm_inertia;
 
 	std::list<Nametag *> m_nametags;
+	bool m_show_nametag_backgrounds;
 };