diff --git a/Docs/README.materials b/Docs/README.materials index 1544f3585..c37add5e7 100644 --- a/Docs/README.materials +++ b/Docs/README.materials @@ -149,3 +149,68 @@ heading-type : Indicator of how the heading of the random objects should be mask - Rotation is taken from the red channel of the object-mask billboard - Object is always rotated to face camera - expensive + +Random Buildings +================ + +Random Buildings come in three sizes, with individual constraints. + +Small buildings, which may have pitched roofs. They have different front, back and +side textures. Small buildings are never deeper than they are wide. + +Medium buildings, which have flat roofs. They have different front and side textures. +They are never taller than they are wide. + +Large buildings, which have flat roofs. They have different front and size textures. There +are no constraints on their width, depth or height. + +building-coverage : The coverage of random buildings in areas marked for random objects in + m^2. A lower number means a higher density of buildings. A value of + 0 indicates no buildings. May be masked by the blue channel of an + object-mask. (default: 0) + +building-spacing-m : The minimum spacing between random buildings and other buildings + or random objects. This helps avoid objects being placed on top of each other. + (default: 5) + +building-small-ratio: Ratio of small buildings. These buildings are 1-3 stories + in height, and may have a pitched roof. Fraction of small buildings is + ( / ( + + + ). (default: 0.8) + +building-medium-ratio : Ratio of medium buildings. These buildings are 3-6 stories in + height, and have a flat roof. (default: 0.15) + +building-large-ratio : Ratio of large buildings. These buildings are 5-10 stories in + height, and have a flat roof. (default 0.05) + +building-small-pitch : Fraction of small buildings with pitched roofs. (default 0.8) +building-medium-pitch : Fraction of small buildings with pitched roofs. (default 0.2) +building-large-pitch : Fraction of small buildings with pitched roofs. (default 0.1) + +building-small-min-floors : Minimum number of floors for a small building. (default 1) +building-small-max-floors : Maximum number of floors for a small building. (default 3) + +building-medium-min-floors : Minimum number of floors for a medium building. (default 3) +building-medium-max-floors : Maximum number of floors for a medium building. (default 8) + +building-large-min-floors : Minimum number of floors for a medium building. (default 5) +building-large-max-floors : Maximum number of floors for a medium building. (default 20) + +building-small-min-width-m : Minimum width of small buildings. (default 15) +building-small-max-width-m : Maximum width of small buildings. (default 60) +building-small-min-depth-m : Minimum depth of small buildings. (default 10) +building-small-max-depth-m : Maximum depty of small buildings. (default 20) + +building-medium-min-width-m : Minimum width of medium buildings. (default 25) +building-medium-max-width-m : Maximum width of medium buildings. (default 50) +building-medium-min-depth-m : Minimum depth of medium buildings. (default 20) +building-medium-max-depth-m : Maximum depty of medium buildings. (default 50) + +building-large-min-width-m : Minimum width of large buildings. (default 50) +building-large-max-width-m : Maximum width of large buildings. (default 75) +building-large-min-depth-m : Minimum depth of large buildings. (default 50) +building-large-max-depth-m : Maximum depty of large buildings. (default 75) + +texture : The texture used for all buildings. See Texture/buildings.xcf for details. +(default Texture/buildings.png) diff --git a/Docs/buildings.png b/Docs/buildings.png new file mode 100644 index 000000000..1e6537e89 Binary files /dev/null and b/Docs/buildings.png differ diff --git a/Effects/urban.eff b/Effects/urban.eff index 4c3473c1f..4ed75d233 100644 --- a/Effects/urban.eff +++ b/Effects/urban.eff @@ -48,6 +48,10 @@ 4.0 /sim/rendering/shaders/urban + + /sim/rendering/random-buildings + false + 2.0 @@ -234,6 +238,10 @@ 1.0 /sim/rendering/shaders/urban + + /sim/rendering/random-buildings + false + 2.0 @@ -388,6 +396,10 @@ 4.0 /sim/rendering/shaders/urban + + /sim/rendering/random-buildings + false + 2.0 @@ -633,6 +645,10 @@ 1.0 /sim/rendering/shaders/urban + + /sim/rendering/random-buildings + false + 2.0 diff --git a/Materials/dds/materials.xml b/Materials/dds/materials.xml index 9283d4401..8fc2a0d1d 100644 --- a/Materials/dds/materials.xml +++ b/Materials/dds/materials.xml @@ -902,6 +902,14 @@ 1.0 + 500.0 + 0.4 + 3 + 30.0 + 10.0 + 30.0 + 0.6 + 0.2 10000.0 Trees/mixed-summer.png 8 @@ -910,6 +918,52 @@ 15.0 + + + + sim/startup/season + summer + + + BuiltUpCover + Urban + Effects/transition-base-dirt + + Terrain/city1.png + Terrain.winter/builtup.png + + + Terrain/city2.png + Terrain.winter/builtup.png + + Terrain/city1.mask.png + Terrain/city2.mask.png + 1000 + 1000 + 100000.0 + + 0.05 + 0.05 + 0.02 + 1.0 + + + 500.0 + 0.4 + 3 + 30.0 + 10.0 + 30.0 + 0.6 + 0.2 + 25000.0 + Trees/mixed-summer.dds + 8 + + 25.0 + 15.0 + + @@ -944,48 +998,6 @@ - - - - sim/startup/season - summer - - - sim/rendering/shaders/urban - - - BuiltUpCover - Urban - Effects/transition-base-dirt - - Terrain/city1.png - Terrain.winter/builtup.png - - - Terrain/city2.png - Terrain.winter/builtup.png - - Terrain/city1.mask.png - Terrain/city2.mask.png - 1000 - 1000 - 100000.0 - - 0.05 - 0.05 - 0.02 - 1.0 - - - 25000.0 - Trees/mixed-summer.dds - 8 - - 25.0 - 15.0 - - - @@ -1007,6 +1019,11 @@ 1.0 + 500.0 + 0.9 + 0.1 + 0.0 + 4 5000.0 Trees/mixed-summer.dds 8 @@ -1377,7 +1394,7 @@ Terrain/countryside1.green.dds Terrain.winter/countryside1.winter.dds - + Terrain/countryside1.green.mask.png Terrain/countryside2.green.mask.png Terrain/countryside3.green.mask.png @@ -1762,9 +1779,9 @@ - sim/startup/season - winter - + sim/startup/season + winter + BuiltUpCover Urban @@ -1791,6 +1808,14 @@ 1.0 + 500.0 + 0.4 + 3 + 30.0 + 10.0 + 30.0 + 0.6 + 0.2 250000.0 Trees/mixed-winter.png 8 @@ -1847,6 +1872,11 @@ 1.0 + 500.0 + 0.9 + 0.1 + 0.0 + 4 5000.0 Trees/mixed-winter.png 8 diff --git a/Materials/default/materials.xml b/Materials/default/materials.xml index a589207ab..cec59b488 100644 --- a/Materials/default/materials.xml +++ b/Materials/default/materials.xml @@ -874,6 +874,14 @@ 1.0 + 500.0 + 0.4 + 3 + 30.0 + 10.0 + 30.0 + 0.6 + 0.2 250000.0 Trees/mixed-summer.png 8 @@ -929,6 +937,11 @@ 1.0 + 500.0 + 0.9 + 0.1 + 0.0 + 4 5000.0 Trees/mixed-summer.png 8 @@ -1629,12 +1642,6 @@ Terrain/city1.mask.png Terrain/city2.mask.png - 1000 1000 100000.0 @@ -1645,6 +1652,14 @@ 1.0 + 500.0 + 0.4 + 3 + 30.0 + 10.0 + 30.0 + 0.6 + 0.2 250000.0 Trees/mixed-winter.png 8 @@ -1700,6 +1715,11 @@ 1.0 + 500.0 + 0.9 + 0.1 + 0.0 + 4 5000.0 Trees/mixed-winter.png 8 diff --git a/Textures/buildings.png b/Textures/buildings.png new file mode 100644 index 000000000..139af2b9b Binary files /dev/null and b/Textures/buildings.png differ diff --git a/gui/dialogs/rendering.xml b/gui/dialogs/rendering.xml index 39d279199..52292b20d 100644 --- a/gui/dialogs/rendering.xml +++ b/gui/dialogs/rendering.xml @@ -178,39 +178,6 @@ - - hbox - - - left - - - true - - - - - left - - particles - /sim/rendering/particles - - dialog-apply - particles - - - - - left - - precipitation - /sim/rendering/precipitation-gui-enable - - dialog-apply - precipitation - - - + + hbox + + + left + + + true + + + + + left + + jetways + /nasal/jetways/enabled + + dialog-apply + jetways + + + left @@ -233,11 +222,7 @@ dialog-apply random-objects - - reinit - tile-manager - - + left @@ -248,10 +233,6 @@ dialog-apply random-vegetation - - reinit - tile-manager - @@ -286,19 +267,62 @@ left - - jetways - /nasal/jetways/enabled + + random-buildings + /sim/rendering/random-buildings dialog-apply - jetways + random-buildings hbox + right - + + + /sim/rendering/random-buildings + + + + building-density + 0 + 10.0 + /sim/rendering/building-density + + dialog-apply + building-density + + + + + %.2f + true + /sim/rendering/building-density + + /sim/rendering/random-buildings + + + + + + + + vbox + 1 + + + + hbox + + left @@ -306,6 +330,28 @@ + + left + + particles + /sim/rendering/particles + + dialog-apply + particles + + + + + left + + precipitation + /sim/rendering/precipitation-gui-enable + + dialog-apply + precipitation + + +