Extend motion prediction support

.gitignore

@@ -8,3 +8,5 @@
 publish/
 **_dxbc.txt
 /.vs/
+**/Profile
+**/Release (ResMod)

README.md

@@ -34,8 +34,7 @@ Update July 2021: I have been too busy to work on D2DX for a while, but hope to
 
 ## Compatibility
 Game versions supported:
-  - All features: 1.09d, 1.13c, 1.13d and 1.14d.
-  - Without resolution switching: 1.10f, 1.12.
+  - All features: 1.09d, 1.10f, 1.12, 1.13c, 1.13d and 1.14d.
   - Other versions are unsupported, will display a warning at startup and exhibit glitches.
 
 For compatibility with mods, see the [wiki](https://github.com/bolrog/d2dx/wiki/Compatibility-with-other-mods).

d2dx-defaults.cfg

@@ -30,3 +30,4 @@ noaa=false		 # if true, will not apply anti-aliasing to jagged edges
 nocompatmodefix=false	 # if true, will not block the use of "Windows XP compatibility mode"
 notitlechange=false	 # if true, will not change the window title text
 nomotionprediction=false # if true, will not run the game graphics at high fps
+nokeepaspectratio=false # if true, will not keep the aspect ratio when drawing to the screen

src/d2dx.sln

@@ -1,31 +1,41 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.30517.126
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "d2dx", "d2dx\d2dx.vcxproj", "{93A28F27-8D56-470C-B699-15B0CF2C926A}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "d2dxtests", "d2dxtests\d2dxtests.vcxproj", "{64214704-FE00-4DB6-BEFA-1E622F7262A1}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|x86 = Debug|x86
-		Release|x86 = Release|x86
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{93A28F27-8D56-470C-B699-15B0CF2C926A}.Debug|x86.ActiveCfg = Debug|Win32
-		{93A28F27-8D56-470C-B699-15B0CF2C926A}.Debug|x86.Build.0 = Debug|Win32
-		{93A28F27-8D56-470C-B699-15B0CF2C926A}.Release|x86.ActiveCfg = Release|Win32
-		{93A28F27-8D56-470C-B699-15B0CF2C926A}.Release|x86.Build.0 = Release|Win32
-		{64214704-FE00-4DB6-BEFA-1E622F7262A1}.Debug|x86.ActiveCfg = Debug|Win32
-		{64214704-FE00-4DB6-BEFA-1E622F7262A1}.Debug|x86.Build.0 = Debug|Win32
-		{64214704-FE00-4DB6-BEFA-1E622F7262A1}.Release|x86.ActiveCfg = Release|Win32
-		{64214704-FE00-4DB6-BEFA-1E622F7262A1}.Release|x86.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {680244CF-729A-4310-A2CA-D9ABD4923671}
-	EndGlobalSection
-EndGlobal
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.3.32901.215
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "d2dx", "d2dx\d2dx.vcxproj", "{93A28F27-8D56-470C-B699-15B0CF2C926A}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "d2dxtests", "d2dxtests\d2dxtests.vcxproj", "{64214704-FE00-4DB6-BEFA-1E622F7262A1}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|x86 = Debug|x86
+		Profile|x86 = Profile|x86
+		Release (ResMod)|x86 = Release (ResMod)|x86
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{93A28F27-8D56-470C-B699-15B0CF2C926A}.Debug|x86.ActiveCfg = Debug|Win32
+		{93A28F27-8D56-470C-B699-15B0CF2C926A}.Debug|x86.Build.0 = Debug|Win32
+		{93A28F27-8D56-470C-B699-15B0CF2C926A}.Profile|x86.ActiveCfg = Profile|Win32
+		{93A28F27-8D56-470C-B699-15B0CF2C926A}.Profile|x86.Build.0 = Profile|Win32
+		{93A28F27-8D56-470C-B699-15B0CF2C926A}.Release (ResMod)|x86.ActiveCfg = Release (ResMod)|Win32
+		{93A28F27-8D56-470C-B699-15B0CF2C926A}.Release (ResMod)|x86.Build.0 = Release (ResMod)|Win32
+		{93A28F27-8D56-470C-B699-15B0CF2C926A}.Release|x86.ActiveCfg = Release|Win32
+		{93A28F27-8D56-470C-B699-15B0CF2C926A}.Release|x86.Build.0 = Release|Win32
+		{64214704-FE00-4DB6-BEFA-1E622F7262A1}.Debug|x86.ActiveCfg = Debug|Win32
+		{64214704-FE00-4DB6-BEFA-1E622F7262A1}.Debug|x86.Build.0 = Debug|Win32
+		{64214704-FE00-4DB6-BEFA-1E622F7262A1}.Profile|x86.ActiveCfg = Profile|Win32
+		{64214704-FE00-4DB6-BEFA-1E622F7262A1}.Profile|x86.Build.0 = Profile|Win32
+		{64214704-FE00-4DB6-BEFA-1E622F7262A1}.Release (ResMod)|x86.ActiveCfg = Release (ResMod)|Win32
+		{64214704-FE00-4DB6-BEFA-1E622F7262A1}.Release (ResMod)|x86.Build.0 = Release (ResMod)|Win32
+		{64214704-FE00-4DB6-BEFA-1E622F7262A1}.Release|x86.ActiveCfg = Release|Win32
+		{64214704-FE00-4DB6-BEFA-1E622F7262A1}.Release|x86.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {680244CF-729A-4310-A2CA-D9ABD4923671}
+	EndGlobalSection
+EndGlobal

src/d2dx/BuiltinResMod.cpp

@@ -24,73 +24,9 @@
 
 using namespace d2dx;
 
-_Use_decl_annotations_
-BuiltinResMod::BuiltinResMod(
-    HMODULE hModule,
-    Size gameSize,
-    const std::shared_ptr<IGameHelper>& gameHelper)
-{
-    if (!hModule || !gameHelper)
-    {
-        D2DX_CHECK_HR(E_INVALIDARG);
-    }
-
-    _isActive = false;
 
-#ifndef D2DX_UNITTEST
-    if (IsCompatible(gameHelper.get()))
-    {
-        D2DX_LOG("Writing SGD2FreeRes files.");
-
-        if (!WriteResourceToFile(hModule, IDR_SGD2FR_MPQ, "mpq", "d2dx_sgd2freeres.mpq"))
-        {
-            D2DX_LOG("Failed to write d2dx_sgd2freeres.mpq");
-        }
-
-        if (!WriteResourceToFile(hModule, IDR_SGD2FR_DLL, "dll", "d2dx_sgd2freeres.dll"))
-        {
-            D2DX_LOG("Failed to write d2dx_sgd2freeres.mpq");
-        }
-
-        if (!WriteConfig(gameSize))
-        {
-            D2DX_LOG("Failed to write SGD2FreeRes configuration.");
-        }
-
-        D2DX_LOG("Initializing SGD2FreeRes.");
-        LoadLibraryA("d2dx_sgd2freeres.dll");
-
-        _isActive = true;
-        return;
-    }
-#endif
-}
-
-bool BuiltinResMod::IsActive() const
-{
-    return _isActive;
-}
-
-_Use_decl_annotations_
-bool BuiltinResMod::IsCompatible(
-    IGameHelper* gameHelper)
-{
-    auto gameVersion = gameHelper->GetVersion();
-
-    if (gameVersion != d2dx::GameVersion::Lod109d &&
-        gameVersion != d2dx::GameVersion::Lod113c &&
-        gameVersion != d2dx::GameVersion::Lod113d &&
-        gameVersion != d2dx::GameVersion::Lod114d)
-    {
-        D2DX_LOG("Unsupported game version, won't use built-in resolution mod.");
-        return false;
-    }
-
-    return true;
-}
-
-_Use_decl_annotations_
-bool BuiltinResMod::WriteResourceToFile(
+#ifdef D2DX_INTERNAL_RES_MOD
+bool WriteResourceToFile(
     HMODULE hModule,
     int32_t resourceId,
     const char* ext,
@@ -113,7 +49,7 @@ bool BuiltinResMod::WriteResourceToFile(
 
     resourceData = LoadResource(hModule, resourceInfo);
     if (!resourceData)
-    { 
+    {
         succeeded = false;
         goto end;
     }
@@ -125,7 +61,7 @@ bool BuiltinResMod::WriteResourceToFile(
         succeeded = false;
         goto end;
     }
-    
+
     succeeded = DecompressLZMAToFile((const uint8_t*)payloadPtr, payloadSize, filename);
 
 end:
@@ -141,8 +77,7 @@ bool BuiltinResMod::WriteResourceToFile(
     return succeeded;
 }
 
-_Use_decl_annotations_
-bool BuiltinResMod::WriteConfig(
+bool WriteConfig(
     _In_ Size gameSize)
 {
     HANDLE file = nullptr;
@@ -200,3 +135,84 @@ bool BuiltinResMod::WriteConfig(
 
     return succeeded;
 }
+#endif
+
+_Use_decl_annotations_
+BuiltinResMod::BuiltinResMod(
+    HMODULE hModule,
+    Size gameSize,
+    const std::shared_ptr<IGameHelper>& gameHelper)
+{
+    if (!hModule || !gameHelper)
+    {
+        D2DX_CHECK_HR(E_INVALIDARG);
+    }
+
+    _isActive = false;
+
+#ifndef D2DX_UNITTEST
+    if (IsCompatible(gameHelper.get()))
+    {
+#ifdef D2DX_INTERNAL_RES_MOD
+        D2DX_LOG("Writing SGD2FreeRes files.");
+
+        if (!WriteResourceToFile(hModule, IDR_SGD2FR_MPQ, "mpq", "d2dx_sgd2freeres.mpq"))
+        {
+            D2DX_LOG("Failed to write d2dx_sgd2freeres.mpq");
+        }
+
+        if (!WriteResourceToFile(hModule, IDR_SGD2FR_DLL, "dll", "d2dx_sgd2freeres.dll"))
+        {
+            D2DX_LOG("Failed to write d2dx_sgd2freeres.dll");
+        }
+
+        if (!WriteConfig(gameSize))
+        {
+            D2DX_LOG("Failed to write SGD2FreeRes configuration.");
+        }
+
+        D2DX_LOG("Initializing SGD2FreeRes.");
+        if (LoadLibraryA("d2dx_sgd2freeres.dll") == 0)
+        {
+            D2DX_LOG("Failed to load d2dx_sgd2freeres.dll.");
+            return;
+        }
+#else
+        D2DX_LOG("Initializing SGD2FreeRes.");
+        if (LoadLibraryA("SGD2FreeRes.dll") == 0)
+        {
+            D2DX_LOG("Failed to load SGD2FreeRes.dll.");
+            return;
+        }
+#endif
+
+        _isActive = true;
+        return;
+    }
+#endif
+}
+
+bool BuiltinResMod::IsActive() const
+{
+    return _isActive;
+}
+
+_Use_decl_annotations_
+bool BuiltinResMod::IsCompatible(
+    IGameHelper* gameHelper)
+{
+    auto gameVersion = gameHelper->GetVersion();
+
+    if (gameVersion != d2dx::GameVersion::Lod109d &&
+        gameVersion != d2dx::GameVersion::Lod110f &&
+        gameVersion != d2dx::GameVersion::Lod112 &&
+        gameVersion != d2dx::GameVersion::Lod113c &&
+        gameVersion != d2dx::GameVersion::Lod113d &&
+        gameVersion != d2dx::GameVersion::Lod114d)
+    {
+        D2DX_LOG("Unsupported game version, won't use built-in resolution mod.");
+        return false;
+    }
+
+    return true;
+}

src/d2dx/BuiltinResMod.h

@@ -39,15 +39,6 @@ namespace d2dx
         bool IsCompatible(
             _In_ IGameHelper* gameHelper);
 
-        bool WriteResourceToFile(
-            _In_ HMODULE hModule,
-            _In_ int32_t resourceId,
-            _In_z_ const char* ext,
-            _In_z_ const char* filename);
-
-        bool WriteConfig(
-            _In_ Size gameSize);
-
         bool _isActive = false;
     };
 }