Merge branch 'main' of https://github.com/TempleDevelopment/TempleWare

Author: aglaeaaaa

TempleWare-CS2/source/templeware/config/config.cpp

@@ -45,4 +45,5 @@ namespace Config {
 	float aimbot_fov = 0;
 	bool rcs = 0;
 	bool fov_circle = 0;
+	ImVec4 fovCircleColor = ImVec4(1.0f, 1.0f, 1.0f, 1.0f);
 }

TempleWare-CS2/source/templeware/config/config.h

@@ -44,4 +44,5 @@ namespace Config {
 	extern float aimbot_fov;
 	extern bool rcs;
 	extern bool fov_circle;
+	extern ImVec4 fovCircleColor;
 }

TempleWare-CS2/source/templeware/config/configmanager.h

@@ -148,6 +148,12 @@ namespace internal_config
                 Config::teamcolVisualChams.z,
                 Config::teamcolVisualChams.w
             };
+            j["fovCircleColor"] = {
+                Config::fovCircleColor.x,
+                Config::fovCircleColor.y,
+                Config::fovCircleColor.z,
+                Config::fovCircleColor.w
+            };
 
             auto filePath = GetConfigPath(configName);
             std::ofstream ofs(filePath);
@@ -268,6 +274,14 @@ namespace internal_config
                 Config::teamcolVisualChams.w = arr[3].get<float>();
             }
 
+            if (j.contains("fovCircleColor") && j["fovCircleColor"].is_array() && j["fovCircleColor"].size() == 4) {
+                auto arr = j["fovCircleColor"];
+                Config::fovCircleColor.x = arr[0].get<float>();
+                Config::fovCircleColor.y = arr[1].get<float>();
+                Config::fovCircleColor.z = arr[2].get<float>();
+                Config::fovCircleColor.w = arr[3].get<float>();
+            }
+
             ifs.close();
         }
 

TempleWare-CS2/source/templeware/menu/hud.cpp

@@ -12,21 +12,20 @@ Hud::Hud() {
 }
 
 float CalculateFovRadius(float fovDegrees, float screenWidth, float screenHeight, float gameVerticalFOV) {
-    // Horizontal FOV conversion to radians
     float aspectRatio = screenWidth / screenHeight;
     float fovRadians = fovDegrees * (DirectX::XM_PI / 180.0f);
 
-    // Calculate radius based on in-game vertical FOV and screen height
     float screenRadius = std::tan(fovRadians / 2.0f) * (screenHeight / 2.0f) / std::tan(gameVerticalFOV * (DirectX::XM_PI / 180.0f) / 2.0f);
 
     static float flScalingMultiplier = 2.5f;
 
     return screenRadius * flScalingMultiplier;
 }
 
-void RenderFovCircle(ImDrawList* drawList, float fov, ImVec2 screenCenter, float screenWidth, float screenHeight, uint32_t color, float thickness) {
+void RenderFovCircle(ImDrawList* drawList, float fov, ImVec2 screenCenter, float screenWidth, float screenHeight, float thickness) {
     float radius = CalculateFovRadius(fov, screenWidth, screenHeight, H::g_flActiveFov);
-    drawList->AddCircle(screenCenter, radius, color, 100, thickness);  // 100 segments for smoothness
+    uint32_t color = ImGui::ColorConvertFloat4ToU32(Config::fovCircleColor);
+    drawList->AddCircle(screenCenter, radius, color, 100, thickness);
 }
 
 void Hud::render() {
@@ -69,6 +68,6 @@ void Hud::render() {
     if (Config::fov_circle) {
         ImVec2 Center = ImVec2(ImGui::GetIO().DisplaySize.x / 2.f, ImGui::GetIO().DisplaySize.y / 2.f);
 
-        RenderFovCircle(drawList, Config::aimbot_fov, Center, ImGui::GetIO().DisplaySize.x, ImGui::GetIO().DisplaySize.y, ImColor(255, 255, 255, 255), 1.f);
+        RenderFovCircle(drawList, Config::aimbot_fov, Center, ImGui::GetIO().DisplaySize.x, ImGui::GetIO().DisplaySize.y, 1.f);
     }
 }

TempleWare-CS2/source/templeware/menu/menu.cpp

@@ -117,6 +117,9 @@ void Menu::render() {
 
             ImGui::SliderFloat("FOV", &Config::aimbot_fov, 0.f, 90.f);
             ImGui::Checkbox("DrawFOV", &Config::fov_circle);
+            if (Config::fov_circle) {
+                ImGui::ColorEdit4("Color##FovColor", (float*)&Config::fovCircleColor);
+            }
             ImGui::Checkbox("RCS", &Config::rcs);
             ImGui::Separator();
             break;