Preparation for making dynamic cloud layers -- moved cloud state out

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

diff --git a/simgear/sky/cloud.hxx b/simgear/sky/cloud.hxx
index 4d117e143c4154828867c7f457d0882cd26e69ff..36746d888ca1f586cacff210e549fd080d6a91e9 100644 (file)
--- a/simgear/sky/cloud.hxx
+++ b/simgear/sky/cloud.hxx
@@ -25,65 +25,50 @@
 #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 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_USING_STD(string);
 
 
 class SGCloudLayer {
 
-private:
+public:
 
-    ssgRoot *layer_root;
-    ssgTransform *layer_transform;
-    ssgSimpleState *layer_state;
+    enum Type {
+       SG_CLOUD_OVERCAST = 0,
+       SG_CLOUD_MOSTLY_CLOUDY,
+       SG_CLOUD_MOSTLY_SUNNY,
+       SG_CLOUD_CIRRUS,
+       SG_CLOUD_CLEAR,
+       SG_MAX_CLOUD_TYPES
+    };
 
-    ssgColourArray *cl; 
-    ssgVertexArray *vl;
-    ssgTexCoordArray *tl;
+    // Constructors
+    SGCloudLayer( const string &tex_path );
 
-    // height above sea level (meters)
-    float layer_asl;
-    float layer_thickness;
-    float layer_transition;
-    float size;
-    float scale;
+    // Destructor
+    ~SGCloudLayer( void );
 
-    // for handling texture coordinates to simulate cloud movement
-    // from winds, and to simulate the clouds being tied to ground
-    // position, not view position
-    // double xoff, yoff;
-    double last_lon, last_lat;
+    float getSpan_m () const;
+    void setSpan_m (float span_m);
 
-public:
+    float getElevation_m () const;
+    void setElevation_m (float elevation_m);
 
-    // Constructor
-    SGCloudLayer( void );
+    float getThickness_m () const;
+    void setThickness_m (float thickness_m);
 
-    // Destructor
-    ~SGCloudLayer( void );
+    float getTransition_m () const;
+    void setTransition_m (float transition_m);
+
+    Type getType () const;
+    void setType (Type type);
 
     // build the cloud object
-    void build( double size, double asl, double thickness,
-               double transition, ssgSimpleState *state );
+    void rebuild();
 
     // repaint the cloud colors based on current value of sun_angle,
     // sky, and fog colors.  This updates the color arrays for
@@ -105,9 +90,34 @@ public:
     // draw the cloud layer
     void draw();
 
-    inline float get_asl() const { return layer_asl; }
-    inline float get_thickness() const { return layer_thickness; }
-    inline float get_transition() const { return layer_transition; }
+private:
+
+    static ssgSimpleState *layer_states[SG_MAX_CLOUD_TYPES];
+    static int layer_sizes[SG_MAX_CLOUD_TYPES];
+
+    ssgRoot *layer_root;
+    ssgTransform *layer_transform;
+    ssgLeaf * layer;
+
+    ssgColourArray *cl; 
+    ssgVertexArray *vl;
+    ssgTexCoordArray *tl;
+
+    // height above sea level (meters)
+    SGPath texture_path;
+    float layer_span;
+    float layer_asl;
+    float layer_thickness;
+    float layer_transition;
+    Type layer_type;
+    float scale;
+
+    // for handling texture coordinates to simulate cloud movement
+    // from winds, and to simulate the clouds being tied to ground
+    // position, not view position
+    // double xoff, yoff;
+    double last_lon, last_lat;
+
 };