Work around apparent OSG 3.2.0 normal binding bug.

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

diff --git a/simgear/scene/sky/newcloud.hxx b/simgear/scene/sky/newcloud.hxx
index eb92c9249daf50ba9b6120176602106d25479bbb..88edf19c4bba181683b57d8f16cf449733db3494 100644 (file)
--- a/simgear/scene/sky/newcloud.hxx
+++ b/simgear/scene/sky/newcloud.hxx
@@ -28,6 +28,7 @@
 #include <vector>
 #include <osg/Fog>
 
+#include <simgear/math/sg_random.h>
 #include <simgear/scene/material/Effect.hxx>
 #include <simgear/scene/material/EffectGeode.hxx>
 
@@ -40,14 +41,14 @@ using std::vector;
 class SGNewCloud {
 
 public:
-        SGNewCloud(const SGPath &texture_root, const SGPropertyNode *cld_def);
+        SGNewCloud(const SGPath &texture_root, const SGPropertyNode *cld_def, mt* s);
 
         ~SGNewCloud();
 
         // Generate a Cloud
         osg::ref_ptr<simgear::EffectGeode> genCloud ();
 
-        static double getDensity(void)
+        static float getDensity(void)
         {
             return sprite_density;
         }
@@ -61,26 +62,50 @@ public:
 
 private:
 
-        double min_width;
-        double max_width;
-        double min_height;
-        double max_height;
-        double min_sprite_width;
-        double max_sprite_width;
-        double min_sprite_height;
-        double max_sprite_height;
-        double bottom_shade;
-        double zscale;
+        float min_width;
+        float max_width;
+        float min_height;
+        float max_height;
+        float min_sprite_width;
+        float max_sprite_width;
+        float min_sprite_height;
+        float max_sprite_height;
+        
+        // Minimum and maximum bottom, middle, top, sunny, shade lighting
+        // factors. For individual clouds we choose a bottom/middle/top
+        // shade from between each min/max value
+        float min_bottom_lighting_factor;
+        float max_bottom_lighting_factor;
+        float min_middle_lighting_factor;
+        float max_middle_lighting_factor;
+        float min_top_lighting_factor;
+        float max_top_lighting_factor;
+        float min_shade_lighting_factor;
+        float max_shade_lighting_factor;
+        
+        // The density of the cloud is the shading applied
+        // to cloud sprites on the opposite side of the cloud
+        // from the sun. For an individual cloud instance a value
+        // between min_density and max_density is chosen.
+        float min_density;
+        float max_density;
+        
+        // zscale indicates how sprites should be scaled vertically
+        // after billboarding. 
+        float zscale;
+        bool height_map_texture;
         int num_sprites;
         int num_textures_x;
         int num_textures_y;
         string texture;
         osg::Geometry* quad;
         osg::ref_ptr<simgear::Effect> effect;
-        static double sprite_density;
+        static float sprite_density;
+        
+        // RNG seed for this cloud
+        mt* seed;
 
         osg::Geometry* createOrthQuad(float w, float h, int varieties_x, int varieties_y);
-
 };