Removed HOR+ fix and added FOV and aspect fixes
This commit is contained in:
@@ -17,30 +17,38 @@ typedef void (*InitDLL)();
|
|||||||
|
|
||||||
static HMODULE fixLib = nullptr;
|
static HMODULE fixLib = nullptr;
|
||||||
static SetBoolFn SetFixEnabled = nullptr;
|
static SetBoolFn SetFixEnabled = nullptr;
|
||||||
static SetBoolFn SetARAxisConstrainFixEnabled = nullptr;
|
static SetBoolFn SetFOVFixEnabled = nullptr;
|
||||||
|
static SetBoolFn SetAspectRatioFixEnabled = nullptr;
|
||||||
static SetBoolFn SetDOFFixEnabled = nullptr;
|
static SetBoolFn SetDOFFixEnabled = nullptr;
|
||||||
static SetBoolFn SetVignettingFixEnabled = nullptr;
|
static SetBoolFn SetVignettingFixEnabled = nullptr;
|
||||||
static SetBoolFn SetFogFixEnabled = nullptr;
|
static SetBoolFn SetFogFixEnabled = nullptr;
|
||||||
static InitDLL InitializeLogger = nullptr;
|
static InitDLL InitializeLogger = nullptr;
|
||||||
|
static SetIntFn SetFOV = nullptr;
|
||||||
|
static GetFloatFn GetFOVIn = nullptr;
|
||||||
|
static GetFloatFn GetCompensadedFOV = nullptr;
|
||||||
|
static GetFloatFn GetFOVOut = nullptr;
|
||||||
|
|
||||||
// Plugin variables for checkboxes and sliders
|
// Plugin variables for checkboxes and sliders
|
||||||
static bool fov_fix_enabled = false;
|
static bool fov_fix_enabled = false;
|
||||||
static bool AR_Axis_constrain_fix_enabled = false;
|
static bool aspect_ratio_fix_enabled = false;
|
||||||
static bool DOF_fix_enabled = false;
|
static bool DOF_fix_enabled = false;
|
||||||
static bool Vignetting_fix_enabled = false;
|
static bool Vignetting_fix_enabled = false;
|
||||||
static bool Fog_fix_enabled = false;
|
static bool Fog_fix_enabled = false;
|
||||||
static bool fix_enabled = false;
|
static bool fix_enabled = false;
|
||||||
|
static int worldFOVvalue = 0;
|
||||||
static bool popup_Informations = false;
|
static bool popup_Informations = false;
|
||||||
|
|
||||||
// Plugin settings
|
// Plugin settings
|
||||||
const char* SETTINGS_FILE = "PluginSettings.ini";
|
const char* SETTINGS_FILE = "PluginSettings.ini";
|
||||||
const char* GENERAL_FIX_SETTING = "GeneralFIX=";
|
const char* GENERAL_FIX_SETTING = "GeneralFIX=";
|
||||||
const char* AR_AXIS_CONSTRAIN_FIX_SETTING = "ARAxisConstrainFIX=";
|
const char* FOV_FIX_SETTING = "FOVFIX=";
|
||||||
|
const char* ASPECT_FIX_SETTING = "AspectFIX=";
|
||||||
const char* DOF_FIX_SETTING = "DOFFIX=";
|
const char* DOF_FIX_SETTING = "DOFFIX=";
|
||||||
const char* VIGNETTING_FIX_SETTING = "VignettingFIX=";
|
const char* VIGNETTING_FIX_SETTING = "VignettingFIX=";
|
||||||
const char* FOG_FIX_SETTING = "FogFIX=";
|
const char* FOG_FIX_SETTING = "FogFIX=";
|
||||||
const char* FIX_VERSION = "1.0.1";
|
const char* WORLD_FOV_SETTING = "WorldFOV=";
|
||||||
const char* FIX_INFORMATIONS = "This fix allows to:\n - Enable HOR+.\n - Disable depth of field.\n - Disable vignetting.\n - Disbale FOG.\n\nEnabling HOR + may over compensate FOV in game.\nDisabling Fog will not entirely remove it.";
|
const char* FIX_VERSION = "1.0.2";
|
||||||
|
const char* FIX_INFORMATIONS = "This fix allows to:\n - Control FOV.\n - Disable pillarboxing in cutscenes.\n - Disable depth of field.\n - Disable vignetting.\n - Disable fog.\n\nDisabling pillarboxing will compensate FOV for ultrawide.\nDisabling Fog will not entirely remove it.";
|
||||||
const char* DONATION_URL = "https://buymeacoffee.com/k4sh44";
|
const char* DONATION_URL = "https://buymeacoffee.com/k4sh44";
|
||||||
|
|
||||||
// Ensure that our Core DLL will be called only once
|
// Ensure that our Core DLL will be called only once
|
||||||
@@ -86,13 +94,20 @@ static void LoadFixDLL()
|
|||||||
}
|
}
|
||||||
|
|
||||||
SetFixEnabled = (SetBoolFn)GetProcAddress(fixLib, "SetFixEnabled");
|
SetFixEnabled = (SetBoolFn)GetProcAddress(fixLib, "SetFixEnabled");
|
||||||
SetARAxisConstrainFixEnabled = (SetBoolFn)GetProcAddress(fixLib, "SetARAxisConstrainFixEnabled");
|
SetFOVFixEnabled = (SetBoolFn)GetProcAddress(fixLib, "SetFOVFixEnabled");
|
||||||
|
SetAspectRatioFixEnabled = (SetBoolFn)GetProcAddress(fixLib, "SetAspectRatioFixEnabled");
|
||||||
SetDOFFixEnabled = (SetBoolFn)GetProcAddress(fixLib, "SetDOFFixEnabled");
|
SetDOFFixEnabled = (SetBoolFn)GetProcAddress(fixLib, "SetDOFFixEnabled");
|
||||||
SetVignettingFixEnabled = (SetBoolFn)GetProcAddress(fixLib, "SetVignettingFixEnabled");
|
SetVignettingFixEnabled = (SetBoolFn)GetProcAddress(fixLib, "SetVignettingFixEnabled");
|
||||||
SetFogFixEnabled = (SetBoolFn)GetProcAddress(fixLib, "SetFogFixEnabled");
|
SetFogFixEnabled = (SetBoolFn)GetProcAddress(fixLib, "SetFogFixEnabled");
|
||||||
|
SetFOV = (SetIntFn)GetProcAddress(fixLib, "SetFOV");
|
||||||
|
GetFOVIn = (GetFloatFn)GetProcAddress(fixLib, "GetFOVIn");
|
||||||
|
GetCompensadedFOV = (GetFloatFn)GetProcAddress(fixLib, "GetCompensatedFOV");
|
||||||
|
GetFOVOut = (GetFloatFn)GetProcAddress(fixLib, "GetFOVOut");;
|
||||||
|
|
||||||
// Apply initial values loaded from settings
|
// Apply initial values loaded from settings
|
||||||
if (SetARAxisConstrainFixEnabled) SetARAxisConstrainFixEnabled(AR_Axis_constrain_fix_enabled, true);
|
if (SetFOV) SetFOV(worldFOVvalue);
|
||||||
|
if (SetFOVFixEnabled) SetFOVFixEnabled(fov_fix_enabled, true);
|
||||||
|
if (SetAspectRatioFixEnabled) SetAspectRatioFixEnabled(aspect_ratio_fix_enabled, true);
|
||||||
if (SetDOFFixEnabled) SetDOFFixEnabled(DOF_fix_enabled, true);
|
if (SetDOFFixEnabled) SetDOFFixEnabled(DOF_fix_enabled, true);
|
||||||
if (SetVignettingFixEnabled) SetVignettingFixEnabled(Vignetting_fix_enabled, true);
|
if (SetVignettingFixEnabled) SetVignettingFixEnabled(Vignetting_fix_enabled, true);
|
||||||
if (SetFogFixEnabled) SetFogFixEnabled(Fog_fix_enabled, true);
|
if (SetFogFixEnabled) SetFogFixEnabled(Fog_fix_enabled, true);
|
||||||
@@ -108,10 +123,12 @@ static void SaveSettings()
|
|||||||
if (file.is_open())
|
if (file.is_open())
|
||||||
{
|
{
|
||||||
file << GENERAL_FIX_SETTING << (fix_enabled ? "1" : "0") << "\n";
|
file << GENERAL_FIX_SETTING << (fix_enabled ? "1" : "0") << "\n";
|
||||||
file << AR_AXIS_CONSTRAIN_FIX_SETTING << (AR_Axis_constrain_fix_enabled ? "1" : "0") << "\n";
|
file << FOV_FIX_SETTING << (fov_fix_enabled ? "1" : "0") << "\n";
|
||||||
|
file << ASPECT_FIX_SETTING << (aspect_ratio_fix_enabled ? "1" : "0") << "\n";
|
||||||
file << DOF_FIX_SETTING << (DOF_fix_enabled ? "1" : "0") << "\n";
|
file << DOF_FIX_SETTING << (DOF_fix_enabled ? "1" : "0") << "\n";
|
||||||
file << VIGNETTING_FIX_SETTING << (Vignetting_fix_enabled ? "1" : "0") << "\n";
|
file << VIGNETTING_FIX_SETTING << (Vignetting_fix_enabled ? "1" : "0") << "\n";
|
||||||
file << FOG_FIX_SETTING << (Fog_fix_enabled ? "1" : "0") << "\n";
|
file << FOG_FIX_SETTING << (Fog_fix_enabled ? "1" : "0") << "\n";
|
||||||
|
file << WORLD_FOV_SETTING << worldFOVvalue << "\n";
|
||||||
file.close();
|
file.close();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -124,15 +141,20 @@ static void LoadSettings()
|
|||||||
std::string line;
|
std::string line;
|
||||||
while (std::getline(file, line))
|
while (std::getline(file, line))
|
||||||
{
|
{
|
||||||
|
if (line.find(FOV_FIX_SETTING) == 0)
|
||||||
|
{
|
||||||
|
std::string val = line.substr(strlen(FOV_FIX_SETTING));
|
||||||
|
fov_fix_enabled = (val == "1" || val == "true");
|
||||||
|
}
|
||||||
if (line.find(GENERAL_FIX_SETTING) == 0)
|
if (line.find(GENERAL_FIX_SETTING) == 0)
|
||||||
{
|
{
|
||||||
std::string val = line.substr(strlen(GENERAL_FIX_SETTING));
|
std::string val = line.substr(strlen(GENERAL_FIX_SETTING));
|
||||||
fix_enabled = (val == "1" || val == "true");
|
fix_enabled = (val == "1" || val == "true");
|
||||||
}
|
}
|
||||||
else if (line.find(AR_AXIS_CONSTRAIN_FIX_SETTING) == 0)
|
else if (line.find(ASPECT_FIX_SETTING) == 0)
|
||||||
{
|
{
|
||||||
std::string val = line.substr(strlen(AR_AXIS_CONSTRAIN_FIX_SETTING));
|
std::string val = line.substr(strlen(ASPECT_FIX_SETTING));
|
||||||
AR_Axis_constrain_fix_enabled = (val == "1" || val == "true");
|
aspect_ratio_fix_enabled = (val == "1" || val == "true");
|
||||||
}
|
}
|
||||||
else if (line.find(DOF_FIX_SETTING) == 0)
|
else if (line.find(DOF_FIX_SETTING) == 0)
|
||||||
{
|
{
|
||||||
@@ -149,6 +171,8 @@ static void LoadSettings()
|
|||||||
std::string val = line.substr(strlen(FOG_FIX_SETTING));
|
std::string val = line.substr(strlen(FOG_FIX_SETTING));
|
||||||
Fog_fix_enabled = (val == "1" || val == "true");
|
Fog_fix_enabled = (val == "1" || val == "true");
|
||||||
}
|
}
|
||||||
|
else if (line.find(WORLD_FOV_SETTING) == 0)
|
||||||
|
worldFOVvalue = std::stoi(line.substr(strlen(WORLD_FOV_SETTING)));
|
||||||
}
|
}
|
||||||
file.close();
|
file.close();
|
||||||
}
|
}
|
||||||
@@ -156,6 +180,7 @@ static void LoadSettings()
|
|||||||
|
|
||||||
static void displayFixInformations() {
|
static void displayFixInformations() {
|
||||||
// Fix version
|
// Fix version
|
||||||
|
ImGui::SetNextWindowSize(ImVec2(420, 210), ImGuiCond_Once);
|
||||||
ImGui::Begin("Informations", &popup_Informations); //
|
ImGui::Begin("Informations", &popup_Informations); //
|
||||||
ImGui::SetCursorPos(ImVec2(10, 36));
|
ImGui::SetCursorPos(ImVec2(10, 36));
|
||||||
ImGui::Text("Version : %s", FIX_VERSION);
|
ImGui::Text("Version : %s", FIX_VERSION);
|
||||||
@@ -199,35 +224,72 @@ static void on_overlay_draw(reshade::api::effect_runtime* runtime)
|
|||||||
}
|
}
|
||||||
ImGui::EndChild();
|
ImGui::EndChild();
|
||||||
|
|
||||||
|
// FOV adjustment
|
||||||
|
ImGui::SetCursorPos(ImVec2(10, 120));
|
||||||
|
ImGui::BeginChild("FOVHeader", ImVec2(220, 0), false); // true = bordure
|
||||||
|
if (ImGui::CollapsingHeader("In game additional FOV", ImGuiTreeNodeFlags_DefaultOpen)) {
|
||||||
|
ImGui::SetCursorPos(ImVec2(5, 30));
|
||||||
|
ImGui::SetNextItemWidth(150.0f);
|
||||||
|
if (ImGui::SliderInt("", &worldFOVvalue, -20, 50)) {}
|
||||||
|
if (ImGui::IsItemDeactivatedAfterEdit()) {
|
||||||
|
if (SetFOV) SetFOV(worldFOVvalue);
|
||||||
|
SaveSettings();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
ImGui::EndChild();
|
||||||
|
|
||||||
// Individual fixes
|
// Individual fixes
|
||||||
ImGui::SetCursorPos(ImVec2(240, 60));
|
ImGui::SetCursorPos(ImVec2(240, 60));
|
||||||
ImGui::BeginChild("IndividualFixesHeader", ImVec2(250, 0), false);
|
ImGui::BeginChild("IndividualFixesHeader", ImVec2(250, 0), false);
|
||||||
if (ImGui::CollapsingHeader("Individual fixes", ImGuiTreeNodeFlags_DefaultOpen)) {
|
if (ImGui::CollapsingHeader("Individual fixes", ImGuiTreeNodeFlags_DefaultOpen)) {
|
||||||
ImGui::SetCursorPos(ImVec2(5, 30));
|
ImGui::SetCursorPos(ImVec2(5, 30));
|
||||||
if (ImGui::Checkbox("Enable HOR+", &AR_Axis_constrain_fix_enabled)) {
|
if (ImGui::Checkbox("Enable FOV fix", &fov_fix_enabled)) {
|
||||||
if (SetARAxisConstrainFixEnabled) SetARAxisConstrainFixEnabled(AR_Axis_constrain_fix_enabled, false);
|
if (SetFOVFixEnabled) SetFOVFixEnabled(fov_fix_enabled, false);
|
||||||
SaveSettings();
|
SaveSettings();
|
||||||
}
|
}
|
||||||
|
|
||||||
ImGui::SetCursorPos(ImVec2(5, 55));
|
ImGui::SetCursorPos(ImVec2(5, 55));
|
||||||
|
if (ImGui::Checkbox("Enable aspect fix", &aspect_ratio_fix_enabled)) {
|
||||||
|
if (SetAspectRatioFixEnabled) SetAspectRatioFixEnabled(aspect_ratio_fix_enabled, false);
|
||||||
|
SaveSettings();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (ImGui::IsItemHovered()) {
|
||||||
|
ImGui::BeginTooltip();
|
||||||
|
ImGui::Text("Aspect ratio fix is only usefull for ultrawide displays.");
|
||||||
|
ImGui::Text("No need to enable it if you play at 16/9.");
|
||||||
|
ImGui::EndTooltip();
|
||||||
|
}
|
||||||
|
|
||||||
|
ImGui::SetCursorPos(ImVec2(5, 80));
|
||||||
if (ImGui::Checkbox("Depth of field Fix", &DOF_fix_enabled)) {
|
if (ImGui::Checkbox("Depth of field Fix", &DOF_fix_enabled)) {
|
||||||
if (SetDOFFixEnabled) SetDOFFixEnabled(DOF_fix_enabled, false);
|
if (SetDOFFixEnabled) SetDOFFixEnabled(DOF_fix_enabled, false);
|
||||||
SaveSettings();
|
SaveSettings();
|
||||||
}
|
}
|
||||||
|
|
||||||
ImGui::SetCursorPos(ImVec2(5, 80));
|
ImGui::SetCursorPos(ImVec2(5, 105));
|
||||||
if (ImGui::Checkbox("Vignetting Fix", &Vignetting_fix_enabled)) {
|
if (ImGui::Checkbox("Vignetting Fix", &Vignetting_fix_enabled)) {
|
||||||
if (SetVignettingFixEnabled) SetVignettingFixEnabled(Vignetting_fix_enabled, false);
|
if (SetVignettingFixEnabled) SetVignettingFixEnabled(Vignetting_fix_enabled, false);
|
||||||
SaveSettings();
|
SaveSettings();
|
||||||
}
|
}
|
||||||
|
|
||||||
ImGui::SetCursorPos(ImVec2(5, 105));
|
ImGui::SetCursorPos(ImVec2(145, 105));
|
||||||
if (ImGui::Checkbox("Fog Fix", &Fog_fix_enabled)) {
|
if (ImGui::Checkbox("Fog Fix", &Fog_fix_enabled)) {
|
||||||
if (SetFogFixEnabled) SetFogFixEnabled(Fog_fix_enabled, false);
|
if (SetFogFixEnabled) SetFogFixEnabled(Fog_fix_enabled, false);
|
||||||
SaveSettings();
|
SaveSettings();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
ImGui::EndChild();
|
ImGui::EndChild();
|
||||||
|
|
||||||
|
// Fix status
|
||||||
|
ImGui::SetCursorPos(ImVec2(10, 220));
|
||||||
|
ImGui::BeginChild("INFOSHeader", ImVec2(480, 80), true); // true = border
|
||||||
|
if (ImGui::CollapsingHeader("Fix informations", ImGuiTreeNodeFlags_DefaultOpen)) {
|
||||||
|
ImGui::SetCursorPos(ImVec2(5, 30));
|
||||||
|
if (GetFOVIn && GetCompensadedFOV && GetFOVOut)
|
||||||
|
ImGui::Text("FOV In: %.2f, Compensated : %.2f, Out : %.2f", GetFOVIn(), GetCompensadedFOV(), GetFOVOut());
|
||||||
|
}
|
||||||
|
ImGui::EndChild();
|
||||||
}
|
}
|
||||||
|
|
||||||
// Main dll intrance
|
// Main dll intrance
|
||||||
|
|||||||
Reference in New Issue
Block a user