diff --git a/Docs/README.materials b/Docs/README.materials index 226b8147c..df06fadb3 100644 --- a/Docs/README.materials +++ b/Docs/README.materials @@ -109,8 +109,13 @@ tree-range-m : The range at which trees become visible. Note that this is not absolute, as trees are loaded in blocks. A lower number means trees will not become visible until you are closer. -tree-texture : A texture to use for the trees. Typically this will be a - strip with multiple tree textures. +tree-texture : A texture to use for the trees. Typically this will contain around + 8 different trees in a row, duplicate 4 times. From bottom to top, the + rows contain + * summer textures + * snow texture + * winter texture + * winter snow texture tree-varieties : The number of different trees defined in the tree-texture horizontally. (default: 1) @@ -233,3 +238,6 @@ building-texture : The texture used for all buildings. See Docs/buildings.png fo building-lightmap: Emissive texture for all buildings, which is faded in at night to provide illusion of lit windows. Same texture coordinates and format at building-texture above. + +building-range-m: Range at which all buildings are visible. Beyond this point fewer and fewer + buildings are rendered, with no buildings rendered at 2*building-range-m (default 10000) diff --git a/Effects/tree.eff b/Effects/tree.eff index 3970b7de1..b12badec0 100644 --- a/Effects/tree.eff +++ b/Effects/tree.eff @@ -25,13 +25,14 @@ /environment/terminator-relative-position-m /sim/rendering/shaders/skydome /environment/mean-terrain-elevation-m - /rendering/scene/overcast - /sim/rendering/eye-altitude-m + /rendering/scene/overcast + /sim/rendering/eye-altitude-m /environment/snow-level-m + /environment/tree-season /environment/surface/dust-cover-factor /sim/rendering/shaders/skydome /environment/fog-structure - /sim/rendering/shaders/landmass + /sim/rendering/shaders/landmass @@ -123,9 +124,19 @@ eye_alt - dust_cover_factor - float - dust_cover_factor + dust_cover_factor + float + dust_cover_factor + + + snow_level + float + snow_level + + + season + int + season texture @@ -138,9 +149,9 @@ 2 - quality_level - int - quality_level + quality_level + int + quality_level @@ -235,9 +246,19 @@ eye_alt - dust_cover_factor - float - dust_cover_factor + dust_cover_factor + float + dust_cover_factor + + + snow_level + float + snow_level + + + season + int + season texture @@ -250,9 +271,9 @@ 2 - quality_level - int - quality_level + quality_level + int + quality_level @@ -290,6 +311,11 @@ Shaders/gbuffer-functions.frag Shaders/gbuffer-encode.frag + + season + int + season + texture sampler-2d @@ -382,6 +408,11 @@ fogtype + + season + int + season + @@ -471,6 +502,11 @@ fogtype + + season + int + season + @@ -558,6 +594,11 @@ fogtype + + season + int + season + diff --git a/Environment/local-weather-rules.xml b/Environment/local-weather-rules.xml index 2e9b07e77..92a4fed77 100644 --- a/Environment/local-weather-rules.xml +++ b/Environment/local-weather-rules.xml @@ -751,4 +751,54 @@ /environment/mean-terrain-elevation-m + + + EnvironmentInterpolator:Trees:Season:Summer + gain + + + + + + sim/startup/season + winter + + + /environment/season + 1.5 + + + + + + + 0.0 + + /environment/tree-season + + + + + EnvironmentInterpolator:Trees:Season:Winter + gain + + + + + sim/startup/season + winter + + + /environment/season + 1.5 + + + + + + 1.0 + + /environment/tree-season + + diff --git a/Materials/base/materials-base.xml b/Materials/base/materials-base.xml index 42f636ab7..9196bc716 100644 --- a/Materials/base/materials-base.xml +++ b/Materials/base/materials-base.xml @@ -16,9 +16,15 @@ Shared parameters for various materials. --> - - 8000 + + + 8000 + + + + 10000 + diff --git a/Materials/dds/materials.xml b/Materials/dds/materials.xml index 796aca764..8f595462e 100644 --- a/Materials/dds/materials.xml +++ b/Materials/dds/materials.xml @@ -678,7 +678,7 @@ 500 10000000.0 4000.0 - Trees/coniferous-summer.dds + Trees/coniferous.dds 8 25.0 @@ -702,7 +702,7 @@ 500 10000000.0 4000.0 - Trees/coniferous-summer.dds + Trees/coniferous.dds 8 25.0 @@ -726,7 +726,7 @@ 2000 10000000.0 4000.0 - Trees/deciduous-summer.dds + Trees/deciduous.dds 8 25.0 @@ -751,7 +751,7 @@ 500 5000000.0 4000.0 - Trees/mixed-summer.dds + Trees/mixed.dds 8 25.0 @@ -775,7 +775,7 @@ 500 10000000.0 4000.0 - Trees/coniferous-summer.dds + Trees/coniferous.dds 8 20.0 @@ -798,7 +798,7 @@ 500 10000000.0 4000.0 - Trees/coniferous-summer.dds + Trees/coniferous.dds 8 15.0 @@ -912,8 +912,9 @@ 30.0 0.6 0.2 + 10000.0 - Trees/mixed-summer.png + Trees/mixed.png 8 25.0 @@ -958,8 +959,9 @@ 30.0 0.6 0.2 + 25000.0 - Trees/mixed-summer.dds + Trees/mixed.dds 8 25.0 @@ -1026,8 +1028,9 @@ 0.1 0.0 4 + 5000.0 - Trees/mixed-summer.dds + Trees/mixed.dds 8 25.0 @@ -1312,7 +1315,7 @@ 1e30 2000.0 - Trees/mixed-summer.dds + Trees/mixed.dds 8 20.0 @@ -1351,7 +1354,7 @@ 1e30 2000.0 - Trees/mixed-summer.dds + Trees/mixed.dds 8 20.0 @@ -1398,7 +1401,7 @@ 2000000.0 2000.0 - Trees/deciduous-summer.dds + Trees/deciduous.dds 8 20.0 @@ -1426,7 +1429,7 @@ 2000000.0 500000.0 - Trees/deciduous-summer.dds + Trees/deciduous.dds 8 20.0 @@ -1472,7 +1475,7 @@ 2000000.0 2000.0 - Trees/deciduous-summer.dds + Trees/deciduous.dds 8 20.0 @@ -1512,7 +1515,7 @@ 0.3 1e30 5000.0 - Trees/deciduous-summer.dds + Trees/deciduous.dds 8 20.0 @@ -1543,7 +1546,7 @@ 2000000.0 2000.0 - Trees/mixed-summer.dds + Trees/mixed.dds 8 20.0 @@ -1593,7 +1596,7 @@ 2000 10000000.0 4000.0 - Trees/coniferous-winter.png + Trees/coniferous.png 8 25.0 @@ -1618,7 +1621,7 @@ 2000 10000000.0 4000.0 - Trees/deciduous-winter.png + Trees/deciduous.png 8 25.0 @@ -1644,7 +1647,7 @@ 2000 5000000.0 4000.0 - Trees/mixed-winter.png + Trees/mixed.png 8 25.0 @@ -1667,7 +1670,7 @@ 1000 10000000.0 4000.0 - Trees/coniferous-winter.png + Trees/coniferous.png 8 20.0 @@ -1689,7 +1692,7 @@ 1000 10000000.0 4000.0 - Trees/coniferous-winter.png + Trees/coniferous.png 8 15.0 @@ -1749,7 +1752,7 @@ 1.2 20000000.0 8000.0 - Trees/mixed-shrub-winter.png + Trees/mixed-shrub.png 8 2.0 @@ -1798,8 +1801,9 @@ 30.0 0.6 0.2 + 250000.0 - Trees/mixed-winter.png + Trees/mixed.png 8 25.0 @@ -1859,8 +1863,9 @@ 0.1 0.0 4 + 5000.0 - Trees/mixed-winter.png + Trees/mixed.png 8 25.0 @@ -2125,7 +2130,7 @@ 1e30 10000.0 - Trees/mixed-winter.png + Trees/mixed.png 8 20.0 @@ -2161,7 +2166,7 @@ 1e30 10000.0 - Trees/mixed-winter.png + Trees/mixed.png 8 20.0 @@ -2196,7 +2201,7 @@ 2000000.0 4000.0 - Trees/deciduous-winter.dds + Trees/deciduous.dds 8 20.0 @@ -2223,7 +2228,7 @@ 2000000.0 150000.0 - Trees/deciduous-winter.dds + Trees/deciduous.dds 8 20.0 @@ -2265,7 +2270,7 @@ 0.3 1e30 500000.0 - Trees/deciduous-winter.png + Trees/deciduous.png 8 20.0 @@ -2304,7 +2309,7 @@ 0.3 1e30 5000.0 - Trees/deciduous-winter.png + Trees/deciduous.png 8 20.0 @@ -2331,7 +2336,7 @@ 0.7 10 4000.0 - Trees/mixed-winter.png + Trees/mixed.png 8 20.0 diff --git a/Materials/default/materials.xml b/Materials/default/materials.xml index 395e2d711..d135de18a 100644 --- a/Materials/default/materials.xml +++ b/Materials/default/materials.xml @@ -638,7 +638,7 @@ 2000 10000000.0 4000.0 - Trees/coniferous-summer.png + Trees/coniferous.png 8 25.0 @@ -664,7 +664,7 @@ 2000 10000000.0 4000.0 - Trees/coniferous-summer.png + Trees/coniferous.png 8 25.0 @@ -692,7 +692,7 @@ 2000 10000000.0 4000.0 - Trees/deciduous-summer.png + Trees/deciduous.png 8 25.0 @@ -719,7 +719,7 @@ 2000 5000000.0 4000.0 - Trees/mixed-summer.png + Trees/mixed.png 8 25.0 @@ -743,7 +743,7 @@ 1000 10000000.0 4000.0 - Trees/coniferous-summer.png + Trees/coniferous.png 8 20.0 @@ -766,7 +766,7 @@ 1000 10000000.0 4000.0 - Trees/coniferous-summer.png + Trees/coniferous.png 8 15.0 @@ -878,8 +878,9 @@ 30.0 0.6 0.2 + 250000.0 - Trees/mixed-summer.png + Trees/mixed.png 8 25.0 @@ -938,8 +939,9 @@ 0.1 0.0 4 + 5000.0 - Trees/mixed-summer.png + Trees/mixed.png 8 25.0 @@ -1233,7 +1235,7 @@ 1e30 10000.0 - Trees/mixed-summer.png + Trees/mixed.png 8 20.0 @@ -1270,7 +1272,7 @@ 1e30 10000.0 - Trees/mixed-summer.png + Trees/mixed.png 8 20.0 @@ -1305,7 +1307,7 @@ 2000000.0 10000.0 - Trees/mixed-summer.png + Trees/mixed.png 8 20.0 @@ -1332,7 +1334,7 @@ 2000000.0 10000.0 - Trees/mixed-summer.png + Trees/mixed.png 8 20.0 @@ -1375,7 +1377,7 @@ 0.3 1e30 150000.0 - Trees/mixed-summer.png + Trees/mixed.png 8 20.0 @@ -1414,7 +1416,7 @@ 0.3 1e30 5000.0 - Trees/mixed-summer.png + Trees/mixed.png 8 20.0 @@ -1443,7 +1445,7 @@ 0.7 10 4000.0 - Trees/mixed-summer.png + Trees/mixed.png 8 20.0 @@ -1474,7 +1476,7 @@ 2000 10000000.0 4000.0 - Trees/coniferous-winter.png + Trees/coniferous.png 8 25.0 @@ -1501,7 +1503,7 @@ 2000 10000000.0 4000.0 - Trees/deciduous-winter.png + Trees/deciduous.png 8 25.0 @@ -1527,7 +1529,7 @@ 2000 5000000.0 4000.0 - Trees/mixed-winter.png + Trees/mixed.png 8 25.0 @@ -1550,7 +1552,7 @@ 1000 10000000.0 4000.0 - Trees/coniferous-winter.png + Trees/coniferous.png 8 20.0 @@ -1572,7 +1574,7 @@ 1000 10000000.0 4000.0 - Trees/coniferous-winter.png + Trees/coniferous.png 8 15.0 @@ -1631,7 +1633,7 @@ 1.2 20000000.0 8000.0 - Trees/mixed-shrub-winter.png + Trees/mixed-shrub.png 8 2.0 @@ -1678,8 +1680,9 @@ 30.0 0.6 0.2 + 250000.0 - Trees/mixed-winter.png + Trees/mixed.png 8 25.0 @@ -1738,8 +1741,9 @@ 0.1 0.0 4 + 5000.0 - Trees/mixed-winter.png + Trees/mixed.png 8 25.0 @@ -2020,7 +2024,7 @@ 1e30 10000.0 - Trees/mixed-winter.png + Trees/mixed.png 8 20.0 @@ -2056,7 +2060,7 @@ 1e30 10000.0 - Trees/mixed-winter.png + Trees/mixed.png 8 20.0 @@ -2090,7 +2094,7 @@ 2000000.0 10000.0 - Trees/mixed-winter.png + Trees/mixed.png 8 20.0 @@ -2117,7 +2121,7 @@ 2000000.0 10000.0 - Trees/mixed-winter.png + Trees/mixed.png 8 20.0 @@ -2159,7 +2163,7 @@ 0.3 1e30 150000.0 - Trees/mixed-winter.png + Trees/mixed.png 8 20.0 @@ -2198,7 +2202,7 @@ 0.3 1e30 5000.0 - Trees/mixed-winter.png + Trees/mixed.png 8 20.0 @@ -2226,7 +2230,7 @@ 0.7 10 4000.0 - Trees/mixed-winter.png + Trees/mixed.png 8 20.0 diff --git a/Materials/regions/materials.xml b/Materials/regions/materials.xml index f5fe5cb21..16d64ac9f 100644 --- a/Materials/regions/materials.xml +++ b/Materials/regions/materials.xml @@ -796,7 +796,7 @@ 2000 5000000.0 4000.0 - Trees/tropical-summer.png + Trees/tropical.png 8 25.0 @@ -822,7 +822,7 @@ 2000 4000000.0 25000.0 - Trees/tropical-summer.png + Trees/tropical.png 8 25.0 @@ -875,7 +875,7 @@ 1e30 120000.0 - Trees/tropical-summer.png + Trees/tropical.png 8 20.0 @@ -905,7 +905,7 @@ 1e30 2000000.0 80000.0 - Trees/tropical-summer.png + Trees/tropical.png 8 20.0 @@ -931,7 +931,7 @@ 2000 5000000.0 4000.0 - Trees/tropical-summer.png + Trees/tropical.png 8 25.0 @@ -992,7 +992,7 @@ 2000 10000000.0 4000.0 - Trees/deciduous-summer.png + Trees/deciduous.png 8 25.0 @@ -1146,7 +1146,7 @@ 0.1 0.0 5000.0 - Trees/tropical-summer.png + Trees/tropical.png 8 25.0 @@ -1274,7 +1274,7 @@ 1e30 10000.0 - Trees/mixed-summer.png + Trees/mixed.png 8 20.0 @@ -1323,7 +1323,7 @@ 2000 10000000.0 120000.0 - Trees/deciduous-summer.png + Trees/deciduous.png 8 20.0 @@ -1887,7 +1887,7 @@ 1e30 5000.0 - Trees/mixed-summer.png + Trees/mixed.png 8 20.0 @@ -1918,7 +1918,7 @@ 0.6 0.2 250000.0 - Trees/deciduous-summer.png + Trees/deciduous.png 8 15.0 @@ -1946,7 +1946,7 @@ 0.0 4 1000.0 - Trees/deciduous-summer.png + Trees/deciduous.png 8 15.0 @@ -2002,7 +2002,7 @@ 1e30 5000.0 - Trees/mixed-summer.png + Trees/mixed.png 8 20.0 @@ -2029,7 +2029,7 @@ 1e30 5000.0 - Trees/mixed-summer.png + Trees/mixed.png 8 20.0 @@ -2095,7 +2095,7 @@ 2000 10000000.0 4000.0 - Trees/deciduous-summer.png + Trees/deciduous.png 8 25.0 @@ -2156,7 +2156,7 @@ 2000000.0 2000.0 - Trees/deciduous-summer.png + Trees/deciduous.png 8 15.0 @@ -2194,7 +2194,7 @@ 1e30 2000.0 - Trees/deciduous-summer.png + Trees/deciduous.png 8 15.0 @@ -2238,7 +2238,7 @@ 1e30 5000.0 - Trees/deciduous-summer.png + Trees/deciduous.png 8 15.0 @@ -2297,7 +2297,7 @@ 1e30 5000.0 - Trees/deciduous-summer.png + Trees/deciduous.png 8 15.0 @@ -2320,7 +2320,7 @@ 1e30 2000.0 - Trees/deciduous-summer.png + Trees/deciduous.png 8 15.0 @@ -2352,7 +2352,7 @@ 0.6 0.2 25000.0 - Trees/deciduous-summer.png + Trees/deciduous.png 8 15.0 @@ -2380,7 +2380,7 @@ 0.0 4 1500.0 - Trees/deciduous-summer.png + Trees/deciduous.png 8 15.0 @@ -2462,7 +2462,7 @@ 1e30 10000.0 - Trees/mixed-summer.png + Trees/mixed.png 8 20.0 @@ -2486,7 +2486,7 @@ 2000 10000000.0 4000.0 - Trees/tropical-summer.png + Trees/tropical.png 8 35.0 @@ -2527,7 +2527,7 @@ 0.15 1e30 70000.0 - Trees/tropical-summer.png + Trees/tropical.png 8 25.0 @@ -2552,7 +2552,7 @@ 0.7 1e30 10000.0 - Trees/tropical-summer.png + Trees/tropical.png 8 20.0 @@ -2577,7 +2577,7 @@ 1e30 2000000.0 50000.0 - Trees/tropical-summer.png + Trees/tropical.png 8 20.0 @@ -2644,7 +2644,7 @@ 2000 10000000.0 4000.0 - Trees/tropical-summer.png + Trees/tropical.png 8 35.0 @@ -2730,7 +2730,7 @@ 1e30 2000000.0 50000.0 - Trees/tropical-summer.png + Trees/tropical.png 8 20.0 @@ -2759,7 +2759,7 @@ 0.0 4 1000.0 - Trees/tropical-alt-summer.png + Trees/tropical-alt.png 8 15.0 @@ -2782,7 +2782,7 @@ 2000 10000000.0 4000.0 - Trees/tropical-summer.png + Trees/tropical.png 8 25.0 @@ -2828,7 +2828,7 @@ 2000 10000000.0 4000.0 - Trees/coniferous-summer.png + Trees/coniferous.png 8 25.0 @@ -2855,7 +2855,7 @@ 2000 10000000.0 4000.0 - Trees/deciduous-summer.png + Trees/deciduous.png 8 25.0 @@ -2880,7 +2880,7 @@ 2000 5000000.0 4000.0 - Trees/mixed-summer.png + Trees/mixed.png 8 25.0 @@ -2906,7 +2906,7 @@ 2000 10000000.0 4000.0 - Trees/coniferous-summer.png + Trees/coniferous.png 8 25.0 @@ -2930,7 +2930,7 @@ 1000 10000000.0 4000.0 - Trees/coniferous-summer.png + Trees/coniferous.png 8 20.0 @@ -2953,7 +2953,7 @@ 1000 10000000.0 4000.0 - Trees/coniferous-summer.png + Trees/coniferous.png 8 15.0 @@ -3085,7 +3085,7 @@ 0.6 0.2 250000.0 - Trees/mixed-summer.png + Trees/mixed.png 8 25.0 @@ -3146,7 +3146,7 @@ 0.0 4 5000.0 - Trees/mixed-summer.png + Trees/mixed.png 8 25.0 @@ -3476,7 +3476,7 @@ 1e30 10000.0 - Trees/mixed-summer.png + Trees/mixed.png 8 20.0 @@ -3514,7 +3514,7 @@ 1e30 10000.0 - Trees/mixed-summer.png + Trees/mixed.png 8 20.0 @@ -3549,7 +3549,7 @@ 2000000.0 10000.0 - Trees/mixed-summer.png + Trees/mixed.png 8 20.0 @@ -3576,7 +3576,7 @@ 2000000.0 10000.0 - Trees/mixed-summer.png + Trees/mixed.png 8 20.0 @@ -3621,7 +3621,7 @@ 0.3 1e30 150000.0 - Trees/mixed-summer.png + Trees/mixed.png 8 20.0 @@ -3660,7 +3660,7 @@ 0.3 1e30 5000.0 - Trees/mixed-summer.png + Trees/mixed.png 8 20.0 @@ -3689,7 +3689,7 @@ 0.7 10 4000.0 - Trees/mixed-summer.png + Trees/mixed.png 8 20.0 @@ -3722,7 +3722,7 @@ 2000 10000000.0 4000.0 - Trees/coniferous-winter.png + Trees/coniferous.png 8 25.0 @@ -3749,7 +3749,7 @@ 2000 10000000.0 4000.0 - Trees/deciduous-winter.png + Trees/deciduous.png 8 25.0 @@ -3775,7 +3775,7 @@ 2000 5000000.0 4000.0 - Trees/mixed-winter.png + Trees/mixed.png 8 25.0 @@ -3798,7 +3798,7 @@ 1000 10000000.0 4000.0 - Trees/coniferous-winter.png + Trees/coniferous.png 8 20.0 @@ -3820,7 +3820,7 @@ 1000 10000000.0 4000.0 - Trees/coniferous-winter.png + Trees/coniferous.png 8 15.0 @@ -3879,7 +3879,7 @@ 1.2 20000000.0 8000.0 - Trees/mixed-shrub-winter.png + Trees/mixed-shrub.png 8 2.0 @@ -3927,7 +3927,7 @@ 0.6 0.2 250000.0 - Trees/mixed-winter.png + Trees/mixed.png 8 25.0 @@ -3987,7 +3987,7 @@ 0.0 4 5000.0 - Trees/mixed-winter.png + Trees/mixed.png 8 25.0 @@ -4268,7 +4268,7 @@ 1e30 10000.0 - Trees/mixed-winter.png + Trees/mixed.png 8 20.0 @@ -4304,7 +4304,7 @@ 1e30 10000.0 - Trees/mixed-winter.png + Trees/mixed.png 8 20.0 @@ -4338,7 +4338,7 @@ 2000000.0 10000.0 - Trees/mixed-winter.png + Trees/mixed.png 8 20.0 @@ -4365,7 +4365,7 @@ 2000000.0 10000.0 - Trees/mixed-winter.png + Trees/mixed.png 8 20.0 @@ -4407,7 +4407,7 @@ 0.3 1e30 150000.0 - Trees/mixed-winter.png + Trees/mixed.png 8 20.0 @@ -4446,7 +4446,7 @@ 0.3 1e30 5000.0 - Trees/mixed-winter.png + Trees/mixed.png 8 20.0 @@ -4474,7 +4474,7 @@ 0.7 10 4000.0 - Trees/mixed-winter.png + Trees/mixed.png 8 20.0 diff --git a/Shaders/deferred-tree.vert b/Shaders/deferred-tree.vert index 2b6b254ec..f19595b57 100644 --- a/Shaders/deferred-tree.vert +++ b/Shaders/deferred-tree.vert @@ -5,6 +5,8 @@ // color - xyz of tree quad origin, replicated 4 times. #version 120 +uniform int season; + void main() { // Texture coordinates @@ -12,6 +14,7 @@ void main() { float texFract = floor(fract(gl_MultiTexCoord0.x) * numVarieties) / numVarieties; texFract += floor(gl_MultiTexCoord0.x) / numVarieties; gl_TexCoord[0] = vec4(texFract, gl_MultiTexCoord0.y, 0.0, 0.0); + gl_TexCoord[0].y = gl_TexCoord[0].y + 0.5 * season; // Position and scaling vec3 position = gl_Vertex.xyz * gl_Normal.xxy; diff --git a/Shaders/tree-haze.vert b/Shaders/tree-haze.vert index feea2ba53..1135ef852 100644 --- a/Shaders/tree-haze.vert +++ b/Shaders/tree-haze.vert @@ -37,6 +37,8 @@ uniform float visibility; uniform float overcast; //uniform float scattering; uniform float ground_scattering; +uniform float snow_level; +uniform int season; float earthShade; float mie_angle; @@ -82,6 +84,9 @@ void main() float sr = sin(gl_FogCoord + gl_Color.x); float cr = cos(gl_FogCoord + gl_Color.x); gl_TexCoord[0] = vec4(texFract, gl_MultiTexCoord0.y, 0.0, 0.0); + + // Determine the y texture coordinate based on whether it's summer, winter, snowy. + gl_TexCoord[0].y = gl_TexCoord[0].y + 0.25 * int(gl_Color.z > snow_level) + 0.5 * season; // scaling vec3 position = gl_Vertex.xyz * gl_Normal.xxy; diff --git a/Shaders/tree.vert b/Shaders/tree.vert index 65b3d2d7e..3a50f5491 100644 --- a/Shaders/tree.vert +++ b/Shaders/tree.vert @@ -12,6 +12,7 @@ // // void fog_Func(int type); // ///////////////////////// +uniform int season; void main(void) { @@ -25,6 +26,7 @@ void main(void) float sr = sin(gl_FogCoord + gl_Color.x); float cr = cos(gl_FogCoord + gl_Color.x); gl_TexCoord[0] = vec4(texFract, gl_MultiTexCoord0.y, 0.0, 0.0); + gl_TexCoord[0].y = gl_TexCoord[0].y + 0.5 * season; // scaling vec3 position = gl_Vertex.xyz * gl_Normal.xxy; diff --git a/Textures/Trees/coniferous-summer.dds b/Textures/Trees/coniferous-summer.dds deleted file mode 100644 index eabddd54b..000000000 Binary files a/Textures/Trees/coniferous-summer.dds and /dev/null differ diff --git a/Textures/Trees/coniferous-summer.png b/Textures/Trees/coniferous-summer.png deleted file mode 100644 index b5cab5934..000000000 Binary files a/Textures/Trees/coniferous-summer.png and /dev/null differ diff --git a/Textures/Trees/coniferous-winter.dds b/Textures/Trees/coniferous-winter.dds deleted file mode 100644 index ac0e59011..000000000 Binary files a/Textures/Trees/coniferous-winter.dds and /dev/null differ diff --git a/Textures/Trees/coniferous-winter.png b/Textures/Trees/coniferous-winter.png deleted file mode 100644 index f8fe6bd3c..000000000 Binary files a/Textures/Trees/coniferous-winter.png and /dev/null differ diff --git a/Textures/Trees/coniferous.dds b/Textures/Trees/coniferous.dds new file mode 100644 index 000000000..71e66fc0d Binary files /dev/null and b/Textures/Trees/coniferous.dds differ diff --git a/Textures/Trees/coniferous.png b/Textures/Trees/coniferous.png new file mode 100644 index 000000000..90dfdeb9d Binary files /dev/null and b/Textures/Trees/coniferous.png differ diff --git a/Textures/Trees/deciduous-summer.dds b/Textures/Trees/deciduous-summer.dds deleted file mode 100644 index 1fef152ca..000000000 Binary files a/Textures/Trees/deciduous-summer.dds and /dev/null differ diff --git a/Textures/Trees/deciduous-summer.png b/Textures/Trees/deciduous-summer.png deleted file mode 100644 index 161661ba9..000000000 Binary files a/Textures/Trees/deciduous-summer.png and /dev/null differ diff --git a/Textures/Trees/deciduous-winter.dds b/Textures/Trees/deciduous-winter.dds deleted file mode 100644 index 85de7e851..000000000 Binary files a/Textures/Trees/deciduous-winter.dds and /dev/null differ diff --git a/Textures/Trees/deciduous-winter.png b/Textures/Trees/deciduous-winter.png deleted file mode 100644 index a01d0e8d3..000000000 Binary files a/Textures/Trees/deciduous-winter.png and /dev/null differ diff --git a/Textures/Trees/deciduous.dds b/Textures/Trees/deciduous.dds new file mode 100644 index 000000000..0a0473916 Binary files /dev/null and b/Textures/Trees/deciduous.dds differ diff --git a/Textures/Trees/deciduous.png b/Textures/Trees/deciduous.png new file mode 100644 index 000000000..61f6120d3 Binary files /dev/null and b/Textures/Trees/deciduous.png differ diff --git a/Textures/Trees/mixed-shrub-winter.dds b/Textures/Trees/mixed-shrub-winter.dds deleted file mode 100644 index 66b828ed0..000000000 Binary files a/Textures/Trees/mixed-shrub-winter.dds and /dev/null differ diff --git a/Textures/Trees/mixed-shrub-winter.png b/Textures/Trees/mixed-shrub-winter.png deleted file mode 100644 index 6661d8195..000000000 Binary files a/Textures/Trees/mixed-shrub-winter.png and /dev/null differ diff --git a/Textures/Trees/mixed-shrub.dds b/Textures/Trees/mixed-shrub.dds index d10afc9c4..586d099bc 100644 Binary files a/Textures/Trees/mixed-shrub.dds and b/Textures/Trees/mixed-shrub.dds differ diff --git a/Textures/Trees/mixed-shrub.png b/Textures/Trees/mixed-shrub.png index 557c0bcc3..30cded1c2 100644 Binary files a/Textures/Trees/mixed-shrub.png and b/Textures/Trees/mixed-shrub.png differ diff --git a/Textures/Trees/mixed-summer.dds b/Textures/Trees/mixed-summer.dds deleted file mode 100644 index b2261e5fd..000000000 Binary files a/Textures/Trees/mixed-summer.dds and /dev/null differ diff --git a/Textures/Trees/mixed-summer.png b/Textures/Trees/mixed-summer.png deleted file mode 100644 index b7bbb4cd9..000000000 Binary files a/Textures/Trees/mixed-summer.png and /dev/null differ diff --git a/Textures/Trees/mixed-winter.dds b/Textures/Trees/mixed-winter.dds deleted file mode 100644 index 0e23a2f07..000000000 Binary files a/Textures/Trees/mixed-winter.dds and /dev/null differ diff --git a/Textures/Trees/mixed-winter.png b/Textures/Trees/mixed-winter.png deleted file mode 100644 index 2b3a52f6f..000000000 Binary files a/Textures/Trees/mixed-winter.png and /dev/null differ diff --git a/Textures/Trees/mixed.dds b/Textures/Trees/mixed.dds new file mode 100644 index 000000000..dd98eb9fb Binary files /dev/null and b/Textures/Trees/mixed.dds differ diff --git a/Textures/Trees/mixed.png b/Textures/Trees/mixed.png new file mode 100644 index 000000000..97dc262cf Binary files /dev/null and b/Textures/Trees/mixed.png differ diff --git a/Textures/Trees/tropical-alt.dds b/Textures/Trees/tropical-alt.dds new file mode 100644 index 000000000..e3f915738 Binary files /dev/null and b/Textures/Trees/tropical-alt.dds differ diff --git a/Textures/Trees/tropical-alt.png b/Textures/Trees/tropical-alt.png new file mode 100644 index 000000000..7f9a33d2b Binary files /dev/null and b/Textures/Trees/tropical-alt.png differ diff --git a/Textures/Trees/tropical-summer.dds b/Textures/Trees/tropical-summer.dds deleted file mode 100644 index 877e90cfd..000000000 Binary files a/Textures/Trees/tropical-summer.dds and /dev/null differ diff --git a/Textures/Trees/tropical-summer.png b/Textures/Trees/tropical-summer.png deleted file mode 100644 index 9fdfe0549..000000000 Binary files a/Textures/Trees/tropical-summer.png and /dev/null differ diff --git a/Textures/Trees/tropical.dds b/Textures/Trees/tropical.dds new file mode 100644 index 000000000..acc9936f1 Binary files /dev/null and b/Textures/Trees/tropical.dds differ diff --git a/Textures/Trees/tropical.png b/Textures/Trees/tropical.png new file mode 100644 index 000000000..6625f2a7b Binary files /dev/null and b/Textures/Trees/tropical.png differ