Add factor for light conversion

elishacloud · Apr 25, 2024 · 6651807 · 6651807
1 parent be2aad9
commit 6651807
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/Dllmain/BuildNo.rc b/Dllmain/BuildNo.rc
@@ -1 +1 @@
-#define BUILD_NUMBER 7003 
+#define BUILD_NUMBER 7004 
diff --git a/ddraw/IDirect3DDeviceX.cpp b/ddraw/IDirect3DDeviceX.cpp
@@ -2165,6 +2165,7 @@ HRESULT m_IDirect3DDeviceX::SetLight(m_IDirect3DLight* lpLightInterface, LPD3DLI
 
 	D3DLIGHT7 Light7;
 
+	// ToDo: the dvAttenuation members are interpreted differently in D3DLIGHT2 than they were for D3DLIGHT.
 	ConvertLight(Light7, *lpLight);
 
 	DWORD dwLightIndex = 0;

diff --git a/ddraw/IDirect3DTypes.cpp b/ddraw/IDirect3DTypes.cpp
@@ -35,10 +35,13 @@ void ConvertLight(D3DLIGHT7& Light7, D3DLIGHT& Light)
 		LOG_LIMIT(100, __FUNCTION__ << " Error: Incorrect dwSize: " << Light.dwSize);
 		return;
 	}
+	const float DiffuseFactor = 1.0f;
+	const float SpecularFactor = 0.1f;
+	const float AmbientFactor = 0.3f;
 	Light7.dltType = Light.dltType;
-	Light7.dcvDiffuse = Light.dcvColor;
-	Light7.dcvSpecular = Light.dcvColor;
-	Light7.dcvAmbient = Light.dcvColor;
+	Light7.dcvDiffuse = { Light.dcvColor.r * DiffuseFactor, Light.dcvColor.g * DiffuseFactor, Light.dcvColor.b * DiffuseFactor, Light.dcvColor.a };
+	Light7.dcvSpecular = { Light.dcvColor.r * SpecularFactor, Light.dcvColor.g * SpecularFactor, Light.dcvColor.b * SpecularFactor, Light.dcvColor.a };
+	Light7.dcvAmbient = { Light.dcvColor.r * AmbientFactor, Light.dcvColor.g * AmbientFactor, Light.dcvColor.b * AmbientFactor, Light.dcvColor.a };
 	Light7.dvPosition = Light.dvPosition;
 	Light7.dvDirection = Light.dvDirection;
 	Light7.dvRange = Light.dvRange;
@@ -50,7 +53,7 @@ void ConvertLight(D3DLIGHT7& Light7, D3DLIGHT& Light)
 	Light7.dvPhi = Light.dvPhi;
 
 	// Apply additional flags
-	if (Light.dwSize == sizeof(D3DLIGHT2) && !(((LPD3DLIGHT2)&Light)->dwFlags & D3DLIGHT_NO_SPECULAR))
+	if (Light.dwSize == sizeof(D3DLIGHT2) && (((LPD3DLIGHT2)&Light)->dwFlags & D3DLIGHT_NO_SPECULAR))
 	{
 		// No specular reflection
 		Light7.dcvSpecular = { 0.0f, 0.0f, 0.0f, 1.0f };