[Flightgear-commitlogs] FlightGear Base Package branch, master, updated. 57a40227ade9748e550581b2c3241526b0fdf321

[Flightgear-commitlogs <ma...@hy...>]

The branch, master has been updated

- Log -----------------------------------------------------------------
commit 57a40227ade9748e550581b2c3241526b0fdf321
Author: Emilian Huminiuc
Date:   Mon Feb 27 01:56:46 2012 +0200

    Revert "countryside.mask convert to .dds. Flip png version to keep correct orientation"
    
    This reverts commit beb89d56d0e02dd27316f6f68368394a6ff5c091.

commit f9e77ed465c1ce8d73f9d702903c722c95fc4590
Author: Emilian Huminiuc
Date:   Mon Feb 27 01:56:07 2012 +0200

    Revert "add actual files"
    
    This reverts commit acde460ba6f170fb55746fbed2fa5a7d901a3a17.


- Summary -------------------------------------------------------------

 Materials/dds/materials.xml                  |   32 +++++++++++++-------------
 Textures/Terrain/countryside1.green.mask.dds |  Bin 43832 -> 0 bytes
 Textures/Terrain/countryside1.green.mask.png |  Bin 9083 -> 8502 bytes
 Textures/Terrain/countryside2.green.mask.dds |  Bin 43832 -> 0 bytes
 Textures/Terrain/countryside2.green.mask.png |  Bin 7781 -> 7107 bytes
 Textures/Terrain/countryside3.green.mask.dds |  Bin 43832 -> 0 bytes
 Textures/Terrain/countryside3.green.mask.png |  Bin 4382 -> 3872 bytes
 Textures/Terrain/countryside4.green.mask.dds |  Bin 43832 -> 0 bytes
 Textures/Terrain/countryside4.green.mask.png |  Bin 6814 -> 6286 bytes
 materials-dds.xml                            |   26 ++++++++++----------
 10 files changed, 29 insertions(+), 29 deletions(-)
 delete mode 100644 Textures/Terrain/countryside1.green.mask.dds
 delete mode 100644 Textures/Terrain/countryside2.green.mask.dds
 delete mode 100644 Textures/Terrain/countryside3.green.mask.dds
 delete mode 100644 Textures/Terrain/countryside4.green.mask.dds


- Diff ----------------------------------------------------------------

diff --git a/Materials/dds/materials.xml b/Materials/dds/materials.xml
index e775909..5e3d44f 100644
--- a/Materials/dds/materials.xml
+++ b/Materials/dds/materials.xml
@@ -901,7 +901,7 @@
     <b>0.02</b>
     <a>1.0</a>
   </emissive>
-  <object-group include="Materials/base/urban-buildings.xml"/>
+  <object-group include="Materials/base/urban-buildings.xml"/>  
   <wood-coverage>10000.0</wood-coverage>
   <tree-texture>Trees/mixed-summer.png</tree-texture>
   <tree-varieties>8</tree-varieties>
@@ -941,7 +941,7 @@
     <b>0.02</b>
     <a>1.0</a>
   </emissive>
-	<object-group include="Materials/base/industrial-buildings.xml"/>
+	<object-group include="Materials/base/industrial-buildings.xml"/>	
 </material>
 
 <material>
@@ -976,7 +976,7 @@
     <b>0.02</b>
     <a>1.0</a>
   </emissive>
-  <object-group include="Materials/base/urban-buildings.xml"/>
+  <object-group include="Materials/base/urban-buildings.xml"/>  
   <wood-coverage>25000.0</wood-coverage>
   <tree-texture>Trees/mixed-summer.dds</tree-texture>
   <tree-varieties>8</tree-varieties>
@@ -996,7 +996,7 @@
   <name>Town</name>
   <name>SubUrban</name>
   <texture>Terrain/Town1.png</texture>
-  <object-mask>Terrain/Town1.mask.png</object-mask>
+  <object-mask>Terrain/Town1.mask.png</object-mask>    
   <xsize>1024</xsize>
   <ysize>1024</ysize>
   <light-coverage>100000.0</light-coverage>
@@ -1389,10 +1389,10 @@
     <texture>Terrain/countryside4.green.dds</texture>
     <texture n="4">Terrain.winter/countryside4.winter.dds</texture>
   </texture-set>
-  <object-mask>Terrain/countryside1.green.mask.dds</object-mask>
-  <object-mask>Terrain/countryside2.green.mask.dds</object-mask>
-  <object-mask>Terrain/countryside3.green.mask.dds</object-mask>
-  <object-mask>Terrain/countryside4.green.mask.dds</object-mask>
+  <object-mask>Terrain/countryside1.green.mask.png</object-mask>
+  <object-mask>Terrain/countryside2.green.mask.png</object-mask>
+  <object-mask>Terrain/countryside3.green.mask.png</object-mask>
+  <object-mask>Terrain/countryside4.green.mask.png</object-mask>
   <xsize>1800</xsize>
   <ysize>1800</ysize>
   <solid>1</solid>
