Combines terrain and units ambient colors into the single color.

Tested By: Stan Differential Revision: https://code.wildfiregames.com/D3237 This was SVN commit r24661.
2021-01-17 13:10:00 +00:00
parent 6ddbf75db1
commit 1cb4ee1634
166 changed files with 320 additions and 364 deletions
@@ -312,8 +312,7 @@ placePlayersNomad(clPlayer, avoidClasses(clForest, 1, clWater, 4, clMetal, 4, cl
 setSkySet("sunset 1");
 setSunRotation(randomAngle());
 setSunColor(0.8, 0.7, 0.6);
-setTerrainAmbientColor(0.6, 0.5, 0.6);
-setUnitsAmbientColor(0.6, 0.5, 0.6);
+setAmbientColor(0.6, 0.5, 0.6);
 setSunElevation(Math.PI * randFloat(1/12, 1/7));
 setWaterColor(0, 0.047, 0.286);
 setWaterTint(0.462, 0.756, 0.866);
@@ -466,7 +466,6 @@ createObjectGroupsByAreasDeprecated(group, 0,

 placePlayersNomad(clPlayer, avoidClasses(clForest, 1, clMetal, 4, clRock, 4, clHill, 4, clFood, 2));

-setTerrainAmbientColor(0.44,0.51,0.56);
-setUnitsAmbientColor(0.44,0.51,0.56);
+setAmbientColor(0.44,0.51,0.56);

 g_Map.ExportMap();
@@ -462,7 +462,7 @@ setWaterWaviness(9);
 setWaterMurkiness(0.8);
 setWaterType("lake");

-setTerrainAmbientColor(0.521, 0.475, 0.322);
+setAmbientColor(0.521, 0.475, 0.322);

 setSunRotation(Math.PI);
 setSunElevation(Math.PI / 6.25);
@@ -509,8 +509,7 @@ setSunColor(0.8, 0.66, 0.48);
 setSunElevation(0.828932);
 setSunRotation((swapAngle ? 0.288 : 0.788) * Math.PI);

-setTerrainAmbientColor(0.564706,0.543726,0.419608);
-setUnitsAmbientColor(0.564706,0.543726,0.419608);
+setAmbientColor(0.564706,0.543726,0.419608);
 setWaterColor(0.2,0.294,0.49);
 setWaterTint(0.208, 0.659, 0.925);
 setWaterMurkiness(0.72);
@@ -825,8 +825,7 @@ else
 	setSunElevation(0.13499);
 	setSunRotation(-2.5);

-	setTerrainAmbientColor(0.25, 0.3, 0.45);
-	setUnitsAmbientColor(0.25, 0.3, 0.45);
+	setAmbientColor(0.25, 0.3, 0.45);

 	setFogFactor(0.004);
 	setFogThickness(0.25);
@@ -554,13 +554,12 @@ g_Environment = {
 	},
 	"SunElevation": 0.908117,
 	"SunRotation": -0.558369,
-	"TerrainAmbientColor": {
+	"AmbientColor": {
 		"r": 0.54902,
 		"g": 0.419608,
 		"b": 0.352941,
 		"a": 0
 	},
-	"UnitsAmbientColor": { "r": 0.54902, "g": 0.419608, "b": 0.352941, "a": 0 },
 	"Fog": {
 		"FogFactor": 0.00195313,
 		"FogThickness": 0,
@@ -258,8 +258,7 @@ setWaterWaviness(2.0);
 setWaterType("clap");
 setWaterMurkiness(0.835938);

-setUnitsAmbientColor(0.57, 0.58, 0.55);
-setTerrainAmbientColor(0.57, 0.58, 0.55);
+setAmbientColor(0.57, 0.58, 0.55);

 setFogFactor(0.25);
 setFogThickness(0.15);
@@ -1487,7 +1487,7 @@ setWaterWaviness(8);
 setWaterMurkiness(0.87);
 setWaterType("lake");

-setTerrainAmbientColor(0.58, 0.443, 0.353);
+setAmbientColor(0.58, 0.443, 0.353);

 setSunColor(0.733, 0.746, 0.574);
 setSunRotation(Math.PI / 2 * randFloat(-1, 1));
@@ -401,7 +401,7 @@ setWaterWaviness(8);
 setWaterMurkiness(0.87);
 setWaterType("lake");

-setTerrainAmbientColor(0.58, 0.443, 0.353);
+setAmbientColor(0.58, 0.443, 0.353);

 setSunColor(0.733, 0.746, 0.574);
 setSunRotation(Math.PI * 1.1);
@@ -352,7 +352,7 @@ setWaterWaviness(8);
 setWaterMurkiness(0.99);
 setWaterType("lake");

-setTerrainAmbientColor(0.521, 0.475, 0.322);
+setAmbientColor(0.521, 0.475, 0.322);

 setSunRotation(Math.PI * 0.85);
 setSunElevation(Math.PI / 14);
@@ -449,7 +449,7 @@ setWaterWaviness(8);
 setWaterMurkiness(0.87);
 setWaterType("ocean");

-setTerrainAmbientColor(0.72, 0.72, 0.82);
+setAmbientColor(0.72, 0.72, 0.82);

 setSunColor(0.733, 0.746, 0.574);
 setSunRotation(Math.PI * 0.95);
@@ -556,7 +556,7 @@ placePlayersNomad(
 			g_TileClasses.mountain, 2)
 	]);

-setTerrainAmbientColor(0.521, 0.475, 0.322);
+setAmbientColor(0.521, 0.475, 0.322);

 setSunColor(0.733, 0.746, 0.574);
 setSunRotation(Math.PI);
@@ -308,7 +308,6 @@ setWaterTint(0, 0.545, 0.859);
 setWaterWaviness(1.0);
 setWaterType("clap");
 setWaterMurkiness(0.5);
-setTerrainAmbientColor(0.501961, 0.501961, 0.501961);
-setUnitsAmbientColor(0.501961, 0.501961, 0.501961);
+setAmbientColor(0.501961, 0.501961, 0.501961);

 g_Map.ExportMap();
@@ -313,8 +313,7 @@ setWaterWaviness(2.0);
 setWaterType("ocean");
 setWaterMurkiness(0.8);

-setTerrainAmbientColor(0.447059, 0.509804, 0.54902);
-setUnitsAmbientColor(0.447059, 0.509804, 0.54902);
+setAmbientColor(0.447059, 0.509804, 0.54902);

 setSunElevation(0.671884);
 setSunRotation(-0.582913);
@@ -245,8 +245,7 @@ if (g_MapSettings.Daytime !== undefined ? g_MapSettings.Daytime == "dawn" : rand
 {
 	setSkySet("sunset 1");
 	setSunColor(0.8, 0.7, 0.6);
-	setTerrainAmbientColor(0.7, 0.6, 0.7);
-	setUnitsAmbientColor(0.7, 0.6, 0.7);
+	setAmbientColor(0.7, 0.6, 0.7);
 	setSunElevation(Math.PI * randFloat(1/24, 1/7));
 }
 else
@@ -442,8 +442,7 @@ setWaterWaviness(8);
 setWaterMurkiness(0.87);
 setWaterType("lake");

-setTerrainAmbientColor(0.3, 0.3, 0.3);
-setUnitsAmbientColor(0.3, 0.3, 0.3);
+setAmbientColor(0.3, 0.3, 0.3);

 setSunColor(0.8, 0.8, 0.8);
 setSunRotation(Math.PI);
@@ -451,8 +451,7 @@ setSunRotation(randomAngle());

 setSkySet("cumulus");
 setSunColor(0.73,0.73,0.65);
-setTerrainAmbientColor(0.45,0.45,0.50);
-setUnitsAmbientColor(0.45,0.45,0.50);
+setAmbientColor(0.45,0.45,0.50);
 setWaterColor(0.263, 0.353, 0.616);
 setWaterTint(0.104, 0.172, 0.563);
 setWaterWaviness(5.0);
@@ -362,7 +362,7 @@ setWaterWaviness(8);
 setWaterMurkiness(0.87);
 setWaterType("clap");

-setTerrainAmbientColor(0.521, 0.475, 0.322);
+setAmbientColor(0.521, 0.475, 0.322);

 setSunRotation(-Math.PI);
 setSunElevation(Math.PI / 6.25);
@@ -370,7 +370,7 @@ setWaterWaviness(8);
 setWaterMurkiness(0.87);
 setWaterType("lake");

-setTerrainAmbientColor(0.58, 0.443, 0.353);
+setAmbientColor(0.58, 0.443, 0.353);

 setSunColor(0.733, 0.746, 0.574);
 setSunRotation(Math.PI * 1.1);
@@ -1,7 +1,6 @@
 {
 	"Environment": {
-		"TerrainAmbientColor": { "r": 0.447059, "g": 0.509804, "b": 0.54902 },
-		"UnitsAmbientColor": { "r": 0.447059, "g": 0.509804, "b": 0.54902 }
+		"AmbientColor": { "r": 0.447059, "g": 0.509804, "b": 0.54902 },
 	},
 	"Terrains": {
 		"mainTerrain": [
@@ -7,7 +7,7 @@
 		"SunColor": { "r": 1, "g": 0.796, "b": 0.374, "a": 0 },
 		"SunElevation": 0.52359877559,
 		"SunRotation": -1.86532,
-		"TerrainAmbientColor": { "r": 0.329412, "g": 0.419608, "b": 0.501961, "a": 0 },
+		"AmbientColor": { "r": 0.329412, "g": 0.419608, "b": 0.501961, "a": 0 },
 		"Fog": {
 			"FogThickness": 0,
 			"FogFactor": 0.002,
@@ -7,7 +7,7 @@
 		"SunColor": { "r": 1, "g": 0.796, "b": 0.374, "a": 0 },
 		"SunElevation": 0.52359877559,
 		"SunRotation": -1.86532,
-		"TerrainAmbientColor": { "r": 0.501961, "g": 0.501961, "b": 0.501961, "a": 0 },
+		"AmbientColor": { "r": 0.501961, "g": 0.501961, "b": 0.501961, "a": 0 },
 		"Fog": {
 			"FogThickness": 0,
 			"FogFactor": 0.002,
@@ -7,8 +7,7 @@ var g_Environment = {
 	"SunColor": { "r": 0.749020, "g": 0.749020, "b": 0.749020, "a": 0 }, // all rgb from 0 to 1
 	"SunElevation": 0.785398, // 0 to 2pi
 	"SunRotation": 5.49779, // 0 to 2pi
-	"TerrainAmbientColor": { "r": 0.501961, "g": 0.501961, "b": 0.501961, "a": 0 },
-	"UnitsAmbientColor": { "r": 0.501961, "g": 0.501961, "b": 0.501961, "a": 0 },
+	"AmbientColor": { "r": 0.501961, "g": 0.501961, "b": 0.501961, "a": 0 },
 	"Water": {
 		"WaterBody": {
 			"Type": "ocean", // Subdirectory name of art/textures/animated/water
@@ -67,14 +66,9 @@ function setSunRotation(r)
 	g_Environment.SunRotation = r;
 }

-function setTerrainAmbientColor(r, g, b)
+function setAmbientColor(r, g, b)
 {
-	g_Environment.TerrainAmbientColor = { "r" : r, "g" : g, "b" : b, "a" : 0 };
-}
-
-function setUnitsAmbientColor(r, g, b)
-{
-	g_Environment.UnitsAmbientColor = { "r" : r, "g" : g, "b" : b, "a" : 0 };
+	g_Environment.AmbientColor = { "r" : r, "g" : g, "b" : b, "a" : 0 };
 }

 ////////////////////////////////////////////////////////////////////////////
@@ -228,8 +228,7 @@ setWaterWaviness(2.0);
 setWaterType("clap");
 setWaterMurkiness(0.835938);

-setUnitsAmbientColor(0.447059, 0.509804, 0.54902);
-setTerrainAmbientColor(0.447059, 0.509804, 0.54902);
+setAmbientColor(0.447059, 0.509804, 0.54902);

 setFogFactor(0.25);
 setFogThickness(0.15);
--- a/Show More
+++ b/Show More