Merge pull request #356 from RagnarokResearchLab/remove-contrast-comp…

…utation Remove the obsolete contrast color computation
RagnarokResearchLab · Feb 1, 2024 · 6ff1f3c · 6ff1f3c
2 parents 4695908 + 52ff47a
commit 6ff1f3c
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 36 deletions.
diff --git a/Core/FileFormats/RagnarokRSW.lua b/Core/FileFormats/RagnarokRSW.lua
@@ -236,19 +236,8 @@ function RagnarokRSW:DecodeEnvironmentalLightSources()
 		},
 	}
 
-	-- Composite blending (additive + multiplicative components) ~> scenewide color tint
-	local contrastCorrectionColor = {
-		red = (directionalLight.diffuseColor.red + ambientLight.diffuseColor.red)
-			- directionalLight.diffuseColor.red * ambientLight.diffuseColor.red,
-		green = (directionalLight.diffuseColor.green + ambientLight.diffuseColor.green)
-			- directionalLight.diffuseColor.green * ambientLight.diffuseColor.green,
-		blue = (directionalLight.diffuseColor.blue + ambientLight.diffuseColor.blue)
-			- directionalLight.diffuseColor.blue * ambientLight.diffuseColor.blue,
-	}
-
 	self.directionalLight = directionalLight
 	self.ambientLight = ambientLight
-	self.contrastCorrectionColor = contrastCorrectionColor
 	self.prebakedShadowmapAlpha = tonumber(environmentalLightInfo.shadowmap_alpha)
 end
 

diff --git a/Tests/FileFormats/RagnarokRSW.spec.lua b/Tests/FileFormats/RagnarokRSW.spec.lua
@@ -49,10 +49,6 @@ describe("RagnarokRSW", function()
 			assertEqualNumbers(rsw.ambientLight.diffuseColor.blue, 0.35, 1E-3)
 			assertEquals(rsw.prebakedShadowmapAlpha, 0.5)
 
-			assertEqualNumbers(rsw.contrastCorrectionColor.red, 0.5775, 1E-3)
-			assertEqualNumbers(rsw.contrastCorrectionColor.green, 0.5775, 1E-3)
-			assertEqualNumbers(rsw.contrastCorrectionColor.blue, 0.5775, 1E-3)
-
 			assertEquals(rsw.boundingBox.top, 12)
 			assertEquals(rsw.boundingBox.bottom, 777)
 			assertEquals(rsw.boundingBox.left, 512)
@@ -200,10 +196,6 @@ describe("RagnarokRSW", function()
 			assertEqualNumbers(rsw.ambientLight.diffuseColor.blue, 0.35, 1E-3)
 			assertEquals(rsw.prebakedShadowmapAlpha, 0.5)
 
-			assertEqualNumbers(rsw.contrastCorrectionColor.red, 0.5775, 1E-3)
-			assertEqualNumbers(rsw.contrastCorrectionColor.green, 0.5775, 1E-3)
-			assertEqualNumbers(rsw.contrastCorrectionColor.blue, 0.5775, 1E-3)
-
 			assertEquals(rsw.boundingBox.top, 12)
 			assertEquals(rsw.boundingBox.bottom, 777)
 			assertEquals(rsw.boundingBox.left, 512)
@@ -351,10 +343,6 @@ describe("RagnarokRSW", function()
 			assertEqualNumbers(rsw.ambientLight.diffuseColor.blue, 0.35, 1E-3)
 			assertEquals(rsw.prebakedShadowmapAlpha, 0.5)
 
-			assertEqualNumbers(rsw.contrastCorrectionColor.red, 0.5775, 1E-3)
-			assertEqualNumbers(rsw.contrastCorrectionColor.green, 0.5775, 1E-3)
-			assertEqualNumbers(rsw.contrastCorrectionColor.blue, 0.5775, 1E-3)
-
 			assertEquals(rsw.boundingBox.top, 12)
 			assertEquals(rsw.boundingBox.bottom, 777)
 			assertEquals(rsw.boundingBox.left, 512)
@@ -502,10 +490,6 @@ describe("RagnarokRSW", function()
 			assertEqualNumbers(rsw.ambientLight.diffuseColor.blue, 0.35, 1E-3)
 			assertEquals(rsw.prebakedShadowmapAlpha, 0.5)
 
-			assertEqualNumbers(rsw.contrastCorrectionColor.red, 0.5775, 1E-3)
-			assertEqualNumbers(rsw.contrastCorrectionColor.green, 0.5775, 1E-3)
-			assertEqualNumbers(rsw.contrastCorrectionColor.blue, 0.5775, 1E-3)
-
 			assertEquals(rsw.boundingBox.top, 12)
 			assertEquals(rsw.boundingBox.bottom, 777)
 			assertEquals(rsw.boundingBox.left, 512)
@@ -645,10 +629,6 @@ describe("RagnarokRSW", function()
 			assertEqualNumbers(rsw.ambientLight.diffuseColor.blue, 0.35, 1E-3)
 			assertEqualNumbers(rsw.prebakedShadowmapAlpha, 0.5, 1E-3)
 
-			assertEqualNumbers(rsw.contrastCorrectionColor.red, 0.5775, 1E-3)
-			assertEqualNumbers(rsw.contrastCorrectionColor.green, 0.5775, 1E-3)
-			assertEqualNumbers(rsw.contrastCorrectionColor.blue, 0.5775, 1E-3)
-
 			assertEquals(rsw.boundingBox.top, 12)
 			assertEquals(rsw.boundingBox.bottom, 777)
 			assertEquals(rsw.boundingBox.left, 512)
@@ -788,10 +768,6 @@ describe("RagnarokRSW", function()
 			assertEqualNumbers(rsw.ambientLight.diffuseColor.blue, 0.35, 1E-3)
 			assertEqualNumbers(rsw.prebakedShadowmapAlpha, 0.5, 1E-3)
 
-			assertEqualNumbers(rsw.contrastCorrectionColor.red, 0.5775, 1E-3)
-			assertEqualNumbers(rsw.contrastCorrectionColor.green, 0.5775, 1E-3)
-			assertEqualNumbers(rsw.contrastCorrectionColor.blue, 0.5775, 1E-3)
-
 			assertEquals(rsw.boundingBox.top, 12)
 			assertEquals(rsw.boundingBox.bottom, 777)
 			assertEquals(rsw.boundingBox.left, 512)

diff --git a/Tools/rsw-to-json.lua b/Tools/rsw-to-json.lua
@@ -25,7 +25,6 @@ local sceneObjects = {
 	buildNumber = rsw.buildNumber,
 	directionalLight = rsw.directionalLight,
 	ambientLight = rsw.ambientLight,
-	contrastCorrectionColor = rsw.contrastCorrectionColor,
 	prebakedShadowmapAlpha = rsw.prebakedShadowmapAlpha,
 	animatedProps = rsw.animatedProps,
 	spatialAudioSources = rsw.spatialAudioSources,