Changeset 53

Timestamp:

May 28, 2010, 10:18:54 AM (14 years ago)

Author:

Torben Dannhauer

Message:

Update to use osg for sky fog instead OpenGL.

this way the osg fog feature "radialFog" can be used.

Location:

osgVisual

Files:

• include/sky_Silverlining/skySilverLining_skyDrawable.h (modified) (4 diffs)
• src/sky_Silverlining/skySilverLining_skyDrawable.cpp (modified) (6 diffs)
• src/sky_Silverlining/visual_skySilverLining.cpp (modified) (5 diffs)

osgVisual/include/sky_Silverlining/skySilverLining_skyDrawable.h

@@ -22 +22 @@
 
 #include <osg/Drawable>
+#include <osg/CoordinateSystemNode>
+#include <osg/Fog>
+
 #include <osgViewer/Viewer>
 #include <OpenThreads/ScopedLock>
@@ -40 +43 @@
 public:
         skySilverLining_skyDrawable();
-        skySilverLining_skyDrawable(osgViewer::Viewer* view);
+        skySilverLining_skyDrawable(osgViewer::Viewer* view, osg::CoordinateSystemNode* csn_);
 
     virtual bool isSameKindAs(const Object* obj) const {
@@ -58 +61 @@
         void addCloudLayer(cloudLayerSlot *cloudLayerSlot_);
 
+        void shutdown();
+
 protected:
         void setLighting(SilverLining::Atmosphere *atm) const;
@@ -71 +76 @@
         mutable std::vector<cloudLayerSlot*> cloudLayerSlots;
         bool newCloudLayersToAdd;
+        osg::ref_ptr<osg::CoordinateSystemNode> sceneRoot;
 };
 

osgVisual/src/sky_Silverlining/skySilverLining_skyDrawable.cpp

@@ -43 +43 @@
 }
 
-skySilverLining_skyDrawable::skySilverLining_skyDrawable(osgViewer::Viewer* view)
+skySilverLining_skyDrawable::skySilverLining_skyDrawable(osgViewer::Viewer* view,  osg::CoordinateSystemNode* csn_)
         : osg::Drawable()
         , _view(view)
@@ -53 +53 @@
         cloudLayerSlots.clear();
         newCloudLayersToAdd = false;
+        sceneRoot = csn_;
 }
 
@@ -86 +87 @@
 void skySilverLining_skyDrawable::setSceneFog(SilverLining::Atmosphere *atmosphere) const
 {    
-        glEnable(GL_FOG);
-    glFogi(GL_FOG_MODE, GL_EXP);
+        //glEnable(GL_FOG);
+ //   glFogi(GL_FOG_MODE, GL_EXP);
+
+        ////float hazeR, hazeG, hazeB;
+        ////double hazeDepth, hazeDensity;
+        ////atmosphere->GetHaze(hazeR, hazeG, hazeB, hazeDepth, hazeDensity);
+
+ //   //hazeDensity = 1.0 / 40000;
+        ////hazeDensity = 0;
+        //float hazeDensity = 1.0 / atmosphere->GetConditions()->GetVisibility();
+
+ //   // Decrease fog density with altitude, to avoid fog effects through the vacuum of space.
+ //   static const double H = 8435.0; // Pressure scale height of Earth's atmosphere
+ //   double isothermalEffect = exp(-(atmosphere->GetConditions()->GetLocation().GetAltitude() / H));     
+ //   if (isothermalEffect <= 0) isothermalEffect = 1E-9;
+ //   if (isothermalEffect > 1.0) isothermalEffect = 1.0;
+ //   hazeDensity *= isothermalEffect;
+
+ //   bool silverLiningHandledTheFog = false;
+
+ //   if (atmosphere->GetFogEnabled())
+ //   {
+ //           float density, r, g, b;
+ //           // Note, the fog color returned is already lit
+ //           atmosphere->GetFogSettings(&density, &r, &g, &b);
+
+ //           if (density > hazeDensity)
+ //           {
+ //                   glFogf(GL_FOG_DENSITY, density);
+
+ //                   GLfloat fogColor[4] = {r, g, b, 1.0};
+ //                   glFogfv(GL_FOG_COLOR, fogColor);
+
+ //                   silverLiningHandledTheFog = true;
+ //           }
+ //   }
+ //   
+ //   if (!silverLiningHandledTheFog)
+ //   {
+ //           GLfloat fogColor[4];
+ //           //atmosphere->GetHorizonColor(yaw, &fogColor[0], &fogColor[1], &fogColor[2]);     // New version of this call: SL_1.94 /** \todo transmit the yaw value of the center channel to all slaves for consistent fog color. */
+        //              atmosphere->GetHorizonColor( 0, &fogColor[0], &fogColor[1], &fogColor[2]);
+ //           glFogfv(GL_FOG_COLOR, fogColor);
+
+ //           glFogf(GL_FOG_DENSITY, hazeDensity);
+ //   }
+
+
+
+
+
+        
+        osg::ref_ptr<osg::Fog> fog = new osg::Fog;
+    fog->setMode(osg::Fog::EXP);
+        //fog->setUseRadialFog( true );
+
+        //_objectsNode  = erde oder object, das mit nebel bedacht werden soll   
+        sceneRoot->getOrCreateStateSet()->setAttributeAndModes(fog.get());
 
         //float hazeR, hazeG, hazeB;
@@ -114 +171 @@
             if (density > hazeDensity)
             {
-                    glFogf(GL_FOG_DENSITY, density);
-
-                    GLfloat fogColor[4] = {r, g, b, 1.0};
-                    glFogfv(GL_FOG_COLOR, fogColor);
-
-                    silverLiningHandledTheFog = true;
+                                fog->setDensity(density);
+                                fog->setColor(osg::Vec4(r, g, b, 1.0));
+
+                                silverLiningHandledTheFog = true;
             }
     }