@@ -1778,7 +1778,7 @@
       <texture n="2">Terrain/city2-relief-light.png</texture>
   </texture-set>
   <object-mask>Terrain/city1.mask.png</object-mask>
-  <object-mask>Terrain/city2.mask.png</object-mask>
+  <object-mask>Terrain/city2.mask.png</object-mask>  
   <object-mask>Terrain/city1.mask.png</object-mask>
   <object-mask>Terrain/city2.mask.png</object-mask>
     <xsize>1000</xsize>
@@ -1790,7 +1790,7 @@
     <b>0.02</b>
     <a>1.0</a>
   </emissive>
-  <object-group include="Materials/base/urban-buildings.xml"/>
+  <object-group include="Materials/base/urban-buildings.xml"/>  
   <wood-coverage>250000.0</wood-coverage>
   <tree-texture>Trees/mixed-winter.png</tree-texture>
   <tree-varieties>8</tree-varieties>
@@ -1823,7 +1823,7 @@
     <b>0.02</b>
     <a>1.0</a>
   </emissive>
-	<object-group include="Materials/base/industrial-buildings.xml"/>
+	<object-group include="Materials/base/industrial-buildings.xml"/>	
 </material>
 
 <material>
@@ -1836,7 +1836,7 @@
   <name>Town</name>
   <name>SubUrban</name>
   <texture>Terrain.winter/Town1.png</texture>
-  <object-mask>Terrain/Town1.mask.png</object-mask>
+  <object-mask>Terrain/Town1.mask.png</object-mask>    
   <xsize>1024</xsize>
   <ysize>1024</ysize>
   <light-coverage>100000.0</light-coverage>
@@ -2172,10 +2172,10 @@
   <texture >Terrain.winter/countryside2.winter.dds</texture>
   <texture >Terrain.winter/countryside3.winter.dds</texture>
   <texture >Terrain.winter/countryside3.winter.dds</texture>
-  <object-mask>Terrain/countryside1.green.mask.dds</object-mask>
-  <object-mask>Terrain/countryside2.green.mask.dds</object-mask>
-  <object-mask>Terrain/countryside3.green.mask.dds</object-mask>
-  <object-mask>Terrain/countryside4.green.mask.dds</object-mask>
+  <object-mask>Terrain/countryside1.green.mask.png</object-mask>
+  <object-mask>Terrain/countryside2.green.mask.png</object-mask>
+  <object-mask>Terrain/countryside3.green.mask.png</object-mask>
+  <object-mask>Terrain/countryside4.green.mask.png</object-mask>
   <xsize>1800</xsize>
   <ysize>1800</ysize>
   <solid>1</solid>
diff --git a/Textures/Terrain/countryside1.green.mask.dds b/Textures/Terrain/countryside1.green.mask.dds
deleted file mode 100644
index e1fd9ac..0000000
Binary files a/Textures/Terrain/countryside1.green.mask.dds and /dev/null differ
diff --git a/Textures/Terrain/countryside1.green.mask.png b/Textures/Terrain/countryside1.green.mask.png
index a64ad09..32d8d50 100644
Binary files a/Textures/Terrain/countryside1.green.mask.png and b/Textures/Terrain/countryside1.green.mask.png differ
diff --git a/Textures/Terrain/countryside2.green.mask.dds b/Textures/Terrain/countryside2.green.mask.dds
deleted file mode 100644
index c2fb2f1..0000000
Binary files a/Textures/Terrain/countryside2.green.mask.dds and /dev/null differ
diff --git a/Textures/Terrain/countryside2.green.mask.png b/Textures/Terrain/countryside2.green.mask.png
index b37c28c..f4c2c0d 100644
Binary files a/Textures/Terrain/countryside2.green.mask.png and b/Textures/Terrain/countryside2.green.mask.png differ
diff --git a/Textures/Terrain/countryside3.green.mask.dds b/Textures/Terrain/countryside3.green.mask.dds
deleted file mode 100644
index 352bff3..0000000
Binary files a/Textures/Terrain/countryside3.green.mask.dds and /dev/null differ
diff --git a/Textures/Terrain/countryside3.green.mask.png b/Textures/Terrain/countryside3.green.mask.png
index 7f78e26..4c326f5 100644
Binary files a/Textures/Terrain/countryside3.green.mask.png and b/Textures/Terrain/countryside3.green.mask.png differ
diff --git a/Textures/Terrain/countryside4.green.mask.dds b/Textures/Terrain/countryside4.green.mask.dds
deleted file mode 100644
index e24aac4..0000000
Binary files a/Textures/Terrain/countryside4.green.mask.dds and /dev/null differ
diff --git a/Textures/Terrain/countryside4.green.mask.png b/Textures/Terrain/countryside4.green.mask.png
index 59d7026..2ed424b 100644
Binary files a/Textures/Terrain/countryside4.green.mask.png and b/Textures/Terrain/countryside4.green.mask.png differ
diff --git a/materials-dds.xml b/materials-dds.xml
index 4b290df..d85e9e3 100644
--- a/materials-dds.xml
+++ b/materials-dds.xml
@@ -10,7 +10,7 @@ Shared parameters for various materials.
 	<forest>
 	    <!-- Maximum distance from which a tree is visible -->
       <tree-range-m>8000</tree-range-m>
