backup/DDrawCompat
1
0
Fork 0
mirror of https://github.com/narzoul/DDrawCompat synced 2024-12-30 08:55:36 +01:00
Code Issues Projects Releases Activity

Added ResolutionScaleFilter setting

Browse Source
This commit is contained in:
narzoul 2022-09-24 15:48:46 +02:00
parent 13e4d90116
commit c7ee5206d8
8 changed files with 34 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
DDrawCompat/Config/Config.cpp
View File

@ -23,6 +23,7 @@ namespace Config
Settings::RemoveBorders removeBorders; Settings::RemoveBorders removeBorders;
Settings::RenderColorDepth renderColorDepth; Settings::RenderColorDepth renderColorDepth;
Settings::ResolutionScale resolutionScale; Settings::ResolutionScale resolutionScale;
Settings::ResolutionScaleFilter resolutionScaleFilter;
Settings::SoftwareDevice softwareDevice; Settings::SoftwareDevice softwareDevice;
Settings::SpriteDetection spriteDetection; Settings::SpriteDetection spriteDetection;
Settings::SpriteFilter spriteFilter; Settings::SpriteFilter spriteFilter;

2
DDrawCompat/Config/Config.h
View File

@ -21,6 +21,7 @@
#include <Config/Settings/RemoveBorders.h> #include <Config/Settings/RemoveBorders.h>
#include <Config/Settings/RenderColorDepth.h> #include <Config/Settings/RenderColorDepth.h>
#include <Config/Settings/ResolutionScale.h> #include <Config/Settings/ResolutionScale.h>
#include <Config/Settings/ResolutionScaleFilter.h>
#include <Config/Settings/SoftwareDevice.h> #include <Config/Settings/SoftwareDevice.h>
#include <Config/Settings/SpriteDetection.h> #include <Config/Settings/SpriteDetection.h>
#include <Config/Settings/SpriteFilter.h> #include <Config/Settings/SpriteFilter.h>
@ -54,6 +55,7 @@ namespace Config
extern Settings::RemoveBorders removeBorders; extern Settings::RemoveBorders removeBorders;
extern Settings::RenderColorDepth renderColorDepth; extern Settings::RenderColorDepth renderColorDepth;
extern Settings::ResolutionScale resolutionScale; extern Settings::ResolutionScale resolutionScale;
extern Settings::ResolutionScaleFilter resolutionScaleFilter;
extern Settings::SoftwareDevice softwareDevice; extern Settings::SoftwareDevice softwareDevice;
extern Settings::SpriteDetection spriteDetection; extern Settings::SpriteDetection spriteDetection;
extern Settings::SpriteFilter spriteFilter; extern Settings::SpriteFilter spriteFilter;

21
DDrawCompat/Config/Settings/ResolutionScaleFilter.h Normal file
View File

@ -0,0 +1,21 @@
#pragma once
#include <Config/MappedSetting.h>
namespace Config
{
namespace Settings
{
class ResolutionScaleFilter : public MappedSetting<UINT>
{
public:
static const UINT POINT = 0;
static const UINT BILINEAR = 1;
ResolutionScaleFilter::ResolutionScaleFilter()
: MappedSetting("ResolutionScaleFilter", "point", { {"point", POINT}, {"bilinear", BILINEAR} })
{
}
};
}
}

3
DDrawCompat/D3dDdi/Resource.cpp
View File

