Move IsGfxVSyncEnabled to SDK::Options

Author: Plextora

LatiteRewrite.vcxproj

@@ -873,6 +873,7 @@
     </ClCompile>
     <ClCompile Include="src\sdk\common\client\game\ClientInstance.cpp" />
     <ClCompile Include="src\sdk\common\client\game\MinecraftGame.cpp" />
+    <ClCompile Include="src\sdk\common\client\game\Options.cpp" />
     <ClCompile Include="src\sdk\common\client\gui\controls\UIControl.cpp" />
     <ClCompile Include="src\sdk\common\client\gui\screens\ContainerScreenController.cpp" />
     <ClCompile Include="src\sdk\common\client\input\RemappingLayout.cpp" />

LatiteRewrite.vcxproj.filters

@@ -163,6 +163,7 @@
     <ClCompile Include="src\client\script\objects\OSScriptingObject.cpp" />
     <ClCompile Include="src\client\feature\module\impl\game\AutoGG.cpp" />
     <ClCompile Include="src\client\feature\module\impl\hud\FrameTimeDisplay.cpp" />
+    <ClCompile Include="src\sdk\common\client\game\Options.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="assets\lang\en_US.json" />

src/client/hook/impl/DXHooks.cpp

@@ -2,6 +2,7 @@
 #include "DXHooks.h"
 #include "client/Latite.h"
 #include "client/render/Renderer.h"
+#include "sdk/common/client/game/Options.h"
 
 namespace {
 	typedef HRESULT(WINAPI* CreateSwapChainForCoreWindow_t)(
@@ -18,35 +19,6 @@ namespace {
 	std::shared_ptr<Hook> ExecuteCommandListsHook;
 }
 
-// doing file read operations in DXHooks is a little silly but im too tired to find a better way
-bool DXHooks::IsGfxVSyncEnabled() {
-	wchar_t userProfile[MAX_PATH];
-	DWORD pathLen = GetEnvironmentVariableW(L"USERPROFILE", userProfile, MAX_PATH);
-	if (pathLen == 0 || pathLen >= MAX_PATH) {
-		return true;
-	}
-
-	std::wstring optionsPath(userProfile);
-	optionsPath +=
-	    L"\\AppData\\Local\\Packages\\Microsoft.MinecraftUWP_8wekyb3d8bbwe\\LocalState\\games\\com.mojang\\minecraftpe\\options.txt";
-
-	std::ifstream file(optionsPath.c_str());
-	if (!file.is_open()) {
-		return true;
-	}
-
-	std::string line;
-	while (std::getline(file, line)) {
-		std::erase(line, '\r');
-		if (line.find("gfx_vsync:") == 0) {
-			return line != "gfx_vsync:0";
-		}
-	}
-
-	// default to enabled
-	return true;
-}
-
 void DXHooks::CheckTearingSupport() {
 	ComPtr<IDXGIFactory5> factory5;
 	if (SUCCEEDED(CreateDXGIFactory1(IID_PPV_ARGS(&factory5)))) {
@@ -55,7 +27,7 @@ void DXHooks::CheckTearingSupport() {
 			DXGI_FEATURE_PRESENT_ALLOW_TEARING,
 			&allowTearing,
 			sizeof(allowTearing)))) {
-			if (allowTearing && !DXHooks::IsGfxVSyncEnabled()) {
+			if (allowTearing && !SDK::Options::get().IsGfxVSyncEnabled()) {
 				tearingSupported = true;
 			}
 		}

src/client/hook/impl/DXHooks.h

@@ -10,7 +10,6 @@ class DXHooks : public HookGroup {
 	static HRESULT __stdcall CommandQueue_ExecuteCommandLists(ID3D12CommandQueue* queue, UINT NumCommandLists, ID3D12CommandList* const* ppCommandLists);
 
 	static void CheckTearingSupport();
-	static bool IsGfxVSyncEnabled();
 public:
 	DXHooks();
 };

src/sdk/common/client/game/Options.cpp

@@ -0,0 +1,37 @@
+#include "pch.h"
+#include "Options.h"
+
+SDK::Options* SDK::Options::instance = nullptr;
+
+SDK::Options& SDK::Options::get() {
+    static Options instance;
+    return instance;
+}
+
+bool SDK::Options::IsGfxVSyncEnabled() {
+	wchar_t userProfile[MAX_PATH];
+	DWORD pathLen = GetEnvironmentVariableW(L"USERPROFILE", userProfile, MAX_PATH);
+	if (pathLen == 0 || pathLen >= MAX_PATH) {
+		return true;
+	}
+
+	std::wstring optionsPath(userProfile);
+	optionsPath +=
+		L"\\AppData\\Local\\Packages\\Microsoft.MinecraftUWP_8wekyb3d8bbwe\\LocalState\\games\\com.mojang\\minecraftpe\\options.txt";
+
+	std::ifstream file(optionsPath.c_str());
+	if (!file.is_open()) {
+		return true;
+	}
+
+	std::string line;
+	while (std::getline(file, line)) {
+		std::erase(line, '\r');
+		if (line.find("gfx_vsync:") == 0) {
+			return line != "gfx_vsync:0";
+		}
+	}
+
+	// default to enabled
+	return true;
+}

src/sdk/common/client/game/Options.h

@@ -2,6 +2,10 @@
 namespace SDK {
 	class Options {
 	public:
+		static Options& get();
+
+		Options(const Options&) = delete;
+		Options& operator=(const Options&) = delete;
 
 		void setPlayerViewPerspective(int) {
 			// TODO: lol
@@ -11,5 +15,12 @@ namespace SDK {
 			// TODO: lol
 			return 0;
 		}
+
+		bool IsGfxVSyncEnabled();
+	private:
+		Options() = default;
+		~Options() = default;
+
+		static Options* instance;
 	};
 }