@@ -125 +180 @@
     if (!silverLiningHandledTheFog)
     {
-            GLfloat fogColor[4];
-            //atmosphere->GetHorizonColor(yaw, &fogColor[0], &fogColor[1], &fogColor[2]);       // New version of this call: SL_1.94 /** \todo transmit the yaw value of the center channel to all slaves for consistent fog color. */
-                        atmosphere->GetHorizonColor( 0, &fogColor[0], &fogColor[1], &fogColor[2]);
-            glFogfv(GL_FOG_COLOR, fogColor);
-
-            glFogf(GL_FOG_DENSITY, hazeDensity);
+                float r, g, b;
+                atmosphere->GetHorizonColor(0, &r, &g, &b);// New version of this call: since SL_1.94 /** \todo transmit the yaw value of the center channel to all slaves for consistent fog color. */
+
+                fog->setDensity(hazeDensity);
+                fog->setColor(osg::Vec4(r, g, b, 1.0));
     }
 
-
- //   _fog = new osg::Fog;
-        //_objectsNode  = erde oder object, das mit nebel bedacht werden soll   
-        //_objectsNode->getOrCreateStateSet()->setAttributeAndModes(_fog.get());
-
-        //fog->setMode(osg::Fog::EXP);
-
- //   float hazeDensity = 0;//1.0 / 10000.0; //0.000075f
- //   bool silverLiningHandledTheFog = false;
-
- //   if (atmosphere->GetFogEnabled())
- //   {
- //       float density, r, g, b;
- //       atmosphere->GetFogSettings(&density, &r, &g, &b);
-
- //       if (density > hazeDensity)
- //       {
- //           fog->setDensity(density);
- //           fog->setColor(osg::Vec4(r, g, b, 1.0));
-
- //           silverLiningHandledTheFog = true;
- //       }
- //   }
-
- //   if (!silverLiningHandledTheFog)
- //   {
- //       float r, g, b;
- //       atmosphere->GetHorizonColor(0, &r, &g, &b);
-
- //       fog->setDensity(hazeDensity);
- //       fog->setColor(osg::Vec4(r, g, b, 1.0));
- //   }
 }
 
@@ -278 +300 @@
         }
 }
+
+void skySilverLining_skyDrawable::shutdown()
+{
+        sceneRoot = NULL;
+}

osgVisual/src/sky_Silverlining/visual_skySilverLining.cpp

@@ -164 +164 @@
     // Add the sky (calls Atmosphere::BeginFrame and handles initialization once you're in
     // the rendering thread)
-        skyDrawable = new skySilverLining_skyDrawable(viewer);
+        skyDrawable = new skySilverLining_skyDrawable(viewer, sceneRoot);
 
         osg::Camera *mainCamera = viewer->getCamera();
@@ -244 +244 @@
     // Add the sky (calls Atmosphere::BeginFrame and handles initialization once you're in
     // the rendering thread)
-        skyDrawable = new skySilverLining_skyDrawable(viewer);
+        skyDrawable = new skySilverLining_skyDrawable(viewer, sceneRoot);
  
         if (!useProjMatrixCallback)
@@ -301 +301 @@
 
         setTime(16,00,23);
-        setVisibility(50000);
+        setVisibility(5000);
+        //AtmosphericConditions::SetFog()// use this for simulation real fog.
+
+
 
         //Todo: secure memory-manager of timer*. oder remove paragraph
@@ -371 +374 @@
 
                 // delete drawables
+                skyDrawable->shutdown();
                 this->removeDrawable(skyDrawable);
                 this->removeDrawable(cloudsDrawable);
@@ -382 +386 @@
                 atmosphere->GetConditions()->SetVisibility( visibility_ );
         }
+
 }