Itms/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Combines terrain and units ambient colors into the single color.

Browse Source 
Tested By: Stan
Differential Revision: https://code.wildfiregames.com/D3237
This was SVN commit r24661.
This commit is contained in:
Vladislav Belov 2021-01-17 13:10:00 +00:00
parent 6ddbf75db1
commit 1cb4ee1634
166 changed files with 320 additions and 364 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
binaries/data/mods/public/maps/random/arctic_summer.js
View File

@ -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);

3
binaries/data/mods/public/maps/random/ardennes_forest.js
View File

@ -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();

2
binaries/data/mods/public/maps/random/bahrain.js
View File

@ -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);

3
binaries/data/mods/public/maps/random/corsica.js
View File

@ -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);

3
binaries/data/mods/public/maps/random/danubius.js
View File

@ -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);

3
binaries/data/mods/public/maps/random/elephantine.js
View File

@ -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,

3
binaries/data/mods/public/maps/random/india.js
View File

@ -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);

2
binaries/data/mods/public/maps/random/jebel_barkal.js
View File

@ -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));

2
binaries/data/mods/public/maps/random/lower_nubia.js
View File

@ -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);

2
binaries/data/mods/public/maps/random/marmara.js
View File

@ -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);

2
binaries/data/mods/public/maps/random/mediterranean.js
View File

@ -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);

2
binaries/data/mods/public/maps/random/ngorongoro.js
View File

@ -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);

3
binaries/data/mods/public/maps/random/oasis.js
View File

@ -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();

3
binaries/data/mods/public/maps/random/phoenician_levant.js
View File

@ -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);

3
binaries/data/mods/public/maps/random/polar_sea.js
View File

@ -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

3
binaries/data/mods/public/maps/random/pompeii.js
View File

@ -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);

3
binaries/data/mods/public/maps/random/pyrenean_sierra.js
View File

@ -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);

2
binaries/data/mods/public/maps/random/ratumacos.js
View File

@ -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);

2
binaries/data/mods/public/maps/random/red_sea.js
View File

@ -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);

3
binaries/data/mods/public/maps/random/rmbiome/defaultbiome.json
View File

@ -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": [

2
binaries/data/mods/public/maps/random/rmbiome/persian_highlands/spring.json
View File

@ -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,

2
binaries/data/mods/public/maps/random/rmbiome/persian_highlands/summer.json
View File

@ -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,

12
binaries/data/mods/public/maps/random/rmgen/environment.js
View File

@ -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 };
}
////////////////////////////////////////////////////////////////////////////

3
binaries/data/mods/public/maps/random/sahel.js
View File

@ -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);

BIN
binaries/data/mods/public/maps/scenarios/_default.xml (Stored with Git LFS)
View File

Binary file not shown.

BIN
binaries/data/mods/public/maps/scenarios/arcadia.xml (Stored with Git LFS)
View File

Binary file not shown.

BIN
binaries/data/mods/public/maps/scenarios/azure_coast_2p.xml (Stored with Git LFS)
View File

Binary file not shown.

BIN
binaries/data/mods/public/maps/scenarios/azure_coast_4p.xml (Stored with Git LFS)
View File

Binary file not shown.

BIN
binaries/data/mods/public/maps/scenarios/azure_coast_8p.xml (Stored with Git LFS)
View File

Binary file not shown.

BIN
binaries/data/mods/public/maps/scenarios/battle_for_the_tiber.xml (Stored with Git LFS)
View File

Binary file not shown.

BIN
binaries/data/mods/public/maps/scenarios/belgian_bog_night.xml (Stored with Git LFS)
View File

Binary file not shown.

BIN
binaries/data/mods/public/maps/scenarios/bridge_demo.xml (Stored with Git LFS)
View File

Binary file not shown.

BIN
binaries/data/mods/public/maps/scenarios/campaign_test_map.xml (Stored with Git LFS)
View File

Binary file not shown.

BIN
binaries/data/mods/public/maps/scenarios/campaign_test_map_2_heightmap.xml (Stored with Git LFS)
View File

Binary file not shown.

BIN
binaries/data/mods/public/maps/scenarios/cinema_demo.xml (Stored with Git LFS)
View File

Binary file not shown.

BIN
binaries/data/mods/public/maps/scenarios/combat_demo.xml (Stored with Git LFS)
View File

Binary file not shown.

BIN
binaries/data/mods/public/maps/scenarios/combat_demo_huge.xml (Stored with Git LFS)
View File

Binary file not shown.

