From: Elias Fleckenstein <eliasfleckenstein@web.de>
Date: Sat, 28 Nov 2020 13:37:26 +0000 (+0100)
Subject: Added configureable Colors for PlayerESP and EntityESP
X-Git-Tag: 03-12-2020~11
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=b4e475726b0793af1338f0618fac29e4fef69098;p=dragonfireclient.git

Added configureable Colors for PlayerESP and EntityESP
---

diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt
index 33b9fa130..9c5e859b8 100644
--- a/builtin/settingtypes.txt
+++ b/builtin/settingtypes.txt
@@ -2364,3 +2364,7 @@ enable_player_esp (PlayerESP) bool false
 enable_node_esp (NodeESP) bool false
 
 enable_node_tracers (NodeTracers) bool false
+
+entity_esp_color (EntityESP Color) v3f 255, 255, 255
+
+player_esp_color (PlayerESP Color) v3f 0, 255, 0
diff --git a/src/client/render/core.cpp b/src/client/render/core.cpp
index 6d1c68cd1..794ec0186 100644
--- a/src/client/render/core.cpp
+++ b/src/client/render/core.cpp
@@ -75,6 +75,10 @@ void RenderingCore::draw(video::SColor _skycolor, bool _show_hud, bool _show_min
 	draw_player_tracers = g_settings->getBool("enable_player_tracers");
 	draw_node_esp = g_settings->getBool("enable_node_esp");
 	draw_node_tracers = g_settings->getBool("enable_node_tracers");
+	v3f entity_color = g_settings->getV3F("entity_esp_color");	
+	v3f player_color = g_settings->getV3F("player_esp_color");
+	entity_esp_color = video::SColor(255, entity_color.X, entity_color.Y, entity_color.Z);
+	player_esp_color = video::SColor(255, player_color.X, player_color.Y, player_color.Z);
 	
 	beforeDraw();
 	drawAll();
@@ -109,6 +113,7 @@ void RenderingCore::drawTracersAndESP()
 			bool is_player = obj->isPlayer();
 			bool draw_esp = is_player ? draw_player_esp : draw_entity_esp;
 			bool draw_tracers = is_player ? draw_player_tracers : draw_entity_tracers;
+			video::SColor color = is_player ? player_esp_color : entity_esp_color;
 			if (! (draw_esp || draw_tracers))
 				continue;
 			aabb3f box;
@@ -118,9 +123,9 @@ void RenderingCore::drawTracersAndESP()
 			box.MinEdge += pos;
 			box.MaxEdge += pos;
 			if (draw_esp)
-				driver->draw3DBox(box, video::SColor(255, 255, 255, 255));
+				driver->draw3DBox(box, color);
 			if (draw_tracers)
-				driver->draw3DLine(eye_pos, box.getCenter(), video::SColor(255, 255, 255, 255));
+				driver->draw3DLine(eye_pos, box.getCenter(), color);
 		}
 	}
 	if (draw_node_esp || draw_node_tracers) {
diff --git a/src/client/render/core.h b/src/client/render/core.h
index 6137acd62..386c5a840 100644
--- a/src/client/render/core.h
+++ b/src/client/render/core.h
@@ -42,6 +42,8 @@ class RenderingCore
 	bool draw_player_tracers;
 	bool draw_node_esp;
 	bool draw_node_tracers;
+	video::SColor entity_esp_color;
+	video::SColor player_esp_color;
 
 	IrrlichtDevice *device;
 	video::IVideoDriver *driver;
diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
index 34851cfa1..3c4e5f82b 100644
--- a/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@@ -146,6 +146,8 @@ void set_default_settings(Settings *settings)
 	settings->setDefault("enable_player_tracers", "false");
 	settings->setDefault("enable_node_esp", "false");
 	settings->setDefault("enable_node_tracers", "false");
+	settings->setDefault("entity_esp_color", "(255, 255, 255)");
+	settings->setDefault("player_esp_color", "(0, 255, 0)");	
 
 	// Keymap
 	settings->setDefault("remote_port", "30000");