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 1faabb3f5605cbf82932201058049c1007749226..cbc425a2cea685b515b229d730c67393bbd07255 100644 (file)
--- a/simgear/sky/cloud.hxx
+++ b/simgear/sky/cloud.hxx
@@ -24,14 +24,34 @@
 #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 = 1,
+    SG_CLOUD_MOSTLY_SUNNY = 2,
+    SG_CLOUD_CIRRUS = 3,
+};
 
 
 class SGCloudLayer {
 
+private:
+
+    ssgRoot *layer_root;
     ssgTransform *layer_transform;
     ssgSimpleState *layer_state;
 
@@ -39,7 +59,18 @@ class SGCloudLayer {
     ssgVertexArray *vl;
     ssgTexCoordArray *tl;
 
-    float layer_asl;           // height above sea level (meters)
+    // height above sea level (meters)
+    float layer_asl;
+    float layer_thickness;
+    float layer_transition;
+    float size;
+    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;
 
 public:
 
@@ -50,7 +81,8 @@ public:
     ~SGCloudLayer( void );
 
     // build the cloud object
-    ssgBranch *build( FGPath path, double size, double asl );
+    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
@@ -67,8 +99,19 @@ public:
     // lat specifies a rotation about the new Y axis
     // spin specifies a rotation about the new Z axis (and orients the
     // sunrise/set effects
-    bool reposition( sgVec3 p, sgVec3 up, double lon, double lat );
+    bool reposition( sgVec3 p, sgVec3 up, double lon, double lat, double alt );
+
+    // 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; }
 };
 
 
+// make an ssgSimpleState for a cloud layer given the named texture
+ssgSimpleState *SGCloudMakeState( const string &path );
+
+
 #endif // _SG_CLOUD_HXX_