Allow floating-point window scale factors.

Author: Jarcho

d2dx-defaults.cfg

@@ -6,7 +6,7 @@
 #
 
 [window]
-scale=1			# range 1-3, an integer scale factor for the window
+scale=1.0			# range 1.0-3.0, a scale factor for the window
 position=[-1,-1]	# if [-1,-1] the window will be centered, otherwise placed at the explicit position given here
 frameless=false         # if true, the window frame (caption bar etc) will be removed
 

src/d2dx/Options.cpp

@@ -116,10 +116,10 @@ void Options::ApplyCfg(
 
 	if (window)
 	{
-		auto windowScale = toml_int_in(window, "scale");
+		auto windowScale = toml_double_in(window, "scale");
 		if (windowScale.ok)
 		{
-			SetWindowScale((int32_t)windowScale.u.i);
+			SetWindowScale((float)windowScale.u.d);
 		}
 
 		auto windowPosition = toml_array_in(window, "position");
@@ -178,8 +178,21 @@ void Options::ApplyCommandLine(
 			static_cast<unsigned int>(upscale[11]) - static_cast<unsigned int>('0')));
 	}
 
-	if (strstr(cmdLine, "-dxscale3")) SetWindowScale(3);
-	else if (strstr(cmdLine, "-dxscale2")) SetWindowScale(2);
+	char const* scale = strstr(cmdLine, "-dxscale=");
+	if (scale)
+	{
+		scale = scale + 9;
+		auto end = const_cast<char*>(scale);
+		while (*end != 0 && *end != ' ' && *end != '\t')
+		{
+			++end;
+		}
+		float s = strtof(scale, &end);
+		if (scale != end)
+		{
+			SetWindowScale(s);
+		}
+	}
 
 	if (strstr(cmdLine, "-dxdbg_dump_textures")) SetFlag(OptionsFlag::DbgDumpTextures, true);
 }
@@ -204,13 +217,13 @@ void Options::SetFlag(
 	}
 }
 
-int32_t Options::GetWindowScale() const
+float Options::GetWindowScale() const
 {
 	return _windowScale;
 }
 
 void Options::SetWindowScale(
-	_In_ int32_t windowScale)
+	_In_ float windowScale)
 {
 	_windowScale = min(3, max(1, windowScale));
 }

src/d2dx/Options.h

@@ -71,10 +71,10 @@ namespace d2dx
 			_In_ OptionsFlag flag,
 			_In_ bool value);
 
-		int32_t GetWindowScale() const;
+		float GetWindowScale() const;
 
 		void SetWindowScale(
-			_In_ int32_t zoomLevel);
+			_In_ float zoomLevel);
 
 		Offset GetWindowPosition() const;
 
@@ -98,7 +98,7 @@ namespace d2dx
 
 	private:
 		uint32_t _flags = 1 << (int)OptionsFlag::NoVSync;
-		int32_t _windowScale = 1;
+		float _windowScale = 1;
 		Offset _windowPosition{ -1, -1 };
 		Size _userSpecifiedGameSize{ -1, -1 };
 		UpscaleMethod _upscaleMethod{ UpscaleMethod::HighQuality };

src/d2dx/Types.h

@@ -247,6 +247,12 @@ namespace d2dx
 			return { width * (int32_t)value, height * (int32_t)value };
 		}
 
+		Size operator*(float value) noexcept
+		{
+			return { static_cast<int32_t>(static_cast<float>(width) * value),
+				static_cast<int32_t>(static_cast<float>(height) * value) };
+		}
+
 		bool operator==(const Size& rhs) const noexcept
 		{
 			return width == rhs.width && height == rhs.height;