From b41afb94c626b67888318fe286802a2694a08698 Mon Sep 17 00:00:00 2001
From: fredb <fredb>
Date: Fri, 19 Dec 2008 07:42:29 +0000
Subject: [PATCH] Stuart Buchanan :

Attached is yet another 3D clouds patch, to fix the following:
1) The 3D clouds were not modified by the cloud coverage, due to some problems with osg::Switch
2) METAR changes to cloud coverage were not obeyed.
3) Making changes via the Cloud dialog had no effect unless 3D clouds were toggled.
4) Cloud cover was too sparse.
5) 3D Stratus clouds caused performance issues on some hardware (fixed by removing 3D stratus from cloudlayers.xml - it will now be a 2D layer).
---
 cloudlayers.xml        | 25 +++++++++++++------------
 gui/dialogs/clouds.xml | 13 +++++++++++++
 2 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/cloudlayers.xml b/cloudlayers.xml
index 0d45ecd12..ddfc8f9f8 100644
--- a/cloudlayers.xml
+++ b/cloudlayers.xml
@@ -987,11 +987,11 @@
         <name>cu-con</name>
         <count>2</count>
       </cloud>
-      <grid-x-size type="double">3000.0</grid-x-size>
-      <grid-y-size type="double">3000.0</grid-y-size>
-      <grid-x-rand type="double">1500.0</grid-x-rand>
-      <grid-y-rand type="double">1500.0</grid-y-rand>
-      <grid-z-rand type="double">200.0</grid-z-rand>
+      <grid-x-size type="double">2000.0</grid-x-size>
+      <grid-y-size type="double">2000.0</grid-y-size>
+      <grid-x-rand type="double">500.0</grid-x-rand>
+      <grid-y-rand type="double">500.0</grid-y-rand>
+      <grid-z-rand type="double">100.0</grid-z-rand>
     </cu>
     <cb>
       <cloud>
@@ -1010,10 +1010,10 @@
         <name>cu-con</name>
         <count>5</count>
       </cloud>
-      <grid-x-size type="double">6000.0</grid-x-size>
-      <grid-y-size type="double">6000.0</grid-y-size>
-      <grid-x-rand type="double">2000.0</grid-x-rand>
-      <grid-y-rand type="double">2000.0</grid-y-rand>
+      <grid-x-size type="double">2000.0</grid-x-size>
+      <grid-y-size type="double">2000.0</grid-y-size>
+      <grid-x-rand type="double">500.0</grid-x-rand>
+      <grid-y-rand type="double">500.0</grid-y-rand>
       <grid-z-rand type="double">200.0</grid-z-rand>
     </cb>
      <ac>
@@ -1021,13 +1021,13 @@
         <name>ac-str</name>
         <count>1</count>
       </cloud>
-      <grid-x-size type="double">2000.0</grid-x-size>
-      <grid-y-size type="double">2000.0</grid-y-size>
+      <grid-x-size type="double">1000.0</grid-x-size>
+      <grid-y-size type="double">1000.0</grid-y-size>
       <grid-x-rand type="double">100.0</grid-x-rand>
       <grid-y-rand type="double">100.0</grid-y-rand>
       <grid-z-rand type="double">100.0</grid-z-rand>
     </ac>
-    
+<!--    
    <st>
       <cloud>
         <name>st</name>
@@ -1039,6 +1039,7 @@
       <grid-y-rand type="double">500.0</grid-y-rand>
       <grid-z-rand type="double">100.0</grid-z-rand>
     </st>
+-->    
     <sc>
       <cloud>
         <name>sc</name>
diff --git a/gui/dialogs/clouds.xml b/gui/dialogs/clouds.xml
index 7d280f4b9..dfe583c88 100644
--- a/gui/dialogs/clouds.xml
+++ b/gui/dialogs/clouds.xml
@@ -274,6 +274,12 @@
    <binding>
     <command>dialog-apply</command>
    </binding>
+   <binding>
+       <command>nasal</command>
+       <script>
+           setprop("/environment/rebuild-layers", getprop("/environment/rebuild-layers")+1);
+       </script>
+   </binding>
    <binding>
     <command>dialog-close</command>
    </binding>
@@ -287,6 +293,13 @@
    <binding>
     <command>dialog-apply</command>
    </binding>
+   <binding>
+       <command>nasal</command>
+       <script>
+           setprop("/environment/rebuild-layers", getprop("/environment/rebuild-layers")+1);
+       </script>
+   </binding>
+   
   </button>
 
   <button>