BIN
binaries/data/mods/public/maps/scenarios/death_canyon_invasion_force.xml (Stored with Git LFS)
View File

Binary file not shown.

BIN
binaries/data/mods/public/maps/scenarios/demo_trading.xml (Stored with Git LFS)
View File

Binary file not shown.

BIN
binaries/data/mods/public/maps/scenarios/eire_and_albion.xml (Stored with Git LFS)
View File

Binary file not shown.

BIN
binaries/data/mods/public/maps/scenarios/fast_oasis.xml (Stored with Git LFS)
View File

Binary file not shown.

BIN
binaries/data/mods/public/maps/scenarios/fishing_demo.xml (Stored with Git LFS)
View File

Binary file not shown.

BIN
binaries/data/mods/public/maps/scenarios/flight_demo.xml (Stored with Git LFS)
View File

Binary file not shown.

BIN
binaries/data/mods/public/maps/scenarios/gold_rush.xml (Stored with Git LFS)
View File

Binary file not shown.

BIN
binaries/data/mods/public/maps/scenarios/gorge.xml (Stored with Git LFS)
View File

Binary file not shown.

BIN
binaries/data/mods/public/maps/scenarios/laconia.xml (Stored with Git LFS)
View File

Binary file not shown.

BIN
binaries/data/mods/public/maps/scenarios/migration.xml (Stored with Git LFS)
View File

Binary file not shown.

BIN
binaries/data/mods/public/maps/scenarios/miletus.xml (Stored with Git LFS)
View File

Binary file not shown.

BIN
binaries/data/mods/public/maps/scenarios/multiplayer_demo.xml (Stored with Git LFS)
View File

Binary file not shown.

BIN
binaries/data/mods/public/maps/scenarios/napata_reconstruction.xml (Stored with Git LFS)
View File

Binary file not shown.

BIN
binaries/data/mods/public/maps/scenarios/necropolis.xml (Stored with Git LFS)
View File

Binary file not shown.

BIN
binaries/data/mods/public/maps/scenarios/pathfinding_demo.xml (Stored with Git LFS)
View File

Binary file not shown.

BIN
binaries/data/mods/public/maps/scenarios/pathfinding_terrain_demo.xml (Stored with Git LFS)
View File

Binary file not shown.

BIN
binaries/data/mods/public/maps/scenarios/peloponnese.xml (Stored with Git LFS)
View File

Binary file not shown.

BIN
binaries/data/mods/public/maps/scenarios/pickup_test_map.xml (Stored with Git LFS)
View File

Binary file not shown.

BIN
binaries/data/mods/public/maps/scenarios/polynesia.xml (Stored with Git LFS)
View File

Binary file not shown.

BIN
binaries/data/mods/public/maps/scenarios/reservoir.xml (Stored with Git LFS)
View File

Binary file not shown.

BIN
binaries/data/mods/public/maps/scenarios/resource_demo.xml (Stored with Git LFS)
View File

Binary file not shown.

BIN
binaries/data/mods/public/maps/scenarios/road_demo.xml (Stored with Git LFS)
View File

Binary file not shown.

BIN
binaries/data/mods/public/maps/scenarios/saharan_oases.xml (Stored with Git LFS)
View File

Binary file not shown.

BIN
binaries/data/mods/public/maps/scenarios/sahel.xml (Stored with Git LFS)
View File

Binary file not shown.

BIN
binaries/data/mods/public/maps/scenarios/sandbox_athenians.xml (Stored with Git LFS)
View File

Binary file not shown.

BIN
binaries/data/mods/public/maps/scenarios/sandbox_britons.xml (Stored with Git LFS)
View File

Binary file not shown.

BIN
binaries/data/mods/public/maps/scenarios/sandbox_carthaginians.xml (Stored with Git LFS)
View File

Binary file not shown.

BIN
binaries/data/mods/public/maps/scenarios/sandbox_gauls.xml (Stored with Git LFS)
View File

Binary file not shown.

BIN
binaries/data/mods/public/maps/scenarios/sandbox_iberians.xml (Stored with Git LFS)
View File

Binary file not shown.

BIN
binaries/data/mods/public/maps/scenarios/sandbox_kushites.xml (Stored with Git LFS)
View File

Binary file not shown.

BIN
binaries/data/mods/public/maps/scenarios/sandbox_macedonians.xml (Stored with Git LFS)
View File

Binary file not shown.

BIN
binaries/data/mods/public/maps/scenarios/sandbox_mauryas.xml (Stored with Git LFS)
View File

Binary file not shown.

