Merge branch 'master' of git://gitorious.org/fg/fgdata

Materials/regions/caribbean-farm-buildings.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<!-- Set of generic farm buildings, for inclusion in a materials file -->
+<PropertyList>
+  <range-m>5000</range-m>
+  <object>
+    <path>Models/Buildings/red-barn.ac</path>
+    <path>Models/Buildings/cow-stable.ac</path>
+    <path>Models/Agriculture/farmhouse1.ac</path>
+    <path>Models/Agriculture/farmhouse2.ac</path>
+    <path>Models/Agriculture/farmhouse3.ac</path>
+    <coverage-m2>5000</coverage-m2>
+    <heading-type>mask</heading-type>
+  </object>
+</PropertyList>

Materials/regions/caribbean.xml

@@ -0,0 +1,45 @@
+<?xml version="1.0"?>
+<!-- General settings for all caribbean materials -->
+<PropertyList>
+  <!-- Define the caribbean as a box with given latitude/longitude -->
+  <condition>
+    <and>
+     <greater-than>
+      <property>position/longitude-deg</property>
+      <value>-85.0</value>
+     </greater-than>
+     <less-than>
+      <property>position/longitude-deg</property>
+      <value>-40.0</value>
+     </less-than>
+     <greater-than>
+      <property>position/latitude-deg</property>
+      <value>11.0</value>
+     </greater-than>
+     <less-than>
+      <property>position/latitude-deg</property>
+      <value>25</value>
+     </less-than>
+    </and>
+  </condition>
+  
+  <!-- Caribbean buildings definitions. Notes that these will be used for -->
+  <!-- both towns and cities                                              -->
+  <building-texture>Textures/buildings-caribbean.png</building-texture>
+  <building-lightmap>Textures/buildings-caribbean-lightmap.png</building-lightmap>
+  <building-small-min-floors>1</building-small-min-floors>
+  <building-small-max-floors>2</building-small-max-floors>
+  <building-small-max-width-m>20.0</building-small-max-width-m>
+  <building-small-min-depth-m>8.0</building-small-min-depth-m>
+  <building-small-max-depth-m>20.0</building-small-max-depth-m>
+  <building-medium-min-floors>1</building-medium-min-floors>
+  <building-medium-max-floors>3</building-medium-max-floors>
+
+  <!-- Appropriate tropical trees -->
+  <tree-texture>Trees/tropical-summer.png</tree-texture>
+  <tree-varieties>8</tree-varieties>
+  <tree-range-m alias="/params/forest/tree-range-m"/>
+  <tree-height-m>25.0</tree-height-m>
+  <tree-width-m>15.0</tree-width-m>
+  
+</PropertyList>

Materials/regions/european.xml

@@ -0,0 +1,34 @@
+<?xml version="1.0"?>
+<!-- General settings for all European materials -->
+<PropertyList>
+  <!-- Define Europe as a box with given latitude/longitude -->
+  <condition>
+    <and>
+      <equals>
+        <property>sim/startup/season</property>
+        <value>summer</value>
+      </equals>
+    <and>
+     <greater-than>
+      <property>position/longitude-deg</property>
+      <value>-20.0</value>
+     </greater-than>
+     <less-than>
+      <property>position/longitude-deg</property>
+      <value>40.0</value>
+     </less-than>
+     <greater-than>
+      <property>position/latitude-deg</property>
+      <value>35.0</value>
+     </greater-than>
+    </and>
+   </and>
+  </condition>
+  
+  <!-- European buildings definitions. Notes that these will be used for  -->
+  <!-- both towns and cities                                              -->
+  <building-texture>Textures/buildings.png</building-texture>
+  <building-lightmap>Textures/buildings-lightmap.png</building-lightmap>
+
+  
+</PropertyList>

Materials/regions/hawaii.xml

@@ -0,0 +1,38 @@
+<?xml version="1.0"?>
+<!-- General settings for all Hawaii materials -->
+<PropertyList>
+  <!-- Define Hawaii as a box with given latitude/longitude -->
+  <condition>
+   <and>
+     <greater-than>
+      <property>position/longitude-deg</property>
+      <value>-179.0</value>
+     </greater-than>
+     <less-than>
+      <property>position/longitude-deg</property>
+      <value>-154.0</value>
+     </less-than>
+     <greater-than>
+      <property>position/latitude-deg</property>
+      <value>18.8</value>
+     </greater-than>
+     <less-than>
+      <property>position/latitude-deg</property>
+      <value>28.5</value>
+     </less-than>
+   </and>
+  </condition>
+  
+  <!-- Hawaiian buildings definitions. Notes that these will be used for  -->
+  <!-- both towns and cities                                              -->
+  <building-texture>Textures/buildings-caribbean.png</building-texture>
+  <building-lightmap>Textures/buildings-caribbean-lightmap.png</building-lightmap>
+  <building-small-min-floors>1</building-small-min-floors>
+  <building-small-max-floors>2</building-small-max-floors>
+  <building-small-max-width-m>20.0</building-small-max-width-m>
+  <building-small-min-depth-m>8.0</building-small-min-depth-m>
+  <building-small-max-depth-m>20.0</building-small-max-depth-m>
+  <building-medium-min-floors>1</building-medium-min-floors>
+  <building-medium-max-floors>3</building-medium-max-floors>
+  
+</PropertyList>

Shaders/runway.frag

@@ -38,8 +38,6 @@ uniform int fogType;
 vec3 fog_Func(vec3 color, int type);
 //////////////////////
 
