From df82561b755737bfd697ff33b3f163e1fafc0d83 Mon Sep 17 00:00:00 2001 From: Thorsten Renk <thorsten.i.renk@jyu.fi> Date: Mon, 13 Jan 2014 10:54:07 +0200 Subject: [PATCH] Separate, non-agricultural texture definition for Grassland landclass, corrsponding fix for correct cloud generation on the landclass in Advanced Weather --- Materials/regions/materials.xml | 43 ++++++++++++++++++++++++++- Nasal/local_weather/local_weather.nas | 2 +- 2 files changed, 43 insertions(+), 2 deletions(-) diff --git a/Materials/regions/materials.xml b/Materials/regions/materials.xml index e80485099..38158dff5 100644 --- a/Materials/regions/materials.xml +++ b/Materials/regions/materials.xml @@ -4045,7 +4045,6 @@ <effect>Effects/cropgrass</effect> <name>CropGrassCover</name> <name>CropGrass</name> - <name>Grassland</name> <texture>Terrain/cropgrass1.png</texture> <texture>Terrain/cropgrass2.png</texture> <texture>Terrain/cropgrass3.png</texture> @@ -4078,6 +4077,48 @@ <tree-width-m>12.0</tree-width-m> </material> + <material> + <condition> + <equals> + <property>sim/startup/season</property> + <value>summer</value> + </equals> + </condition> + <effect>Effects/cropgrass</effect> + <name>Grassland</name> + <texture-set> + <texture>Terrain/dry_pasture4.png</texture> + <texture n="12">Terrain/tundra-hawaii-green.png</texture> + </texture-set> + <xsize>2000</xsize> + <ysize>2000</ysize> + <light-coverage>2000000.0</light-coverage> + <diffuse> + <r>0.93</r> + <g>0.95</g> + <b>0.93</b> + <a>1.0</a> + </diffuse> + <specular> + <r>0.1</r> + <g>0.12</g> + <b>0.1</b> + <a>1.0</a> + </specular> + <shininess>1.2</shininess> + <solid>1</solid> + <friction-factor>0.7</friction-factor> + <rolling-friction>0.1</rolling-friction> + <bumpiness>0.3</bumpiness> + <load-resistance>1e30</load-resistance> + <wood-coverage>150000.0</wood-coverage> + <tree-texture>Trees/mixed.png</tree-texture> + <tree-varieties>8</tree-varieties> + <tree-range-m alias="/params/forest/tree-range-m"/> + <tree-height-m>20.0</tree-height-m> + <tree-width-m>12.0</tree-width-m> + </material> + <material> <condition> <equals> diff --git a/Nasal/local_weather/local_weather.nas b/Nasal/local_weather/local_weather.nas index b176dd118..11102b8b2 100644 --- a/Nasal/local_weather/local_weather.nas +++ b/Nasal/local_weather/local_weather.nas @@ -4396,7 +4396,7 @@ var ec = "/environment/config/"; # a hash map of the strength for convection associated with terrain types -var landcover_map = {BuiltUpCover: 0.35, Town: 0.35, Freeway:0.35, BarrenCover:0.3, HerbTundraCover: 0.25, GrassCover: 0.2, CropGrassCover: 0.2, EvergreenBroadCover: 0.2, EvergreenNeedleCover: 0.2, Sand: 0.25, Grass: 0.2, Ocean: 0.01, Marsh: 0.05, Lake: 0.01, ShrubCover: 0.15, Landmass: 0.2, CropWoodCover: 0.15, MixedForestCover: 0.15, DryCropPastureCover: 0.25, MixedCropPastureCover: 0.2, IrrCropPastureCover: 0.15, DeciduousBroadCover: 0.1, DeciduousNeedleCover: 0.1, Bog: 0.05, pa_taxiway : 0.35, pa_tiedown: 0.35, pc_taxiway: 0.35, pc_tiedown: 0.35, Glacier: 0.03, SnowCover: 0.04, DryLake: 0.3, IntermittentStream: 0.2, DryCrop: 0.2, Lava: 0.3, GolfCourse: 0.2, Rock: 0.3, Construction: 0.35, PackIce: 0.04, NaturalCrop: 0.2}; +var landcover_map = {BuiltUpCover: 0.35, Town: 0.35, Freeway:0.35, BarrenCover:0.3, HerbTundraCover: 0.25, GrassCover: 0.2, CropGrassCover: 0.2, EvergreenBroadCover: 0.2, EvergreenNeedleCover: 0.2, Sand: 0.25, Grass: 0.2, Grassland: 0.2, Ocean: 0.01, Marsh: 0.05, Lake: 0.01, ShrubCover: 0.15, Landmass: 0.2, CropWoodCover: 0.15, MixedForestCover: 0.15, DryCropPastureCover: 0.25, MixedCropPastureCover: 0.2, IrrCropPastureCover: 0.15, DeciduousBroadCover: 0.1, DeciduousNeedleCover: 0.1, Bog: 0.05, pa_taxiway : 0.35, pa_tiedown: 0.35, pc_taxiway: 0.35, pc_tiedown: 0.35, Glacier: 0.03, SnowCover: 0.04, DryLake: 0.3, IntermittentStream: 0.2, DryCrop: 0.2, Lava: 0.3, GolfCourse: 0.2, Rock: 0.3, Construction: 0.35, PackIce: 0.04, NaturalCrop: 0.2}; # a hash map of average vertical cloud model sizes