diff --git a/Materials/regions/california.xml b/Materials/regions/california.xml index 10d365372..3c4b7cabc 100644 --- a/Materials/regions/california.xml +++ b/Materials/regions/california.xml @@ -55,10 +55,16 @@ <name>SaltMarsh</name> <name>HerbWetlandCover</name> <name>WoodedWetlandCover</name> + <effect>Effects/agriculture</effect> <texture-set> - <texture>Terrain/california-grass.png</texture> - <texture n="13">Terrain/california-rock.png</texture> + <texture>Terrain/california-grass2.png</texture> + <!--<texture n="16">Terrain/california-rock.png</texture>--> </texture-set> + <parameters> + <rotation_flag>1</rotation_flag> + <rotation_scale>1000.0</rotation_scale> + <distortion_factor>1.0</distortion_factor> + </parameters> <xsize>2000</xsize> <ysize>2000</ysize> <light-coverage>4000000.0</light-coverage> @@ -200,14 +206,20 @@ <bumpiness>0.4</bumpiness> </material> - <material> + <material> <name>DryCropPastureCover</name> <name>DryCrop</name> - <effect>Effects/forest</effect> + <effect>Effects/agriculture</effect> <texture-set> - <texture>Terrain/california-drycrop.png</texture> - </texture-set> + <texture>Terrain/california-drycrop.png</texture> + </texture-set> <object-mask>Terrain/california-drycrop-mask.png</object-mask> + <parameters> + <rotation_flag>2</rotation_flag> + <rotation_scale>2000.0</rotation_scale> + <uv_xoffset>0.0</uv_xoffset> + <uv_yoffset>0.0</uv_yoffset> + </parameters> <xsize>2000</xsize> <ysize>2000</ysize> <light-coverage>900000000.0</light-coverage> diff --git a/Materials/regions/materials.xml b/Materials/regions/materials.xml index 6d6d30d69..40992d21c 100644 --- a/Materials/regions/materials.xml +++ b/Materials/regions/materials.xml @@ -17,7 +17,7 @@ <!-- North America --> <region include="Materials/regions/alaska.xml"/> <region include="Materials/regions/us_southwest.xml"/> -<!--<region include="Materials/regions/california.xml"/>--> +<region include="Materials/regions/california.xml"/> <region include="Materials/regions/sierras.xml"/> <region include="Materials/regions/florida.xml"/> <region include="Materials/regions/bermuda.xml"/> diff --git a/Textures/Terrain/california-airport.png b/Textures/Terrain/california-airport.png index ce24d65c5..9ceb4080f 100644 Binary files a/Textures/Terrain/california-airport.png and b/Textures/Terrain/california-airport.png differ diff --git a/Textures/Terrain/california-airport2.png b/Textures/Terrain/california-airport2.png index f40fb157a..96e752b73 100644 Binary files a/Textures/Terrain/california-airport2.png and b/Textures/Terrain/california-airport2.png differ diff --git a/Textures/Terrain/california-grass2.png b/Textures/Terrain/california-grass2.png new file mode 100644 index 000000000..0a6b0e68d Binary files /dev/null and b/Textures/Terrain/california-grass2.png differ