-vec3 fog_Func(vec3 color, int type);
-
 void main (void)
 {
     //vec3 halfV;

Shaders/sunlight-nofiltering.frag

@@ -6,6 +6,7 @@ uniform sampler2D spec_emis_tex;
 uniform sampler2DShadow shadow_tex;
 uniform vec4 fg_SunDiffuseColor;
 uniform vec4 fg_SunSpecularColor;
+uniform vec4 fg_SunAmbientColor;
 uniform vec3 fg_SunDirection;
 uniform vec3 fg_Planes;
 uniform int fg_ShadowNumber;
@@ -81,7 +82,7 @@ void main() {
     }
 
     float matID = texture2D( color_tex, coords ).a * 255.0;
-    if (matID == 255.0)
+    if (matID >= 254.0)
         Idiff += Ispec * spec_emis.x;
 
     gl_FragColor = vec4(mix(vec3(0.0), Idiff + Ispec, shadow) + Iemis, 1.0);

Shaders/sunlight-noshadow.frag

@@ -35,7 +35,7 @@ void main() {
     }
 
     float matID = texture2D( color_tex, coords ).a * 255.0;
-    if (matID == 255.0)
+    if (matID >= 254.0)
         Idiff += Ispec * spec_emis.x;
 
     gl_FragColor = vec4(Idiff + Ispec + Iemis, 1.0);

Translations/en/menu.xml

@@ -88,6 +88,8 @@
 	<reload-autopilot>Reload Autopilot</reload-autopilot>
 	<reload-network>Reload Network</reload-network>
 	<reload-model>Reload Aircraft Model</reload-model>
+	<reload-materials>Reload Materials</reload-materials>
+	<reload-scenery>Reload Scenery</reload-scenery>
 	<nasal-console>Nasal Console</nasal-console>
 	<development-keys>Development Keys</development-keys>
 	<configure-dev-extension>Configure Development Extensions</configure-dev-extension>

gui/dialogs/rendering.xml

@@ -247,6 +247,19 @@
 					<row>2</row>
 					<col>0</col>
 					<halign>left</halign>
+					<label>Random buildings</label>
+					<name>random-buildings</name>
+					<property>/sim/rendering/random-buildings</property>
+					<binding>
+						<command>dialog-apply</command>
+						<object-name>random-buildings</object-name>
+					</binding>
+				</checkbox>
+
+				<checkbox>
+					<row>3</row>
+					<col>0</col>
+					<halign>left</halign>
 					<label>Random objects</label>
 					<name>random-objects</name>
 					<property>/sim/rendering/random-objects</property>
@@ -257,7 +270,7 @@
 				</checkbox>
 
 				<checkbox>
-					<row>3</row>
+					<row>4</row>
 					<col>0</col>
 					<halign>left</halign>
 					<label>Random vegetation</label>
@@ -269,7 +282,7 @@
 					</binding>
 				</checkbox>
 				<text>
-					<row>3</row>
+					<row>4</row>
 					<col>1</col>
 					<label>density</label>
 					<enable>
@@ -277,7 +290,7 @@
 					</enable>
 				</text>
 				<slider>
-					<row>3</row>
+					<row>4</row>
 					<col>2</col>
 					<name>vegetation-density</name>
 					<min>0</min>
@@ -290,7 +303,7 @@
 					</binding>
 				</slider>
 				<text>
-					<row>3</row>
+					<row>4</row>
 					<col>3</col>
 					<label>12345678</label>
 					<format>%.1f</format>
@@ -301,50 +314,6 @@
 					</enable>
 				</text>
 				
-				<checkbox>
-					<row>4</row>
-					<col>0</col>
-					<halign>left</halign>
-					<label>Random buildings</label>
-					<name>random-buildings</name>
-					<property>/sim/rendering/random-buildings</property>
-					<binding>
-						<command>dialog-apply</command>
-						<object-name>random-buildings</object-name>
-					</binding>
-				</checkbox>
-				<text>
-					<row>4</row>
-					<col>1</col>
-					<label>density</label>
-					<enable>
-						<property>/sim/rendering/random-buildings</property>
-					</enable>
-				</text>
-				<slider>
-					<row>4</row>
-					<col>2</col>
-					<name>building-density</name>
-					<min>0</min>
-					<max>5.0</max>
-					<step>0.1</step>
-					<property>/sim/rendering/building-density</property>
-					<binding>
-						<command>dialog-apply</command>
-						<object-name>building-density</object-name>
-					</binding>
-				</slider>
-				<text>
-					<row>4</row>
-					<col>3</col>
-					<label>12345678</label>
-					<format>%.1f</format>
-					<live>true</live>
-					<property>/sim/rendering/building-density</property>
-					<enable>
-						<property>/sim/rendering/random-buildings</property>
-					</enable>
-				</text>
 			</group>
 
 			<button>

gui/menubar.xml

@@ -552,15 +552,30 @@
 				<command>reinit</command>
 				<subsystem>io</subsystem>
 			</binding>
-        </item>
+		</item>
 
-        <item>
+		<item>
-            <name>reload-model</name>
+			<name>reload-model</name>
-            <binding>
+			<binding>
-                <command>reinit</command>
+				<command>reinit</command>
-                <subsystem>aircraft-model</subsystem>
+				<subsystem>aircraft-model</subsystem>
-            </binding>
+		        </binding>
-        </item>
+		</item>
+
+		<item>
+			<name>reload-materials</name>
+			<binding>
+				<command>reload-materials</command>
+			</binding>
+		</item>
+
+		<item>
+			<name>reload-scenery</name>
+			<binding>
+				<command>reinit</command>
+				<subsystem>tile-manager</subsystem>
+			</binding>
+		</item>
 
 		<item>
 			<name>nasal-console</name>