Collapsed the init() method into the constructor.

[simgear.git] / simgear / sky / cloud.hxx

diff --git a/simgear/sky/cloud.hxx b/simgear/sky/cloud.hxx
index 05961c54af56af73f0d14dc36c9ee5d6f1f5e00a..cbc425a2cea685b515b229d730c67393bbd07255 100644 (file)
--- a/simgear/sky/cloud.hxx
+++ b/simgear/sky/cloud.hxx
@@ -24,17 +24,26 @@
 #ifndef _SG_CLOUD_HXX_
 #define _SG_CLOUD_HXX_
 
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
+#include <simgear/compiler.h>
 
 #include <plib/ssg.h>
 
-#include <simgear/misc/fgpath.hxx>
+#include STL_STRING
+FG_USING_STD(string);
+
 
+#define SG_MAX_CLOUD_TYPES 4   // change this if we add/remove cloud
+                               // types en the enum below
 
 enum SGCloudType {
     SG_CLOUD_OVERCAST = 0,
-    SG_CLOUD_MOSTLY_CLOUDY,
-    SG_CLOUD_MOSTLY_SUNNY,
-    SG_CLOUD_CIRRUS,
+    SG_CLOUD_MOSTLY_CLOUDY = 1,
+    SG_CLOUD_MOSTLY_SUNNY = 2,
+    SG_CLOUD_CIRRUS = 3,
 };
 
 
@@ -72,8 +81,8 @@ public:
     ~SGCloudLayer( void );
 
     // build the cloud object
-    void build( FGPath path, double size, double asl, double thickness,
-               double transition, SGCloudType type );
+    void build( double size, double asl, double thickness,
+               double transition, ssgSimpleState *state );
 
     // repaint the cloud colors based on current value of sun_angle,
     // sky, and fog colors.  This updates the color arrays for