-	</forest>
+	</forest>  
     </params>
 
     <material>
@@ -1243,7 +1243,7 @@ Shared parameters for various materials.
 	    <b>0.02</b>
 	    <a>1.0</a>
 	</emissive>
-	<object-group>
+	<object-group>	
     <range-m>10000</range-m>
     <object>
       <path>Models/Buildings/factory.ac</path>
@@ -1585,7 +1585,7 @@ Shared parameters for various materials.
 	<name>Town</name>
 	<name>SubUrban</name>
     <texture>Terrain/Town1.png</texture>
-    <object-mask>Terrain/Town1.mask.png</object-mask>
+    <object-mask>Terrain/Town1.mask.png</object-mask>    
 	<xsize>1024</xsize>
 	<ysize>1024</ysize>
 	<light-coverage>100000.0</light-coverage>
@@ -2065,10 +2065,10 @@ Shared parameters for various materials.
       <texture>Terrain/countryside4.green.dds</texture>
 	    <texture n="4">Terrain.winter/countryside4.winter.dds</texture>
 	</texture-set>
-	<object-mask>Terrain/countryside1.green.mask.dds</object-mask>
-	<object-mask>Terrain/countryside2.green.mask.dds</object-mask>
-	<object-mask>Terrain/countryside3.green.mask.dds</object-mask>
-	<object-mask>Terrain/countryside4.green.mask.dds</object-mask>
+	<object-mask>Terrain/countryside1.green.mask.png</object-mask>
+	<object-mask>Terrain/countryside2.green.mask.png</object-mask>
+	<object-mask>Terrain/countryside3.green.mask.png</object-mask>
+	<object-mask>Terrain/countryside4.green.mask.png</object-mask>
 	<xsize>1800</xsize>
 	<ysize>1800</ysize>
 	<solid>1</solid>
@@ -2499,7 +2499,7 @@ Shared parameters for various materials.
       <texture n="2">Terrain/city2-relief-light.png</texture>
 	</texture-set>
 	<object-mask>Terrain/city1.mask.png</object-mask>
-	<object-mask>Terrain/city2.mask.png</object-mask>
+	<object-mask>Terrain/city2.mask.png</object-mask>	
     <!--
   <texture-set>
    <texture>Terrain/city3.png</texture>
@@ -2677,7 +2677,7 @@ Shared parameters for various materials.
 	<name>Town</name>
 	<name>SubUrban</name>
     <texture>Terrain.winter/Town1.png</texture>
-    <object-mask>Terrain/Town1.mask.png</object-mask>
+    <object-mask>Terrain/Town1.mask.png</object-mask>    
 	<xsize>1024</xsize>
 	<ysize>1024</ysize>
 	<light-coverage>100000.0</light-coverage>
@@ -3100,10 +3100,10 @@ Shared parameters for various materials.
     <texture >Terrain.winter/countryside2.winter.dds</texture>
     <texture >Terrain.winter/countryside3.winter.dds</texture>
     <texture >Terrain.winter/countryside3.winter.dds</texture>
-    <object-mask>Terrain/countryside1.green.mask.dds</object-mask>
-    <object-mask>Terrain/countryside2.green.mask.dds</object-mask>
-    <object-mask>Terrain/countryside3.green.mask.dds</object-mask>
-    <object-mask>Terrain/countryside4.green.mask.dds</object-mask>
+    <object-mask>Terrain/countryside1.green.mask.png</object-mask>
+    <object-mask>Terrain/countryside2.green.mask.png</object-mask>
+    <object-mask>Terrain/countryside3.green.mask.png</object-mask>
+    <object-mask>Terrain/countryside4.green.mask.png</object-mask>
     <xsize>1800</xsize>
     <ysize>1800</ysize>
 	<solid>1</solid>


-----------------------------------------------------------------------


FlightGear Base Package