Merge branch 'next' of git.gitorious.org:fg/simgear into next

[simgear.git] / simgear / scene / sky / newcloud.hxx

diff --git a/simgear/scene/sky/newcloud.hxx b/simgear/scene/sky/newcloud.hxx
index 26987933c6352fb44b353691a3c4fc6caefd4f88..91db9f60b37dbaaaaa3b87018b798ae1c1e5ea27 100644 (file)
--- a/simgear/scene/sky/newcloud.hxx
+++ b/simgear/scene/sky/newcloud.hxx
@@ -40,21 +40,7 @@ using std::vector;
 class SGNewCloud {
 
 public:
-        SGNewCloud(string type,
-                   const SGPath &tex_path, 
-                    string tex,
-                    double min_w,
-                    double max_w,
-                    double min_h,
-                    double max_h,
-                    double min_sprite_w,
-                    double max_sprite_w,
-                    double min_sprite_h,
-                    double max_sprite_h,
-                    double b,
-                    int n,
-                    int nt_x,
-                    int nt_y);
+        SGNewCloud(const SGPath &texture_root, const SGPropertyNode *cld_def);
 
         ~SGNewCloud();
 
@@ -84,11 +70,12 @@ private:
         double min_sprite_height;
         double max_sprite_height;
         double bottom_shade;
+        double zscale;
+        bool height_map_texture;
         int num_sprites;
         int num_textures_x;
         int num_textures_y;
-        const string texture;
-        const string name;
+        string texture;
         osg::Geometry* quad;
         osg::ref_ptr<simgear::Effect> effect;
         static double sprite_density;