Add JPEGQuality option to Options.ini (default 80)

Author: bobtista

Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DScreenshot.cpp

@@ -65,7 +65,7 @@ static DWORD WINAPI screenshotThreadFunc(LPVOID param)
 	return 0;
 }
 
-void W3D_TakeCompressedScreenshot(ScreenshotFormat format, int quality)
+void W3D_TakeCompressedScreenshot(ScreenshotFormat format, int quality = 0)
 {
 	char leafname[256];
 	char pathname[1024];
@@ -130,6 +130,9 @@ void W3D_TakeCompressedScreenshot(ScreenshotFormat format, int quality)
 	surfaceCopy->Release_Ref();
 	surfaceCopy = NULL;
 
+	if (quality <= 0 && format == SCREENSHOT_JPEG)
+		quality = TheGlobalData->m_jpegQuality;
+
 	ScreenshotThreadData* threadData = new ScreenshotThreadData();
 	threadData->imageData = image;
 	threadData->width = width;

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

@@ -139,6 +139,7 @@ class GlobalData : public SubsystemInterface
 	Int m_terrainLODTargetTimeMS;
 	Bool m_useAlternateMouse;
 	Bool m_rightMouseAlwaysScrolls;
+	Int m_jpegQuality;
 	Bool m_useWaterPlane;
 	Bool m_useCloudPlane;
 	Bool m_useShadowVolumes;

Generals/Code/GameEngine/Include/Common/UserPreferences.h

@@ -91,6 +91,7 @@ class OptionPreferences : public UserPreferences
 	void setOnlineIPAddress(UnsignedInt IP);	// convenience function
 	Bool getArchiveReplaysEnabled() const;		// convenience function
 	Bool getAlternateMouseModeEnabled(void);	// convenience function
+	Int getJPEGQuality(void);									// convenience function
 	Real getScrollFactor(void);								// convenience function
 	Bool getDrawScrollAnchor(void);
 	Bool getMoveScrollAnchor(void);

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

@@ -1177,6 +1177,7 @@ void GlobalData::parseGameDataDefinition( INI* ini )
 	// override INI values with user preferences
 	OptionPreferences optionPref;
  	TheWritableGlobalData->m_useAlternateMouse = optionPref.getAlternateMouseModeEnabled();
+	TheWritableGlobalData->m_jpegQuality = optionPref.getJPEGQuality();
 	TheWritableGlobalData->m_keyboardScrollFactor = optionPref.getScrollFactor();
 	TheWritableGlobalData->m_drawScrollAnchor = optionPref.getDrawScrollAnchor();
 	TheWritableGlobalData->m_moveScrollAnchor = optionPref.getMoveScrollAnchor();

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

@@ -335,6 +335,17 @@ Bool OptionPreferences::getAlternateMouseModeEnabled(void)
 	return FALSE;
 }
 
+Int OptionPreferences::getJPEGQuality(void)
+{
+	OptionPreferences::const_iterator it = find("JPEGQuality");
+	if (it == end())
+		return 80;
+
+	Int quality = atoi(it->second.str());
+	if (quality < 1) quality = 1;
+	if (quality > 100) quality = 100;
+	return quality;
+}
 
 Real OptionPreferences::getScrollFactor(void)
 {

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

@@ -2889,12 +2889,12 @@ static void CreateBMPFile(LPTSTR pszFile, char *image, Int width, Int height)
 
 void W3DDisplay::takeScreenShotCompressed(void)
 {
-	W3D_TakeCompressedScreenshot(SCREENSHOT_JPEG, 80);
+	W3D_TakeCompressedScreenshot(SCREENSHOT_JPEG);
 }
 
 void W3DDisplay::takeScreenShotPNG(void)
 {
-	W3D_TakeCompressedScreenshot(SCREENSHOT_PNG, 0);
+	W3D_TakeCompressedScreenshot(SCREENSHOT_PNG);
 }
 
 /** Start/Stop capturing an AVI movie*/

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

@@ -143,6 +143,7 @@ class GlobalData : public SubsystemInterface
 	Bool m_clientRetaliationModeEnabled;
 	Bool m_doubleClickAttackMove;
 	Bool m_rightMouseAlwaysScrolls;
+	Int m_jpegQuality;
 	Bool m_useWaterPlane;
 	Bool m_useCloudPlane;
 	Bool m_useShadowVolumes;

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

@@ -93,6 +93,7 @@ class OptionPreferences : public UserPreferences
 	Bool getAlternateMouseModeEnabled(void);	// convenience function
 	Bool getRetaliationModeEnabled();					// convenience function
 	Bool getDoubleClickAttackMoveEnabled(void);	// convenience function
+	Int getJPEGQuality(void);									// convenience function
 	Real getScrollFactor(void);								// convenience function
 	Bool getDrawScrollAnchor(void);
 	Bool getMoveScrollAnchor(void);

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

@@ -1205,6 +1205,7 @@ void GlobalData::parseGameDataDefinition( INI* ini )
 	TheWritableGlobalData->m_useAlternateMouse = optionPref.getAlternateMouseModeEnabled();
 	TheWritableGlobalData->m_clientRetaliationModeEnabled = optionPref.getRetaliationModeEnabled();
 	TheWritableGlobalData->m_doubleClickAttackMove = optionPref.getDoubleClickAttackMoveEnabled();
+	TheWritableGlobalData->m_jpegQuality = optionPref.getJPEGQuality();
 	TheWritableGlobalData->m_keyboardScrollFactor = optionPref.getScrollFactor();
 	TheWritableGlobalData->m_drawScrollAnchor = optionPref.getDrawScrollAnchor();
 	TheWritableGlobalData->m_moveScrollAnchor = optionPref.getMoveScrollAnchor();

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

@@ -368,6 +368,18 @@ Bool OptionPreferences::getDoubleClickAttackMoveEnabled(void)
 	return FALSE;
 }
 
+Int OptionPreferences::getJPEGQuality(void)
+{
+	OptionPreferences::const_iterator it = find("JPEGQuality");
+	if (it == end())
+		return 80;
+
+	Int quality = atoi(it->second.str());
+	if (quality < 1) quality = 1;
+	if (quality > 100) quality = 100;
+	return quality;
+}
+
 Real OptionPreferences::getScrollFactor(void)
 {
 	OptionPreferences::const_iterator it = find("ScrollFactor");