Preserve initial "state" by careful use of glPushAttrib() and glPopAttrib()

[simgear.git] / simgear / sky / sky.cxx

diff --git a/simgear/sky/sky.cxx b/simgear/sky/sky.cxx
index 36c3c257fa8e5cc85d886e8fb294b096274b040f..07acea9ad76d0c8f36862a5a7d599bde8f2da8be 100644 (file)
--- a/simgear/sky/sky.cxx
+++ b/simgear/sky/sky.cxx
@@ -5,19 +5,20 @@
 //
 // Copyright (C) 1997-2000  Curtis L. Olson  - curt@flightgear.org
 //
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License as
-// published by the Free Software Foundation; either version 2 of the
-// License, or (at your option) any later version.
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Library General Public
+// License as published by the Free Software Foundation; either
+// version 2 of the License, or (at your option) any later version.
 //
-// This program is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
+// Library General Public License for more details.
 //
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// You should have received a copy of the GNU Library General Public
+// License along with this library; if not, write to the
+// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+// Boston, MA  02111-1307, USA.
 //
 // $Id$
 
@@ -248,8 +249,8 @@ void SGSky::postDraw( float alt ) {
 }
 
  
-void SGSky::add_cloud_layer( double span, double asl,
-                            double thickness, double transition,
+void SGSky::add_cloud_layer( double asl, double thickness,
+                            double transition, double span,
                             ssgSimpleState *state ) {
     SGCloudLayer *layer = new SGCloudLayer;
     layer->build( span, asl, thickness, transition, state );
@@ -273,19 +274,19 @@ void SGSky::add_cloud_layer( double span, double asl,
 }
 
 
-void SGSky::add_cloud_layer( double span, double asl,
-                            double thickness, double transition,
+void SGSky::add_cloud_layer( double asl, double thickness,
+                            double transition, double span,
                             const string &tex_path ) {
     ssgSimpleState *state = SGCloudMakeState( tex_path );
-    add_cloud_layer( span, asl, thickness, transition, state );
+    add_cloud_layer( asl, thickness, transition, span, state );
 }
 
 
-void SGSky::add_cloud_layer( double span, double asl,
-                            double thickness, double transition,
+void SGSky::add_cloud_layer( double asl, double thickness,
+                            double transition, double span,
                             SGCloudType type ) {
     if ( type > 0 && type < SG_MAX_CLOUD_TYPES ) {
-       add_cloud_layer( span, asl, thickness, transition, cloud_mats[type] );
+       add_cloud_layer( asl, thickness, transition, span, cloud_mats[type] );
     }
 }