BIN
binaries/data/mods/public/maps/scenarios/sandbox_persians.xml (Stored with Git LFS)
View File

Binary file not shown.

BIN
binaries/data/mods/public/maps/scenarios/sandbox_ptolemies.xml (Stored with Git LFS)
View File

Binary file not shown.

BIN
binaries/data/mods/public/maps/scenarios/sandbox_ptolemies_02.xml (Stored with Git LFS)
View File

Binary file not shown.

BIN
binaries/data/mods/public/maps/scenarios/sandbox_romans.xml (Stored with Git LFS)
View File

Binary file not shown.

BIN
binaries/data/mods/public/maps/scenarios/sandbox_seleucids.xml (Stored with Git LFS)
View File

Binary file not shown.

BIN
binaries/data/mods/public/maps/scenarios/sandbox_spartans.xml (Stored with Git LFS)
View File

Binary file not shown.

BIN
binaries/data/mods/public/maps/scenarios/savanna_ravine.xml (Stored with Git LFS)
View File

Binary file not shown.

BIN
binaries/data/mods/public/maps/scenarios/serengeti.xml (Stored with Git LFS)
View File

Binary file not shown.

BIN
binaries/data/mods/public/maps/scenarios/ship_formations.xml (Stored with Git LFS)
View File

Binary file not shown.

BIN
binaries/data/mods/public/maps/scenarios/shipattacks.xml (Stored with Git LFS)
View File

Binary file not shown.

BIN
binaries/data/mods/public/maps/scenarios/siwa_oasis.xml (Stored with Git LFS)
View File

Binary file not shown.

BIN
binaries/data/mods/public/maps/scenarios/temperate_map.xml (Stored with Git LFS)
View File

Binary file not shown.

BIN
binaries/data/mods/public/maps/scenarios/territory_demo.xml (Stored with Git LFS)
View File

Binary file not shown.

BIN
binaries/data/mods/public/maps/scenarios/test_foundation.xml (Stored with Git LFS)
View File

Binary file not shown.

BIN
binaries/data/mods/public/maps/scenarios/the_massacre_of_delphi.xml (Stored with Git LFS)
View File

Binary file not shown.

BIN
binaries/data/mods/public/maps/scenarios/the_persian_gates.xml (Stored with Git LFS)
View File

Binary file not shown.

BIN
binaries/data/mods/public/maps/scenarios/third_macedonian_war.xml (Stored with Git LFS)
View File

Binary file not shown.

BIN
binaries/data/mods/public/maps/scenarios/treasure_islands.xml (Stored with Git LFS)
View File

Binary file not shown.

BIN
binaries/data/mods/public/maps/scenarios/triggers_demo.xml (Stored with Git LFS)
View File

Binary file not shown.

BIN
binaries/data/mods/public/maps/scenarios/tropical_island.xml (Stored with Git LFS)
View File

Binary file not shown.

BIN
binaries/data/mods/public/maps/scenarios/unit_dancing_test.xml (Stored with Git LFS)
View File

Binary file not shown.

BIN
binaries/data/mods/public/maps/scenarios/unit_motion_integration_test.xml (Stored with Git LFS)
View File

Binary file not shown.

BIN
binaries/data/mods/public/maps/scenarios/units_demo.xml (Stored with Git LFS)
View File

Binary file not shown.

BIN
binaries/data/mods/public/maps/scenarios/walls.xml (Stored with Git LFS)
View File

Binary file not shown.

BIN
binaries/data/mods/public/maps/scenarios/walltest.xml (Stored with Git LFS)
View File

Binary file not shown.

BIN
binaries/data/mods/public/maps/scenarios/we_are_legion.xml (Stored with Git LFS)
View File

Binary file not shown.

BIN
binaries/data/mods/public/maps/skirmishes/acropolis_bay_2p.xml (Stored with Git LFS)
View File

Binary file not shown.

BIN
binaries/data/mods/public/maps/skirmishes/alpine_mountains_3p.xml (Stored with Git LFS)
View File

Binary file not shown.

BIN
binaries/data/mods/public/maps/skirmishes/alpine_valleys_2p.xml (Stored with Git LFS)
View File

Binary file not shown.

BIN
binaries/data/mods/public/maps/skirmishes/atlas_valleys_8p.xml (Stored with Git LFS)
View File

Binary file not shown.

BIN
binaries/data/mods/public/maps/skirmishes/bactria_2p.xml (Stored with Git LFS)
View File

Binary file not shown.

Some files were not shown because too many files have changed in this diff Show More