feat(options): Implement game options for texture filter mode and anisotropy level (#2482)

Author: Mauller

Core/GameEngine/Include/Common/OptionPreferences.h

@@ -56,6 +56,8 @@ class OptionPreferences : public UserPreferences
 	Bool loadFromIniFile();
 
 	UnsignedInt getAntiAliasing() const;
+	UnsignedInt getTextureFilterMode() const;
+	UnsignedInt getTextureAnisotropyLevel() const;
 	UnsignedInt getLANIPAddress();
 	UnsignedInt getOnlineIPAddress();
 	void setLANIPAddress(AsciiString IP);

Core/GameEngine/Source/Common/OptionPreferences.cpp

@@ -32,6 +32,7 @@
 #include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "ww3d.h"
+#include "texturefilter.h"
 
 #include "Common/AudioSettings.h"
 #include "Common/GameAudio.h"
@@ -81,6 +82,40 @@ UnsignedInt OptionPreferences::getAntiAliasing() const
 	return level;
 }
 
+UnsignedInt OptionPreferences::getTextureFilterMode() const
+{
+	OptionPreferences::const_iterator it = find("TextureFilter");
+	if (it == end())
+		return TextureFilterClass::TEXTURE_FILTER_BILINEAR;
+
+	UnsignedInt filter = TextureFilterClass::TEXTURE_FILTER_NONE;
+	if (stricmp(it->second.str(), TextureFilterClass::TextureFilterModeString[TextureFilterClass::TEXTURE_FILTER_NONE]) == 0)
+		filter = TextureFilterClass::TEXTURE_FILTER_NONE;
+	else if(stricmp(it->second.str(), TextureFilterClass::TextureFilterModeString[TextureFilterClass::TEXTURE_FILTER_NONE]) == 0)
+		filter = TextureFilterClass::TEXTURE_FILTER_POINT;
+	else if (stricmp(it->second.str(), TextureFilterClass::TextureFilterModeString[TextureFilterClass::TEXTURE_FILTER_BILINEAR]) == 0)
+		filter = TextureFilterClass::TEXTURE_FILTER_BILINEAR;
+	else if (stricmp(it->second.str(), TextureFilterClass::TextureFilterModeString[TextureFilterClass::TEXTURE_FILTER_TRILINEAR]) == 0)
+		filter = TextureFilterClass::TEXTURE_FILTER_TRILINEAR;
+	else if (stricmp(it->second.str(), TextureFilterClass::TextureFilterModeString[TextureFilterClass::TEXTURE_FILTER_ANISOTROPIC]) == 0)
+		filter = TextureFilterClass::TEXTURE_FILTER_ANISOTROPIC;
+
+	return filter;
+}
+
+UnsignedInt OptionPreferences::getTextureAnisotropyLevel() const
+{
+	OptionPreferences::const_iterator it = find("AnisotropyLevel");
+	if (it == end())
+		return TextureFilterClass::TEXTURE_FILTER_ANISOTROPIC_2X;
+
+	UnsignedInt level = atoi(it->second.str());
+	level = clamp((UnsignedInt)TextureFilterClass::TEXTURE_FILTER_ANISOTROPIC_2X, level, (UnsignedInt)TextureFilterClass::TEXTURE_FILTER_ANISOTROPIC_16X);
+	level = highestBit(level);
+
+	return level;
+}
+
 Int OptionPreferences::getCampaignDifficulty()
 {
 	OptionPreferences::const_iterator it = find("CampaignDifficulty");

Core/Libraries/Source/WWVegas/WW3D2/texturefilter.cpp

@@ -40,6 +40,14 @@
 #include "texturefilter.h"
 #include "dx8wrapper.h"
 
+const char* const TextureFilterClass::TextureFilterModeString[5] = {
+		"None",
+		"Point",
+		"Bilinear",
+		"Trilinear",
+		"Anisotropic"
+};
+
 unsigned _MinTextureFilters[MAX_TEXTURE_STAGES][TextureFilterClass::FILTER_TYPE_COUNT];
 unsigned _MagTextureFilters[MAX_TEXTURE_STAGES][TextureFilterClass::FILTER_TYPE_COUNT];
 unsigned _MipMapFilters[MAX_TEXTURE_STAGES][TextureFilterClass::FILTER_TYPE_COUNT];
@@ -100,7 +108,7 @@ void TextureFilterClass::Apply(unsigned int stage)
 //! Init filters (legacy)
 /*!
 */
-void TextureFilterClass::_Init_Filters(TextureFilterMode filter_type)
+void TextureFilterClass::_Init_Filters(TextureFilterMode texture_filter, AnisotropicFilterMode anisotropy_level)
 {
 	const D3DCAPS8& dx8caps=DX8Wrapper::Get_Current_Caps()->Get_DX8_Caps();
 
@@ -122,7 +130,7 @@ void TextureFilterClass::_Init_Filters(TextureFilterMode filter_type)
 	// TheSuperHackers @feature Mauller 08/03/2026 Add full support for all texture filtering modes;
 	// None, Point, Bilinear, Trilinear, Anisotropic.
 	BOOL FilterSupported = false;
-	switch (filter_type) {
+	switch (texture_filter) {
 
 	default:
 		// TheSuperHackers @info if we have an invalid filter_type, set the filtering to none
@@ -201,8 +209,8 @@ void TextureFilterClass::_Init_Filters(TextureFilterMode filter_type)
 			_MinTextureFilters[0][FILTER_TYPE_BEST]=D3DTEXF_ANISOTROPIC;
 			_MagTextureFilters[0][FILTER_TYPE_BEST]=D3DTEXF_ANISOTROPIC;
 
-			// Set the Anisotropic filtering level for all stages - 2X by default
-			_Set_Max_Anisotropy(TEXTURE_FILTER_ANISOTROPIC_2X);
+			// Set the Anisotropic filtering level for all stages
+			_Set_Max_Anisotropy(anisotropy_level);
 		}
 		else {
 			_MinTextureFilters[0][FILTER_TYPE_BEST]=D3DTEXF_POINT;

Core/Libraries/Source/WWVegas/WW3D2/texturefilter.h

@@ -91,6 +91,8 @@ class TextureFilterClass
 		TEXTURE_FILTER_ANISOTROPIC
 	};
 
+	static const char* const TextureFilterModeString[5];
+
 	enum AnisotropicFilterMode
 	{
 		TEXTURE_FILTER_ANISOTROPIC_2X = 2,
@@ -124,7 +126,7 @@ class TextureFilterClass
 	void Set_V_Addr_Mode(TxtAddrMode mode) { VAddressMode=mode; }
 
 	// These need to be called after device has been created
-	static void _Init_Filters(TextureFilterMode texture_filter);
+	static void _Init_Filters(TextureFilterMode texture_filter, AnisotropicFilterMode anisotropy_level);
 	static void _Set_Max_Anisotropy(AnisotropicFilterMode mode);
 
 	static void _Set_Default_Min_Filter(FilterType filter);

GeneralsMD/Code/GameEngine/Include/Common/GlobalData.h

@@ -397,6 +397,9 @@ class GlobalData : public SubsystemInterface
 																			 smaller area within the rectangle to order the gather. */
 
 	UnsignedInt m_antiAliasLevel;          ///< value of selected antialias level in the game options
+	UnsignedInt m_textureFilteringMode;       ///< value related to TextureFilterClass::TextureFilterModeEnum
+	UnsignedInt m_textureAnisotropyLevel;     ///< value related to TextureFilterClass::AnisotropicFilterMode
+
 	Bool m_languageFilterPref;        ///< Bool if user wants to filter language
 	Bool m_loadScreenDemo;						///< Bool if true, run the loadscreen demo movie
 	Bool m_disableRender;							///< if true, no rendering!

GeneralsMD/Code/GameEngine/Source/Common/GlobalData.cpp

@@ -33,6 +33,7 @@
 #include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
 #include "ww3d.h"
+#include "texturefilter.h"
 
 #include "Common/GlobalData.h"
 
@@ -933,6 +934,8 @@ GlobalData::GlobalData()
 	m_standardPublicBones.clear();
 
 	m_antiAliasLevel = WW3D::MultiSampleModeEnum::MULTISAMPLE_MODE_NONE;
+	m_textureFilteringMode = TextureFilterClass::TextureFilterMode::TEXTURE_FILTER_BILINEAR;
+	m_textureAnisotropyLevel = TextureFilterClass::AnisotropicFilterMode::TEXTURE_FILTER_ANISOTROPIC_2X;
 
 //	m_languageFilterPref = false;
 	m_languageFilterPref = true;
@@ -1232,6 +1235,8 @@ void GlobalData::parseGameDataDefinition( INI* ini )
 	TheWritableGlobalData->m_showMoneyPerMinute = optionPref.getShowMoneyPerMinute();
 
 	TheWritableGlobalData->m_antiAliasLevel = optionPref.getAntiAliasing();
+	TheWritableGlobalData->m_textureFilteringMode = optionPref.getTextureFilterMode();
+	TheWritableGlobalData->m_textureAnisotropyLevel = optionPref.getTextureAnisotropyLevel();
 
 	Int val=optionPref.getGammaValue();
 	//generate a value between 0.6 and 2.0.

GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/OptionsMenu.cpp

@@ -75,6 +75,7 @@
 #include "GameClient/MessageBox.h"
 
 #include "ww3d.h"
+#include "texturefilter.h"
 
 // This is for non-RC builds only!!!
 #define VERBOSE_VERSION L"Release"
@@ -566,6 +567,31 @@ static void saveOptions()
 		(*pref)["AntiAliasing"] = prefString;
   }
 
+	//-------------------------------------------------------------------------------------------------
+	// texture filter mode
+	val = pref->getTextureFilterMode();
+	if (val >= 0 && TheGlobalData)
+	{
+		clamp((int)TextureFilterClass::TEXTURE_FILTER_NONE, val, (int)TextureFilterClass::TEXTURE_FILTER_ANISOTROPIC);
+
+		TheWritableGlobalData->m_textureFilteringMode = val;
+		AsciiString prefString;
+		prefString = TextureFilterClass::TextureFilterModeString[val];
+		(*pref)["TextureFilter"] = prefString;
+	}
+
+	//-------------------------------------------------------------------------------------------------
+	// anisotropy level
+	val = pref->getTextureAnisotropyLevel();
+	if (val >= 0 && TheGlobalData)
+	{
+		clamp((int)TextureFilterClass::TEXTURE_FILTER_ANISOTROPIC_2X, val, (int)TextureFilterClass::TEXTURE_FILTER_ANISOTROPIC_16X);
+
+		TheWritableGlobalData->m_textureAnisotropyLevel = val;
+		AsciiString prefString;
+		prefString.format("%d", val);
+		(*pref)["AnisotropyLevel"] = prefString;
+	}
 
 	//-------------------------------------------------------------------------------------------------
 	// mouse mode

GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplay.cpp

@@ -773,7 +773,12 @@ void W3DDisplay::init()
 				true );
 
 			// TheSuperHackers @info Update the MSAA mode that was set as some GPU's may not support certain levels
+			// Texture filtering must be also be updated after render device initialisation
 			TheWritableGlobalData->m_antiAliasLevel = (UnsignedInt)WW3D::Get_MSAA_Mode();
+			WW3D::Set_Texture_Filter(TheWritableGlobalData->m_textureFilteringMode);
+			TheWritableGlobalData->m_textureFilteringMode = WW3D::Get_Texture_Filter();
+			WW3D::Set_Anisotropy_level(TheWritableGlobalData->m_textureAnisotropyLevel);
+			TheWritableGlobalData->m_textureAnisotropyLevel = WW3D::Get_Anisotropy_level();
 
 			++attempt;
 		}

GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8wrapper.cpp

@@ -411,7 +411,10 @@ void DX8Wrapper::Do_Onetime_Device_Dependent_Inits()
 	** Initialize any other subsystems inside of WW3D
 	*/
 	MissingTexture::_Init();
-	TextureFilterClass::_Init_Filters((TextureFilterClass::TextureFilterMode)WW3D::Get_Texture_Filter());
+	TextureFilterClass::_Init_Filters(
+		(TextureFilterClass::TextureFilterMode)WW3D::Get_Texture_Filter(),
+		(TextureFilterClass::AnisotropicFilterMode)WW3D::Get_Anisotropy_level()
+	);
 	TheDX8MeshRenderer.Init();
 	SHD_INIT;
 	BoxRenderObjClass::Init();

GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/ww3d.cpp

@@ -223,6 +223,7 @@ int														WW3D::LastFrameMemoryAllocations;
 int														WW3D::LastFrameMemoryFrees;
 
 int														WW3D::TextureFilter = TextureFilterClass::TextureFilterMode::TEXTURE_FILTER_BILINEAR;
+int														WW3D::AnisotropyLevel = TextureFilterClass::AnisotropicFilterMode::TEXTURE_FILTER_ANISOTROPIC_2X;
 
 bool														WW3D::Lite = false;
 
@@ -768,9 +769,29 @@ void WW3D::Set_Texture_Filter(int texture_filter)
 	if (texture_filter<0) texture_filter=0;
 	if (texture_filter>TextureFilterClass::TEXTURE_FILTER_ANISOTROPIC) texture_filter=TextureFilterClass::TEXTURE_FILTER_ANISOTROPIC;
 	TextureFilter=texture_filter;
-	TextureFilterClass::_Init_Filters((TextureFilterClass::TextureFilterMode)TextureFilter);
+	TextureFilterClass::_Init_Filters(
+		(TextureFilterClass::TextureFilterMode)TextureFilter,
+		(TextureFilterClass::AnisotropicFilterMode)AnisotropyLevel
+	);
 }
 