@ -921,7 +921,8 @@ namespace D3dDdi
if (m_lockData[subResourceIndex].isMsaaUpToDate || m_lockData[subResourceIndex].isMsaaResolvedUpToDate) if (m_lockData[subResourceIndex].isMsaaUpToDate || m_lockData[subResourceIndex].isMsaaResolvedUpToDate)
{ {
loadMsaaResolvedResource(subResourceIndex); loadMsaaResolvedResource(subResourceIndex);
if (!m_fixedData.Flags.RenderTarget) if (!m_fixedData.Flags.RenderTarget ||
Config::Settings::ResolutionScaleFilter::POINT == Config::resolutionScaleFilter.get())
{ {
copySubResource(*this, *m_msaaResolvedSurface.resource, subResourceIndex); copySubResource(*this, *m_msaaResolvedSurface.resource, subResourceIndex);
return; return;

1
DDrawCompat/DDrawCompat.vcxproj
View File

@ -180,6 +180,7 @@
<ClInclude Include="Config\Settings\RemoveBorders.h" /> <ClInclude Include="Config\Settings\RemoveBorders.h" />
<ClInclude Include="Config\Settings\RenderColorDepth.h" /> <ClInclude Include="Config\Settings\RenderColorDepth.h" />
<ClInclude Include="Config\Settings\ResolutionScale.h" /> <ClInclude Include="Config\Settings\ResolutionScale.h" />
<ClInclude Include="Config\Settings\ResolutionScaleFilter.h" />
<ClInclude Include="Config\Settings\SoftwareDevice.h" /> <ClInclude Include="Config\Settings\SoftwareDevice.h" />
<ClInclude Include="Config\Settings\SpriteDetection.h" /> <ClInclude Include="Config\Settings\SpriteDetection.h" />
<ClInclude Include="Config\Settings\SpriteFilter.h" /> <ClInclude Include="Config\Settings\SpriteFilter.h" />

3
DDrawCompat/DDrawCompat.vcxproj.filters
View File

@ -600,6 +600,9 @@
<ClInclude Include="Config\Settings\SoftwareDevice.h"> <ClInclude Include="Config\Settings\SoftwareDevice.h">
<Filter>Header Files\Config\Settings</Filter> <Filter>Header Files\Config\Settings</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="Config\Settings\ResolutionScaleFilter.h">
<Filter>Header Files\Config\Settings</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="Gdi\Gdi.cpp"> <ClCompile Include="Gdi\Gdi.cpp">

3
DDrawCompat/Overlay/ConfigWindow.cpp
View File

@ -17,7 +17,7 @@ namespace
namespace Overlay namespace Overlay
{ {
ConfigWindow::ConfigWindow() ConfigWindow::ConfigWindow()
: Window(nullptr, { 0, 0, SettingControl::TOTAL_WIDTH, 405 }, Config::configHotKey.get()) : Window(nullptr, { 0, 0, SettingControl::TOTAL_WIDTH, 430 }, Config::configHotKey.get())
, m_buttonCount(0) , m_buttonCount(0)
, m_focus(nullptr) , m_focus(nullptr)
{ {
@ -35,6 +35,7 @@ namespace Overlay
addControl(Config::fpsLimiter); addControl(Config::fpsLimiter);
addControl(Config::renderColorDepth); addControl(Config::renderColorDepth);
addControl(Config::resolutionScale); addControl(Config::resolutionScale);
addControl(Config::resolutionScaleFilter);
addControl(Config::spriteDetection); addControl(Config::spriteDetection);
addControl(Config::spriteFilter); addControl(Config::spriteFilter);
addControl(Config::spriteTexCoord); addControl(Config::spriteTexCoord);

4
DDrawCompat/Overlay/SettingControl.h
View File

@ -20,8 +20,8 @@ namespace Overlay
public: public:
static const int PARAM_LABEL_WIDTH = 70; static const int PARAM_LABEL_WIDTH = 70;
static const int PARAM_CONTROL_WIDTH = 241; static const int PARAM_CONTROL_WIDTH = 241;
static const int SETTING_LABEL_WIDTH = 120; static const int SETTING_LABEL_WIDTH = 130;
static const int SETTING_CONTROL_WIDTH = 151; static const int SETTING_CONTROL_WIDTH = 141;
static const int TOTAL_WIDTH = static const int TOTAL_WIDTH =
SETTING_LABEL_WIDTH + SETTING_CONTROL_WIDTH + PARAM_LABEL_WIDTH + PARAM_CONTROL_WIDTH + BORDER; SETTING_LABEL_WIDTH + SETTING_CONTROL_WIDTH + PARAM_LABEL_WIDTH + PARAM_CONTROL_WIDTH + BORDER;