Merge branch 'ehofman/sound'

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

diff --git a/simgear/scene/sky/newcloud.hxx b/simgear/scene/sky/newcloud.hxx
index be5549ff1d5c6cf1522d26c0af2af9db2f5ebd81..28f8a9c38f5d2d296e9653dd0a0ad1b9c3d3af33 100644 (file)
--- a/simgear/scene/sky/newcloud.hxx
+++ b/simgear/scene/sky/newcloud.hxx
@@ -31,6 +31,9 @@
 
 #include "bbcache.hxx"
 
+#include <simgear/scene/material/Effect.hxx>
+#include <simgear/scene/material/EffectGeode.hxx>
+
 using std::string;
 using std::vector;
 
@@ -59,7 +62,7 @@ public:
         ~SGNewCloud();
 
         // Generate a Cloud
-        osg::ref_ptr<osg::Geode> genCloud ();
+        osg::ref_ptr<simgear::EffectGeode> genCloud ();
 
         static double getDensity(void)
         {
@@ -90,7 +93,7 @@ private:
         const string texture;
         const string name;
         osg::Geometry* quad;
-        osg::ref_ptr<osg::StateSet> stateSet;
+        osg::ref_ptr<simgear::Effect> effect;
         static double sprite_density;
 
         osg::Geometry* createOrthQuad(float w, float h, int varieties_x, int varieties_y);