+void WW3D::Set_Anisotropy_level(int level)
+{
+	if (level <= TextureFilterClass::TEXTURE_FILTER_ANISOTROPIC_2X)
+		level = TextureFilterClass::TEXTURE_FILTER_ANISOTROPIC_2X;
+	else if(level <= TextureFilterClass::TEXTURE_FILTER_ANISOTROPIC_4X)
+		level = TextureFilterClass::TEXTURE_FILTER_ANISOTROPIC_4X;
+	else if (level <= TextureFilterClass::TEXTURE_FILTER_ANISOTROPIC_8X)
+		level = TextureFilterClass::TEXTURE_FILTER_ANISOTROPIC_8X;
+	else if (level <= TextureFilterClass::TEXTURE_FILTER_ANISOTROPIC_16X)
+		level = TextureFilterClass::TEXTURE_FILTER_ANISOTROPIC_16X;
+
+	if (level > TextureFilterClass::TEXTURE_FILTER_ANISOTROPIC_16X)
+		level = TextureFilterClass::TEXTURE_FILTER_ANISOTROPIC_16X;
+
+	AnisotropyLevel = level;
+	TextureFilterClass::_Set_Max_Anisotropy((TextureFilterClass::AnisotropicFilterMode)AnisotropyLevel);
+}
 
 /***********************************************************************************************
  * WW3D::Begin_Render -- mark the start of rendering for a new frame                           *